Item71: Item163:

* fixes for ie6 * using jquery buttons where possible * fixed preview git-svn-id: http://svn.foswiki.org/trunk/NatSkin@779 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 18, 2008 · 5d91b55 · 5d91b55
1 parent 90a9853
commit 5d91b55
Show file tree

Hide file tree

Showing 29 changed files with 279 additions and 93 deletions.
diff --git a/data/TWiki/NatSkin.txt b/data/TWiki/NatSkin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1226506238" format="1.1" reprev="1.5" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1227037698" format="1.1" version="$Rev$"}%
 <!--
 
    PLEASE DO NOT EDIT THIS TOPIC
@@ -119,12 +119,15 @@ 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-pre27 |
+|  Skin Version: | v3.0-pre28 |
 |  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; |
+|  18 Nov 2008: | fixes for IE6; \
+                  new interim logo for foswiki; \
+                  using jquery buttons where possible |
 |  12 Nov 2008: | rendering data forms as tables in view again; \
                   integrated css fixes by Carlo Schulz; \
                   moving revinfo to first h1 in content area |
@@ -406,8 +409,8 @@ allways open an extra window.
 |  12 Aug 2005: | first round of pre-releases numbered 1.91 upwards |
 |  24 Jul 2005: | rewritten the templates, renamed the CSS classes |
 |  25 Jun 2003: | Initial version |
-|  Skin Home: | http://nextwiki.org/Extensions/NatSkin |
-|  Feedback: | http://nextwiki.org/Extensions/NatSkinDev |
+|  Skin Home: | http://foswiki.org/Extensions/NatSkin |
+|  Feedback: | http://foswiki.org/Extensions/NatSkinDev |
 
 %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"}%
diff --git a/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt b/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt
@@ -2,11 +2,11 @@
 %TMPL:INCLUDE{"view"}%
 
 %TMPL:DEF{"content"}%
----+ %MAKETEXT{"Create New Topic in [_1] Web" args="<nop>%BASEWEB%"}%
 %TMPL:P{"formstartstep"}%
+---++ %MAKETEXT{"Create New Topic in the [_1] Web" args="<nop>%BASEWEB%"}%
 %TMPL:P{"topictitlestep"}%
-%TMPL:P{"topicnamestep"}%
-%TMPL:P{"DIStopictemplatestep"}%
+%TMPL:P{"DIStopicnamestep"}%
+%TMPL:P{"topictemplatestep"}%
 %TMPL:P{"formbuttons"}%
 %TMPL:P{"formendstep"}%
 %TMPL:END%
@@ -36,21 +36,21 @@
 
 %TMPL:DEF{"topicnamestep"}%<!-- topicnamestep -->
 <div class='twikiFormStep'>
----+++ %MAKETEXT{"<nop>Name:"}%
+---+++ %MAKETEXT{"Name:"}%
 %TMPL:P{"topicname"}%%TMPL:P{"nonwikiword"}%
 </div>
 <!-- //topicnamestep -->%TMPL:END%
 
 %TMPL:DEF{"topictemplatestep"}%<!-- topictemplatestep -->
 <div class='twikiFormStep'>
----+++ %MAKETEXT{"Use template:"}%
+---+++ %MAKETEXT{"Template:"}%
 %TMPL:P{"topictemplate"}%
 </div>
 <!-- //topictemplate -->%TMPL:END%
 
 %TMPL:DEF{"formbuttons"}%<!-- formbuttons -->
 <div class='twikiFormStep twikiFormButtons twikiFormLast'>
-%TMPL:P{"submit"}%%TMPL:P{"reset"}%%TMPL:P{"cancel"}%
+%TMPL:P{"submit"}%%TMPL:P{"reset"}%%TMPL:P{"cancel"}%%CLEAR%
 </div>
 <!-- //formbuttons -->%TMPL:END%
 
@@ -59,13 +59,14 @@
 <input type="hidden" name="t" value="%GMTIME{"$epoch"}%" />
 <input type="hidden" name="onlynewtopic" value="on" />
 <input type="hidden" name="topicparent" value="%URLPARAM{"topicparent"}%" />
+<input type="hidden" name="topic" id="topic" value="%URLPARAM{"newtopic"}%"/>
 <!-- //formstart -->%TMPL:END%
 
 
 %TMPL:DEF{"topictitle"}%<!-- topictitle -->
 <input type="text" class="twikiInputField required" name="TopicTitle" id="topictitle" size="40" value="%URLPARAM{"newtopictitle"}%" />
 <div class="twikiFormDescription">
-Free form title text.
+%MAKETEXT{"Free form title text."}%
 </div>
 <!--//topictitle -->%TMPL:END%
 
@@ -81,20 +82,20 @@ Free form title text.
 %IF{"'%URLPARAM{"templatetopic"}%'" then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'}%
 <option value="">%MAKETEXT{"Default template"}%</option>%SEARCH{".*Template$" scope="topic" excludetopic="WebTopicEditTemplate,WebCreateNewTopicTemplate,*ViewTemplate" type="regex" nonoise="on" format="<option>$topic</option>"}%</select> 
 <div class="twikiFormDescription">
-Initialize the new topic using a template.
+%MAKETEXT{"Initialize the new topic using a template."}%
 </div>
 <!-- //topictemplate -->%TMPL:END%
 
 %TMPL:DEF{"submit"}%<!-- submit -->
-<input id="submit" type="submit" class="natOkButton twikiSubmit" value='%MAKETEXT{"OK"}%' />
+%BUTTON{type="submit" icon="tick" value="%MAKETEXT{"OK"}%"}%
 <!-- //submit -->%TMPL:END%
 
 %TMPL:DEF{"reset"}%<!-- reset -->
-<input id="reset" type="reset" class="natAltButton twikiButton" value='%MAKETEXT{"Reset"}%' />
+%BUTTON{type="reset" icon="application_form" value="%MAKETEXT{"Reset"}%"}%
 <!-- //reset -->%TMPL:END%
 
 %TMPL:DEF{"cancel"}%<!-- cancel -->
-<input id="button" type="button" class="natCancelButton twikiButton" value='%MAKETEXT{"Cancel"}%' onclick="window.location.href='%URLPARAM{"origurl" default="%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%"}%';" />
+%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%URLPARAM{"origurl" default="%BASEWEB%.%BASETOPIC%"}%"}%
 <!-- //cancel -->%TMPL:END%
 
 

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-pre27';
+$RELEASE = '3.00-pre28';
 
 1;
diff --git a/lib/TWiki/Contrib/NatSkin/DEPENDENCIES b/lib/TWiki/Contrib/NatSkin/DEPENDENCIES
@@ -1 +1 @@
-TWiki::Plugins::NatSkinPlugin,>=3.0,perl,Required. Download from the TWiki:Plugins/NatSkinPlugin code library.
+TWiki::Plugins::NatSkinPlugin,>=3.0,perl,Required.
diff --git a/lib/TWiki/Contrib/NatSkin/MANIFEST b/lib/TWiki/Contrib/NatSkin/MANIFEST
@@ -1,5 +1,5 @@
 data/Main/NatSkinUserViewTemplate.txt 0644
-data/Main/WikiGuestSideBar.txt 0644
+data/Main/TWikiGuestSideBar.txt 0644
 data/Main/WebLinks.txt 0644
 data/TWiki/MySideBarTemplate.txt 0644
 data/TWiki/MySideBar.txt 0644
@@ -32,6 +32,7 @@ pub/TWiki/NatSkin/BaseButtons.css 0644
 pub/TWiki/NatSkin/BaseStyle.css 0644
 pub/TWiki/NatSkin/BaseThin.css 0644
 pub/TWiki/NatSkin/bin.png 0644
+pub/TWiki/NatSkin/blank.gif 0644
 pub/TWiki/NatSkin/BlueNoteBorder.css 0644
 pub/TWiki/NatSkin/BlueNoteButtons.css 0644
 pub/TWiki/NatSkin/BlueNoteStyle.css 0644
@@ -51,13 +52,16 @@ pub/TWiki/NatSkin/feed-icon-12x12.gif 0644
 pub/TWiki/NatSkin/feed-icon-12x12-gray.gif 0644
 pub/TWiki/NatSkin/feed-icon-12x12-gray.png 0644
 pub/TWiki/NatSkin/feed-icon-12x12.png 0644
+pub/TWiki/NatSkin/foswiki-logo.png 0644
 pub/TWiki/NatSkin/GrayBlend.gif 0644
 pub/TWiki/NatSkin/GrayBlend.png 0644
 pub/TWiki/NatSkin/help.png 0644
+pub/TWiki/NatSkin/iepngfix.htc 0644
 pub/TWiki/NatSkin/link_add.png 0644
 pub/TWiki/NatSkin/magnifier.png 0644
 pub/TWiki/NatSkin/menuarrow.gif 0644
 pub/TWiki/NatSkin/menucorner.gif 0644
+pub/TWiki/NatSkin/nextwiki-header-notrans.png 0644
 pub/TWiki/NatSkin/nextwiki-header.png 0644
 pub/TWiki/NatSkin/nextwiki-header-tile.png 0644
 pub/TWiki/NatSkin/nextwiki-logo.png 0644

diff --git a/pub/TWiki/NatSkin/BaseButtons.css b/pub/TWiki/NatSkin/BaseButtons.css
@@ -4,11 +4,13 @@
   margin:0;
   padding:0;
 }
+.natWebButtonsContents {
+  display:none; /* will be switched on using javascript */
+}
 .natWebButtons ul {
   margin:0;
   padding:0;
   list-style:none;
-  visibility:hidden; /* will be switched on using javascript */
 }
 .natWebButtons ul li {
   display:inline;

diff --git a/pub/TWiki/NatSkin/BaseStyle.css b/pub/TWiki/NatSkin/BaseStyle.css
@@ -20,7 +20,7 @@
 .twikiClear {
   margin:0;
   padding:0;
-  height:0;
+  height:0px;
   line-height:0px;
   clear:both;
   display:block;
@@ -37,18 +37,18 @@
 }
 
 .twikiGrayText {
-  color:#8E9195 !important;
+  color:#8E9195;
 }
 .twikiGrayText a {
-  color:#7B7E81 !important;
+  color:#7B7E81;
 }
 .twikiSmallish i,
 .twikiSmall i {
   font-style:normal; /* no italics for fonts that are already small */
 }
 
 /* html elements */
-html {
+.natHtml {
   background:white;
 }
 .twikiEmulatedLink,
@@ -130,6 +130,11 @@ pre {
   /*\*/ overflow:auto !important; /* */ overflow:scroll; /* for Mac Safari */
 }
 
+form {
+  padding:0px;
+  margin:0px;
+}
+
 /* extra divs */
 .natExtraDiv1,
 .natExtraDiv2,
@@ -355,13 +360,6 @@ pre {
   margin:0px auto;
   width:500px;
 }
-.natLogonFormButtons {
-  padding-top:1em;
-}
-.natRememberMe {
-  padding-bottom:1em;
-}
-
 
 /* edit */
 .natEditBody .natLayoutTable {
@@ -834,6 +832,9 @@ legend {
   margin:0.35em 0em;
   line-height:160%;
 }
+.twikiFormStep.twikiFormButtons {
+  margin-top:2em;
+}
 .twikiFormButtons.twikiFormLast {
   margin-top:20px;
 }

diff --git a/pub/TWiki/NatSkin/BlueNoteButtons.css b/pub/TWiki/NatSkin/BlueNoteButtons.css
@@ -8,6 +8,8 @@
   background-repeat:repeat-x;
   background-position:left bottom;
   border-top:1px solid #E1EAFA;
+  /* ie 6 */
+  _background-image:none;
 }
 .natBodyRight .natWebButtons {
   padding-left:2em;
@@ -48,6 +50,8 @@
   background-repeat:repeat-x;
   background-position:left bottom;
   color:white;
+  /* ie6 */
+  _background-image:none
 }
 
 /* superfish menu *************************/
@@ -134,9 +138,11 @@ ul.superfish li li li.sfHover ul {
 ul.superfish a {
   margin:0em -1em;
   padding:0em 1em;
-  _padding:0em 2em; /* broken box model in IE6 */
   display:block;
   width:100%;
+  /* ie 6 */
+  _padding:0em 2em; 
+  _width:auto;
 }
 
 ul.superfish li {
@@ -215,8 +221,9 @@ ul.superfish li li a:link,
 ul.superfish li li a {
   display:block;
   background:transparent;
-  _background:inherit;
   margin:0em -1em;
   padding:0em 1em;
-  _padding:0em 2em; /* broken box model in IE6 */
+  /* ie 6 */
+  _background:inherit;
+  _padding:0em 2em; 
 }