X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=_plugins%2Fmanual.rb;h=2a5d905b9ef590f41e33ac1f515cd1e78e53e773;hb=72b45cdd036b0cc51a55c414298315ebc105abed;hp=b3d8dad24463c9cef7a1d238afdb7468e06ea696;hpb=02d432c2ef00abbed1bdf926707d01deecd32890;p=ardour-manual-diverged

diff --git a/_plugins/manual.rb b/_plugins/manual.rb
index b3d8dad..2a5d905 100644
--- a/_plugins/manual.rb
+++ b/_plugins/manual.rb
@@ -131,7 +131,13 @@ module Manual
           "<li><a href='#{child[:url]}'>#{child[:title]}</a></li>"
         end.uniq
 
-        "<ul>#{entries.join}</ul>"
+        "<div id='subtopics'>
+        <h2>This chapter covers the following topics:</h2>
+        <ul>
+          #{entries.join}
+        </ul>
+        </div>
+        "
       end
     end
   end
@@ -165,10 +171,6 @@ module Manual
       position ? [current, position, level + 1] : [current]
     end
 
-    def sanitize_NMTOKEN(s)
-      'ID'+s.gsub(/[^0-9A-z:_.-]/, '_')
-    end
-    
     def render(context)
 
       @source = '_manual' #context.registers[:site].source
@@ -181,14 +183,14 @@ module Manual
       current_a = current.split('/').reject(&:empty?)
 
       tree = Manual.traverse_data(@@data_tree) do |entry|
-
+      
           url = entry[:url]
 
           url_a = url.split('/').reject(&:empty?)
 
           depth = url_a.length
           is_current, position, level = *process_hierarchy(current_a, url_a)
-
+          
           # this massively speeds up build time by not including the whole menu tree for each page
           next if depth > 1 && current_a[0] != url_a[0]
 
@@ -205,7 +207,7 @@ module Manual
 
               erb = ::ERB.new <<-HTML
                   <dt class="<%= css_classes %>">
-                      <a id="<%= sanitize_NMTOKEN(entry[:url]) %>" href="<%= entry[:url] %>"><%= entry[:menu_title] %></a>
+                      <a href="<%= entry[:url] %>"><%= entry[:menu_title] %></a>
                   </dt>
                   <dd class="<%= css_classes %>">
                       <% if entry[:children].any? %>
@@ -225,7 +227,7 @@ module Manual
 
                 erb = ::ERB.new <<-HTML
                     <dt class="<%= css_classes %>">
-                        <a id="<%= sanitize_NMTOKEN(entry[:url]) %>" href="<%= entry[:url] %>"><%= entry[:menu_title] %></a>
+                        <a href="<%= entry[:url] %>"><%= entry[:menu_title] %></a>
                     </dt>
                     <dd class="<%= css_classes %>">
                     </dd>
@@ -234,9 +236,20 @@ module Manual
                 erb.result(binding)
              end
           end
+          
+         
       end
 
-      "<dl>#{tree.join}</dl>"
+      "<dl>#{tree.join}</dl>
+      <script type='text/javascript'>
+      //<![CDATA[
+        offset = document.getElementsByClassName('active')[0].offsetTop;
+        height = document.getElementById('tree').clientHeight;
+        if (offset > (height * .7)) {
+          tree.scrollTop = offset - height * .3;
+        }
+      //]]>
+      </script>"
 
     end