Item71: fixed buttons in preview

git-svn-id: http://svn.foswiki.org/trunk@1993 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 15, 2009 · f934d44 · f934d44
1 parent aea1837
commit f934d44
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 17 deletions.
diff --git a/NatEditPlugin/data/TWiki/NatEditPlugin.txt b/NatEditPlugin/data/TWiki/NatEditPlugin.txt
@@ -84,8 +84,9 @@ Sponsored by [[http://www.trivadis.com][Trivadis AG]]
 |  Author: | Michael Daum |
 |  Copyright &copy;: | 2007-2009 Michael Daum http://michaeldaumconsulting.com |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Version: | v3.31 |
+|  Version: | v3.32 |
 |  Change History: | |
+|  15 Jan 2009 | fixed buttons in preview screen |
 |  07 Jan 2009 | support for <nop>TinyMCEPlugin wysiwyg editor; \
                  removed non-maintained "word" style; \
                  fixes for foswiki/compat; \

diff --git a/NatEditPlugin/lib/TWiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/TWiki/Plugins/NatEditPlugin.pm
@@ -22,7 +22,7 @@ use vars qw(
 );
 
 $VERSION = '$Rev$';
-$RELEASE = 'v3.31';
+$RELEASE = 'v3.32';
 
 $NO_PREFS_IN_TOPIC = 1;
 $SHORTDESCRIPTION = 'A Wikiwyg Editor';

diff --git a/NatEditPlugin/templates/edit.natedit.tmpl b/NatEditPlugin/templates/edit.natedit.tmpl
@@ -5,7 +5,7 @@
 
 %TMPL:DEF{"titleaction"}%(%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%MAKETEXT{"edit"}%"}%)%TMPL:END%
 %TMPL:DEF{"pagetitlestylewrapper"}%<!-- backwards compatibility -->%TMPL:END%
-%TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">[[%WEB%.%TOPIC%][%TOPIC%]] (%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%IF{"istopic '%WEB%.%TOPIC%'" then="%MAKETEXT{"edit"}%" else="%MAKETEXT{"new"}%"}%"}%)</h1>%TMPL:END%
+%TMPL:DEF{"contenttitle"}%<h1 class="patternTemplateTitle">%IF{"defined 'rev'" then="[[%WEB%.%TOPIC%][%TOPIC%]] (%MAKETEXT{"restore"}%)" else="%IF{"istopic '%WEB%.%TOPIC%'" then="[[%WEB%.%TOPIC%][%TOPIC%]] (%MAKETEXT{"edit"}%)" else="<nop>%TOPIC% (%MAKETEXT{"new"}%)"}%"}%</h1>%TMPL:END%
 
 %TMPL:DEF{"gettopictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="gettopictitle_dbcache" else="gettopictitle_default"}%%TMPL:END%
 %TMPL:DEF{"gettopictitle_default"}%%IF{"defined 'TOPICTITLE'" then="%TOPICTITLE%" else=""}%%TMPL:END%

diff --git a/NatEditPlugin/templates/edittoolbar.natedit.tmpl b/NatEditPlugin/templates/edittoolbar.natedit.tmpl
@@ -2,7 +2,7 @@
 %TMPL:DEF{"bottomtopicactions"}%<!-- bottomtopicactions -->
 <div class="natEditBottomBar">
 <ul>
-%TMPL:P{"savebutton"}%<!-- savebutton -->
+%TMPL:P{"saveorrestorebutton"}%<!-- saveorerestorebutton -->
 %TMPL:P{"checkpointbutton"}%<!-- checkpointbutton -->
 %TMPL:P{"previewbutton"}%<!-- previewbutton -->
 %TMPL:P{"formbutton"}%<!-- formbutton -->
@@ -12,15 +12,62 @@
 </ul>
 </div>
 <!-- //bottomtopicactions -->%TMPL:END%
-%TMPL:DEF{"savebutton"}%<li class="natEditSaveButton">%IF{"defined 'rev'" 
-  then="$percntBUTTON{\"%MAKETEXT{"Restore"}%\" title=\"%MAKETEXT{"Restore and exit"}%\" icon=\"arrow_undo\" id=\"save\" accesskey=\"r\" onclick=\"submitEditForm('save', 'save')\"}$percnt"
-  else="$percntBUTTON{\"%MAKETEXT{"Save"}%\" title=\"%MAKETEXT{"Save and exit"}%\" icon=\"tick\" id=\"save\" accesskey=\"s\" onclick=\"submitEditForm('save', 'save')\"}$percnt"
-}%</li>%TMPL:END%
+%TMPL:DEF{"restorebutton"}%%BUTTON{
+  "%MAKETEXT{"Restore"}%" 
+  title="%MAKETEXT{"Restore and exit"}%" 
+  icon="tick" 
+  id="save" 
+  accesskey="r" 
+  onclick="submitEditForm('save', 'save')"
+}%%TMPL:END%
+%TMPL:DEF{"savebutton"}%%BUTTON{
+  "%MAKETEXT{"Save"}%" 
+  title="%MAKETEXT{"Save and exit"}%" 
+  icon="tick" 
+  id="save" 
+  accesskey="s" 
+  onclick="submitEditForm('save', 'save')"
+}%%TMPL:END%
+%TMPL:DEF{"restoreandcontinuebutton"}%%BUTTON{
+  "%MAKETEXT{"Restore and Continue"}%" 
+  title="%MAKETEXT{"Restore and continue editing"}%" 
+  icon="disk" 
+  id="checkpoint" 
+  accesskey="w" 
+  onclick="submitEditForm('save', 'checkpoint')"
+}%%TMPL:END%
+%TMPL:DEF{"saveandcontinuebutton"}%%BUTTON{
+  "%MAKETEXT{"Save and Continue"}%" 
+  title="%MAKETEXT{"Save and continue editing"}%" 
+  icon="disk"
+  id="checkpoint" accesskey="w" 
+  onclick="submitEditForm('save', 'checkpoint')"
+}%%TMPL:END%
 %TMPL:DEF{"checkpointbutton"}%<li class="natEditCheckpointButton">%IF{"defined 'rev'"
-  then="$percntBUTTON{\"%MAKETEXT{"Restore and Continue"}%\" title=\"%MAKETEXT{"Restore and continue editing"}%\" icon=\"disk\" id=\"checkpoint\" accesskey=\"w\" onclick=\"submitEditForm('save', 'checkpoint')\"}$percnt"
-  else="$percntBUTTON{\"%MAKETEXT{"Save and Continue"}%\" title=\"%MAKETEXT{"Save and continue editing"}%\" icon=\"disk\" id=\"checkpoint\" accesskey=\"w\" onclick=\"submitEditForm('save', 'checkpoint')\"}$percnt"
+  then="$percntTMPL:P{\"restoreandcontinuebutton\"}$percnt"
+  else="$percntTMPL:P{\"saveandcontinuebutton\"}$percnt"
+}%</li>%TMPL:END%
+%TMPL:DEF{"saveorrestorebutton"}%<li class="natEditSaveButton">%IF{"defined 'rev'" 
+  then="$percntTMPL:P{\"restorebutton\"}$percnt"
+  else="$percntTMPL:P{\"savebutton\"}$percnt"
+}%</li>%TMPL:END%
+%TMPL:DEF{"previewbutton"}%<li class="natEditPreviewButton">%BUTTON{
+  "%MAKETEXT{"Preview"}%" 
+  title="%MAKETEXT{"Preview your changes"}%" 
+  icon="eye" 
+  id="preview" 
+  accesskey="p" 
+  onclick="submitEditForm('preview', 'preview')"
+}%</li>%TMPL:END%
+%TMPL:DEF{"cancelbutton"}%<li class="natEditCancelButton">%BUTTON{
+  "%MAKETEXT{"Cancel"}%" 
+  title="%MAKETEXT{"Abandon changes and exit"}%" 
+  icon="cross" 
+  id="cancel" 
+  accesskey="c" 
+  onclick="submitEditForm('save', 'cancel')"
+}% </li>%TMPL:END%
+%TMPL:DEF{"formbutton"}%<li class="natEditFormButton">%FORMBUTTON{
+  "$percntBUTTON{\"$action\" accesskey=\"f\" title=\"$title\" icon=\"application_form\" onclick=\"$script\"}$percnt"
 }%</li>%TMPL:END%
-%TMPL:DEF{"previewbutton"}%<li class="natEditPreviewButton">%BUTTON{"%MAKETEXT{"Preview"}%" title="%MAKETEXT{"Preview your changes"}%" icon="eye" id="preview" accesskey="p" onclick="submitEditForm('preview', 'preview')"}%</li>%TMPL:END%
-%TMPL:DEF{"cancelbutton"}%<li class="natEditCancelButton">%BUTTON{"%MAKETEXT{"Cancel"}%" title="%MAKETEXT{"Abandon changes and exit"}%" icon="cross" id="cancel" accesskey="c" onclick="submitEditForm('save', 'cancel')"}% </li>%TMPL:END%
-%TMPL:DEF{"forcenewrevision"}%<li class="natEditForceNewRevision"><label for="forcenewrevision"><input type="checkbox" title="Creates a new topic revision when saving" id="forcenewrevision" name="forcenewrevision" %FORCENEWREVISIONCHECKBOX% />%MAKETEXT{"Force new revision"}%</label></li>%TMPL:END%
-%TMPL:DEF{"formbutton"}%<li class="natEditFormButton">%FORMBUTTON{"$percntBUTTON{\"$action\" accesskey=\"f\" title=\"$title\" icon=\"application_form\" onclick=\"$script\"}$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%
diff --git a/NatEditPlugin/templates/previewtoolbar.natedit.tmpl b/NatEditPlugin/templates/previewtoolbar.natedit.tmpl
@@ -2,11 +2,16 @@
 <div class="natEditBottomBar" style="position:static;margin-bottom:25px;">
 <ul>
 %TMPL:P{"savebutton"}%<!-- savebutton// -->
-%TMPL:P{"checkpointbutton"}%<!-- checkpointbutton// -->
+%TMPL:P{"saveandcontinuebutton"}%<!-- checkpointbutton// -->
 %TMPL:P{"editbutton"}%<!-- editbutton// -->
 %TMPL:P{"cancelbutton"}%<!-- cancelbutton// -->
 %TMPL:P{"forcenewrevision"}%<!-- forcenewrevision// -->
 </ul>
 </div>%TMPL:END%
-%TMPL:DEF{"editbutton"}%<li class="natEditEditButton">%BUTTON{"%MAKETEXT{"Edit"}%" accesskey="e" icon="pencil" href="javascript:history.back()" title="%MAKETEXT{"Continue editing"}%"}%</li>%TMPL:END%
-
+%TMPL:DEF{"editbutton"}%<li class="natEditEditButton">%BUTTON{
+  "%MAKETEXT{"Edit"}%" 
+  accesskey="e" 
+  icon="pencil" 
+  onclick="window.history.back()" 
+  title="%MAKETEXT{"Continue editing"}%"
+}%</li>%TMPL:END%