Item12062:Item12481:

* fixed encoding problem in oopsleaseconflict * removed outdated ajax web selector * improved support for responsive navigation on mobile devices * only initialize autosuggest searchbox when SolrPlugin installed git-svn-id: http://svn.foswiki.org/trunk/NatSkin@16746 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 24, 2013 · bb1bfdb · bb1bfdb
1 parent 4e0938e
commit bb1bfdb
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 237 deletions.
diff --git a/data/System/AjaxWebSelector.txt b/data/System/AjaxWebSelector.txt
diff --git a/lib/Foswiki/Contrib/NatSkin.pm b/lib/Foswiki/Contrib/NatSkin.pm
@@ -3,8 +3,8 @@ package Foswiki::Contrib::NatSkin;
 use strict;
 use warnings;
 
-our $VERSION = '3.99_009';
-our $RELEASE = '3.99_009';
+our $VERSION = '3.99_010';
+our $RELEASE = '3.99_010';
 our $SHORTDESCRIPTION = 'Modern web design for Foswiki';
 
 1;
diff --git a/lib/Foswiki/Contrib/NatSkin/MANIFEST b/lib/Foswiki/Contrib/NatSkin/MANIFEST
@@ -1,7 +1,6 @@
 data/Main/WebLinks.txt 0644
 data/Main/WikiGuestSideBar.txt 0644
 data/Sandbox/NatSkinTest.txt 0644
-data/System/AjaxWebSelector.txt 0644
 data/System/EmptySideBarTemplate.txt 0644
 data/System/JazzyNoteTheme.txt 0644
 data/System/MySideBar.txt 0644
@@ -84,6 +83,7 @@ pub/System/NatSkin/favicon.ico 0644
 pub/System/NatSkin/foswiki-logo.png 0644
 pub/System/NatSkin/grid-40x18.png 0644
 pub/System/NatSkin/grid-40x21.png 0644
+pub/System/NatSkin/hamburger.gif 0644
 pub/System/NatSkin/history.js 0644
 pub/System/NatSkin/history.js.gz 0644
 pub/System/NatSkin/history.uncompressed.js 0644

diff --git a/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css b/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css
@@ -610,3 +610,12 @@ a:hover.natScrollTop {
   border-color:#DDD;
 }
 
+@media (max-width:870px) {
+  .natBreadCrumbs {
+    display:none;
+  }
+  .natBodyFixed .natBodyContents {
+    width:auto;
+    margin:0;
+  }
+}
diff --git a/pub/System/NatSkin/BaseStyle.uncompressed.css b/pub/System/NatSkin/BaseStyle.uncompressed.css
@@ -952,11 +952,6 @@ div.foswikiErrorSummary {
   padding-left:0 !important;
 }
 
-@media (max-width: 540px) {
-  .foswikiGrid .border {
-    border-left:0;
-  }
-}
 
 /* foswiki base **************************************************************/
 a:hover, .foswikiEmulatedLink:hover,
@@ -1788,6 +1783,22 @@ h2 .foswikiTopicSummary {
   border:2px solid red;
 }
 
+.natNavToggle {
+  display:none; /* switch it on using media queries */
+  position:fixed;
+  z-index:9999;
+  top:0.5em;
+  right:0.5em;
+  margin:0;
+  width:50px;
+  height:50px;
+  border-radius:0;
+  overflow:hidden;
+  background:#999 url("hamburger.gif") no-repeat 50% 50%;
+  border:none;
+  text-decoration:none;
+}
+
 a.natScrollTop {
   position:fixed;
   bottom:0.5em;
@@ -2266,6 +2277,7 @@ a:hover.natScrollTop {
 }
 
 /* web menu ******************************************************************/
+
 .natWebMenu li a,
 .natWebMenu h2,
 .natWebMenu h3,
@@ -2643,3 +2655,10 @@ a:hover.natScrollTop {
 .natSubscribeButton.state-unsubscribed .natUnsubscribeAction {
   display:none !important;
 }
+
+/* responsive gear */
+@media (max-width: 540px) {
+  .foswikiGrid .border {
+    border-left:0;
+  }
+}
diff --git a/pub/System/NatSkin/hamburger.gif b/pub/System/NatSkin/hamburger.gif
diff --git a/pub/System/NatSkin/natskin.uncompressed.js b/pub/System/NatSkin/natskin.uncompressed.js
@@ -157,4 +157,34 @@ jQuery(function($) {
       $('a.natScrollTop').fadeOut(100);
     }
   });
+
+  /* responsive navi */
+  $(".natNavToggle").livequery(function() {
+    var $this = $(this), 
+        $sidebar = $(".natSideBar");
+
+    if ($sidebar.length == 0) {
+      $this.hide();
+      return false;
+    }
+
+    $this.on("click", function(ev) {
+
+      $sidebar.toggle("slide", {
+        direction: "right"
+      });
+
+      if (ev.preventDefault) {
+        ev.preventDefault();
+        ev.stopPropagation();
+      } else {
+        ev.returnValue = false;
+      }
+
+
+      return false;
+    });
+
+  });
+
 });
diff --git a/templates/javascript.nat.tmpl b/templates/javascript.nat.tmpl
@@ -11,7 +11,7 @@
 %TMPL:DEF{"initOverflows"}%'NatSkin.initOverflows': false%TMPL:END%
 %TMPL:DEF{"initTopicActions"}%'NatSkin.initTopicActions': true%TMPL:END%
 %TMPL:DEF{"initSideBar"}%'NatSkin.initSideBar': true%TMPL:END%
-%TMPL:DEF{"initAutoComplete"}%'NatSkin.initAutocomplete': true%TMPL:END%
+%TMPL:DEF{"initAutoComplete"}%'NatSkin.initAutocomplete': %IF{"context SolrPluginEnabled" then="true" else="false"}%%TMPL:END%
 %TMPL:DEF{"initRedDot"}%'NatSkin.initRedDot': true%TMPL:END%
 
 %TMPL:DEF{"metaflags"}%<literal>

diff --git a/templates/oopsleaseconflict.nat.tmpl b/templates/oopsleaseconflict.nat.tmpl
@@ -43,17 +43,17 @@ first." args="%PARAM1%"}%
   <input type="hidden" name="breaklock" value="on" />
   %BUTTON{"%MAKETEXT{"Edit anyway"}%" type="submit" icon="pencil"}%
   %CLEAR%
-%QUERYPARAMS{format="<input type='hidden' name='$name' value='$percntENCODE{$quot()$value$quot type=$quot()html$quot}$percnt' />"}%
+%QUERYPARAMS{format="<input type='hidden' name='$name' value='$value' />" encoding="html"}%
 </form>
 </td> 
 <td valign="top">
 <form style="margin-bottom:0px" class="natOopsButtons" action="%SCRIPTURLPATH{"%PARAM4%"}%/%WEB%/%TOPIC%" method="post">
   %BUTTON{"%MAKETEXT{"Try again"}%" type="submit" icon="arrow_redo"}%
-%QUERYPARAMS{format="<input type='hidden' name='$name' value='$percntENCODE{$quot()$value$quot type=$quot()html$quot}$percnt' />"}%
+%QUERYPARAMS{format="<input type='hidden' name='$name' value='$value' />" encoding="html"}%
 </form>
 </td>
 <td valign="top">
-  %BUTTON{"%MAKETEXT{"Cancel"}%" target="%WEB%.%TOPIC%" icon="cross"}%
+  %BUTTON{"%MAKETEXT{"Cancel"}%" target="%IF{"defined redirectto" then="%URLPARAM{"redirectto"}%" else="%WEB%.%TOPIC%"}%" icon="cross"}%
   %CLEAR%
 </td>
 </tr></table> %TMPL:END%
diff --git a/templates/page.nat.tmpl b/templates/page.nat.tmpl
@@ -10,7 +10,7 @@
 <meta charset="%CHARSET%" />
 <title>%TMPL:P{"title"}%</title>
 %TMPL:P{"favicon"}%<!-- -->
-<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 %TMPL:P{"meta"}%%TMPL:P{"metaflags"}%%TMPL:P{"styles"}%%TMPL:P{"javascript"}%%WEBCOMPONENT{"HtmlHead"}%