Item13619: Remove RevComment from templates.

This removed the RevComment customization from the core templates. The function will be added by a skin override shipped with RevCommentPlugin This is safe to remove in a core patch because the RevCommentPlugin is not currently functional on Foswiki 2.0. Note that the RevCommentPlugin CSS is still contained in the PatternSkin CSS files.
foswiki · Aug 24, 2015 · 32898b1 · 32898b1
1 parent 31f3836
commit 32898b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/HistoryPlugin/templates/oopshistory.tmpl b/HistoryPlugin/templates/oopshistory.tmpl
@@ -21,23 +21,10 @@ This version is tested with Foswiki in IE6, IE7 and FF3.
 %TMPL:DEF{"diffbin_compare"}%compare%TMPL:END%
 
 
-%TMPL:DEF{"historytable"}%%TMPL:P{context="RevCommentPluginEnabled" then="historytable_rcp_enabled" else="historytable_rcp_disabled"}%%TMPL:END%
-
-
-%TMPL:DEF{"historytable_rcp_enabled"}%<table class="foswikiTable historySelectTable" summary="%MAKETEXT{"Topic history"}%">
-<tr>
-<th colspan="3">%MAKETEXT{"Revision"}%</th>
-<th>%MAKETEXT{"Changed on"}%</th>
-<th>%MAKETEXT{"Last edited by"}%</th>
-<th>%MAKETEXT{"Comment"}%</th>
-</tr>
-%HISTORY{"<tr><td align="right"><a href=\"%SCRIPTURL{view}%/%WEB%/%TOPIC%?rev=$rev\">$rev</a></td><td style=\"background-color:#fffaf2; text-align:center;\"><input type=\"radio\" name=\"rev2\" value=\"$rev\" style=\"border:none; background-color:#fffaf2;\" /></td><td style=\"background-color:#f2f7fc; text-align:center;\"><input type=\"radio\" name=\"rev1\" value=\"$rev\" style=\"border:none; background-color:#f2f7fc;\" /></td><td style="white-space: nowrap;">$date</td><td>[[$wikiusername][$wikiname]]</td><td><div class="historyRevComment">%REVCOMMENT[$rev]%</div></td></tr>" rev1="%URLPARAM{"rev1"}%" rev2="%URLPARAM{"rev2"}%" nrev="%URLPARAM{"nrev"}%" header="" footer="</table>$n%TMPL:P{"historytable:navigation"}%%TMPL:END%
-
-
 %TMPL:DEF{"historytable:navigation"}%$next{'%MAKETEXT{"Jump to latest revision ([_1])" args="%HISTORY_MAXREV%"}%' url='%SCRIPTURL{oops}%/%WEB%/%TOPIC%?template=oopshistory&nrev=$nrev'} $next{'%MAKETEXT{"View later"}%' url='%SCRIPTURL{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=$rev1&nrev=$nrev'} $previous{'%MAKETEXT{"View earlier"}%' url='%SCRIPTURL{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=$rev1&nrev=$nrev'} $previous{'%MAKETEXT{"Jump to first revision"}%' url='%SCRIPTURL{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=1&nrev=$nrev'}"}%%TMPL:END%
 
 
-%TMPL:DEF{"historytable_rcp_disabled"}%<table class="foswikiTable historySelectTable" summary="%MAKETEXT{"Topic history"}%">
+%TMPL:DEF{"historytable"}%<table class="foswikiTable historySelectTable" summary="%MAKETEXT{"Topic history"}%">
 <tr>
 <th colspan="3">%MAKETEXT{"Revision"}%</th>
 <th>%MAKETEXT{"Changed on"}%</th>
@@ -60,15 +47,6 @@ table.historySelectTable th {
 	padding-left:.7em;
 	padding-right:.7em;
 }
-.historyRevComment ul {
-	list-style:none;
-	padding:0;
-	margin:0 0 0 1em;
-}
-.historyRevComment li {
-	padding:0;
-	margin:0;
-}
 table.foswikiDiffOptions {
 	margin:.5em 0;
 	border:none;
@@ -141,4 +119,4 @@ table.foswikiDiffOptions img {
 %TMPL:DEF{"viewoptions:upto"}%<input type='text' class='foswikiInputField' name='rev2' value='%HISTORY_REV2%' size='2' />%TMPL:END%
 
 
-%TMPL:DEF{"topicactionbuttons"}%<a href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%' rel='nofollow' %MAKETEXT{"title='View topic' accesskey='v'>&View topic"}%</a>%TMPL:P{"sep"}%<a href="%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%?type=history" title="%MAKETEXT{"View total topic history"}%" accesskey="S" rel="nofollow">%MAKETEXT{"&Sequential"}%</a>%TMPL:END%
+%TMPL:DEF{"topicactionbuttons"}%<a href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%' rel='nofollow' %MAKETEXT{"title='View topic' accesskey='v'>&View topic"}%</a>%TMPL:P{"sep"}%<a href="%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%?type=history" title="%MAKETEXT{"View total topic history"}%" accesskey="S" rel="nofollow">%MAKETEXT{"&Sequential"}%</a>%TMPL:END%
diff --git a/NatEditPlugin/templates/edit.natedit.tmpl b/NatEditPlugin/templates/edit.natedit.tmpl
@@ -89,12 +89,6 @@
   container=".natEditHelp"
 }%%TMPL:P{"edithelp"}%%ENDTAB%%TMPL:END%
 
-%TMPL:DEF{"revCommentPluginOptions"}%%IF{ 
-  "context RevCommentPluginEnabled" 
-  then="<div class='revComment'><label for='comment'>Summary of changes</label> <input class='foswikiEditComment foswikiInputField' size='50' type='text' name='comment' id='comment' /></div><!--/revComment-->" 
-  else=""
-}%%TMPL:END%
-
 %TMPL:DEF{"selectedtab"}%%URLPARAM{"selectedtab"}%%TMPL:END%
 
 %TMPL:DEF{"permissionstab"}%%TAB{"%MAKETEXT{"Permissions"}%" id="permissions"}%

diff --git a/PatternSkin/templates/edit.pattern.tmpl b/PatternSkin/templates/edit.pattern.tmpl
@@ -18,8 +18,6 @@
 <form name="main" id="main" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%" method="post">%TMPL:END%
 
 
-%TMPL:DEF{"revCommentPluginOptions"}%<hr /><div class='foswikiFormStep revComment'><label for='comment'>Summary of changes</label> <input class='foswikiInputField' type='text' style='width:50%' name='comment' id='comment' /> %POPUPWINDOW{"%SYSTEMWEB%.RevComment" label="%MAKETEXT{"help"}%"}%</div>%TMPL:END%
-
 %TMPL:DEF{"forcerevisioncheckbox"}%<div class="foswikiFormStep"><input type="checkbox" class="foswikiCheckbox" title="Creates a new topic revision when saving" id="forcenewrevision" name="forcenewrevision" %IF{"'%URLPARAM{"forcenewrevision" default="%FORCENEWREVISIONCHECKBOX%"}%'=~'1|on|yes|checked'" then="checked"}% /><label for="forcenewrevision">%MAKETEXT{"Force new revision"}%</label> %POPUPWINDOW{"%SYSTEMWEB%.ForceNewRevision" label="%MAKETEXT{"help"}%"}%</div>%TMPL:END%
 
 
@@ -37,7 +35,7 @@
 %TMPL:DEF{"button_cancel"}%<input type="submit" class="foswikiButtonCancel" name="action_cancel" id="cancel" title='%MAKETEXT{"Cancel editing and discard changes"}%' %MAKETEXT{"value='Cancel' accesskey='c'"}% />%TMPL:END%
 
 
-%TMPL:DEF{"topicinfo"}%%TMPL:P{context="RevCommentPluginEnabled" then="revCommentPluginOptions"}%<hr /><div class="patternTopicActions foswikiFormStep clear"><div class="patternActionButtons">%TMPL:P{"action_buttons"}%</div></div>%TMPL:P{"forcerevisioncheckbox"}%%TMPL:END%
+%TMPL:DEF{"topicinfo"}%<hr /><div class="patternTopicActions foswikiFormStep clear"><div class="patternActionButtons">%TMPL:P{"action_buttons"}%</div></div>%TMPL:P{"forcerevisioncheckbox"}%%TMPL:END%
 
 
 %TMPL:DEF{"textarea"}%%IF{"{Validation}{Method}='strikeone'" then="<noscript>$percentTMPL:P{enable_js}$percent</noscript>"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea>%TMPL:P{"sig_textareabuttons"}%</div>%TMPL:END%