diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 14:11:38 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 14:11:38 +0200 |
| commit | 32379c9538d54499f62d03ed310cdabb31a81de6 (patch) | |
| tree | b7107929106a151654a985bb7b0ed4042b866a9a | |
| parent | 9a6afc5ea4985b871b6794596edc03fbc31ac943 (diff) | |
Sync with ikiwiki 3.20120419.
| -rw-r--r-- | atompage.tmpl | 2 | ||||
| -rw-r--r-- | editcomment.tmpl | 6 | ||||
| -rw-r--r-- | editpage.tmpl | 5 | ||||
| -rw-r--r-- | notifyemail.tmpl | 9 | ||||
| -rw-r--r-- | page.tmpl | 13 | ||||
| -rw-r--r-- | trails.tmpl | 23 |
6 files changed, 55 insertions, 3 deletions
diff --git a/atompage.tmpl b/atompage.tmpl index e82b598..3cdd71d 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -33,7 +33,7 @@ <id><TMPL_VAR PAGEURL></id> </TMPL_IF> <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> -<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator> +<generator uri="http://ikiwiki.info/">ikiwiki</generator> <updated><TMPL_VAR FEEDDATE></updated> <TMPL_VAR CONTENT> </feed> diff --git a/editcomment.tmpl b/editcomment.tmpl index a2edc69..e177db9 100644 --- a/editcomment.tmpl +++ b/editcomment.tmpl @@ -13,6 +13,9 @@ <label for="url" class="block">Website:</label> <TMPL_VAR NAME=FIELD-URL> (optional) <br /> +<label for="url" class="block">Email:</label> +<TMPL_VAR NAME=FIELD-EMAIL> <TMPL_VAR FIELD-ANONSUBSCRIBE> +<br /> <TMPL_ELSE> (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?) <br /> @@ -22,7 +25,8 @@ <TMPL_VAR FIELD-SUBJECT><br /> <label for="editcontent" class="block">Comment:</label> <TMPL_VAR FIELD-EDITCONTENT><br /> -<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br /> +<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK> +<TMPL_VAR FIELD-SUBSCRIBE><br /> <TMPL_VAR NAME="FORM-END"> <TMPL_VAR WMD_PREVIEW> diff --git a/editpage.tmpl b/editpage.tmpl index 696c8dc..4736c95 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -18,13 +18,16 @@ <TMPL_VAR FIELD-EDITCONTENT><br /> </div> <TMPL_IF NAME="CAN_COMMIT"> -<label for="editmessage" class="block">Optional comment about this change:</label> +<label for="editmessage" class="block">Optional description of this change:</label> <TMPL_VAR FIELD-EDITMESSAGE><br /> </TMPL_IF> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR HELPONFORMATTINGLINK> <TMPL_IF NAME="FIELD-ATTACHMENT"> <a class="toggle" href="#attachments">Attachments</a> +</TMPL_IF> +<TMPL_VAR FIELD-SUBSCRIBE> +<TMPL_IF NAME="FIELD-ATTACHMENT"> <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments"> <div id="fileupload"> <script> diff --git a/notifyemail.tmpl b/notifyemail.tmpl new file mode 100644 index 0000000..5087668 --- /dev/null +++ b/notifyemail.tmpl @@ -0,0 +1,9 @@ +A <TMPL_IF NAME=ISCOMMENT>comment has been posted at<TMPL_ELSE>change has been made to</TMPL_IF> <TMPL_VAR URL> +<TMPL_IF NAME=SHOWCONTENT> +---- + +<TMPL_VAR CONTENT> + +---- +</TMPL_IF> +To stop these notifications, visit <TMPL_VAR PREFSURL> @@ -27,6 +27,15 @@ <TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF> <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF> <TMPL_IF META><TMPL_VAR META></TMPL_IF> +<TMPL_LOOP TRAILLOOP> +<TMPL_IF PREVPAGE> +<link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" /> +</TMPL_IF> +<link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" /> +<TMPL_IF NEXTPAGE> +<link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" /> +</TMPL_IF> +</TMPL_LOOP> </head> <body> @@ -103,6 +112,8 @@ <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<TMPL_VAR TRAILS> + <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> <TMPL_IF SIDEBAR> @@ -138,6 +149,8 @@ <TMPL_UNLESS DYNAMIC> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> +<TMPL_VAR TRAILS> + <TMPL_IF TAGS> <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF> Tags: diff --git a/trails.tmpl b/trails.tmpl new file mode 100644 index 0000000..54c0460 --- /dev/null +++ b/trails.tmpl @@ -0,0 +1,23 @@ +<TMPL_LOOP TRAILLOOP> +<TMPL_IF __FIRST__><TMPL_IF HTML5><nav class="trails"><TMPL_ELSE><div class="trails"></TMPL_IF></TMPL_IF> +<div class="trail"> +<TMPL_IF PREVPAGE> +<span class="trailprev"> +<span class="trailarrow">←</span> +<a href="<TMPL_VAR PREVURL>"><TMPL_VAR PREVTITLE></a> +<span class="trailsep">|</span> +</span> +</TMPL_IF> +<span class="trailup"> +<a href="<TMPL_VAR TRAILURL>"><TMPL_VAR TRAILTITLE></a> +</span> +<TMPL_IF NEXTPAGE> +<span class="trailnext"> +<span class="trailsep">|</span> +<a href="<TMPL_VAR NEXTURL>"><TMPL_VAR NEXTTITLE></a> +<span class="trailarrow">→</span> +</span> +</TMPL_IF> +</div> +<TMPL_IF __LAST__><TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF></TMPL_IF> +</TMPL_LOOP> |