diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
| commit | 75196e76b627709a6ecae3fa948e1fba7928a5ce (patch) | |
| tree | 6aa2baeb9cc68f98ca256ce0ff5cb20909f52ef9 /templates | |
| parent | 8c2962ec48ae57605d6d0e297be437a97b6229ca (diff) | |
| parent | e5ed3c9e3801360cc00ce4f4f325f68ac0770bff (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/change.tmpl | 10 | ||||
| -rw-r--r-- | templates/revert.tmpl | 21 | ||||
| -rw-r--r-- | templates/rssitem.tmpl | 2 |
3 files changed, 28 insertions, 5 deletions
diff --git a/templates/change.tmpl b/templates/change.tmpl index 671b9e483..d7ec90875 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -10,10 +10,8 @@ <span class="desc"><br />Changed pages:</span> <span class="pagelinks"> <TMPL_LOOP PAGES> -<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> -<TMPL_ELSE> -<TMPL_VAR LINK> -</TMPL_IF> +<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> +<TMPL_ELSE><TMPL_VAR LINK></TMPL_IF> </TMPL_LOOP> </span> <span class="desc"><br />Changed by:</span> @@ -28,6 +26,10 @@ <span class="committype"><TMPL_VAR COMMITTYPE></span> <span class="desc"><br />Date:</span> <span class="changedate"><TMPL_VAR COMMITDATE></span> +<span class="desc"><br /></span> +<TMPL_IF REVERTURL><span class="revert"> +<a href="<TMPL_VAR REVERTURL>" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span></TMPL_IF> </div> <div class="changelog"> <TMPL_LOOP MESSAGE> diff --git a/templates/revert.tmpl b/templates/revert.tmpl new file mode 100644 index 000000000..0de32811b --- /dev/null +++ b/templates/revert.tmpl @@ -0,0 +1,21 @@ +<TMPL_VAR FORM-START> +<div> + <TMPL_VAR FIELD-DO> + <TMPL_VAR FIELD-SID> + <TMPL_VAR FIELD-REV> +<label for="revertmessage" class="block">Optional comment about this change:</label> + <TMPL_VAR FIELD-REVERTMESSAGE> +</div> +<div class="revert buttons"> +<TMPL_VAR form-submit> +<TMPL_VAR form-cancel> +</div> +<TMPL_VAR FORM-END> +<br \> +<div class="header"> +<span>Diff being reverted:</span> +</div> +<div id="diff"> +<pre> +<TMPL_VAR diff> +</pre> diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a64a4ebd7..272b340bb 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -8,7 +8,7 @@ <TMPL_IF GUID> <guid isPermaLink="no"><TMPL_VAR GUID></guid> <TMPL_ELSE> - <guid><TMPL_VAR URL></guid> + <guid isPermaLink="no"><TMPL_VAR URL></guid> </TMPL_IF> <link><TMPL_VAR PERMALINK></link> <TMPL_IF CATEGORIES> |