Item8210:

* fixed multiple problems with internet exploders 6+7 * removed dependency on GluePlugin * fixed ie6 png fix * removed variable searchbox positions: there's only the top position now git-svn-id: http://svn.foswiki.org/trunk/NatSkin@4413 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jul 3, 2009 · e001170 · e001170
1 parent 7a00e83
commit e001170
Show file tree

Hide file tree

Showing 22 changed files with 160 additions and 209 deletions.
diff --git a/data/System/NatSkin.txt b/data/System/NatSkin.txt
@@ -129,9 +129,6 @@ allways open an extra window.
 ---++ Dependencies
 %$DEPENDENCIES%
 
-Please have a look at the dependencies of the NatSkinPlugin. Most additional packages
-are listed there.
-
 ---++ Skin Info
 |  Skin Author: | Michael Daum |
 |  Copyright &copy;: | 2003-2009, Michael Daum http://michaeldaumconsulting.com |

diff --git a/data/System/NatSkinConfiguration.txt b/data/System/NatSkinConfiguration.txt
@@ -30,11 +30,6 @@ This is the list of variables to configure the skin style:
 | switch on/of the tab buttons above the topic area | off |
 | STYLESIDEBAR (stylesidebar) | left, right, both, off \
 | configure where the sidebar is to be displayed | left |
-| STYLESEARCHBOX (stylesearchbox) | top, pos1, pos2, pos3, off \
-| configure where the searchbox is to be displayed: \
-  in the topbar (top), at the top of the sidebar (pos1), \
-  in the middle of the sidebar (pos2), \
-  at the bottom of the sidebar (pos3) or off | top |
 
 There are a couple of special url parameters:
    * =togglesidebar=: disable the sidebar for this request only. 

diff --git a/data/System/NatSkinCss.txt b/data/System/NatSkinCss.txt
@@ -501,14 +501,8 @@ the =natBottomBar= will be classified as =natBottomBarBoth=.
 | defaultsidebar.nat.tmpl, %BR% \
   defaulttopbar.nat.tmpl \
 | |
-| =natSearchBoxPos1= \
-| defaultsidebar.nat.tmpl \
-| |
-| =natSearchBoxPos3= \
-| defaultsidebar.nat.tmpl \
-| |
-| =natSearchBoxTop= \
-| defaulttopbar.nat.tmpl \
+| =natSearchBox= \
+| searchbox.nat.tmpl \
 | |
 | =natSearchHit= \
 | changes.nat.tmpl, %BR% \

diff --git a/data/System/NatSkinStyleBrowser.txt b/data/System/NatSkinStyleBrowser.txt
@@ -71,14 +71,6 @@ See the %SYSTEMWEB%.NatSkinPlugin documentation on how to use style settings in
       <li> <input type="radio" class="foswikiRadiobox" id="buttonson" name="stylebuttons" value="on" %IF{"context natskin_buttons_on" then="checked='checked'"}% /><label for="buttonson">%MAKETEXT{"Web Buttons On"}%</label></li>
       <li> <input type="radio" class="foswikiRadiobox" id="buttonsoff" name="stylebuttons" value="off" %IF{"context natskin_buttons_off" then="checked='checked'"}% /><label for="buttonsoff">%MAKETEXT{"Web Buttons Off"}%</label></li>
     </ul>
-
-    <ul>
-      <li> <input type="radio" class="foswikiRadiobox" id="searchboxtop" name="stylesearchbox" value="top" %IF{"context natskin_searchbox_top" then="checked='checked'"}% /><label for="searchboxtop">%MAKETEXT{"Searchbox in topbar"}%</label></li>
-      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos1" name="stylesearchbox" value="pos1" %IF{"context natskin_searchbox_pos1" then="checked='checked'"}% /><label for="searchboxpos1">%MAKETEXT{"Searchbox in pos. 1"}%</label></li>
-      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos2" name="stylesearchbox" value="pos2" %IF{"context natskin_searchbox_pos2" then="checked='checked'"}% /><label for="searchboxpos2">%MAKETEXT{"Searchbox in pos. 2"}%</label></li>
-      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos3" name="stylesearchbox" value="pos3" %IF{"context natskin_searchbox_pos3" then=" checked='checked'"}% /><label for="searchboxpos3">%MAKETEXT{"Searchbox in pos. 3"}%</label></li>
-      <li> <input type="radio" class="foswikiRadiobox" id="searchboxoff" name="stylesearchbox" value="off" %IF{"context natskin_searchbox_off" then=" checked='checked'"}% /><label for="searchboxoff">%MAKETEXT{"Searchbox off"}%</label></li>
-    </ul>
   </div>
   <div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
     %BUTTON{"%MAKETEXT{"OK"}%" type="submit" icon="tick"}%

diff --git a/data/System/SiteSideBar.txt b/data/System/SiteSideBar.txt
@@ -11,15 +11,14 @@ Default sidebar implementation
    * [[WebNotify][%MAKETEXT{"Notifications"}%]]
    * [[WebStatistics][%MAKETEXT{"Statistics"}%]]
    * [[Sandbox.WebHome][Sandbox]]
-%TMPL:P{context="natskin_sidebar_pos2" then="searchbox_pos2"}%<!-- -->
 %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%.WebCreateNewWeb][%MAKETEXT{"Add Web"}%]]
+   * [[%SYSTEMWEB%.WebCreateNewWeb][%MAKETEXT{"Create Web"}%]]
    * [[%SCRIPTURL{"rename"}%/%BASEWEB%/%BASETOPIC%?action=renameweb][Rename Web]]
 </div>
 %FIDEFINED%

diff --git a/lib/Foswiki/Contrib/NatSkin.pm b/lib/Foswiki/Contrib/NatSkin.pm
@@ -1,6 +1,6 @@
 package Foswiki::Contrib::NatSkin;
 use vars qw($VERSION $RELEASE);
 $VERSION = '$Rev$';
-$RELEASE = '3.91';
+$RELEASE = '3.92';
 
 1;
diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -2,10 +2,10 @@ Foswiki::Contrib::FamFamFamContrib,>=2075,perl,Required.
 Foswiki::Plugins::BreadCrumbsPlugin,>=4318,perl,Required
 Foswiki::Plugins::FilterPlugin,>=3491,perl,Required
 Foswiki::Plugins::FlexWebListPlugin,>=3493,perl,Required
-Foswiki::Plugins::GluePlugin,>=3494,perl,Required
 Foswiki::Plugins::IfDefinedPlugin,>=3637,perl,Required
 Foswiki::Plugins::SetVariablePlugin,>=4287,perl,Required
 Foswiki::Plugins::UploadPlugin,>=1340,perl,Required
 Foswiki::Plugins::NatEditPlugin,>=1993,perl,Required
 Foswiki::Plugins::JQueryPlugin,>=3740,perl,Required
-Foswiki::Plugins::NatSkinPlugin,>=4359,perl,Required.
+Foswiki::Plugins::NatSkinPlugin,>=4359,perl,Required
+Foswiki::Plugins::RenderPlugin,>=3644,perl,Required
diff --git a/pub/System/JazzyNoteTheme/JazzyNoteStyle.css b/pub/System/JazzyNoteTheme/JazzyNoteStyle.css
@@ -652,37 +652,43 @@ fieldset .foswikiFormSteps {
   padding-left:0px;
 }
 
-.natSearchBox table {
-  width:100%;
-}
 .natSearchBox input {
   color:#0055b5;
   margin:0px;
   border:thin inset;
   padding:1px;
+  width:14em;
+  _width:12em; /* IE6 fix */
+}
+*:first-child+html 
+.natSearchBox input { /* IE7 fix */
+  width:12em;
 }
-.natSearchBoxPos1 a span {
+.natSearchBox a {
   display:none;
 }
-.natSearchBoxPos1 a {
-  margin:1px 5px;
+
+/*
+.natSearchBox a span {
+  display:none;
+}
+.natSearchBox a {
+  margin:5px;
   padding:0px;
-  background-image:url(../NatSkin/icons/magnifier.png);
-  background-repeat:no-repeat;
   display:block;
   height:16px;
   width:16px;
 }
-.natSearchBoxPos1 a:hover {
+.natSearchBox a,
+.natSearchBox a:hover {
   background-color:inherit;
   background-image:url(../NatSkin/icons/magnifier.png);
   background-repeat:no-repeat;
 }
-.natSearchBoxPos2,
-.natSearchBoxPos3 {
-  padding:1em 0px;
+.natSearchBox a:hover {
+  background-position:0px -16px;
 }
-
+*/
 
 /* main area */
 .natBreadCrumbs {

diff --git a/pub/System/JazzyNoteTheme/JazzyNoteStyle.css.gz b/pub/System/JazzyNoteTheme/JazzyNoteStyle.css.gz
diff --git a/pub/System/NatSkin/BaseStyle.css b/pub/System/NatSkin/BaseStyle.css
@@ -240,7 +240,8 @@ form {
   min-height:40em;
 }
 
-*:first-child+html .natSideBarHeaderContents { /* IE7 fix to draw the borders */
+*:first-child+html 
+.natSideBarHeaderContents { /* IE7 fix to draw the borders */
   height:1em;
 }
 .natSideBarHeaderContents {
@@ -282,7 +283,6 @@ form {
 .natTopRight form {
   padding:0px;
   margin:0px;
-  margin-bottom:5px;
 }
 
 .natWebTitle {
@@ -302,19 +302,6 @@ form {
   padding:0px 0px 0px 5px;
   text-decoration:none;
 }
-.natSearchBoxTop a {
-  display:none;
-}
-.natSearchBox form {
-  margin:0px;
-  display:inline;
-}
-
-.natSearchBoxPos1 input,
-.natSearchBoxPos2 input,
-.natSearchBoxPos3 input {
-  width:98%;
-}
 
 /* sidebar */
 .natSideBar h2.natSideBarTitle {
@@ -929,10 +916,15 @@ legend {
 }
 .foswikiFormSteps hr {
   margin:1em 0em;
+  _display:none; /* IE6 fix hide hr, they are non stylable and plain uggly */
 }
 .foswikiFormSteps .foswikiFormLast hr {
   margin-bottom:1em;
 }
+*:first-child+html 
+.foswikiFormSteps hr { /* IE7 fix hide hr, they are non stylable and plain uggly */
+  display:none;
+}
 .foswikiFormLast {
   margin-bottom:0em;
 }

diff --git a/pub/System/NatSkin/BaseStyle.css.gz b/pub/System/NatSkin/BaseStyle.css.gz
diff --git a/pub/System/NatSkin/icons/magnifier.png b/pub/System/NatSkin/icons/magnifier.png
diff --git a/pub/System/NatSkin/natskin.js b/pub/System/NatSkin/natskin.js
@@ -5,24 +5,20 @@
 
   /* ie6 png transperency fix for img tags */
   if ($.browser.msie && $.browser.version < 7) {
-    runOnLoad(
-      function() {
-        window.setTimeout(function() {
-          $("img[src$='png']").each(function () {
-            var img = $(this);
-            var width = img.width() || 16;
-            var height = img.height() || 16;
-            //alert(width);
-            img.css({
-              "width": width,
-              "height": height, 
-              "filter": "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + img.attr("src") + "', sizingMethod='scale')"
-            });
-            img.attr("src", blankImg);
-          });
-        }, 10);
-      }
-    );
+    window.setTimeout(function() {
+      $("img[src$='png']").each(function () {
+        var img = $(this);
+        var width = img.width() || 16;
+        var height = img.height() || 16;
+        //alert(width);
+        img.css({
+          "width": width,
+          "height": height, 
+          "filter": "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + img.attr("src") + "', sizingMethod='scale')"
+        });
+        img.attr("src", blankImg);
+      });
+    }, 10);
   }
 
   /* move revinfo */

diff --git a/pub/System/NatSkin/natskin.js.gz b/pub/System/NatSkin/natskin.js.gz
diff --git a/templates/foswiki.nat.tmpl b/templates/foswiki.nat.tmpl
@@ -179,5 +179,5 @@
 %TMPL:DEF{"spacer"}%<img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/blank.gif' class='natSpacer' />%TMPL:END%
 
 %TMPL:DEF{"topictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="topictitle_dbcache" else="topictitle_default"}%%TMPL:END%
-%TMPL:DEF{"topictitle_default"}%default %IF{"defined 'TOPICTITLE'" then="%TOPICTITLE%" else="%BASETOPIC%"}%%TMPL:END%
-%TMPL:DEF{"topictitle_dbcache"}%dbcache %GETTOPICTITLE{encode="entity"}%%TMPL:END%
+%TMPL:DEF{"topictitle_default"}%%IF{"defined 'TOPICTITLE'" then="%TOPICTITLE%" else="%BASETOPIC%"}%%TMPL:END%
+%TMPL:DEF{"topictitle_dbcache"}%%GETTOPICTITLE{encode="entity"}%%TMPL:END%
diff --git a/templates/oopsaccesscreateweb.nat.tmpl b/templates/oopsaccesscreateweb.nat.tmpl
@@ -2,7 +2,7 @@
 <!-- template: oopsaccesscreateweb.nat.tmpl -->
 %TMPL:DEF{"action"}%view%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Create Web Access Denied"}%%TMPL:END%
-%TMPL:DEF{"message"}% <!-- -->
+%TMPL:DEF{"message"}% <!-- message -->
 %MAKETEXT{"[_1] has no permission to create a new <nop><b>[_2] Web</b>." args="%USERNAME%,%WIKITOOLNAME%"}%
 
 %TMPL:P{"logon"}%