Menu
▾
▴
[TWiki-Dev] [SVN] MichaelDaum r11307 - in twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin: data/TWiki lib/TWiki/Contrib lib/TWiki/Contrib/NatSkin pub/TWiki/NatSkin templates
Author: MichaelDaum Date: 2006-08-15 09:16:42 -0500 (Tue, 15 Aug 2006) New Revision: 11307 Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/pub/TWiki/NatSkin/obfuscator.js twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewjavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamejavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamewebjavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/searchjavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/strings.nat.tmpl Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin.pm twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin/MANIFEST twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultjavascript.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edit.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.natedit.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edittopicactions.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/preview.nat.tmpl twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewtopicactions.nat.tmpl Log: Item2767: Item2755: * only load js snippets that are really needed * added forgotten strings.nat.tmpl * refactored obfuscator.js v3.0-pre3 Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt 2006-08-15 14:16:42 UTC (rev 11307) @@ -177,7 +177,7 @@ | Skin Author: | TWiki:Main/MichaelDaum | | Copyright ©: | 2003-2006, MichaelDaum@WikiRing.com | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Skin Version: | v3.0-pre2 | +| Skin Version: | v3.0-pre3 | | Dependencies: | TWiki:Plugins/NatSkinPlugin | | Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, <nop>MoveableType and Wordpress Look-n-Feel | | Base Name: | nat | @@ -202,7 +202,8 @@ reworked meta data creation: renamed KEYWORDS to METAKEYWORDS, added METAAUTHOR and \ METADESCRIPTION; moved blog related stuff to <nop>BlogPlugin; \ added =strings.nat.tmpl= template defining strings used in <nop>NatSkinPlugin; \ - lots of css and template fixes | + lots of css and template fixes;\ + only load those javascript snippets that are really used | | 2006-08-07: | removed natTWikiInfo from the bottom bar containing the "Powered by" prose; \ fixed USEWYSIWYG (again) | | 2006-08-03: | first 3 dot O prerelease, 3.0-final will be a TWiki V4 only skin; \ Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin/MANIFEST =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin/MANIFEST 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin/MANIFEST 2006-08-15 14:16:42 UTC (rev 11307) @@ -167,6 +167,7 @@ templates/defaulttopbar.nat.tmpl 0644 templates/editform.nat.tmpl 0644 templates/editjavascript.natedit.tmpl 0644 +templates/editjavascript.nat.tmpl 0644 templates/edit.natedit.tmpl 0644 templates/edit.nat.tmpl 0644 templates/editsidebar.nat.tmpl 0644 @@ -228,6 +229,7 @@ templates/oopsupload.nat.tmpl 0644 templates/oopswrongpassword.nat.tmpl 0644 templates/page.nat.tmpl 0644 +templates/previewjavascript.nat.tmpl 0644 templates/preview.natedit.tmpl 0644 templates/preview.nat.tmpl 0644 templates/previewstyles.nat.tmpl 0644 @@ -242,6 +244,7 @@ templates/renamebase.nat.tmpl 0644 templates/renameconfirm.nat.tmpl 0644 templates/renamedelete.nat.tmpl 0644 +templates/renamejavascript.nat.tmpl 0644 templates/rename.nat.tmpl 0644 templates/renamerefs.nat.tmpl 0644 templates/renamesidebar.nat.tmpl 0644 @@ -249,18 +252,21 @@ templates/renamewebbase.nat.tmpl 0644 templates/renamewebconfirm.nat.tmpl 0644 templates/renamewebdelete.nat.tmpl 0644 +templates/renamewebjavascript.nat.tmpl 0644 templates/renameweb.nat.tmpl 0644 templates/renamewebsidebar.nat.tmpl 0644 templates/searchbase.nat.tmpl 0644 templates/searchbookview.nat.tmpl 0644 templates/searchbox.nat.tmpl 0644 templates/searchformat.nat.tmpl 0644 +templates/searchjavascript.nat.tmpl 0644 templates/searchmeta.nat.tmpl 0644 templates/search.nat.tmpl 0644 templates/searchrenameview.nat.tmpl 0644 templates/searchtopicactions.nat.tmpl 0644 templates/settings.nat.tmpl 0644 templates/settingstopicactions.nat.tmpl 0644 +templates/strings.nat.tmpl 0644 templates/view.nat.tmpl 0644 templates/view.plain.nat.tmpl 0644 templates/view.print.nat.tmpl 0644 Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin.pm =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin.pm 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/lib/TWiki/Contrib/NatSkin.pm 2006-08-15 14:16:42 UTC (rev 11307) @@ -1,6 +1,6 @@ package TWiki:Contrib:NatSkin; use vars qw($VERSION $RELEASE); $VERSION = '$Rev$'; -$RELEASE = '3.00-pre2'; +$RELEASE = '3.00-pre3'; 1; Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/pub/TWiki/NatSkin/obfuscator.js =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/pub/TWiki/NatSkin/obfuscator.js 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/pub/TWiki/NatSkin/obfuscator.js 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,31 @@ +// (c)opyright 2006 MichaelDaum@WikiRing.com +function writeEmailAddrs(addrs, linkText, id) { + var elem = document.getElementById(id); + if (elem) { + if (elem.firstChild) { + elem.removeChild(elem.firstChild); + } + + var anchor = document.createElement("a"); + elem.appendChild(anchor); + + anchor.href = 'mailto:'; + + for (var i = 0; i < addrs.length; i++) { + anchor.href += addrs[i][1] + '@' + addrs[i][0] + '.' + addrs[i][2]; + if (i < addrs.length-1) { + anchor.href += ', '; + } + } + + if (linkText == '') { + for (var i = 0; i < addrs.length; i++) { + linkText += addrs[i][1] + '@' + addrs[i][0] + '.' + addrs[i][2] + ' '; + } + } + var anchorText = document.createTextNode(linkText); + anchor.appendChild(anchorText); + } +} + +addLoadEvent(initObfuscator); Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultjavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultjavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultjavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -1,79 +1,6 @@ <!-- template: defaultjavascript.nat.tmpl --> -<!-- vim:set filetype=javascript: --> %TMPL:DEF{"defaultjavascript"}%<script type="text/javascript"> <!-- - function checkAll(formular, theCheck) { - var j = 0; - for( var i = 0; i < document.forms[formular].length; i++ ) { - document.forms[formular].elements[i].checked = theCheck; - } -} - -function toggleElement(id) { - if(document.getElementById) { - var element = document.getElementById(id); - var toggle = document.getElementById(id + "toggle").firstChild.firstChild; - if (element.style.display == '') { - element.style.display = 'none'; - toggle.nodeValue = 'show'; - } else { - element.style.display = ''; - toggle.nodeValue = 'hide'; - } - } -} - -function submitEditFormular(script, action) { - if (action == 'add form') { - document.EditFormular.elements['submitChangeForm'].value = action; - } -%IFSKINSTATETHEN{release="beijing" glue="off"}% - document.EditFormular.action = '%SCRIPTURLPATH%/' + script + '%SCRIPTSUFFIX%/%WEB%/%TOPIC%'; -%ELSIFSKINSTATE{release="cairo" glue="off"}% - document.EditFormular.elements['action'].value = action; -%ELSESKINSTATE% - document.EditFormular.elements['action_preview'].value = ''; - document.EditFormular.elements['action_save'].value = ''; - document.EditFormular.elements['action_checkpoint'].value = ''; - document.EditFormular.elements['action_addform'].value = ''; - document.EditFormular.elements['action_replaceform'].value = ''; - document.EditFormular.elements['action_cancel'].value = ''; - document.EditFormular.elements['action_' + action].value = 'foobar'; -%FISKINSTATE% - document.EditFormular.submit(); -} - -function writeEmailAddrs(addrs, linkText, id) { - var elem = document.getElementById(id); - if (elem) { - if (elem.firstChild) { - elem.removeChild(elem.firstChild); - } - - var anchor = document.createElement("a"); - elem.appendChild(anchor); - - anchor.href = 'mailto:'; - - for (var i = 0; i < addrs.length; i++) { - anchor.href += addrs[i][1] + '@' + addrs[i][0] + '.' + addrs[i][2]; - if (i < addrs.length-1) { - anchor.href += ', '; - } - } - - if (linkText == '') { - for (var i = 0; i < addrs.length; i++) { - linkText += addrs[i][1] + '@' + addrs[i][0] + '.' + addrs[i][2] + ' '; - } - } - var anchorText = document.createTextNode(linkText); - anchor.appendChild(anchorText); - } -} - -// DON'T overwrite existing onload handlers -// http://simon.incutio.com/archive/2004/05/26/addLoadEvent function addLoadEvent(func){ var oldonload = window.onload; if (typeof window.onload != 'function') { @@ -87,22 +14,10 @@ } } } - -function focusSearchBox () { - if (typeof document.SearchForm != 'undefined') { - document.SearchForm.search.focus(); - } -} - -// default plugin impls -function initObfuscator() {} - function initNatSkin() { - initObfuscator(); // SMELL: package this as a plugin of its own and use addLoadEvent %TMPL:P{"onloadscript"}% } - addLoadEvent(initNatSkin); //--> -</script>%TMPL:END% -%TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%%TMPL:END% +</script>%TMPL:END%<!-- +-->%TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%%TMPL:END% Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edit.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edit.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edit.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -38,16 +38,16 @@ </form> %TMPL:END% %TMPL:DEF{"bottomtopicactions"}%<div class="natBottomTopicActions"><!-- --><span class="natEditAction natCurrentAction">Edit</span><!-- ---><span class="natPreviewAction"><a href="javascript:submitEditFormular('preview','preview');" accesskey="p" title='%MAKETEXT{"Preview your changes"}%'>%MAKETEXT{"Preview"}%</a></span><!-- +--><span class="natPreviewAction"><a href="javascript:submitEditForm('preview','preview');" accesskey="p" title='%MAKETEXT{"Preview your changes"}%'>%MAKETEXT{"Preview"}%</a></span><!-- -->%FORMBUTTON{"<span class='natFormAction'>$1</span>"}%<!-- --><span class="natUndoAction"><a href="javascript:self.location.reload();" accesskey="u" title='%MAKETEXT{"Abandon your changes but continue editing"}%'>%MAKETEXT{"Undo"}%</a></span><!-- -->%IFSKINSTATETHEN{release="beijing"}%<!-- ---><span class="natSaveAction"><a href="javascript:submitEditFormular('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a></span><!-- +--><span class="natSaveAction"><a href="javascript:submitEditForm('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a></span><!-- -->%ELSESKINSTATE%<!-- ---><span class="natSaveAction"><a href="javascript:submitEditFormular('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a></span><!-- ---><span class="natDoneAction"><a href="javascript:submitEditFormular('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a></span><!-- +--><span class="natSaveAction"><a href="javascript:submitEditForm('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a></span><!-- +--><span class="natDoneAction"><a href="javascript:submitEditForm('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a></span><!-- -->%FISKINSTATE%<!-- ---><span class="natCancelAction"><a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditFormular('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a></span> +--><span class="natCancelAction"><a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditForm('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a></span> </div> <div class="natSubmitOptions"> <input type="checkbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /> Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,28 @@ +<!-- template: editjavascript.nat.tmpl --> +%TMPL:DEF{"editjavascript"}%<script type="text/javascript"> +<!-- +function submitEditForm(script, action) { + if (action == 'add form') { + document.EditFormular.elements['submitChangeForm'].value = action; + } +%IFSKINSTATETHEN{release="beijing" glue="off"}% + document.EditFormular.action = '%SCRIPTURLPATH%/' + script + '%SCRIPTSUFFIX%/%WEB%/%TOPIC%'; +%ELSIFSKINSTATE{release="cairo" glue="off"}% + document.EditFormular.elements['action'].value = action; +%ELSESKINSTATE% + document.EditFormular.elements['action_preview'].value = ''; + document.EditFormular.elements['action_save'].value = ''; + document.EditFormular.elements['action_checkpoint'].value = ''; + document.EditFormular.elements['action_addform'].value = ''; + document.EditFormular.elements['action_replaceform'].value = ''; + document.EditFormular.elements['action_cancel'].value = ''; + document.EditFormular.elements['action_' + action].value = 'foobar'; +%FISKINSTATE% + document.EditFormular.submit(); +} +//--> +</script>%TMPL:END% +%TMPL:DEF{"javascript"}% +%TMPL:P{"defaultjavascript"}% +%TMPL:P{"editjavascript"}% +%TMPL:END% Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.natedit.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.natedit.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/editjavascript.natedit.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -1,2 +1,7 @@ -<!-- template: editjavascript.nat.tmpl --> -%TMPL:DEF{"javascript"}% %TMPL:P{"defaultjavascript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/NatSkin/edit.js"></script>%TMPL:END% +<!-- template: editjavascript.natedit.tmpl --> +%TMPL:INCLUDE{"editjavascript.nat"}% +%TMPL:DEF{"javascript"}% +%TMPL:P{"defaultjavascript"}% +%TMPL:P{"editjavascript"}% +<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/NatSkin/edit.js"></script> +%TMPL:END% Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edittopicactions.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edittopicactions.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/edittopicactions.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -1,14 +1,14 @@ <!-- template: edittopicactions.nat.tmpl --> %TMPL:DEF{"topicactions"}% <!-- --> <span class="natAction">%MAKETEXT{"Edit"}%</span> -| <a href="javascript:submitEditFormular('preview','preview');" accesskey="p" title='%MAKETEXT{"Preview your changes"}%'>%MAKETEXT{"Preview"}%</a> +| <a href="javascript:submitEditForm('preview','preview');" accesskey="p" title='%MAKETEXT{"Preview your changes"}%'>%MAKETEXT{"Preview"}%</a> %IFSKINSTATETHEN{release="beijing"}% <!-- --> -| <a href="javascript:submitEditFormular('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a> +| <a href="javascript:submitEditForm('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a> %ELSESKINSTATE% <!-- --> -| <a href="javascript:submitEditFormular('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a> -| <a href="javascript:submitEditFormular('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a> +| <a href="javascript:submitEditForm('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a> +| <a href="javascript:submitEditForm('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a> %FISKINSTATE% <!-- --> <br/> %FORMBUTTON{"$1 |"}% <a href="javascript:self.location.reload();" accesskey="u" title='%MAKETEXT{"Abandon your changes but continue editing"}%'>%MAKETEXT{"Undo"}%</a> -| <a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditFormular('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a> +| <a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditForm('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a> %TMPL:END% Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/preview.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/preview.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/preview.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -39,12 +39,12 @@ -->%FORMBUTTON{"<span class='natFormAction'>$1</span>"}%<!-- --><span class="natUndoAction"><a href="%NATSCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$year$mo$day$hours$minutes$seconds"}%" accesskey="u" title='%MAKETEXT{"Abandon your changes but continue editing"}%'>%MAKETEXT{"Undo"}%</a></span><!-- -->%IFSKINSTATETHEN{release="beijing"}%<!-- - --><span class="natSaveAction"><a href="javascript:submitEditFormular('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a></span><!-- + --><span class="natSaveAction"><a href="javascript:submitEditForm('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a></span><!-- -->%ELSESKINSTATE%<!-- - --><span class="natSaveAction"><a href="javascript:submitEditFormular('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a></span><!-- - --><span class="natDoneAction"><a href="javascript:submitEditFormular('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a></span><!-- + --><span class="natSaveAction"><a href="javascript:submitEditForm('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a></span><!-- + --><span class="natDoneAction"><a href="javascript:submitEditForm('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a></span><!-- -->%FISKINSTATE%<!-- - --><span class="natCancelAction"><a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditFormular('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a></span> + --><span class="natCancelAction"><a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditForm('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a></span> </div> <div class="natSubmitOptions"> <input type="checkbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /> Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewjavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewjavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewjavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,2 @@ +<!-- template: previewjavascript.nat.tmpl --> +%TMPL:INCLUDE{"editjavascript"}% Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewtopicactions.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewtopicactions.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/previewtopicactions.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -3,12 +3,12 @@ <a href="javascript:history.back();" accesskey="e" title='%MAKETEXT{"Continue editing"}%'>%MAKETEXT{"Edit"}%</a> | <span class="natAction">Preview</span> %IFSKINSTATETHEN{release="beijing"}% <!-- --> -| <a href="javascript:submitEditFormular('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a> +| <a href="javascript:submitEditForm('save', 'save');" accesskey="s" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Save"}%</a> %ELSESKINSTATE% <!-- --> -| <a href="javascript:submitEditFormular('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a> -| <a href="javascript:submitEditFormular('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a> +| <a href="javascript:submitEditForm('save','checkpoint');" accesskey="s" title='%MAKETEXT{"Save and continue editing"}%'>%MAKETEXT{"Save"}%</a> +| <a href="javascript:submitEditForm('save', 'save');" accesskey="d" title='%MAKETEXT{"Save and exit"}%'>%MAKETEXT{"Done"}%</a> %FISKINSTATE% <!-- --> <br/> %FORMBUTTON{"$1 |"}% <a href="%NATSCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$year$mo$day$hours$minutes$seconds"}%" accesskey="u" title='%MAKETEXT{"Abandon your changes but continue editing"}%'>%MAKETEXT{"Undo"}%</a> -| <a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditFormular('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a> +| <a href="%IFSKINSTATE{release="beijing" then="$percntNATSCRIPTURLPATH{\"view\"}$percnt/%WEB%/%TOPIC%?unlock=on" else="javascript:submitEditForm('save', 'cancel');"}%" accesskey="c" title='%MAKETEXT{"Abandon your changes and exit"}%'>%MAKETEXT{"Cancel"}%</a> %TMPL:END% Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamejavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamejavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamejavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,15 @@ +<!-- template: renamejavascript.nat.tmpl--> +%TMPL:DEF{"renamejavascript"}%<script type="text/javascript"> +<!-- + function checkAll(formular, theCheck) { + var j = 0; + for( var i = 0; i < document.forms[formular].length; i++ ) { + document.forms[formular].elements[i].checked = theCheck; + } +} +//--> +</script>%TMPL:END% +%TMPL:DEF{"javascript"}% +%TMPL:P{"defaultjavascript"}% +%TMPL:P{"renamejavascript"}% +%TMPL:END% Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamewebjavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamewebjavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/renamewebjavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,2 @@ +<!-- template: renamewebjavascript.nat.tmpl--> +%TMPL:INCLUDE{"renamejavascript"}% Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/searchjavascript.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/searchjavascript.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/searchjavascript.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,14 @@ +<!-- template: searchjavascript.nat.tmpl --> +%TMPL:DEF{"searchjavascript"}%<script type="text/javascript"> +<!-- +function focusSearchBox () { + if (typeof document.SearchForm != 'undefined') { + document.SearchForm.search.focus(); + } +} +//--> +</script>%TMPL:END% +%TMPL:DEF{"javascript"}% +%TMPL:P{"defaultjavascript"}% +%TMPL:P{"searchjavascript"}% +%TMPL:END% Added: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/strings.nat.tmpl =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/strings.nat.tmpl 2006-08-15 14:13:05 UTC (rev 11306) +++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/strings.nat.tmpl 2006-08-15 14:16:42 UTC (rev 11307) @@ -0,0 +1,19 @@ +<!-- template: strings.nat.tmpl --> +%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Login"}%%TMPL:END% +%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Logout"}%%TMPL:END% +%TMPL:DEF{"VIEW"}%%MAKETEXT{"View"}%%TMPL:END% +%TMPL:DEF{"VIEW_HELP"}%%MAKETEXT{"View formatted topic"}%%TMPL:END% +%TMPL:DEF{"RAW"}%%MAKETEXT{"Raw"}%%TMPL:END% +%TMPL:DEF{"RAW_HELP"}%%MAKETEXT{"View raw topic"}%%TMPL:END% +%TMPL:DEF{"EDIT"}%%MAKETEXT{"Edit"}%%TMPL:END% +%TMPL:DEF{"EDIT_HELP"}%%MAKETEXT{"Edit this topic"}%%TMPL:END% +%TMPL:DEF{"ATTACH"}%%MAKETEXT{"Attach"}%%TMPL:END% +%TMPL:DEF{"ATTACH_HELP"}%%MAKETEXT{"Attach image or document to this topic"}%%TMPL:END% +%TMPL:DEF{"MOVE"}%%MAKETEXT{"Move"}%%TMPL:END% +%TMPL:DEF{"MOVE_HELP"}%%MAKETEXT{"Move or rename this topic"}%%TMPL:END% +%TMPL:DEF{"DIFF"}%%MAKETEXT{"Diffs"}%%TMPL:END% +%TMPL:DEF{"DIFF_HELP"}%%MAKETEXT{"View topic history"}%%TMPL:END% +%TMPL:DEF{"MORE"}%%MAKETEXT{"More"}%%TMPL:END% +%TMPL:DEF{"MORE_HELP"}%%MAKETEXT{"More topic actions"}%%TMPL:END% +%TMPL:DEF{"ADD_FORM"}%%MAKETEXT{"Add form"}%%TMPL:END% +%TMPL:DEF{"CHANGE_FORM"}%%MAKETEXT{"Change form"}%%TMPL:END% |