Merge branch 'master' into master-noneditmaster-nonedit

Conflicts (manually resolved: text adjustments adopted, newly added files suppressed):
	ikiwiki.mdwn
	ikiwiki/directive.mdwn
	ikiwiki/formatting.mdwn
	ikiwiki/markdown.mdwn
	ikiwiki/openid.mdwn
	ikiwiki/pagespec.mdwn
	ikiwiki/pagespec/attachment.mdwn
	ikiwiki/subpage.mdwn
	ikiwiki/wikilink.mdwn
	index.mdwn
	templates.mdwn
	wikiicons/openidlogin-bg.gif

5 files changed, 244 insertions, 133 deletions

diff --git a/ikiwiki/searching.mdwn b/ikiwiki/searching.mdwn
index 539e719..4c12879 100644
--- a/ikiwiki/searching.mdwn
+++ b/ikiwiki/searching.mdwn
@@ -5,7 +5,7 @@ then="This wiki has searching **enabled**."
 else="This wiki has searching **disabled**."]]
 
 If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to constuct
+as you'd expect. There are a few special things you can do to construct
 more powerful searches.
 
 * To match a phrase, enclose it in double quotes.
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 14cd5ff..54dd0fd 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
@@ -59,12 +59,14 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
+* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after url-encoding it, and '%S' is
-replaced with the raw, non-encoded text. The optional `desc` parameter
-controls the description of the link.
+text passed to the named shortcut, after [[!wikipedia url_encoding]]
+it, and '%S' is replaced with the raw, non-encoded text. The optional
+`desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
@@ -73,5 +75,5 @@ parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
 ikiwiki will include your shortcut in the standard underlay.
diff --git a/style.css b/style.css
index 5787ef6..bf000da 100644
--- a/style.css
+++ b/style.css
@@ -4,6 +4,14 @@
  * local.css and use it to override or change settings in this one.
  */
 
+/* html5 compat */
+article,
+header,
+footer,
+nav {
+	display: block;
+}
+
 .header {
 	margin: 0;
 	font-size: 22px;
@@ -12,7 +20,7 @@
 	display: block;
 }
 
-.author {
+.inlineheader .author {
 	margin: 0;
 	font-size: 18px;
 	font-weight: bold;
@@ -21,8 +29,15 @@
 
 .actions ul {
 	margin: 0;
-	padding: 6px;
+	padding: 6px .4em;
+	height: 1em;
 	list-style-type: none;
+}
+.actions li {
+	display: inline;
+	padding: .2em;
+}
+.pageheader .actions ul {
 	border-bottom: 1px solid #000;
 }
 
@@ -30,20 +45,27 @@
 	border-bottom: 0;
 }
 
-div.inlinecontent {
-	margin-top: .4em;
+#otherlanguages ul {
+	margin: 0;
+	padding: 6px;
+	list-style-type: none;
 }
-
-.actions li {
+#otherlanguages li {
 	display: inline;
 	padding: .2em .4em;
 }
+.pageheader #otherlanguages {
+	border-bottom: 1px solid #000;
+}
 
-.pagefooter {
-	clear: both;
+.inlinecontent {
+	margin-top: .4em;
 }
 
-.tags {
+.pagefooter,
+.inlinefooter,
+.comments {
+	clear: both;
 }
 
 #pageinfo {
@@ -51,10 +73,14 @@ div.inlinecontent {
 	border-top: 1px solid #000;
 }
 
-div.tags {
+.tags {
 	margin-top: 1em;
 }
 
+.inlinepage .tags {
+        display: inline;
+}
+
 .mapparent {
 	text-decoration: none;
 }
@@ -65,6 +91,14 @@ div.tags {
 	text-align: center;
 }
 
+.align-left {
+	float:left;
+}
+
+.align-right {
+	float:right;
+}
+
 #backlinks {
 	margin-top: 1em;
 }
@@ -75,19 +109,28 @@ div.tags {
 }
 
 #editcontent {
-	width: 100%;
+	width: 98%;
+}
+
+.editcontentdiv {
+	width: auto;
+	overflow: auto;
 }
 
 img {
 	border-style: none;
 }
 
+pre {
+	overflow: auto;
+}
+
 div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
 	overflow: auto;
-	clear: both;
-	width: 100%;
+	width: auto;
+	clear: none;
 	background: #eee;
 	color: black !important;
 }
@@ -131,17 +174,19 @@ div.recentchanges {
 	width: 60%;
 }
 
-/* Used for adding a blog page. */
 #blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
 	background: #eee;
 	color: black !important;
+	width: auto;
+	overflow: auto;
 }
 
 .inlinepage {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
+	overflow: auto;
 }
 
 .pagedate,
@@ -156,90 +201,18 @@ div.recentchanges {
 	color: #C00;
 }
 
-/* Used for invalid form fields. */
-.fb_invalid {
-	color: red;
-	background: white !important;
-}
-
-/* Used for required form fields. */
-.fb_required {
-	font-weight: bold;
-}
-
-/* Orange feed button. */
-.feedbutton {
-	background: #ff6600;
-	color: white !important;
-	border-left: 1px solid #cc9966;
-	border-top: 1px solid #ccaa99;
-	border-right: 1px solid #993300;
-	border-bottom: 1px solid #331100;
-	padding: 0px 0.5em 0px 0.5em;
-	font-family: sans-serif;
-	font-weight: bold;
-	font-size: small;
-	text-decoration: none;
-	margin-top: 1em;
-}
-.feedbutton:hover {
-	color: white !important;
-	background: #ff9900;
-}
-
-/* Tag cloud. */
-.pagecloud {
-	float: right;
-	width: 30%;
-	text-align: center;
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
-#sidebar {
-	line-height: 3ex;
+.sidebar {
 	width: 20ex;
 	float: right;
-	margin-left: 40px;
-	margin-bottom: 40px;
-	padding: 2ex 2ex;
+	margin-left: 4px;
+	margin-bottom: 4px;
+	margin-top: -1px;
+	padding: 0ex 2ex;
 	background: white;
+	border: 1px solid black;
 	color: black !important;
 }
 
-/* outlines */
-li.L1 {
-	list-style: upper-roman;
-}
-li.L2 {
-	list-style: decimal;
-}
-li.L3 {
-	list-style: lower-alpha;
-}
-li.L4 {
-	list-style: disc;
-}
-li.L5 {
-	list-style: square;
-}
-li.L6 {
-	list-style: circle;
-}
-li.L7 {
-	list-style: lower-roman;
-}
-li.L8 {
-	list-style: upper-alpha;
-}
-
 hr.poll {
 	height: 10pt;
 	color: white !important;
@@ -253,6 +226,27 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+span.color {
+	padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+	font-style: italic;
+	margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+	font-weight: bold;
+}
+.comment-subject {
+	font-weight: bold;
+}
+.comment {
+	border: 1px solid #aaa;
+	padding: 3px;
+}
+
 div.progress {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -269,23 +263,7 @@ div.progress-done {
 	padding: 1px;
 }
 
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-
-input#searchbox {
-	background: url(wikiicons/search-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 100% 50%;
-	color: #000;
-	padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
+/* things to hide in printouts */
 @media print {
 	.actions { display: none; }
 	.tags { display: none; }
@@ -295,7 +273,7 @@ input#searchbox {
 	#backlinks { display: none; }
 }
 
-/* Provided for use by template plugin for floating info boxes. */
+/* infobox template */
 .infobox {
 	float: right;
 	margin-left: 2ex;
@@ -307,7 +285,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Provided for use by template plugin for floating note boxes. */
+/* notebox template */
 .notebox {
 	float: right;
 	margin-left: 2ex;
@@ -320,7 +298,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Used by the popup template and for backlinks hiding. */
+/* popup template and backlinks hiding */
 .popup {
 	border-bottom: 1px dotted #366;
 	color: #366;
@@ -339,14 +317,9 @@ input#searchbox {
 	border: 2px solid;
 	background-color: #dee;
 	color: black;
-	
-	/* Nonstandard, but very nice. */
-	opacity: 0.95;
-	-moz-opacity: 0.95;
-	filter: alpha(opacity=95);
 }
 
-/* Formbuilder styling */
+/* form styling */
 fieldset {
 	margin: 1ex 0;
 	border: 1px solid black;
@@ -358,17 +331,153 @@ legend {
 	float: left;
 	margin: 2px 0;
 }
-#signin_openid_url_label {
-	float: left;
-	margin-right: 1ex;
+label.block {    
+	display: block;   
+}
+label.inline {    
+	display: inline;
+}
+input#openid_identifier {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
+input#searchbox {
+	background: url(wikiicons/search-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 100% 50%;
+	color: #000;
+	padding-right: 16px;
+}
+/* invalid form fields */
+.fb_invalid {
+	color: red;
+	background: white !important;
+}
+/* required form fields */
+.fb_required {
+	font-weight: bold;
+}
+
+/* highlight plugin */
+pre.hl { color:#000000; background-color:#ffffff; }
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark { background-color:#ffffbb; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }
+
+/* calendar plugin */
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+	background-color: #eee;
+}
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+	text-align: right;
+}
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+	text-decoration: none;
+	font-weight: normal;
+	font-size: 150%;
 }
-#signin_openid {
+
+/* outlines */
+li.L1 { list-style: upper-roman; }
+li.L2 { list-style: decimal; }
+li.L3 { list-style: lower-alpha; }
+li.L4 { list-style: disc; }
+li.L5 { list-style: square; }
+li.L6 { list-style: circle; }
+li.L7 { list-style: lower-roman; }
+li.L8 { list-style: upper-alpha; }
+
+/* tag cloud */
+.pagecloud {
+	float: right;
+	width: 30%;
+	text-align: center;
 	padding: 10px 10px;
 	border: 1px solid #aaa;
-	background: #eee; 
+	background: #eee;
 	color: black !important;
 }
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
 
-span.color {
-	padding: 2px;
+/* orange feed button */
+.feedbutton {
+	background: #ff6600;
+	color: white !important;
+	border-left: 1px solid #cc9966;
+	border-top: 1px solid #ccaa99;
+	border-right: 1px solid #993300;
+	border-bottom: 1px solid #331100;
+	padding: 0px 0.5em 0px 0.5em;
+	font-family: sans-serif;
+	font-weight: bold;
+	font-size: small;
+	text-decoration: none;
+	margin-top: 1em;
+}
+.feedbutton:hover {
+	color: white !important;
+	background: #ff9900;
+}
+
+/* openid selector */
+#openid_choice {
+	display: none;
+}
+#openid_input_area {
+	clear: both;
+	padding: 10px;
+}
+#openid_btns, #openid_btns br {
+	clear: both;
+}
+#openid_highlight {
+	background-color: black;
+	float: left;
+}
+.openid_large_btn {
+	padding: 1em 1.5em;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+.openid_small_btn {
+	padding: 4px 4px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+a.openid_large_btn:focus {
+	outline: none;
+}
+a.openid_large_btn:focus {
+	-moz-outline-style: none;
+}
+.openid_selected {
+	border: 4px solid #DDD;
 }
diff --git a/templates/note.mdwn b/templates/note.mdwn
index 4cc323c..9ef5ad9 100644
--- a/templates/note.mdwn
+++ b/templates/note.mdwn
@@ -1,7 +1,7 @@
 <div class="notebox">
 <TMPL_VAR text>
 </div>
-<TMPL_UNLESS NAME="text">
+<TMPL_UNLESS text>
 Use this template to insert a note into a page. The note will be styled to
 float to the right of other text on the page. This template has one
 parameter:
diff --git a/templates/popup.mdwn b/templates/popup.mdwn
index b355daa..92455eb 100644
--- a/templates/popup.mdwn
+++ b/templates/popup.mdwn
@@ -1,4 +1,4 @@
-<TMPL_UNLESS NAME="mouseover">
+<TMPL_UNLESS mouseover>
 Use this template to create a popup window that is displayed when the mouse
 is over part of the page. This template has two parameters:
 <ul>