Item8039:Item4689:Item71:

* added tape-recorder-like history browser * added suppport for <nop>CompareRevisionsAddOn * added support for twiki _and_ foswiki css classes * improved typographics in <nop>BlueNoteStyle * removed copies of famfamfam icons - using <nop>FamFamFamContrib instead * moved all javascript from template to js file * added hover tios to improve usability of topic actions * fixed oopsmore * added IE6 png workaround * improved login screen * added "show on screen" feature git-svn-id: http://svn.foswiki.org/trunk/NatSkin@1823 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 7, 2009 · 6baa73b · 6baa73b
1 parent 6f57e44
commit 6baa73b
Show file tree

Hide file tree

Showing 133 changed files with 925 additions and 533 deletions.
diff --git a/data/Main/TWikiGuestSideBar.txt b/data/Main/TWikiGuestSideBar.txt
@@ -2,5 +2,5 @@
 %STARTINCLUDE%
 %STOPINCLUDE%
 
-   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup
-   * Set ALLOWTOPICVIEW = %MAINWEB%.WikiGuest
+   * Set ALLOWTOPICCHANGE = AdminGroup
+   * Set ALLOWTOPICVIEW = WikiGuest
diff --git a/data/Main/WebLinks.txt b/data/Main/WebLinks.txt
@@ -5,9 +5,9 @@ Sidebar navigation in the %WEB% web. See also the %SYSTEMWEB%.TWikiWebLinks
 
 %STARTINCLUDE%<!-- main.weblinks -->
    * [[%SYSTEMWEB%.WelcomeGuest][%MAKETEXT{"Welcome"}%]]
-   * [[%TWIKIREGISTRATION%][%MAKETEXT{"Registration"}%]] %IFDEFINEDTHEN{"%IFEXISTS{"%MAINWEB%.%WIKIUSERSTOPIC%"}%" as="1" glue="off"}%
-   * [[%MAINWEB%.%WIKIUSERSTOPIC%][%MAKETEXT{"Users"}%]] %FIDEFINED%
-   * [[%MAINWEB%.WikiGroups][%MAKETEXT{"Groups"}%]]
+   * [[%USERREGISTRATION%][%MAKETEXT{"Registration"}%]] %IFDEFINEDTHEN{"%IFEXISTS{"%USERSWEB%.%WIKIUSERSTOPIC%"}%" as="1" glue="off"}%
+   * [[%USERSWEB%.%WIKIUSERSTOPIC%][%MAKETEXT{"Users"}%]] %FIDEFINED%
+   * [[%USERSWEB%.WikiGroups][%MAKETEXT{"Groups"}%]]
    * [[%SYSTEMWEB%.ChangePassword][%MAKETEXT{"Password"}%]]%WEBCOMPONENT{"TWikiWebLinks"}% 
 <!-- //main.weblinks -->%STOPINCLUDE%
 

diff --git a/data/TWiki/MySideBar.txt b/data/TWiki/MySideBar.txt
@@ -4,7 +4,7 @@
 <nop><h2><a name="mysidebar">MySideBar</a></h2>
 
    * %MAKETEXT{"<a href='[_1]' title='[_2]'>Create your personalized sidebar.</a>"
- args="%SCRIPTURLPATH{"save"}%/%MAINWEB%/%WIKINAME%SideBar?topicparent=%WIKINAME%;templatetopic=%SYSTEMWEB%.MySideBarTemplate,<nop>%WIKINAME%SideBar"}%
+ args="%SCRIPTURLPATH{"save"}%/%USERSWEB%/%WIKINAME%SideBar?topicparent=%WIKINAME%;templatetopic=%SYSTEMWEB%.MySideBarTemplate,<nop>%WIKINAME%SideBar"}%
 <!-- //mysidebar -->%STOPINCLUDE%
 
 %MAKETEXT{"See also:"}% NatSkin, NatSkinPlugin, MySideBarTemplate
diff --git a/data/TWiki/MySideBarTemplate.txt b/data/TWiki/MySideBarTemplate.txt
@@ -3,7 +3,7 @@
 ---+ %MAKETEXT{"[_1]'s sidebar" args="%WIKIUSERNAME%"}%
 
 %STARTINCLUDE%<!-- mysidebar -->
-<h2 > [[%MAINWEB%.%WIKINAME%SideBar][MySideBar]]</h2>
+<h2 > [[%USERSWEB%.%WIKINAME%SideBar][MySideBar]]</h2>
 %TWISTY{
    mode="div"
    prefix="<div>"

diff --git a/data/TWiki/NatSearch.txt b/data/TWiki/NatSearch.txt
@@ -38,7 +38,7 @@ exclude this term from the hit set.
 
 ---++ Examples
 | *Search* | *Description* |
-| <nop>WikiUsers | if the current web is the %MAINWEB% go to the <nop>WikiUsers  |
+| <nop>WikiUsers | if the current web is the %USERSWEB% go to the <nop>WikiUsers  |
 |                 | if the current web is the %SYSTEMWEB% go to the <nop>UsersGuide |
 | g:WikiUsers | list all topics in all webs whose name match "WikiUsers" |
 | g:copyright -webpref | list all topics that contain the word "copyright" but not "webpref" |

diff --git a/data/TWiki/NatSkin.txt b/data/TWiki/NatSkin.txt
@@ -117,14 +117,25 @@ allways open an extra window.
 
 ---++ Skin Info
 |  Skin Author: | Michael Daum |
-|  Copyright &copy;: | 2003-2008, Michael Daum http://michaeldaumconsulting.com |
+|  Copyright &copy;: | 2003-2009, Michael Daum http://michaeldaumconsulting.com |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Skin Version: | v3.0-pre28 |
+|  Skin Version: | v3.0-pre29 |
 |  Dependencies: | NatSkinPlugin |
 |  Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, <nop>MoveableType and Wordpress Look-n-Feel |
 |  Base Name: | nat |
 |  Screenshot: | <div style="overflow:hidden;height:200px"><a href="%ATTACHURL%/BlueNoteStyle.jpeg"><img src="%ATTACHURL%/BlueNoteStyle.jpeg" title="Clean"/></a></div> |
 |  Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
+|  07 Jan 2009: | added tape-recorder-like history browser; \
+                  added suppport for <nop>CompareRevisionsAddOn; \
+                  added support for twiki _and_ foswiki css classes; \
+                  improved typographics in <nop>BlueNoteStyle; \
+                  removed copies of famfamfam icons - using <nop>FamFamFamContrib instead; \
+                  moved all javascript from template to js file; \
+                  added hover tios to improve usability of topic actions; \
+                  fixed oopsmore; \
+                  added IE6 png workaround; \
+                  improved login screen; \
+                  added "show on screen" feature |
 |  18 Nov 2008: | fixes for IE6; \
                   new interim logo for foswiki; \
                   using jquery buttons where possible |
@@ -163,7 +174,7 @@ allways open an extra window.
                   improved usability of renaming/trashing topics and attachments, \
                   also autoadding a overflow wrapper for <nop>MediaWikiTables, \
                   improved usability of selecting/changing <nop>DataForms using the new NATFORMLIST tag, \
-                  woring around text not being hidden when editing the <nop>TWikiForm with <nop>TinyMCE |
+                  woring around text not being hidden when editing the <nop>DataForm with <nop>TinyMCE |
 |  02 Oct 2007: | added support for <nop>HistoryPlugin, <nop>TinyMCEPlugin |
 |  21 Sep 2007: | removed own <nop>NatEdit implementation, \
                   improved move/rename usability, \

diff --git a/data/TWiki/NatSkinStyleBrowser.txt b/data/TWiki/NatSkinStyleBrowser.txt
@@ -8,7 +8,7 @@ the "reset" button whenever you want to revert your selection and come back to
 the site's default settings. Note that each web may have its own defaults build
 in. If you select different style options they have precedence over those.
 
-Register [[%TWIKIREGISTRATION%][here]] to make your settings persistent.
+Register [[%USERREGISTRATION%][here]] to make your settings persistent.
 See the %SYSTEMWEB%.NatSkinPlugin documentation on how to use style settings in your personal
 <nop>%WIKITOOLNAME% account.
 

diff --git a/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt b/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt
@@ -50,7 +50,7 @@
 
 %TMPL:DEF{"formbuttons"}%<!-- formbuttons -->
 <div class='twikiFormStep twikiFormButtons twikiFormLast'>
-%TMPL:P{"submit"}%%TMPL:P{"reset"}%%TMPL:P{"cancel"}%%CLEAR%
+%TMPL:P{"submit"}%%TMPL:P{"cancel"}%%CLEAR%
 </div>
 <!-- //formbuttons -->%TMPL:END%
 
@@ -90,10 +90,6 @@
 %BUTTON{type="submit" icon="tick" value="%MAKETEXT{"OK"}%"}%
 <!-- //submit -->%TMPL:END%
 
-%TMPL:DEF{"reset"}%<!-- reset -->
-%BUTTON{type="reset" icon="application_form" value="%MAKETEXT{"Reset"}%"}%
-<!-- //reset -->%TMPL:END%
-
 %TMPL:DEF{"cancel"}%<!-- cancel -->
 %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%URLPARAM{"origurl" default="%BASEWEB%.%BASETOPIC%"}%"}%
 <!-- //cancel -->%TMPL:END%

diff --git a/data/TWiki/TWikiWebButtons.txt b/data/TWiki/TWikiWebButtons.txt
@@ -1,7 +1,7 @@
 %META:TOPICINFO{author="ProjectContributor" date="1225762335" format="1.1" reprev="1.2" version="$Rev$"}%
 %STARTINCLUDE%<!-- twiki.twikiwebbuttons --> 
 %~~ FLEXWEBLIST{
-~~~   webs="%MAINWEB%,public,%SYSTEMWEB%"
+~~~   webs="%USERSWEB%,public,%SYSTEMWEB%"
 ~~~   selection="%FORMATLIST{"%BASEWEB%" split="[\/\.]" limit="1"}%"
 ~~~   marker="current"
 ~~~   exclude="^(TestCases|Trash|Attic|Sandbox).*"

diff --git a/data/TWiki/TWikiWebMoreTopicActions.txt b/data/TWiki/TWikiWebMoreTopicActions.txt
@@ -1,21 +1,41 @@
 %META:TOPICINFO{author="ProjectContributor" date="1162063414" format="1.1" version="$Rev$"}%
 <div class="natOopsMore">
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%">
-  <form name="main" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%" method="post">
+<div class="twikiFormSteps">
+  <form name="editsettings" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%" method="post">
+    <input type="hidden" name="action" value="editSettings" />
     <div class="twikiFormStep">
-        <input type="hidden" name="action" value="editSettings" />
-        <h2>%MAKETEXT{"Edit topic preferences"}% <img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/page_white_edit.png" /></h2>
+        <h2>%MAKETEXT{"Edit topic preferences"}%</h2>
         %MAKETEXT{"Edit preference settings for '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
     </div>
     <div class="twikiFormStep twikiFormButtons twikiFormLast">
-        <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%'>
+        %BUTTON{value="%MAKETEXT{"Edit"}%" type="submit" icon="page_white_edit"}%
+        %CLEAR%
     </div>
   </form>
 </div>
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%">
-  <form name="backlinksform" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%">
+<div class="twikiFormSteps">
+  <form name="restoretopic" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%">
+    <input type="hidden" name="action" value="restoreRevision" />
+    <input type="hidden" name="nowysiwyg" value="1" />
+    <div class="twikiFormStep">
+      <h2>%MAKETEXT{"Restore topic"}%</h2>
+      %MAKETEXT{"Restore topic to revision:"}% 
+      <input class="twikiInputField" type="text" name="rev" size="6" value="%NATMAXREV%" />
+      <div class="twikiFormDescription">
+        %MAKETEXT{"You will be able to review the topic before saving it to a new revision."}%
+      </div>
+    </div>
+    <div clasS="twikiFormStep twikiFormButtons twikiFormLast">
+      %BUTTON{"%MAKETEXT{"Restore"}%" icon="arrow_undo" type="submit" }%
+      %CLEAR%
+    </div>
+  </form>
+</div>
+
+<div class="twikiFormSteps">
+  <form name="searchbacklinks" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%">
   <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Search for backlinks"}% <img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/page_white_go.png" /></h2>
+    <h2>%MAKETEXT{"Search for backlinks"}%</h2>
   </div>
   <div class="twikiFormStep">
     %MAKETEXT{"Find topics that link back to '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
@@ -27,40 +47,30 @@
     <label for="searchall">%MAKETEXT{"Search in all public webs"}%</label>
   </div>
   <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%' />
+    %BUTTON{"%MAKETEXT{"Search"}%" type="submit" icon="find"}%
+    %CLEAR%
   </div>
   </form>
 </div>     
 <hr class="twikiClear" />
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%">
+<div class="twikiFormSteps">
   <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Rename, move or delete this topic"}% <img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/page_white_delete.png" /></h2>
+    <h2>%MAKETEXT{"Rename, move or delete this topic"}%</h2>
     %MAKETEXT{"Rename topic *[_1]*" args="%BASETOPIC%"}%
 
     %MAKETEXT{"See also:"}% %SYSTEMWEB%.ManagingTopics.
   </div>
   <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    <input type="button" class="natOkButton" onclick="window.location.href='%SCRIPTURLPATH{"rename"}%/%BASEWEB%/%BASETOPIC%?currentwebonly=on'" value="%MAKETEXT{"OK"}%" />
-  </div>
-</div>
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%">
-  <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Rename, move or delete this web"}%<img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/database_delete.png" /></h2>
-    %MAKETEXT{"Rename the <nop>[_1] web" args="%BASEWEB%"}%
-
-    %MAKETEXT{"See also:"}% %SYSTEMWEB%.ManagingWebs
-  </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    <input type="button" class="natOkButton" onclick="window.location.href='%SCRIPTURLPATH{"rename"}%/%BASEWEB%/%BASETOPIC%?action=renameweb'" value="%MAKETEXT{"OK"}%" />
+    %BUTTON{"%MAKETEXT{"Rename"}%" target="%SCRIPTURLPATH{"rename"}%/%BASEWEB%/%BASETOPIC%?currentwebonly=on" icon="page_white_delete"}%
+    %CLEAR%
   </div>
 </div>
-<hr class="twikiClear" />
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%" style='%IF{"context i18n_enabled" then="" else="display:none"}%'>
+<div class="twikiFormSteps" style='%IF{"context i18n_enabled" then="" else="display:none"}%'>
   <form name="changelanguage" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%" method="get">
     <input type="hidden" name="template" value="oopslanguagechanged" />
     <input type="hidden" name="refresh" value="on" />
     <div class="twikiFormStep">
-      <h2>%MAKETEXT{"Change interface language"}% <img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/world.png" /></h2>
+      <h2>%MAKETEXT{"Change interface language"}%</h2>
       <select name="language">
       <option value="default">Default</option>
       %LANGUAGES{format="<option $marker value=\"$langtag\">$langname</option>" selection="%LANGUAGE%" separator=" "}%
@@ -70,24 +80,22 @@
       <label for="todefault">%MAKETEXT{"Default language"}%</label>
     </div>
     <div class="twikiFormStep twikiFormButtons twikiFormLast">
-      <input class="natOkButton" type="submit" value="%MAKETEXT{"OK"}%" />
+      %BUTTON{"%MAKETEXT{"Submit"}%" type="submit" icon="world"}%
+      %CLEAR%
     </div>
   </form>
 </div>
-<div class="twikiFormSteps %CALC{"$SETM(incr,+1)$IF($ODD($GET(incr)),twikiLeft,twikiRight)"}%" style="%IF{"not {Cache}{Enabled}" then="display:none"}%">
+<div class="twikiFormSteps" style="%IF{"not {Cache}{Enabled}" then="display:none"}%">
   <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Refresh topic caching"}% <img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/arrow_refresh.png" /></h2>
+    <h2>%MAKETEXT{"Refresh topic caching"}%</h2>
     %MAKETEXT{"Get a fresh page of the topic [_1]" args="[[%BASEWEB%.%BASETOPIC%]]"}%&nbsp;
   </div>
   <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    <input type="button" class="natOkButton" onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?refresh=on'" value='%MAKETEXT{"OK"}%' />
+    %BUTTON{"%MAKETEXT{"Refresh"}%" icon="arrow_refresh" target="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?refresh=on" }%
+    %CLEAR%
   </div>
 </div>
-<hr class="twikiClear" />
-<div class="alt">
-  <table><tr><td>
-  <input type="button" class="natAltButton" value='%MAKETEXT{"Back"}%' onclick="window.location.href = '%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%';">
-  </td><td>
-  %MAKETEXT{"Jump back to '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
-  </td></tr></table>
+<div class="twikiFormSteps alt">
+  %BUTTON{"%MAKETEXT{"Back"}%" target="%BASEWEB%.%BASETOPIC%" icon="arrow_left"}%
+  %CLEAR%
 </div>
diff --git a/data/TWiki/TWikiWebSideBar.txt b/data/TWiki/TWikiWebSideBar.txt
@@ -16,14 +16,15 @@ Default sidebar implementation
    * [[Sandbox.WebHome][Sandbox]]
 </div>
 %TMPL:P{context="natskin_sidebar_pos2" then="searchbox_pos2"}%<!-- -->
-%IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.AdminGroup" type="change"}%" as="1"}%
+%IFDEFINEDTHEN{"%IFACCESS{"%USERSWEB%.AdminGroup" type="change"}%" as="1"}%
 <div class="natSidebarSection" natSideBarAdminLinks">
 <h2 >Admin</h2>
    * [[%SCRIPTURL{"configure"}%][%MAKETEXT{"Configure [_1]" args="<nop>%WIKITOOLNAME%"}%]]
    * [[%BASEWEB%.WebPreferences][%MAKETEXT{"Web Preferences"}%]]
    * [[%LOCALSITEPREFS%][%MAKETEXT{"Site Preferences"}%]]
    * [[%SYSTEMWEB%.InstalledPlugins][%MAKETEXT{"Installed Plugins"}%]]
-   * [[%SYSTEMWEB%.ManagingWebs][%MAKETEXT{"Managing Webs"}%]]
+   * [[%SYSTEMWEB%.ManagingWebs][%MAKETEXT{"Add Web"}%]]
+   * [[%SCRIPTURL{"rename"}%/%BASEWEB%/%BASETOPIC%?action=renameweb][Rename Web]]
 </div>
 %FIDEFINED%
 <!-- //twiki.twikiwebsidebar -->%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebTopicActions.txt b/data/TWiki/TWikiWebTopicActions.txt
@@ -4,8 +4,9 @@ Default site-level configuration for the !WebTopicActions !WebComponent
 
 %STARTINCLUDE%<!-- twikiwebtopicactions -->
 %USERACTIONS{
-  restrictedactions="new, attach, move, delete, diff, more, raw"
-  format="<div class='natTopicActions'>$edit$sep$new$sep$attach$sep$raw$sep$delete$sep$diff$sep$print$sep$more</div>"
+  restrictedactions="new, attach, move, delete, history, more, raw"
+  format="$edit$sep$attach$sep$new$sep$raw$sep$delete$sep$history$sep$print$sep$more"
+  history="$edit$sep$raw$sep$history$sep$first$sep$prev$sep$next$sep$last$sep$done"
 }%
 <!-- //twikiwebtopicactions -->%STOPINCLUDE%
 
diff --git a/data/TWiki/WebLinks.txt b/data/TWiki/WebLinks.txt
@@ -2,10 +2,9 @@
 ---+!! %TOPIC%
 Navigation links in the %SYSTEMWEB% web.
 
-%STARTINCLUDE%<!-- twiki.weblinks -->
+%STARTINCLUDE%<!-- system.weblinks -->
    * [[TwentyMinuteTutorial][Tutorial]]
    * [[UsersGuide][Users Guide]]
    * [[FrequentlyAskedQuestions][FAQ]]
-   * [[Installed Plugins]]
    * [[ReferenceManual][Reference Manual]]
-<!-- //twiki.weblinks -->%STOPINCLUDE%
+<!-- //system.weblinks -->%STOPINCLUDE%
diff --git a/lib/TWiki/Contrib/NatSkin.pm b/lib/TWiki/Contrib/NatSkin.pm
@@ -1,6 +1,6 @@
 package TWiki::Contrib::NatSkin;
 use vars qw($VERSION $RELEASE);
 $VERSION = '$Rev$';
-$RELEASE = '3.00-pre28';
+$RELEASE = '3.00-pre29';
 
 1;