noodall-ui 0.0.8 → 0.0.9

data/Gemfile.lock

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

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

@@ -32,6 +32,10 @@ module Noodall
 
         render :partial => 'slot_form', :locals => { :type => type, :index => index, :component => component, :options => options, :slot_name => "#{ type }_slot_#{ index }" }
       end
+
+      def can_change_templates?(node)
+        can_publish?(node) and !node.is_a?(Home) and (node.parent.nil? ? Node.template_names : node.parent.class.template_names).length > 1
+      end
     end
   end
 end

data/app/views/noodall/admin/nodes/show.html.erb

@@ -123,7 +123,7 @@
 <span class="tooltip" title="Please choose where you would like to place each component">&nbsp;</span>
 
 <%= yield :component_table %>
-<% if can_publish?(@node) and !@node.is_a?(Home) %>
+<% if can_change_templates?(@node) %>
 <%= link_to "Change Template", change_template_noodall_admin_node_path(@node), :class => 'change' %>
 <% end -%>
 <div id="modules-list">

data/demo/models/page_c.rb

@@ -1,7 +1,7 @@
 class PageC < Noodall::Node
-  sub_templates PageC, PageB
+  sub_templates PageB
   root_template!
-  
+
   main_slots 1
   wide_slots 3
 end

data/demo/views/admin/nodes/_home.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'body', :locals => { :f => f } %>

data/features/change_templates.feature

@@ -11,6 +11,18 @@ Feature: Change templates
     And I visit the content page
     Then the page should be in the "Page C" template
 
+  Scenario: Cannot change template for "Home" template
+    Given a page exists using the "Home" template
+    And I am editing the content
+    Then I should not see "Change Template"
+
+  Scenario: Cannot cahnge template as parent only allows one sub template
+    Given a page exists using the "Page B" template
+    And that page has a "Page C" parent
+    And I am editing the content
+    Then show me the page
+    Then I should not see "Change Template"
+
   Scenario: Prevent Template Change if sub content not allowed in new template
     Given a page exists using the "Page A" template
     And that page has "Page A" subpages

data/features/content_templates.feature

@@ -15,4 +15,4 @@ Feature: Content Templates
     Examples:
      | Ancestor Template Name | Allowed Templates       |
      | Page A                 | Page A, Page B, Page C  |
-     | Page C                 | Page C, Page B          |
+     | Page C                 | Page B                  |

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/public/javascripts/admin/application.js

@@ -80,6 +80,7 @@ $(document).ready(function() {
   });
 
   setup_tooltips();
+
   // Template Choices
   $('.template label img').hide();
   $('.template label img').css({
@@ -89,6 +90,8 @@ $(document).ready(function() {
   $('.template input').click(function() {
     $('.template label img').hide();
     $(this).parent().children('img').fadeIn('fast');
+    var imgHeight = $(this).parent().children('img').height() + 100 ;
+    $('#main-form').css({'min-height' : imgHeight + 'px'});
   });
 
   //Field Types on form creator

data/public/javascripts/admin/tiny_mce_config.js

@@ -12,7 +12,7 @@ lite_tiny_mce_config = {
     //"safari,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking",
     // Theme options
     theme_advanced_blockformats : "h2,h3,h4,p",
-    theme_advanced_buttons1 : "bold,italic,underline,|,table,delete_table,col_before,col_after,row_before,row_after,delete_col,delete_row",
+    theme_advanced_buttons1 : "bold,italic,underline,|,bullist,numlist,|,link,unlink,|,table,delete_table,col_before,col_after,row_before,row_after,delete_col,delete_row",
     theme_advanced_buttons2 : "",
     theme_advanced_buttons3 : "",
     theme_advanced_buttons4 : "",

data/public/stylesheets/admin/layout.css

@@ -664,7 +664,7 @@ span.expand {
 fieldset.template label img {
   left:520px;
   position:absolute;
-  top:30px;
+  top:20px;
 }
 
 #current-label {

data/spec/factories/node.rb

@@ -4,6 +4,9 @@ Factory.define :node do |node|
   node.published_at { Time.now }
 end
 
+Factory.define :home, :parent => :node, :class => Home do |node|
+end
+
 Factory.define :page_a, :parent => :node, :class => PageA do |node|
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +00:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,6 +181,7 @@ files:
 - demo/seeds.rb
 - demo/views/admin/components/_gallery.html.erb
 - demo/views/admin/components/_promo.html.erb
+- demo/views/admin/nodes/_home.html.erb
 - demo/views/admin/nodes/_page_a.html.erb
 - demo/views/admin/nodes/_page_b.html.erb
 - demo/views/admin/nodes/_page_c.html.erb