Merge pull request #19 from KarlHochfilzer/master

Don't show more than n pages in submenue of Section

app/assets/javascripts/page.coffee

@@ -1,16 +1,5 @@
 jQuery ->
 
-  if $('#scroll-to').length > 0
-    $('#scroll-to').ready ->
-      $('#banner').ready ->
-        offset = $('#scroll-to').data('offset')
-        y = $('#scroll-to').position().top + offset
-        setTimeout("skipBanner(#{y})",500)
-
-  self.skipBanner = (y) ->
-    $('body').animate( {scrollTop : y  },'slow')
-
-
   if $('#toggle-section-banner').length > 0
     $('#toggle-section-banner').click (event) ->
       event.preventDefault()

app/assets/stylesheets/wat.css.scss

@@ -468,6 +468,27 @@ img.avatar {
       }
     }
   }
+  ul.pages.dropdown-menu {
+    background: $navbarBackground;
+    border-color: #d5d5d5;
+    border-width: 0 0 1px;
+    border-radius: 5px;
+    a {
+      color: white;
+      &:hover {
+        color: black;
+        background: white;
+      }
+    }
+    .active {
+      a {
+        background: $navbarBackgroundHighlight;
+        &:hover {
+          color: black;
+        }
+      }
+    }
+  }
 }
 
 .sort-title, .sort-edit-link, .sort-section-label {

app/views/pages/_section_subnav.haml

@@ -1,7 +1,15 @@
+- _count_pages = section.pages.count
+- _pages_to_show = Settings.pages_in_section_subnav || 4
 - if section.pages.count > 1
   .subnav
     %ul{class: "nav nav-pills section-menu #{section._id} left"}
       - _pages = can_read?('Admin','Maintainer') ? section.pages : section.pages.online
-      - _pages.only(:title).each do |page|
+      - _pages.only(:title).limit(_pages_to_show).each do |page|
         %li{class: page == @page ? 'active' : 'inactive'}=link_to page.title, page, id: "link_to_#{page.id}"
-  %hr/
+      - if _count_pages > 4
+        %li.inactive.dropdown
+          = link_to ((t(:load_more_link))+"<b class='caret'></b>").html_safe, "#", :class => 'dropdown-toggle', 'data-toggle' => 'dropdown'
+          %ul.pages.dropdown-menu
+            - _pages.only(:title).skip(_pages_to_show).each do |page|
+              %li{class: page == @page ? 'active' : 'inactive'}=link_to page.title, page, id: "link_to_#{page.id}"
+  %hr

config/settings/development.yml_sample

@@ -35,6 +35,7 @@ developer_mail_address: "[email protected]"
 
 # paginate_users_per_page: 4
 # paginate_pages_per_page: 4
+# pages_in_section_subnav: 4
 
 # TIMELINE BEHAVIOR
 

config/settings/production.yml_sample

@@ -36,6 +36,7 @@ developer_mail_address: "[email protected]"
 # default, when not defined = 4
 paginate_users_per_page: 2
 paginate_pages_per_page: 2
+# pages_in_section_subnav: 4
 
 # TIMELINE BEHAVIOR