beef-pages 0.3.12 → 0.3.13

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/app/views/admin/pages/show.html.erb

@@ -36,6 +36,11 @@
   </p>
 <% end %>
 
+  <p>
+    <%= f.label :body, 'Body*' %><br/>
+    <%= f.text_area 'body', :class => 'editor'  %>
+  </p>
+
   <p>
     <%= f.label :description, "Description for search engines*" %><br/>
     <%= f.text_area :description, "rows" => 4 %>
@@ -58,11 +63,6 @@
   </p>
   <% end %>
 
-  <p>
-    <%= f.label :body, 'Body*' %><br/>
-    <%= f.text_area 'body', :class => 'editor'  %>
-  </p>
-
   <%= publish_select(f) %>
 
   <p class="submission">

data/app/views/pages/_page_nav.html.erb

@@ -0,0 +1,9 @@
+  <li>
+    <span><%= link_to_unless_current h(page_nav.title), page_path(page_nav.permalink) %></span>
+
+    <% unless page_nav.children.published.count == 0 %>
+    <ul>
+      <%= render :partial => 'pages/page_nav', :collection => page_nav.children.published %>
+    </ul>
+    <% end%>
+  </li>

data/beef-pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-pages}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-18}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
      "app/views/admin/pages/index.html.erb",
      "app/views/admin/pages/preview.rjs",
      "app/views/admin/pages/show.html.erb",
-     "app/views/pages/_naviagtion.html.erb",
+     "app/views/pages/_page_nav.html.erb",
      "beef-pages.gemspec",
      "config/routes.rb",
-     "generators/page_tempate/page_template_generator.rb",
-     "generators/page_tempate/templates/default.html.erb",
+     "generators/page_template/page_template_generator.rb",
+     "generators/page_template/templates/default.html.erb",
      "generators/pages_migration/pages_migration_generator.rb",
      "generators/pages_migration/templates/migration.rb",
      "lib/pages.rb",

data/generators/page_template/templates/default.html.erb

@@ -0,0 +1,31 @@
+<% @page_id = @page.root.permalink if @page %>
+
+<h1><%= link_to_unless_current h(@page.root.title), page_path(@page.root.permalink) %></h1>
+
+<div id="main-content">
+  <h2><%= @page.title %></h2>
+
+  <%= @page.body %>
+  
+  <h3 class="hidden">Document Download</h3>
+  <%= documents @page.assets %>
+
+  <% if @page.assets.images.empty? %>
+  <% else -%>
+    <h3 class="hidden">Gallery</h3>
+    <div id="gallery">
+      <div class="image-gallery">
+        <%= gallery @page.assets %>
+      </div>
+    </div>
+  <% end -%>
+
+</div><!-- eo: main -->
+
+<div id="supporting-content">
+  <div id="page-nav">
+    <ul class="sub-page-nav">
+    <%= render :partial => 'page_nav', :collection => @page.root.children.published %>
+    </ul>
+  </div>
+</div>

data/lib/pages.rb

@@ -3,14 +3,17 @@ module Beef
     module HelperMethods
       def get_template_names
         templates = []
+        
+        # get all files that would be useable templates from the templates folder
+        # templates that start with an underscore are considered hidden
         Dir.glob("#{RAILS_ROOT}/app/views/pages/templates/*") do |f| 
-          match = /\/([^\/]+)\.html\.erb$/.match(f)
+          match = /\/([^_][^\/]+)\.html\.erb$/.match(f)
           templates << match[1] unless match.nil?
         end
         # Move default to top if it exists
         if default = templates.delete('default')
           templates.insert(0, default)
-        end 
+        end
         templates
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +00:00
+date: 2010-02-18 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -37,11 +37,11 @@ files:
 - app/views/admin/pages/index.html.erb
 - app/views/admin/pages/preview.rjs
 - app/views/admin/pages/show.html.erb
-- app/views/pages/_naviagtion.html.erb
+- app/views/pages/_page_nav.html.erb
 - beef-pages.gemspec
 - config/routes.rb
-- generators/page_tempate/page_template_generator.rb
-- generators/page_tempate/templates/default.html.erb
+- generators/page_template/page_template_generator.rb
+- generators/page_template/templates/default.html.erb
 - generators/pages_migration/pages_migration_generator.rb
 - generators/pages_migration/templates/migration.rb
 - lib/pages.rb

data/app/views/pages/_naviagtion.html.erb

@@ -1,23 +0,0 @@
-<ul id="nav-secondary">
-
-<li><%= link_to @page.root.title, page_path(@page.root.permalink) %></li><ul>
-
-
-
-<% for sibling in @page.root.children.published %>
-  <li<%= ' class="active"' if sibling == @page %>><%= link_to sibling.title, page_path(sibling.permalink) %>
-<%  if sibling == @page && sibling.children.published.count > 0 %>
-      <ul>
-<%    for child in sibling.children.published %>
-        <li><%= link_to child.title, page_path(child.permalink) %></li>
-<%    end %>
-      </ul>
-<%  end %></li>
-<% end %>
-
-
-
-  </ul>
-
-
-</ul>

data/generators/page_tempate/templates/default.html.erb

@@ -1,11 +0,0 @@
-<div id="main-content">
-  <h1><%= @page.title %></h1>
-  
-  <%= @page.body %>
-</div><!-- eo: main -->
-
-<ul class="page-nav">
-<% for page in @page.root? ? @page.children : @page.self_and_siblings %>
-  <li><%= link_to_unless_current h(page.title), page_path(page.permalink) %></li>
-<% end -%>
-</ul>