noodall-ui 0.3.2 → 0.3.3

data/app/controllers/noodall/admin/assets_controller.rb

@@ -1,7 +1,6 @@
 module Noodall
   module Admin
     class AssetsController < BaseController
-      include SortableTable::App::Controllers::ApplicationController
       sortable_attributes :created_at, :title, :updated_at
       protect_from_forgery :except => :plupload
       before_filter :readonly

data/app/controllers/noodall/admin/base_controller.rb

@@ -1,6 +1,8 @@
 module Noodall
   module Admin
     class BaseController < ApplicationController
+      include SortableTable::App::Controllers::ApplicationController
+
       layout 'noodall_admin'
       before_filter :authenticate_user!
 

data/app/helpers/noodall/admin/assets_helper.rb

@@ -1,5 +1,4 @@
 module Noodall::Admin::AssetsHelper
-  include SortableTable::App::Helpers::ApplicationHelper
 
   def asset_icon(asset)
     icon = case asset.file_ext

data/app/helpers/noodall/admin/base_helper.rb

@@ -1,5 +1,7 @@
 module Noodall::Admin::BaseHelper
   include Noodall::LayoutHelper
+  include SortableTable::App::Helpers::ApplicationHelper
+
   def admin_page_title
     @page_title ||= controller.controller_name.titleize +
       (controller.action_name == 'index' ? ' ' : " | #{controller.action_name.titleize}" ) +
@@ -11,14 +13,14 @@ module Noodall::Admin::BaseHelper
       content_tag :li, link_to( title, send(link) )
     end.join.html_safe
   end
-  
+
   # Monkey-patch for the thoughtbot/sortabletable headers, adding 'colspan' option
   def sortable_table_header(opts = {})
     raise ArgumentError if opts[:name].nil? || opts[:sort].nil?
     anchor = opts[:anchor].blank? ? "" : "##{opts[:anchor]}"
-    content_tag :th, 
-      link_to(opts[:name], 
-        sortable_url(opts) + anchor, 
+    content_tag :th,
+      link_to(opts[:name],
+        sortable_url(opts) + anchor,
         :title => opts[:title]),
       :class => sortable_table_header_classes(opts),
       :colspan => opts[:colspan]

data/app/helpers/noodall/nodes_helper.rb

@@ -2,6 +2,20 @@ module Noodall
   module NodesHelper
     include Noodall::Permalinks
 
+    def published_roots
+      Noodall::Node.roots.published
+    end
+
+    def breadcrumb
+      return if @node.nil?
+      links = @node.ancestors.inject([]) do |l, n|
+        l << content_tag( :li, link_to(h(n.title), node_path(n)))
+      end
+      links << content_tag( :li, h(@node.title) )
+    end
+
+    # Site map related helpers
+
     def sitemap(tree)
       list_children(tree, nil, 'sitemap')
     end
@@ -24,14 +38,6 @@ module Noodall
       end
     end
 
-    def breadcrumb
-      return if @node.nil?
-      links = @node.ancestors.inject([]) do |l, n|
-        l << content_tag( :li, link_to(h(n.title), node_path(n)))
-      end
-      links << content_tag( :li, h(@node.title) )
-    end
-
     # get an organised grouped index of nodes for the primary nav
     def node_tree
       @node_tree ||= Node.all({:fields => "title, permalink, parent_id, _id, path, _type", :published_at => { :$lte => Time.zone.now }, :published_to => { :$gte => Time.zone.now }, :order => 'parent_id ASC, position ASC'}).group_by{|n| n.parent_id.to_s }
@@ -55,18 +61,5 @@ module Noodall
       !(current_node.nil? or node_tree[current_node.root.id.to_s].nil?)
     end
 
-    def related_content(ref_node, types =[], options = {})
-      options[:_type] = {'$in' => types} unless types.empty?
-
-      nodes = ref_node.related(options.merge(:order => 'published_at DESC', :published_at => { :$lte => Time.zone.now }, :published_to => { :$gte => Time.zone.now }))
-      
-      return if nodes.empty?
-
-      content_tag('h2', 'Related Content') + content_tag('ul', :id => 'related-content') do
-          nodes.collect do |node|
-            content_tag('li', link_to(node.title, node_path(node)) + node.published_at.to_formatted_s(:short_dot))
-          end.join.html_safe
-      end
-    end
   end
 end

data/demo/views/layouts/application.html.erb

@@ -90,7 +90,9 @@ maximum-scale = 1.0 retains dimensions instead of zooming in if page width < dev
 
     <!-- so:main-navigation -->
     <ul class="nav" id="main-nav">
-      <li></li>
+      <% for root in published_roots %>
+        <li><%= link_to root.name, node_path(root) %></li>
+      <% end %>
     </ul>
     <!-- so:main-navigation -->
 

data/lib/generators/noodall/node/templates/factory.rb

@@ -2,6 +2,7 @@ Factory.define :<%= file_name %> do |<%= file_name %>|
   <%= file_name %>.title { Faker::Lorem.words(3).join(' ') }
   <%= file_name %>.body { Faker::Lorem.paragraphs(6) }
   <%= file_name %>.published_at { Time.now }
+  <%= file_name %>.publish true
 <% for attribute in attributes -%>
   <%= file_name %>.<%= attribute.name %> {Faker::Lorem.words(5).join(' ').titleize}
 <% end -%>

data/lib/generators/noodall/node/templates/model.rb

@@ -1,11 +1,19 @@
 class <%= class_name %> < Noodall::Node
-# sub_templates <%= class_name %>
+  # Define if this Node Template can be added as a root page in the top level of the tree
 <%- if options.root? -%>
   root_template!
+<%- else -%>
+  # root_template!
 <%- end -%>
 
-# small_slots 4
+  # Define which Node Templates can be used as children of Nodes using this template
+  sub_templates <%= class_name %>
+<%- if options.root? -%>
+  root_template!
+<%- end -%>
 
+  # Define the number of each slot type this Node Template allows. Slots are defined in 'config/initializers/noodall.rb'
+  # small_slots 4
 
 <% for attribute in attributes -%>
   key :<%= attribute.name %>, <%= attribute.type.to_s.classify %>

data/lib/generators/noodall/node/templates/template.html.erb

@@ -1,4 +1,4 @@
-<h1><%%=h @node.title %></h1>
+<h1><%%= @node.title %></h1>
 
 <%%= @node.body.html_safe %>
 

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +00:00
+date: 2011-04-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
   name: noodall-core
   prerelease: false
   version_requirements: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,26 +46,27 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
-  type: :runtime
   name: thoughtbot-sortable_table
   prerelease: false
   version_requirements: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 270495401
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
-  type: :runtime
   name: will_paginate
   prerelease: false
   version_requirements: *id003
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,10 +77,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   name: dynamic_form
   prerelease: false
   version_requirements: *id004
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,10 +93,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   name: bundler
   prerelease: false
   version_requirements: *id005
+  type: :development
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email: 
 - steve@wearebeef.co.uk
@@ -680,7 +681,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Noodall Rails User Interface