Item23: more de-twikiing, icon work, login screen

git-svn-id: http://svn.foswiki.org/trunk/NatSkin@598 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 13, 2008 · 2c771aa · 2c771aa
1 parent 1168c5d
commit 2c771aa
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 89 deletions.
diff --git a/data/TWiki/NatSkin.txt b/data/TWiki/NatSkin.txt
@@ -119,7 +119,7 @@ allways open an extra window.
 |  Skin Author: | Michael Daum |
 |  Copyright &copy;: | 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, <nop>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
@@ -19,6 +19,7 @@ Default sidebar implementation
 %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.TWikiAdminGroup" 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"}%]]

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-pre26';
+$RELEASE = '3.00-pre27';
 
 1;
diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 <!-- template: changeformsidebar.nat.tmpl -->
-%TMPL:DEF{"sidebar"}%<!-- -->
+%TMPL:DEF{"sidebar"}%<!-- sidebar -->
 <nop><h2><a name="Help">%MAKETEXT{"Help"}%</a></h2>
    * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TWikiForms" target="_blank">%MAKETEXT{"Form based input"}%</a>
    * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TWikiMetaData" target="_blank">%MAKETEXT{"Topic Meta data"}%</a>
@@ -11,4 +11,4 @@
 <p><span class="twikiAlert">%MAKETEXT{"Existing form data will be lost! (still available in old version)"}%</span></p>
 <p>%MAKETEXT{"All possible forms are defined in the WEBFORM variable in the WebPreferences."}%</p>
 </div>
-%TMPL:END%
+<!-- //sidebar -->%TMPL:END%
diff --git 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="<nop>%WIKITOOLNAME%"}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- message -->
-<h3>%BANNER%</h3>
-%NOTE%
-
-%TMPL:P{"logon"}%
-%TMPL:P{"seealso"}%
+<div class="twikiFormSteps">
+<h2 id="natLogonBanner">%BANNER%</h2>
+%NOTE%<!-- note// -->
+%TMPL:P{"logon"}%<!-- logon// -->
+%TMPL:P{"seealso"}%<!-- seealso/ -->
+</div>
 <!-- //message-->%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 <div class="natLogin">

diff --git a/templates/login.sudo.nat.tmpl b/templates/login.sudo.nat.tmpl
@@ -1,6 +1,6 @@
 %%TMPL:INCLUDE{"login"}%<!-- template: login.sudo.nat.tmpl -->
 
-%TMPL:DEF{"webaction"}%%MAKETEXT{"Admin TWiki User Authentication"}%%TMPL:END%
+%TMPL:DEF{"webaction"}%%MAKETEXT{"Admin <nop>%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"}%<span class="twikiUnvisited">%MAKETEXT{"Enter the TWiki Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%</span>%TMPL:END%
+%TMPL:DEF{"authrealm"}%<span class="twikiUnvisited">%MAKETEXT{"Enter the %WIKITOOLNAME% Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%</span>%TMPL:END%
diff --git a/templates/loginbase.nat.tmpl b/templates/loginbase.nat.tmpl
@@ -1,39 +1,44 @@
 <!-- template: loginbase.tmpl -->
 %TMPL:DEF{"onloadscript"}%if (document.LogonForm) {document.LogonForm.username.focus();} %TMPL:END%
-%TMPL:DEF{"rememberbox"}%<div class="natRememberMe">
+%TMPL:DEF{"rememberbox"}%<!-- rememberbox -->
+<div class="twikiFormStep natRememberMe">
 <label>
   <input name="remember" class="twikiCheckbox" type="checkbox" value="1" />
   %MAKETEXT{"Remember me on this computer"}%
 </label>
-</div>%TMPL:END%
-%TMPL:DEF{"logon"}%<!-- -->
-<div class="natLogonFormHolder">
-<form name="LogonForm" action="%IFDEFINED{"%HTTPSLOGON%" as ="on" then="https" else="http"}%://%HTTP_HOST%%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%" method="post">
-<table class="natLogonForm" border="0"> 
-<tr class="natLogonFormLogin"> 
-  <th class="twikiFirstCol"><b>%MAKETEXT{"Username"}%</b>: </th>
-  <td><input type="text" size="20" name="username" value='%URLPARAM{"usernamestep"}%' /> 
-      <span class="twikiAlert">**</span>
-  </td>
-</tr>
-<tr class="natLogonFormPassword"> 
-  <th class="twikiFirstCol"><b>%MAKETEXT{"Password"}%</b>: </th>
-  <td><input type="password" size="20" name="password" />
-      <span class="twikiAlert">**</span>
-  </td>
-</tr>
-<tr class="natLogonFormButtons">
-  <th class="twikiFirstCol">&nbsp;</th>
-  <td> %TMPL:P{context="can_remember_login" then="rememberbox"}%
-    <input type="submit" class="natOkButton" value='%MAKETEXT{"Log in"}%' />
-    <input type="reset"  class="natAltButton" value='%MAKETEXT{"Clear"}%' />
-    <input type="button" class="natCancelButton" value='%MAKETEXT{"Cancel"}%' onclick="window.location.href='%WIKILOGOURL%'" /> 
-    <input type="hidden" name="web" value="%WEB%" />
-    <input type="hidden" name="topic" value="%TOPIC%" />
-    <input type="hidden" name="action" value="%TMPL:P{action}%"/>
-  </td>
-</tr>
-</table>
+</div>
+<!-- //rememberbox -->%TMPL:END%
+%TMPL:DEF{"logon"}%<!-- logon -->
+<form id="LogonForm" name="LogonForm" action="%IFDEFINED{"%HTTPSLOGON%" as ="on" then="https" else="http"}%://%HTTP_HOST%%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%" method="post">
+<input type="hidden" name="web" value="%WEB%" />
+<input type="hidden" name="topic" value="%TOPIC%" />
+<input type="hidden" name="action" value="%TMPL:P{action}%"/>
 <input type="hidden" name="origurl" value="%IFDEFINED{"%ORIGURL%"}%" />
+<input type="submit" style="display:none" />
+<div class="twikiFormStep">
+---+++ %MAKETEXT{"Username"}%:
+<input type="text" class="twikiFormField required" size="20" id="username" name="username" value='%URLPARAM{"usernamestep"}%' /> 
+</div>
+<div class="twikiFormStep">
+---+++ %MAKETEXT{"Password"}%:
+<input type="password" class="twikiFormField required" size="20" id="password" name="password" />
+</div>
+%TMPL:P{context="can_remember_login" then="rememberbox"}%
+<div class="twikiFormStep natLogonFormButtons">
+  %BUTTON{"%MAKETEXT{"Log In"}%" icon="tick" onclick="$('#LogonForm').submit()"}% 
+  %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%WIKILOGOURL%"}%
+  <span class="twikiClear"></span>
+</div>
 </form>
-</div>%TMPL:END%
+%JQSCRIPT{"jquery.validate"}%
+%JQSCRIPT{"jquery.shake"}%
+<script type="text/javascript">
+$(function() {
+  $("#LogonForm").validate();
+  var bannerText = $("#natLogonBanner").text();
+  if (bannerText == '%TMPL:P{UNRECOGNISED_USER}%') {
+    $(".natLogin").shake(3, 10, 180);
+  }
+});
+</script>
+<!-- //logon -->%TMPL:END%
diff --git 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
@@ -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 <a href=\"javascript:history.back()\">back</a> in your browser and choose a different username."}%
 %TMPL:END%
@@ -260,11 +260,11 @@ However, the filename has been changed from <b><code>[_2]</code></b> to
 <b><code>[_3]</code></b>. Please make a note of it." args="<nop>%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, <nop>%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 <nop>%WIKITOOLNAME% administrator to change the settings if they are inappropriate for your environment."}%
 
 <form action="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%">
 <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%' />
@@ -362,7 +362,7 @@ template that doesn't exist." args="%PARAM2%"}%
 %TMPL:END%
 %TMPL:DEF{"thanks"}%<!-- thanks -->
 ---+++ %MAKETEXT{"Thank you for registering"}%
-   * %MAKETEXT{"Your personal TWiki topic [_1] has been created" args="%USERSWEB%.%PARAM2%"}% 
+   * %MAKETEXT{"Your personal <nop>%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
@@ -6,8 +6,8 @@
 <!-- //attachaction -->%TMPL:END%
 %TMPL:DEF{"notes"}%<!-- notes -->
 <p>
-This will upload the given <nop>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 <nop>OpenOffice document to %WIKITOOLNAME%, converting and importing it
+to %WIKITOOLNAME%. Its content will be stored it into a new topic. 
 </p>
 <p>
 The original document will be attached to the newly

diff --git a/templates/oopsaccessgroup.nat.tmpl b/templates/oopsaccessgroup.nat.tmpl
@@ -1,12 +1,11 @@
-%TMPL:INCLUDE{"oopslogonbase"}%
-<!-- template: oopsaccessgroup.nat.tmpl -->
+%TMPL:INCLUDE{"oopslogonbase"}%<!-- template: oopsaccessgroup.nat.tmpl -->
 %TMPL:DEF{"action"}%view%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Access Denied"}%%TMPL:END%
-%TMPL:DEF{"message"}% <!-- -->
+%TMPL:DEF{"message"}% <!-- 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%
+<!-- //message -->%TMPL:END%
diff --git a/templates/oopsauth.nat.tmpl b/templates/oopsauth.nat.tmpl
@@ -15,6 +15,6 @@
 </ul>            
 ---+++ %MAKETEXT{"To register as a new user:"}%
 <ul>
-  <li> %MAKETEXT{"Simply fill out the *[[[_1]][TWikiRegistration]]* form. It only takes a minute." args="%TWIKIREGISTRATION%"}% </li>
+  <li> %MAKETEXT{"Simply fill out the *[[[_1]][Registration]]* form. It only takes a minute." args="%TWIKIREGISTRATION%"}% </li>
 </ul>
 %TMPL:END%
diff --git a/templates/oopsnotwikiuser.nat.tmpl b/templates/oopsnotwikiuser.nat.tmpl
@@ -1,12 +1,11 @@
-%TMPL:INCLUDE{"oops"}%
-<!-- template: oopsnotwikiuser.nat.tmpl -->
+%TMPL:INCLUDE{"oops"}%<!-- template: oopsnotwikiuser.nat.tmpl -->
 %TMPL:DEF{"heading"}%%MAKETEXT{"You are not registered"}%%TMPL:END%
-%TMPL:DEF{"message"}%<!-- -->
+%TMPL:DEF{"message"}%<!-- message -->
 %MAKETEXT{"Can't find the username <b>[_1]</b>" args="%PARAM1%"}%.
 
 %MAKETEXT{"Make sure you spelled the User Name correctly and try again.
 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%
+<!-- //message -->%TMPL:P{"goback"}% %TMPL:END%
diff --git a/templates/oopsregthanks.nat.tmpl b/templates/oopsregthanks.nat.tmpl
@@ -1,16 +1,15 @@
-%TMPL:INCLUDE{"oops"}%
-<!-- template: oopsregthanks.nat.tmpl -->
+%TMPL:INCLUDE{"oops"}%<!-- template: oopsregthanks.nat.tmpl -->
 %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"}%<!-- message -->
 <ul>
  <li> %MAKETEXT{"Welcome [_1], take a [[[_2]][first tour]] on the [_3]." args="%WIKIUSERNAME%,%SYSTEMWEB%.WelcomeGuest,<nop>%WIKITOOLNAME%"}%</li>
- <li> %MAKETEXT{"Take a look at the [[[_1]][TWikiWeb]] to get help on the [_2]." args="%SYSTEMWEB%.WebHome,<nop>%WIKITOOLNAME%"}%</li>
+ <li> %MAKETEXT{"Take a look at the [[[_1]][%SYSTEMWEB% web]] to get help on the [_2]." args="%SYSTEMWEB%.WebHome,<nop>%WIKITOOLNAME%"}%</li>
  <li> %MAKETEXT{"Review your [[[_1]][personal [_2] homepage]].
      Learn how to customize the <nop>[_2] to your needs.
      Suggestion: How about uploading your picture to your <nop>[_2] homepage?" args="%WIKIUSERNAME%,%WIKITOOLNAME%"}%</li>
  <li> %MAKETEXT{"You are also listed in the [_1] topic" args="%MAINWEB%.%WIKIUSERSTOPIC%"}% </li>
  <li> %MAKETEXT{"A confirmation e-mail has been sent to [_1]" args="%PARAM1%"}%  </li>
 </ul>
-%TMPL:END%
+<!-- //message -->%TMPL:END%
diff --git a/templates/oopsresetpasswd.nat.tmpl b/templates/oopsresetpasswd.nat.tmpl
@@ -2,7 +2,7 @@
 <!-- template: oopsresetpasswd.nat.tmpl -->
 %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 <nop>%WIKITOOLNAME% password"}%%TMPL:END%
 %TMPL:DEF{"mailuri"}%"mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%&#32;-&#32;Sorry,&#32;please&#32;reset&#32;my&#32;password&amp;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
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>%TMPL:P{"title"}%</title>
-<meta name="generator" content="TWiki/NatSkin" /> %TMPL:P{"meta"}%
+<meta name="generator" content="NextWiki/NatSkin" /> %TMPL:P{"meta"}%
 %IFDEFINEDTHEN{"%FAVICON%"}%
 <link rel="icon" href="%FAVICON%" type="image/x-icon" />
 <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />

diff --git a/templates/strings.nat.tmpl b/templates/strings.nat.tmpl
@@ -1,7 +1,7 @@
 <!-- template: strings.nat.tmpl -->
-%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="<nop>%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="<nop>%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
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
 <head>
-<title>%TMPL:P{"title"}%</title>
-<base href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%"></base>
 <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
 <meta http-equiv="Content-Style-Type" content="text/css" /> 
-<meta name="generator" content="TWiki/NatSkin" /> %TMPL:P{"meta"}%
+<title>%TMPL:P{"title"}%</title>
+<meta name="generator" content="NextWiki/NatSkin" /> %TMPL:P{"meta"}%
+<base href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%"></base>
 <link rel="icon" href="%FAVICON%" type="image/x-icon" /> 
 <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
 %GETSKINSTYLE%

diff --git a/templates/view.print.nat.tmpl b/templates/view.print.nat.tmpl
@@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
-<meta http-equiv="Content-Style-Type" content="text/css" /> 
-<meta name="generator" content="TWiki/NatSkin" /> %TMPL:P{"meta"}%
 <title>%HTMLTITLE% - (%MAKETEXT{"printable"}%)</title>
+<meta http-equiv="Content-Style-Type" content="text/css" /> 
+<meta name="generator" content="NextWiki/NatSkin" /> %TMPL:P{"meta"}%
 <base href="%SCRIPTURL{view}%/%WEB%/%TOPIC%"></base>
 <link rel="icon" href="%FAVICON%" type="image/x-icon" /> 
 <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />