noodall-ui 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    noodall-ui (0.0.13)
+    noodall-ui (0.0.14)
       dynamic_form
       noodall-core
       thoughtbot-sortable_table (= 0.0.6)

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

@@ -6,7 +6,8 @@ module Noodall
         render :status => 404 if params[:type].blank?
 
         # TODO: check for an incorrect object class name passed in
-        component_class = params[:type].classify.constantize
+        
+        component_class = params[:type].camelize.constantize
         component = component_class.new
         if component.respond_to?(:contents)
           component.contents.reject!{|c| c.asset_id.blank? }

data/lib/noodall/routes.rb

@@ -32,23 +32,12 @@ module Noodall
               end
             end
             match 'assets/:asset_type/tags' => 'assets#tags', :as => :asset_tags
+
             match 'components/form/:type' => 'components#form'
             
-            resources :forms, :has_many => :form_responses
-            
-            resources :fields do
-              collection do
-                get :form
-              end
-            end
-            
-            match 'components/form/:type' => 'components#form'
-
             resources :groups
           end
           
-          resources :forms, :has_many => :responses
-          
           get "search" => "noodall/nodes#search", :as => :noodall_search
           get "sitemap" => "noodall/nodes#sitemap", :as => :noodall_sitemap
           get "*permalink(.:format)" =>  'noodall/nodes#show', :as => :node_permalink

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/public/javascripts/admin/application.js

@@ -278,6 +278,9 @@ var Component = {
     file_form.prepend(Browser.assets_to_add_html[asset_id]);
     file_form.find('.asset_id').val(asset_id);
     Component.slot_form.find('.multi-file-files ol li:last').before(file_form); // Before the last as the last is the hidden emtpty
+    // enable all form fields
+    file_form.find('input').removeAttr('disabled');
+    file_form.find('textarea').removeAttr('disabled');
     file_form.show();
     // Hide the file details elements
     Component.slot_form.find('li.multi-file .file-form').hide();

data/public/stylesheets/admin/layout.css

@@ -369,7 +369,8 @@ span.delete,
 a.show,
 a.child,
 a.add,
-a.download {
+a.download,
+a.spam,span.spam {
         width:26px;
         height:26px;
         display:block;
@@ -378,7 +379,8 @@ a.download {
 
 a.delete,
 a.show,
-a.download  {
+a.download,
+a.spam,span.spam  {
         margin:auto;
 }
 

data/public/stylesheets/admin/skin.css

@@ -364,6 +364,9 @@ a.edit, span.edit {
 a.delete, span.delete {
         background:url(/images/admin/delete.png) no-repeat -1px -4px;
 }
+a.spam, span.spam {
+        background:url(/images/admin/spam.png) no-repeat -1px -4px;
+}
 a.download {
         background:url(/images/admin/download.png) no-repeat -1px -4px;
 }
@@ -404,7 +407,8 @@ a.page_up:hover,
 a.page_down:hover,
 a.child:hover,
 a.add:hover,
-a.download:hover
+a.download:hover,
+a.spam:hover
  {
         background-position: -1px -36px;
 }
@@ -636,7 +640,8 @@ a.child,
 ul.choices li a,
 a.download,
 .edit-item,
-a.change {
+a.change,
+a.spam, span.spam {
         overflow: hidden;
         text-align: left;
         display: block;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +00:00
+date: 2010-12-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,22 +219,6 @@ files:
 - features/support/logo.png
 - features/support/paths.rb
 - features/support/sevenfeatures.rb
-- generators/component/USAGE
-- generators/component/component_generator.rb
-- generators/component/lib/insert_commands.rb
-- generators/component/templates/admin_template.html.erb
-- generators/component/templates/factory.rb
-- generators/component/templates/model.rb
-- generators/component/templates/template.html.erb
-- generators/node/USAGE
-- generators/node/lib/insert_commands.rb
-- generators/node/node_generator.rb
-- generators/node/templates/admin_template.html.erb
-- generators/node/templates/factory.rb
-- generators/node/templates/model.rb
-- generators/node/templates/template.html.erb
-- generators/node_features/USAGE
-- generators/node_features/node_features_generator.rb
 - lib/generators/noodall/component/USAGE
 - lib/generators/noodall/component/component_generator.rb
 - lib/generators/noodall/component/templates/admin_template.html.erb

data/generators/component/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Explain the generator
-
-Example:
-    ./script/generate node Thing
-
-    This will create:
-        what/will/it/create

data/generators/component/component_generator.rb

@@ -1,35 +0,0 @@
-class ComponentGenerator < ScaffoldGenerator
-  
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions(class_name)
-
-      # Controller, views, test and stylesheets directories.
-      m.directory(File.join('spec','factories'))
-      m.directory(File.join('app','views','components'))
-      m.directory(File.join('app','views','admin','components'))
-
-      m.template(
-        "model.rb",
-        File.join('app','models',"#{controller_file_name.singularize}.rb")
-      )
-
-      m.template(
-        "template.html.erb",
-        File.join('app','views','components', "#{controller_file_name.singularize}.html.erb")
-      )
-      
-      m.template(
-        "admin_template.html.erb",
-        File.join('app','views','admin','components', "_#{controller_file_name.singularize}.html.erb")
-      )
-      
-      m.template(
-        "factory.rb",
-        File.join('spec','factories',"#{controller_file_name.singularize}.rb")
-      )
-    end
-  end
-
-end

data/generators/component/lib/insert_commands.rb

@@ -1,61 +0,0 @@
-# Mostly pinched from http://github.com/ryanb/nifty-generators/tree/master
-Rails::Generator::Commands::Base.class_eval do
-  def file_contains?(relative_destination, line)
-    File.read(destination_path(relative_destination)).include?(line)
-  end
-end
-
-Rails::Generator::Commands::Create.class_eval do
-
-  def route_resources_to_namespace(namespace, resource_list)
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
-    namespace_map = "map.namespace(:#{namespace}) do |#{namespace}|"
-    logger.route namespace_map
-    unless options[:pretend] || file_contains?('config/routes.rb', namespace_map)
-      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  #{namespace_map}\n  end"
-      end
-    end
-    
-    namespace_route = "#{namespace}.resources :#{resource_list}"
-
-    logger.route namespace_route
-    unless options[:pretend] || file_contains?('config/routes.rb', namespace_route)
-      gsub_file 'config/routes.rb', /(#{Regexp.escape(namespace_map)})/mi do |match|
-        "#{match}\n    #{namespace_route}"
-      end
-    end
-  end
-  
-end
-
-Rails::Generator::Commands::Destroy.class_eval do
-  
-  def route_resources_to_namespace(namespace, resource_list)
-    # do ni
-  end
-
-  def insert_into(file, line)
-    logger.remove "#{line} from #{file}"
-    unless options[:pretend]
-      gsub_file file, "\n  #{line}", ''
-    end
-  end
-
-end
-
-Rails::Generator::Commands::List.class_eval do
-
-  def route_resources_to_namespace(namespace, resource_list)
-    namespace_map = "map.namespace(:#{namespace}) do |#{namespace}|"
-    logger.route namespace_map
-    namespace_route = "#{namespace}.resources :#{resource_list}"
-    logger.route namespace_route
-  end
-    
-  def insert_into(file, line)
-    logger.insert "#{line} into #{file}"
-  end
-
-end

data/generators/component/templates/admin_template.html.erb

@@ -1,50 +0,0 @@
-<% for attribute in attributes -%>
-    <p>
-      <span class="tooltip" title="Enter a<%= 'n' if ['a','e','i','o','u'].include?(attribute.name.downcase[0]) %> <%= attribute.name %>">&nbsp;</span>
-      <%%= f.label :<%= attribute.name %> %><br/>
-      <span class="input-wrap"><%%= f.<%= attribute.field_type %> :<%= attribute.name %> %></span>
-    </p>
-<% end -%>
-
-<%%= render :partial => 'noodall/body', :locals => { :f => f }  %>
-<%% content_for :component_table do %>
-<table class="component-table">
-  <tr>
-    <td rowspan="2" class="content"></td>
-    <td colspan="2" rowspan="4" class="content"></td>
-    <td><a href="#small_component_form_0" class="slot_link">4</a></td>
-  </tr>
-  <tr>
-    <td><a href="#small_component_form_1" class="slot_link">5</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><a href="#small_component_form_2" class="slot_link">6</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><a href="#small_component_form_3" class="slot_link">7</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_0" class="slot_link">1</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_1" class="slot_link">2</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_2" class="slot_link">3</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-  </tr>
-</table>
-<%% end -%>

data/generators/component/templates/factory.rb

@@ -1,5 +0,0 @@
-Factory.define :<%= singular_name %>, :parent => :node, :class => <%= singular_name.titleize %> do |<%= singular_name %>|
-<% for attribute in attributes -%>
-  <%= singular_name %>.<%= attribute.name %> {Faker::Lorem.words(5).join(' ').titleize}
-<% end -%>
-end

data/generators/component/templates/model.rb

@@ -1,8 +0,0 @@
-class <%= singular_name.camelize %> < Noodall::Node
-# sub_templates <%= singular_name.camelize %>
-# root_template!
-
-# small_slots 4
-
-  
-end

data/generators/component/templates/template.html.erb

@@ -1,41 +0,0 @@
-<%% content_for 'head' do %>
-  <%%= auto_discovery_link_tag :rss, node_path(@node.parent, :format => 'rss') unless @node.parent.nil? %>
-<%% end %>
-
-<div id="main-content"<%%= ' class="no-nav"' unless node_has_nav? %>>
-
-  <h1><%%=h @node.title %></h1>
-
-  <%%= link_to 'RSS', node_path(@node.parent, :format => 'rss'), :class => 'rss-logo', :title => 'Click and copy this url into your feed reader.' unless @node.parent.nil? %>
-
-  <div id="body"><%%= @node.body %></div>
-
-
-<% unless attributes.empty? %>
-  <dl>
-  <% for attribute in attributes -%>
-      <dt><%= attribute.name.titleize %></dt>
-      <dd><%%= @node.<% attribute.name %>%></dd>
-  <% end -%>
-  </dl>
-<% end -%>
-  
-
-  <div id="related" class="component"><%%= related_content(@node, [@node.class.name], {:limit => 3}) %></div>
-
-  <%%= component(@node, 'small_slot_0') %>
-  <%%= component(@node, 'small_slot_1') %>
-  <%%= component(@node, 'small_slot_2') %>
-  <%%= component(@node, 'small_slot_3') %>
-
-  <%%= component(@node, 'wide_slot_0') %>
-  <%%= component(@node, 'wide_slot_1') %>
-  <%%= component(@node, 'wide_slot_2') %>
-
-</div>
-
-<%% if node_has_nav? -%>
-<div id="supporting-content">
-  <%%= node_nav %>
-</div>
-<%% end -%>

data/generators/node/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Explain the generator
-
-Example:
-    ./script/generate node Thing
-
-    This will create:
-        what/will/it/create

data/generators/node/lib/insert_commands.rb

@@ -1,47 +0,0 @@
-# Mostly pinched from http://github.com/ryanb/nifty-generators/tree/master
-Rails::Generator::Commands::Base.class_eval do
-  def file_contains?(relative_destination, line)
-    File.read(destination_path(relative_destination)).include?(line)
-  end
-end
-
-Rails::Generator::Commands::Create.class_eval do
-  
-  def press_any_key(read_me="Where's the any key?")
-    puts read_me
-    gets
-  end
-  
-  def insert_into(file, line)
-    logger.insert "#{line} into #{file}"
-    unless options[:pretend] || file_contains?(file, line)
-      gsub_file file, /^(class|module) .+$/ do |match|
-        "#{match}\n  #{line}"
-      end
-    end
-  end
-  
-end
-
-Rails::Generator::Commands::Destroy.class_eval do
-  
-  def press_any_key
-    # do ni
-  end
-
-  def insert_into(file, line)
-    logger.remove "#{line} from #{file}"
-    unless options[:pretend]
-      gsub_file file, "\n  #{line}", ''
-    end
-  end
-
-end
-
-Rails::Generator::Commands::List.class_eval do
-  
-  def insert_into(file, line)
-    logger.insert "#{line} into #{file}"
-  end
-
-end

data/generators/node/node_generator.rb

@@ -1,35 +0,0 @@
-class NodeGenerator < ScaffoldGenerator
-  
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions(class_name)
-
-      # Controller, views, test and stylesheets directories.
-      m.directory(File.join('spec','factories'))
-      m.directory(File.join('app','views','nodes'))
-      m.directory(File.join('app','views','admin','nodes'))
-
-      m.template(
-        "model.rb",
-        File.join('app','models',"#{controller_file_name.singularize}.rb")
-      )
-
-      m.template(
-        "template.html.erb",
-        File.join('app','views','nodes', "#{controller_file_name.singularize}.html.erb")
-      )
-      
-      m.template(
-        "admin_template.html.erb",
-        File.join('app','views','admin','nodes', "_#{controller_file_name.singularize}.html.erb")
-      )
-      
-      m.template(
-        "factory.rb",
-        File.join('spec','factories',"#{controller_file_name.singularize}.rb")
-      )
-    end
-  end
-
-end

data/generators/node/templates/admin_template.html.erb

@@ -1,49 +0,0 @@
-<% for attribute in attributes -%>
-    <p>
-      <span class="tooltip" title="Enter a<%= 'n' if ['a','e','i','o','u'].include?(attribute.name.downcase[0]) %> <%= attribute.name %>">&nbsp;</span>
-      <%%= f.label :<%= attribute.name %> %><br/>
-      <span class="input-wrap"><%%= f.<%= attribute.field_type %> :<%= attribute.name %> %></span>
-    </p>
-<% end -%>
-<%%= render :partial => 'noodall/body', :locals => { :f => f }  %>
-<%% content_for :component_table do %>
-<table class="component-table">
-  <tr>
-    <td rowspan="2" class="content"></td>
-    <td colspan="2" rowspan="4" class="content"></td>
-    <td><a href="#small_component_form_0" class="slot_link">4</a></td>
-  </tr>
-  <tr>
-    <td><a href="#small_component_form_1" class="slot_link">5</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><a href="#small_component_form_2" class="slot_link">6</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><a href="#small_component_form_3" class="slot_link">7</a></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_0" class="slot_link">1</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_1" class="slot_link">2</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><a href="#wide_component_form_2" class="slot_link">3</a></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-  </tr>
-</table>
-<%% end -%>

data/generators/node/templates/factory.rb

@@ -1,5 +0,0 @@
-Factory.define :<%= singular_name %>, :parent => :node, :class => <%= singular_name.camelize %> do |<%= singular_name %>|
-<% for attribute in attributes -%>
-  <%= singular_name %>.<%= attribute.name %> {Faker::Lorem.words(5).join(' ').titleize}
-<% end -%>
-end

data/generators/node/templates/model.rb

@@ -1,11 +0,0 @@
-class <%= singular_name.camelize %> < Noodall::Node
-# sub_templates <%= singular_name.camelize %>
-# root_template!
-
-# small_slots 4
-
-
-<% for attribute in attributes -%>
-  key :<%= attribute.name %> 
-<% end -%>  
-end

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

@@ -1,41 +0,0 @@
-<%% content_for 'head' do %>
-  <%%= auto_discovery_link_tag :rss, node_path(@node.parent, :format => 'rss') unless @node.parent.nil? %>
-<%% end %>
-
-<div id="main-content"<%%= ' class="no-nav"' unless node_has_nav? %>>
-
-  <h1><%%=h @node.title %></h1>
-
-  <%%= link_to 'RSS', node_path(@node.parent, :format => 'rss'), :class => 'rss-logo', :title => 'Click and copy this url into your feed reader.' unless @node.parent.nil? %>
-
-  <div id="body"><%%= @node.body %></div>
-
-
-<% unless attributes.empty? %>
-  <dl>
-  <% for attribute in attributes -%>
-      <dt><%= attribute.name.titleize %></dt>
-      <dd><%%= @node.<% attribute.name %>%></dd>
-  <% end -%>
-  </dl>
-<% end -%>
-  
-
-  <div id="related" class="component"><%%= related_content(@node, [@node.class.name], {:limit => 3}) %></div>
-
-  <%%= component(@node, 'small_slot_0') %>
-  <%%= component(@node, 'small_slot_1') %>
-  <%%= component(@node, 'small_slot_2') %>
-  <%%= component(@node, 'small_slot_3') %>
-
-  <%%= component(@node, 'wide_slot_0') %>
-  <%%= component(@node, 'wide_slot_1') %>
-  <%%= component(@node, 'wide_slot_2') %>
-
-</div>
-
-<%% if node_has_nav? -%>
-<div id="supporting-content">
-  <%%= node_nav %>
-</div>
-<%% end -%>

data/generators/node_features/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Explain the generator
-
-Example:
-    ./script/generate node Thing
-
-    This will create:
-        what/will/it/create

data/generators/node_features/node_features_generator.rb

@@ -1,16 +0,0 @@
-class NodeFeaturesGenerator < ScaffoldGenerator
-  
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions(class_name)
-
-      # Controller, views, test and stylesheets directories.
-      m.directory(File.join('spec','factories'))
-      m.directory(File.join('features'))
-
-      m.file('../features', 'features')
-    end
-  end
-
-end