diff --git a/data/TWiki/NatSkin.txt b/data/TWiki/NatSkin.txt index 897a9fa..df0ff27 100644 --- a/data/TWiki/NatSkin.txt +++ b/data/TWiki/NatSkin.txt @@ -119,7 +119,7 @@ allways open an extra window. | Skin Author: | Michael Daum | | Copyright ©: | 2003-2008, Michael Daum http://michaeldaumconsulting.com | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Skin Version: | v3.0-pre26 | +| Skin Version: | v3.0-pre27 | | Dependencies: | NatSkinPlugin | | Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, MoveableType and Wordpress Look-n-Feel | | Base Name: | nat | @@ -411,6 +411,3 @@ allways open an extra window. %META:FILEATTACHMENT{name="wikiringlogo40x40.png" attachment="wikiringlogo40x40.png" attr="h" comment="" date="1189787359" path="wikiringlogo40x40.png" size="2571" stream="wikiringlogo40x40.png" tmpFilename="" user="ProjectContributor" version="1"}% %META:FILEATTACHMENT{name="BlueNoteStyle.jpeg" attachment="BlueNoteStyle.jpeg" attr="h" comment="" date="1225905266" path="BlueNoteStyle.jpeg" size="42093" stream="IO::File=GLOB(0x8f2567c)" tmpFilename="/var/tmp/CGItemp41158" user="ProjectContributor" version="1"}% -%META:FILEATTACHMENT{name="nextwiki-header.png" attachment="nextwiki-header.png" attr="h" comment="" date="1226506238" path="nextwiki-header.png" size="16828" stream="IO::File=GLOB(0x8f63c50)" tmpFilename="/var/tmp/CGItemp29744" user="ProjectContributor" version="1"}% -%META:FILEATTACHMENT{name="nextwiki-header-tile.png" attachment="nextwiki-header-tile.png" attr="h" comment="" date="1225886085" path="nextwiki-header-tile.png" size="762" stream="IO::File=GLOB(0x8f206f0)" tmpFilename="/var/tmp/CGItemp18012" user="ProjectContributor" version="1"}% -%META:FILEATTACHMENT{name="nextwiki-logo.png" attachment="nextwiki-logo.png" attr="h" comment="" date="1226504153" path="nextwiki-logo.png" size="7060" stream="IO::File=GLOB(0x8f64450)" tmpFilename="/var/tmp/CGItemp29501" user="ProjectContributor" version="1"}% diff --git a/data/TWiki/TWikiWebSideBar.txt b/data/TWiki/TWikiWebSideBar.txt index c50a122..ab96235 100644 --- a/data/TWiki/TWikiWebSideBar.txt +++ b/data/TWiki/TWikiWebSideBar.txt @@ -19,6 +19,7 @@ Default sidebar implementation %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.TWikiAdminGroup" type="change"}%" as="1"}%

Admin

+ * [[%SCRIPTURL{"configure"}%][%MAKETEXT{"Configure [_1]" args="%WIKITOOLNAME%"}%]] * [[%BASEWEB%.WebPreferences][%MAKETEXT{"Web Preferences"}%]] * [[%LOCALSITEPREFS%][%MAKETEXT{"Site Preferences"}%]] * [[%SYSTEMWEB%.InstalledPlugins][%MAKETEXT{"Installed Plugins"}%]] diff --git a/lib/TWiki/Contrib/NatSkin.pm b/lib/TWiki/Contrib/NatSkin.pm index b236f74..5ef8f89 100644 --- 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-pre26'; +$RELEASE = '3.00-pre27'; 1; diff --git a/pub/TWiki/NatSkin/BaseStyle.css b/pub/TWiki/NatSkin/BaseStyle.css index c3a2bea..07eb9d2 100644 --- a/pub/TWiki/NatSkin/BaseStyle.css +++ b/pub/TWiki/NatSkin/BaseStyle.css @@ -250,15 +250,6 @@ pre { clear:both; } -/* login */ -.natLoginBody .natMainHeaderContents { - display:none; -} -.natLoginMessage { - margin:0px auto; - width:500px; -} - /* topbar */ .natHeaderArt { background-repeat:no-repeat; @@ -354,16 +345,24 @@ pre { } /* login */ -.natLogonFormHolder { - padding:10px 0px 10px 0px; +.natLoginBody .natMainHeaderContents { + display:none; } -.natLogonFormButtons td { +.natLoginMessage h2 { + margin:0px; +} +.natLoginMessage { + margin:0px auto; + width:500px; +} +.natLogonFormButtons { padding-top:1em; } .natRememberMe { padding-bottom:1em; } + /* edit */ .natEditBody .natLayoutTable { table-layout:auto; /* firefox fix to preven collapsing tables */ diff --git a/pub/TWiki/NatSkin/BlueNoteStyle.css b/pub/TWiki/NatSkin/BlueNoteStyle.css index 4609604..d7b5d50 100644 --- a/pub/TWiki/NatSkin/BlueNoteStyle.css +++ b/pub/TWiki/NatSkin/BlueNoteStyle.css @@ -155,6 +155,11 @@ dl dd { .natLoginBody .natLoginMessage { padding:20px; } +.natLoginBody .twikiFormSteps { + margin:1em 0em; + padding:1.5em; + background:#f6f6f6; +} /* twiki styles */ @@ -674,7 +679,6 @@ fieldset .twikiFormSteps { /* forms */ .natTopicForm { margin:2.0em 0em 0em; - /*background:#f6f6f6;*/ } .natTopicAttachments .natTopicAction:hover, .natTopicForm .natTopicAction:hover { diff --git a/templates/changeformsidebar.nat.tmpl b/templates/changeformsidebar.nat.tmpl index 972ecbb..6b27281 100755 --- a/templates/changeformsidebar.nat.tmpl +++ b/templates/changeformsidebar.nat.tmpl @@ -1,5 +1,5 @@ -%TMPL:DEF{"sidebar"}% +%TMPL:DEF{"sidebar"}%

%MAKETEXT{"Help"}%

* %MAKETEXT{"Form based input"}% * %MAKETEXT{"Topic Meta data"}% @@ -11,4 +11,4 @@

%MAKETEXT{"Existing form data will be lost! (still available in old version)"}%

%MAKETEXT{"All possible forms are defined in the WEBFORM variable in the WebPreferences."}%

-%TMPL:END% +%TMPL:END% diff --git a/templates/login.nat.tmpl b/templates/login.nat.tmpl index bf4051d..91e33d2 100755 --- a/templates/login.nat.tmpl +++ b/templates/login.nat.tmpl @@ -13,13 +13,13 @@ %TMPL:DEF{"LOGGED_IN_BANNER"}%%MAKETEXT{"[_1] is currently logged in" args="%USERSWEB%.%WIKINAME%"}%.%TMPL:END% %TMPL:DEF{"NEW_USER_NOTE"}%%MAKETEXT{"Enter a new username and password to change identity"}%.%TMPL:END% %TMPL:DEF{"UNRECOGNISED_USER"}%%MAKETEXT{"Unrecognised user and/or password."}%%TMPL:END% -%TMPL:DEF{"heading"}%%MAKETEXT{"Welcome to the [_1]" args="%WIKITOOLNAME%"}%%TMPL:END% %TMPL:DEF{"message"}% -

%BANNER%

-%NOTE% - -%TMPL:P{"logon"}% -%TMPL:P{"seealso"}% +
+

%BANNER%

+%NOTE% +%TMPL:P{"logon"}% +%TMPL:P{"seealso"}% +
%TMPL:END% %TMPL:DEF{"content"}%
diff --git a/templates/login.sudo.nat.tmpl b/templates/login.sudo.nat.tmpl index 91064e1..9c0fc2c 100755 --- a/templates/login.sudo.nat.tmpl +++ b/templates/login.sudo.nat.tmpl @@ -1,6 +1,6 @@ %%TMPL:INCLUDE{"login"}% -%TMPL:DEF{"webaction"}%%MAKETEXT{"Admin TWiki User Authentication"}%%TMPL:END% +%TMPL:DEF{"webaction"}%%MAKETEXT{"Admin %WIKITOOLNAME% User Authentication"}%%TMPL:END% %TMPL:DEF{"LOGGED_IN_BANNER"}%%MAKETEXT{"[_1] is currently logged in" args="%USERSWEB%.%WIKINAME%"}%%TMPL:END% %TMPL:DEF{"UNRECOGNISED_USER"}%%MAKETEXT{"Unrecognised user and/or password"}%%TMPL:END% @@ -14,4 +14,4 @@ %TMPL:DEF{"loginasadministratorform"}%%TMPL:END% -%TMPL:DEF{"authrealm"}%%MAKETEXT{"Enter the TWiki Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%%TMPL:END% +%TMPL:DEF{"authrealm"}%%MAKETEXT{"Enter the %WIKITOOLNAME% Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%%TMPL:END% diff --git a/templates/loginbase.nat.tmpl b/templates/loginbase.nat.tmpl index 02f61de..a8c517b 100755 --- a/templates/loginbase.nat.tmpl +++ b/templates/loginbase.nat.tmpl @@ -1,39 +1,44 @@ %TMPL:DEF{"onloadscript"}%if (document.LogonForm) {document.LogonForm.username.focus();} %TMPL:END% -%TMPL:DEF{"rememberbox"}%
+%TMPL:DEF{"rememberbox"}% +
-
%TMPL:END% -%TMPL:DEF{"logon"}% -
-
- - - - - - - - - - - - - -
%MAKETEXT{"Username"}%: - ** -
%MAKETEXT{"Password"}%: - ** -
  %TMPL:P{context="can_remember_login" then="rememberbox"}% - - - - - - -
+
+%TMPL:END% +%TMPL:DEF{"logon"}% + + + + + +
+---+++ %MAKETEXT{"Username"}%: + +
+
+---+++ %MAKETEXT{"Password"}%: + +
+%TMPL:P{context="can_remember_login" then="rememberbox"}% +
+ %BUTTON{"%MAKETEXT{"Log In"}%" icon="tick" onclick="$('#LogonForm').submit()"}% + %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%WIKILOGOURL%"}% + +
-
%TMPL:END% +%JQSCRIPT{"jquery.validate"}% +%JQSCRIPT{"jquery.shake"}% + +%TMPL:END% diff --git a/templates/mailnotify.nat.tmpl b/templates/mailnotify.nat.tmpl index 41c235a..3f351d4 100755 --- a/templates/mailnotify.nat.tmpl +++ b/templates/mailnotify.nat.tmpl @@ -1,4 +1,4 @@ -%TMPL:DEF{"MailNotifyBody"}%From: TWiki Administrator <%WIKIWEBMASTER%> +%TMPL:DEF{"MailNotifyBody"}%From: %WIKITOOLNAME% Administrator <%WIKIWEBMASTER%> To: %EMAILTO% Subject: %MAKETEXT{"[_1] - Automated notification of topic changes" args="%WIKITOOLNAME%.%WEB%"}% Content-Type: text/plain; charset=%CHARSET% diff --git a/templates/messages.nat.tmpl b/templates/messages.nat.tmpl index d1a12cb..98d9cf6 100644 --- a/templates/messages.nat.tmpl +++ b/templates/messages.nat.tmpl @@ -167,7 +167,7 @@ link in your email or enter the code in the box below to activate your membershi ---+++ %MAKETEXT{"You are already registered"}% %MAKETEXT{"You cannot register twice, the name [_1] is already registered." args="'%PARAM1%'"}% -%MAKETEXT{"Did you want to ~[~[[_1]~]~[reset [_2]'s password~]~]?" args="%SCRIPTURLPATH{"view"}%/TWiki.ResetPassword?username=%PARAM1%,%PARAM1%"}% +%MAKETEXT{"Did you want to ~[~[[_1]~]~[reset [_2]'s password~]~]?" args="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/ResetPassword?username=%PARAM1%,%PARAM1%"}% %MAKETEXT{"Alternatively go back in your browser and choose a different username."}% %TMPL:END% @@ -260,11 +260,11 @@ However, the filename has been changed from [_2] to [_3]. Please make a note of it." args="%TOPIC%,%PARAM1%,%PARAM2%"}% %MAKETEXT{"Note:"}% -%MAKETEXT{"In some cases, TWiki changes the name of the uploaded file to make it safe and accessible across all platforms: +%MAKETEXT{"In some cases, %WIKITOOLNAME% changes the name of the uploaded file to make it safe and accessible across all platforms: * Spaces are replaced by underscores * \"A =.txt= extensiPartneron is appended to some filenames for security reasons\" * Some characters such as =~=, =$=, =@=, =%= are removed\" -You may be able to get your TWiki administrator to change the settings if they are inappropriate for your environment."}% +You may be able to get your %WIKITOOLNAME% administrator to change the settings if they are inappropriate for your environment."}%
@@ -362,7 +362,7 @@ template that doesn't exist." args="%PARAM2%"}% %TMPL:END% %TMPL:DEF{"thanks"}% ---+++ %MAKETEXT{"Thank you for registering"}% - * %MAKETEXT{"Your personal TWiki topic [_1] has been created" args="%USERSWEB%.%PARAM2%"}% + * %MAKETEXT{"Your personal %WIKITOOLNAME% topic [_1] has been created" args="%USERSWEB%.%PARAM2%"}% * %MAKETEXT{"You are also listed in the [_1] topic" args="%USERSWEB%.%WIKIUSERSTOPIC%"}% * %MAKETEXT{"You can try out this site hands-on in the [[Sandbox.WebHome][Sandbox]] web."}% %PARAM1% diff --git a/templates/oo2twiki.nat.tmpl b/templates/oo2twiki.nat.tmpl index a5534fa..7e74a89 100644 --- a/templates/oo2twiki.nat.tmpl +++ b/templates/oo2twiki.nat.tmpl @@ -6,8 +6,8 @@ %TMPL:END% %TMPL:DEF{"notes"}%

-This will upload the given OpenOffice document to TWiki, converting and importing it -to TWiki. Its content will be stored it into a new topic. +This will upload the given OpenOffice document to %WIKITOOLNAME%, converting and importing it +to %WIKITOOLNAME%. Its content will be stored it into a new topic.

The original document will be attached to the newly diff --git a/templates/oopsaccessgroup.nat.tmpl b/templates/oopsaccessgroup.nat.tmpl index 220d1c4..33e777a 100755 --- a/templates/oopsaccessgroup.nat.tmpl +++ b/templates/oopsaccessgroup.nat.tmpl @@ -1,12 +1,11 @@ -%TMPL:INCLUDE{"oopslogonbase"}% - +%TMPL:INCLUDE{"oopslogonbase"}% %TMPL:DEF{"action"}%view%TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Access Denied"}%%TMPL:END% -%TMPL:DEF{"message"}% +%TMPL:DEF{"message"}% %MAKETEXT{"Only members of the [_1] are allowed to perform this action." args="%MAINWEB%.%PARAM1%"}% %TMPL:P{"logon"}% %MAKETEXT{"See also:"}% %MAINWEB%.TWikiGroups, %SYSTEMWEB%.TWikiAccessControl, %TWIKIREGISTRATION%, %MAINWEB%.%PARAM1% -%TMPL:END% +%TMPL:END% diff --git a/templates/oopsauth.nat.tmpl b/templates/oopsauth.nat.tmpl index f635de2..1473404 100755 --- a/templates/oopsauth.nat.tmpl +++ b/templates/oopsauth.nat.tmpl @@ -15,6 +15,6 @@ ---+++ %MAKETEXT{"To register as a new user:"}%

    -
  • %MAKETEXT{"Simply fill out the *[[[_1]][TWikiRegistration]]* form. It only takes a minute." args="%TWIKIREGISTRATION%"}%
    • +
  • %MAKETEXT{"Simply fill out the *[[[_1]][Registration]]* form. It only takes a minute." args="%TWIKIREGISTRATION%"}%
%TMPL:END% diff --git a/templates/oopsnotwikiuser.nat.tmpl b/templates/oopsnotwikiuser.nat.tmpl index 528362c..8ff32c3 100755 --- a/templates/oopsnotwikiuser.nat.tmpl +++ b/templates/oopsnotwikiuser.nat.tmpl @@ -1,7 +1,6 @@ -%TMPL:INCLUDE{"oops"}% - +%TMPL:INCLUDE{"oops"}% %TMPL:DEF{"heading"}%%MAKETEXT{"You are not registered"}%%TMPL:END% -%TMPL:DEF{"message"}% +%TMPL:DEF{"message"}% %MAKETEXT{"Can't find the username [_1]" args="%PARAM1%"}%. %MAKETEXT{"Make sure you spelled the User Name correctly and try again. @@ -9,4 +8,4 @@ Remember, a [_1] is case sensitive. See [_2] for a list of existing users or register as new user in [_3]." args="%SYSTEMWEB%.WikiName,%MAINWEB%.TWikiUsers,%TWIKIREGISTRATION%"}% -%TMPL:P{"goback"}% %TMPL:END% +%TMPL:P{"goback"}% %TMPL:END% diff --git a/templates/oopsregthanks.nat.tmpl b/templates/oopsregthanks.nat.tmpl index 924328e..27d3b64 100755 --- a/templates/oopsregthanks.nat.tmpl +++ b/templates/oopsregthanks.nat.tmpl @@ -1,16 +1,15 @@ -%TMPL:INCLUDE{"oops"}% - +%TMPL:INCLUDE{"oops"}% %TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END% %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Thank you for registering"}%%TMPL:END% -%TMPL:DEF{"message"}% +%TMPL:DEF{"message"}%
  • %MAKETEXT{"Welcome [_1], take a [[[_2]][first tour]] on the [_3]." args="%WIKIUSERNAME%,%SYSTEMWEB%.WelcomeGuest,%WIKITOOLNAME%"}%
    • -
  • %MAKETEXT{"Take a look at the [[[_1]][TWikiWeb]] to get help on the [_2]." args="%SYSTEMWEB%.WebHome,%WIKITOOLNAME%"}%
    • +
  • %MAKETEXT{"Take a look at the [[[_1]][%SYSTEMWEB% web]] to get help on the [_2]." args="%SYSTEMWEB%.WebHome,%WIKITOOLNAME%"}%
  • %MAKETEXT{"Review your [[[_1]][personal [_2] homepage]]. Learn how to customize the [_2] to your needs. Suggestion: How about uploading your picture to your [_2] homepage?" args="%WIKIUSERNAME%,%WIKITOOLNAME%"}%
  • %MAKETEXT{"You are also listed in the [_1] topic" args="%MAINWEB%.%WIKIUSERSTOPIC%"}%
  • %MAKETEXT{"A confirmation e-mail has been sent to [_1]" args="%PARAM1%"}%
-%TMPL:END% +%TMPL:END% diff --git a/templates/oopsresetpasswd.nat.tmpl b/templates/oopsresetpasswd.nat.tmpl index 826e9c9..47d3feb 100755 --- a/templates/oopsresetpasswd.nat.tmpl +++ b/templates/oopsresetpasswd.nat.tmpl @@ -2,7 +2,7 @@ %TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END% %TMPL:DEF{"color"}%green%TMPL:END% -%TMPL:DEF{"heading"}%%MAKETEXT{"Request to reset your TWiki password"}%%TMPL:END% +%TMPL:DEF{"heading"}%%MAKETEXT{"Request to reset your %WIKITOOLNAME% password"}%%TMPL:END% %TMPL:DEF{"mailuri"}%"mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME% - Sorry, please reset my password&body=%PARAM1%"%TMPL:END% %TMPL:DEF{"message"}% %MAKETEXT{"The following is your encrypted password entry:"}% diff --git a/templates/page.nat.tmpl b/templates/page.nat.tmpl index 3892dbd..6a81b30 100755 --- a/templates/page.nat.tmpl +++ b/templates/page.nat.tmpl @@ -4,7 +4,7 @@ %TMPL:P{"title"}% - %TMPL:P{"meta"}% + %TMPL:P{"meta"}% %IFDEFINEDTHEN{"%FAVICON%"}% diff --git a/templates/strings.nat.tmpl b/templates/strings.nat.tmpl index 71b2ab9..71ed6c0 100644 --- a/templates/strings.nat.tmpl +++ b/templates/strings.nat.tmpl @@ -1,7 +1,7 @@ -%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Login"}%%TMPL:END% +%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Log In"}%%TMPL:END% %TMPL:DEF{"LOG_IN_HELP"}%%MAKETEXT{"Log in to [_1]." args="%WIKITOOLNAME%"}%%TMPL:END% -%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Logout"}%%TMPL:END% +%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Log Out"}%%TMPL:END% %TMPL:DEF{"LOG_OUT_HELP"}%%MAKETEXT{"Log out [_1]" args="%WIKINAME%"}%%TMPL:END% %TMPL:DEF{"VIEW"}%%MAKETEXT{"View"}%%TMPL:END% %TMPL:DEF{"VIEW_HELP"}%%MAKETEXT{"View formatted topic"}%%TMPL:END% diff --git a/templates/view.plain.nat.tmpl b/templates/view.plain.nat.tmpl index f25f221..adfda39 100644 --- a/templates/view.plain.nat.tmpl +++ b/templates/view.plain.nat.tmpl @@ -1,11 +1,11 @@ -%TMPL:P{"title"}% - - %TMPL:P{"meta"}% +%TMPL:P{"title"}% + %TMPL:P{"meta"}% + %GETSKINSTYLE% diff --git a/templates/view.print.nat.tmpl b/templates/view.print.nat.tmpl index 45b5dee..f85daf2 100755 --- a/templates/view.print.nat.tmpl +++ b/templates/view.print.nat.tmpl @@ -2,9 +2,9 @@ - - %TMPL:P{"meta"}% %HTMLTITLE% - (%MAKETEXT{"printable"}%) + + %TMPL:P{"meta"}%