Item13069: adjustments due to latest changes

... in AngularSkin
foswiki · Nov 13, 2014 · 5821203 · 5821203
1 parent 3213e88
commit 5821203
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 62 deletions.
diff --git a/data/System/SiteBottomBar.txt b/data/System/SiteBottomBar.txt
@@ -14,7 +14,7 @@ Default bottombar component
     map="%FLEXWEBLIST{format="$web=$percntGETTOPICTITLE{\"$web.WebHome\"}$percnt,"}%"
     separator=", " 
     subheader=", "
-    %IF{"not context isadmin" then="exclude=\"^Applications.*\""}%
+    exclude="^(Applications|Trash)([\/\.].*)?$"
   }%"
   split="\s*,\s*"
   pattern="(.*)=(.*)"

diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -7,7 +7,6 @@ Foswiki::Plugins::DBCachePlugin,>=1,perl,Required
 Foswiki::Plugins::FilterPlugin,>=3491,perl,Required
 Foswiki::Plugins::FlexWebListPlugin,>=3493,perl,Required
 Foswiki::Plugins::ImagePlugin,>=2.40,perl,Required
-Foswiki::Plugins::ImagePlugin,>=6307,perl,Required
 Foswiki::Plugins::JQueryPlugin,>=5.00,perl,Required
 Foswiki::Plugins::MimeIconPlugin,>=1,perl,Required
 Foswiki::Plugins::NatEditPlugin,>=8.00,perl,Required

diff --git a/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css b/pub/System/JazzyNoteTheme/JazzyNoteStyle.uncompressed.css
@@ -360,10 +360,12 @@ h2 {
   padding:5px 1em 6px;
 }
 
+.natSideBar .jqListyContainer,
 .natSideBar .jqSerialPager,
 .natSideBar ul {
   margin:0em -1em;
 }
+.natSideBar .jqListyContainer ul,
 .natSideBar .jqSerialPager ul {
   margin:0;
 }

diff --git a/pub/System/NatSkin/angular.uncompressed.js b/pub/System/NatSkin/angular.uncompressed.js
@@ -12,7 +12,9 @@ foswikiApp.directive("natBody", [ '$rootScope',
 
         // things to do when a page loaded
         scope.$on("foswiki.pageLoaded", function() {
-          angular.element(".natTopPanel").hide();
+          if (foswiki.getPreference("NatSkin.initTopPanel")) {
+            angular.element(".natTopPanel").hide();
+          }
           angular.element('ul.sf-js-enabled').hideSuperfishUl(); 
           isEmptySideBar = _testSideBar();
         });

diff --git a/pub/System/NatSkin/natskin.uncompressed.js b/pub/System/NatSkin/natskin.uncompressed.js
@@ -347,7 +347,10 @@
       initExternalLinks();
     }
 
-    initTopPanel();
+    if (foswiki.getPreference("NatSkin.initTopPanel")) {
+      initTopPanel();
+    }
+
     initTopicActions(); 
     initScrollToTop();
     initResponsiveNavi();

diff --git a/templates/angular.nat.tmpl b/templates/angular.nat.tmpl
diff --git a/templates/body.jazzynote.nat.tmpl b/templates/body.jazzynote.nat.tmpl
@@ -1,8 +1,5 @@
 %TMPL:INCLUDE{"body"}%
-%TMPL:DEF{"webmenu"}%<div class="natWebMenu clearfix">
-  <div class="natWebMenuContents"> 
+
+%TMPL:DEF{"webmenu::contents"}%<div class="natWebMenuContents"> 
   %WEBCOMPONENT{"Menu"}% <!-- -->
-  </div>
 </div>%TMPL:END%
-
-
diff --git a/templates/body.nat.tmpl b/templates/body.nat.tmpl
@@ -8,7 +8,7 @@
 %TMPL:DEF{"contentfooter"}%<div class="natMainFooterContents">%TMPL:P{"contentfooter::contents"}%</div>%TMPL:END%
 %TMPL:DEF{"breadcrumbs"}%<div class='natBreadCrumbs'> %TMPL:P{"breadcrumbs::title"}% %TMPL:P{"breadcrumbs::contents"}%</div>
 %TMPL:DEF{"contentheader::contents"}%%TMPL:P{"breadcrumbs"}%%TMPL:END%
-%TMPL:DEF{"webmenu"}%<div class="natWebMenu clearfix">
+%TMPL:DEF{"webmenu"}%<div class="natWebMenu clearfix foswikiContents" name="webmenu::contents" reload="web">
 %TMPL:P{"webmenu::contents"}%<!-- -->
 </div>%TMPL:END%
 
@@ -40,7 +40,7 @@
 %TMPL:DEF{"sidebars"}%%TMPL:P{"sidebar_container"}%%TMPL:P{context="natskin_sidebar_both" then="rightsidebar_container"}%%TMPL:END%
 
 %{ columns ----------------------------------------------------------------- }%
-%TMPL:DEF{"main"}%<div class="natMiddle">
+%TMPL:DEF{"main"}%<div class="natMiddle foswikiContents" name="main::contents" page-in-effect="%TMPL:P{"pageineffect"}%" page-out-effect="%TMPL:P{"pageouteffect"}%">
 %TMPL:P{"main::contents"}%<!-- -->
 </div>%TMPL:END%
 

diff --git a/templates/foswiki.angular.nat.tmpl b/templates/foswiki.angular.nat.tmpl
@@ -1,6 +1,8 @@
 %TMPL:INCLUDE{"foswiki"}%
-%TMPL:DEF{"pagetitle"}%<title class="foswikiContents" name="title" type="plain"></title>%TMPL:END%
-%TMPL:DEF{"logo"}%%NATWEBLOGO{
-  format="<a href='%WIKILOGOURL%' title='$alt'>$logo</a>"
-  height="60"
-}%%TMPL:END%
+
+%{ bounceOut, bounceOutDown, bounceOutLeft, bounceOutRight, fadeOut, fadeOutDown, fadeOutLeft, fadeOutRight, hinge, hinge, zoomOut, zoomOutLeft, zoomOutRight, zoomOutDown }%
+%TMPL:DEF{"pageouteffect"}%%ANGULAR_PAGEOUT_EFFECT{default=""}%%TMPL:END%
+
+%{ pulse, bounceIn, bounceInLeft, bounceInRight, bounceInUp, fadeIn, fadeInUp, fadeInLeft, fadeInRight, lightSpeedIn, zoomIn, zoomInLeft, zoomInRight, zoomInUp }%
+%TMPL:DEF{"pageineffect"}%%ANGULAR_PAGEIN_EFFECT{default=""}%%TMPL:END%
+
diff --git a/templates/foswiki.nat.tmpl b/templates/foswiki.nat.tmpl
@@ -217,7 +217,7 @@
 %TMPL:DEF{"breadcrumbs::title"}%<span class='natBreadCrumbsYouAreHere'>%MAKETEXT{"You are here"}%:</span>%TMPL:END%
 %TMPL:DEF{"breadcrumbs::contents"}%%BREADCRUMBS{separator="%TMPL:P{"sep"}%" newtopicformat="<nop>$topic"}%%TMPL:P{"breadcrumbs::tail"}%%TMPL:END%
 
-%TMPL:DEF{"pagetitle"}%<title>%TMPL:P{"title"}%</title>%TMPL:END%
+%TMPL:DEF{"pagetitle"}%<title class='foswikiContents' name='title' type='plain'>%TMPL:P{"title"}%</title>%TMPL:END%
 %TMPL:DEF{"title"}%<noautolink>%HTMLTITLE{
   "$percntIF{
     \"'$topic'!='%HOMETOPIC%' or '$percntENCODE{\"$title\" type=\"safe\"}$percnt'!='$web' or '%TMPL:P{"titleaction"}%'!=''\" 

diff --git a/templates/javascript.angular.nat.tmpl b/templates/javascript.angular.nat.tmpl
diff --git a/templates/javascript.nat.tmpl b/templates/javascript.nat.tmpl
@@ -6,6 +6,7 @@
   text="<script type='text/javascript'>
 jQuery.extend(foswiki.preferences, {
   %TMPL:P{"initWebMenu"}%
+  %TMPL:P{"initTopPanel"}%
   %TMPL:P{"initOverflows"}%
   %TMPL:P{"initSideBar"}%
   %TMPL:P{"initAutoComplete"}%
@@ -22,6 +23,7 @@ jQuery.extend(foswiki.preferences, {
 <!-- -->%TMPL:END%
 
 %TMPL:DEF{"initWebMenu"}%'NatSkin.initWebMenu': true,%TMPL:END%
+%TMPL:DEF{"initTopPanel"}%'NatSkin.initTopPanel': true,%TMPL:END%
 %TMPL:DEF{"initOverflows"}%'NatSkin.initOverflows': false,%TMPL:END%
 %TMPL:DEF{"initSideBar"}%'NatSkin.initSideBar': false,%TMPL:END%
 %TMPL:DEF{"initAutoComplete"}%'NatSkin.initAutoComplete': %IF{"context SolrPluginEnabled" then="true" else="false"}%,%TMPL:END%

diff --git a/templates/searchbox.nat.tmpl b/templates/searchbox.nat.tmpl
@@ -2,7 +2,7 @@
 %TMPL:DEF{"searchbox"}%<!-- -->
 <div class="natSearchBox foswikiHideOnPrint solrSearchBox jqUITooltip" data-theme="info" data-arrow="on" data-position="left">
   <form name="searchbox" id="searchbox" class="natSearchForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/WebSearch" >
-    <input type="hidden" name="origtopic" value="%BASEWEB%.%BASETOPIC%" />
+    <!-- input type="hidden" name="origtopic" value="%BASEWEB%.%BASETOPIC%" / -->
     <input type="text" class="foswikiInputField" placeholder="%TMPL:P{"searchbox::placeholder"}%" size="20" title="%MAKETEXT{"Enter topic name or a search string"}%" name="search" value="%TMPL:P{"searchbox::value"}%" accesskey="f" /> 
     <input type="submit" class="foswikiSubmit" value="" />
   </form>

diff --git a/templates/styles.angular.nat.tmpl b/templates/styles.angular.nat.tmpl
diff --git a/templates/topbar.customato.nat.tmpl b/templates/topbar.customato.nat.tmpl
@@ -4,7 +4,7 @@
 %TMPL:DEF{"topbar"}%<!-- -->
 %TMPL:P{"langswitcher"}%<!-- -->
 <a class="natNavToggle fa fa-bars"></a>
-<div class="natTopBar clearfix">
+<div class="natTopBar clearfix foswikiContents" name="topbar::contents" reload="web">
 %TMPL:P{"topbar::contents"}%
 </div>
 <!-- -->%TMPL:END%
@@ -41,7 +41,7 @@
 </div>%TMPL:END%
 
 %{################################################################################ }%
-%TMPL:DEF{"toppanel"}%<div class="natTopPanel" style="display:none">
+%TMPL:DEF{"toppanel"}%<div class="natTopPanel foswikiContents" name="toppanel::contents" reload="web" style="display:none">
 %TMPL:P{"toppanel::contents"}%
 </div>
 <div class="natTopShadow"></div>

diff --git a/templates/topbar.nat.tmpl b/templates/topbar.nat.tmpl
@@ -2,7 +2,10 @@
 %TMPL:P{"useractions"}%<!-- -->
 %TMPL:P{"langswitcher"}%<!-- -->
 <a href="#" class="natNavToggle fa fa-bars"></a>
-<div class="natTopBar clearfix">
+<div class="natTopBar clearfix">%TMPL:P{"topbar::contents"}%</div>
+<!-- -->%TMPL:END%
+
+%TMPL:DEF{"topbar::contents"}%<!-- -->
   <div class="natTopRight">
     <div class="natTopRightContents">%TMPL:P{"searchbox"}%</div>
   </div>
@@ -11,6 +14,6 @@
       <div class="natWebTitle">%TMPL:P{"logo"}%</div>
     </div>
   </div>
-</div>
 <!-- -->%TMPL:END%
+
 %TMPL:DEF{"topbar"}%%TMPL:P{"defaulttopbar"}%%TMPL:END%