Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13365: proper use of forcenewrevision
  • Loading branch information
MichaelDaum committed Apr 10, 2015
1 parent dc55210 commit fde394d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
3 changes: 1 addition & 2 deletions NatEditPlugin/templates/edit.natedit.tmpl
Expand Up @@ -49,8 +49,7 @@

%TMPL:DEF{"textarea"}%<textarea id="topic" class="foswikiTextarea foswikiWysiwygEdit natedit" data-rest-params="?%NONCE%" data-auto-max-expand="true" data-min-height="230" data-min-height="300" %TMPL:P{"natedit::options"}% name="text">%TEXT%</textarea>%TMPL:END%

%TMPL:DEF{"formend"}%<input type="hidden" name="forcenewrevision" value="%URLPARAM{"forcenewrevision"}%" />
</form></div>%TMPL:END%
%TMPL:DEF{"formend"}%</form></div>%TMPL:END%

%TMPL:DEF{"editcaptcha"}%%TMPL:P{context="CaptchaEnableSave" then="editcaptcha::impl"}%%TMPL:END%
%TMPL:DEF{"editcaptcha::impl"}%<div class="jqUIDialog foswikiFormSteps {modal:true, resizable:false, width:'auto', draggable:true, appendTo:'#EditForm'}" id="editcaptcha" title="%MAKETEXT{"Please validate"}%" >
Expand Down
3 changes: 1 addition & 2 deletions NatEditPlugin/templates/edittoolbar.natedit.tmpl
Expand Up @@ -203,5 +203,4 @@
href=\"#$id\"
}$percnt"
}%</li>%TMPL:END%
%TMPL:DEF{"forcenewrevision"}%<li class="natEditForceNewRevision"><label for="forcenewrevision"><input type="checkbox" title="%MAKETEXT{"Creates a new topic revision when saving"}%" id="forcenewrevision" name="forcenewrevision" %FORCENEWREVISIONCHECKBOX% />%MAKETEXT{"Force new revision"}%</label></li>%TMPL:END%

%TMPL:DEF{"forcenewrevision"}%<li class="natEditForceNewRevision"><label for="forcenewrevision"><input type="checkbox" title="%MAKETEXT{"Creates a new topic revision when saving"}%" id="forcenewrevision" name="forcenewrevision" %IF{"'%URLPARAM{"forcenewrevision" default="%FORCENEWREVISIONCHECKBOX%"}%'=~'1|on|yes|checked'" then="checked"}% />%MAKETEXT{"Force new revision"}%</label></li>%TMPL:END%
10 changes: 5 additions & 5 deletions NatEditPlugin/templates/previewtoolbar.natedit.tmpl
@@ -1,11 +1,11 @@
%TMPL:DEF{"previewtoolbar"}%<!-- previewtoolbar.natedit.tmpl -->
<div class="natEditBottomBar" style="position:static;margin-bottom:25px;">
<ul>
%TMPL:P{"savebutton"}%<!-- savebutton// -->
%TMPL:P{"saveandcontinuebutton"}%<!-- checkpointbutton// -->
%TMPL:P{"editbutton"}%<!-- editbutton// -->
%TMPL:P{"cancelbutton"}%<!-- cancelbutton// -->
%TMPL:P{"forcenewrevision"}%<!-- forcenewrevision// -->
%TMPL:P{"savebutton"}%<!-- -->
%TMPL:P{"saveandcontinuebutton"}%<!-- -->
%TMPL:P{"editbutton"}%<!-- -->
%TMPL:P{"cancelbutton"}%<!-- -->
%TMPL:P{"forcenewrevision"}%<!-- -->
</ul>
%CLEAR%
</div>%TMPL:END%
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/edit.pattern.tmpl
Expand Up @@ -20,7 +20,7 @@

%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" %FORCENEWREVISIONCHECKBOX% /><label for="forcenewrevision">%MAKETEXT{"Force new revision"}%</label> %POPUPWINDOW{"%SYSTEMWEB%.ForceNewRevision" 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%


%TMPL:DEF{"action_buttons"}%%TMPL:P{"button_save"}%&nbsp;%TMPL:P{"button_quietsave"}%&nbsp;%TMPL:P{"button_checkpoint"}% %TMPL:P{"button_preview"}% %TMPL:P{"button_cancel"}%%TMPL:END%
Expand Down
1 change: 0 additions & 1 deletion core/templates/edit.tmpl
Expand Up @@ -29,7 +29,6 @@
%TMPL:DEF{"formparameters:edit"}%<input type="hidden" name="action" value="%URLPARAM{"action"}%" />
<input type="hidden" name="cmd" value="%CMD%" />
<input type="hidden" name="cover" value="%URLPARAM{"cover"}%" />
<input type="hidden" name="forcenewrevision" value="%URLPARAM{"forcenewrevision"}%" />
<input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" />
<input type="hidden" name="newtopic" value="%NEWTOPIC%" />
<input type="hidden" name="nowysiwyg" value="%URLPARAM{"nowysiwyg"}%" />
Expand Down

0 comments on commit fde394d

Please sign in to comment.