noodall-ui 0.5.13 → 0.5.14

data/Gemfile

@@ -4,7 +4,7 @@ source 'http://gems.github.com'
 gemspec
 
 # Required for running as demo rails app
-gem 'rails', '3.1.0'
+gem 'rails', '~> 3.1.0'
 gem 'dragonfly', '~> 0.9.4'
 gem 'mm-versionable', '0.2.5'
 
@@ -29,7 +29,7 @@ group :development, :test do
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
   gem 'jeweler', '~> 1.4.0'
-  gem 'factory_girl'
+  gem 'factory_girl', '~> 2.0'
   gem 'factory_girl_rails'
   gem "faker", "~> 0.3.1"
   gem "bson_ext"

data/app/assets/javascripts/admin/application.js

@@ -206,6 +206,8 @@ $(document).ready(function() {
 
   // Add emptys div for browsers/preview
   $('body').append('<div style="display:none;"><div id="asset-browser"></div><div id="tree-browser"></div><div id="preview-pane"><iframe name="preview-frame" src="about:blank"/></div></div>');
+
+  $('#parent-title a.edit-item').fancybox();
 });
 
 function get_preview_html(e) {
@@ -526,36 +528,10 @@ $("li.multi-file span.delete").live("click", function(e) {
 });
 
 // Node mover and shaker
-$('span.node-mover, #parent-title').live('click', function(event) {
-  node_id = $(this).closest('form').attr('action').split('/').pop();
-  // open asset lightbox
-  $.get("/admin/nodes/tree", {
-    allowed_types: $('#parent_types').val().split(','),
-    not_branch: node_id
-  },
-  function() {
-    // reopen the opening form if you close this form
-    $.fancybox({
-      href: '#tree-browser',
-      title: "Select a parent"
-    });
-    $('#tree-browser').attr('class', 'parent');
-    $('#tree-browser .tree:first').append('<li><a id="id-none">Root</a></li>');
-  },
-  'script');
-
-  event.stopImmediatePropagation();
-  return false;
-});
-
-$('#tree-browser ol.tree span.expand').live('click', function(e) {
-  $(this).toggleClass('expanded').siblings('ol.tree').toggle();
-});
-
-$('#tree-browser.parent a').live('click', function(e) {
+$('ol.tree a.parent').live('click', function(e) {
   id = this.id.replace('id-', '');
   $('#node_parent').val(id);
-  $('#parent-title').html($(this).text() + '<a class="edit-item">Edit</a>');
+  $('#parent-title strong').html($(this).text());
   $.fancybox.close();
   return false;
 });

data/app/assets/javascripts/admin/assets.js

@@ -18,7 +18,7 @@ function setUpPlupload() {
     runtimes : 'html5,flash,gears,silverlight,html4',
     url : '/admin/assets/plupload',
     // max_file_size : '10mb',
-    chunk_size : '1mb',
+    // chunk_size : '1mb',
     unique_names : false,
 
     // Use multipart

data/app/assets/javascripts/admin/tiny_mce_config.js

@@ -88,15 +88,11 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
           tinyMCE.activeEditor.focus();
           tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark();
           // open asset lightbox
-          $.get("/admin/nodes/tree", function() {
-            // reopen the opening form if you close this form
-            $.fancybox({
-              href: '#tree-browser',
-              title: "Link to content"
-            });
-            $('#tree-browser').attr('class', 'tinymce');
-          },
-          'script');
+          // reopen the opening form if you close this form
+          $.fancybox({
+            href: "/admin/nodes/tree?mode=link",
+            title: "Link to content"
+          });
         }
       });
 
@@ -112,7 +108,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
 
       // wow what a hack: insert a containing span for the page name if nothing is selected,
       // then insert the link, then remove containing span after all is good
-      $('#tree-browser.tinymce li a').live('click', function(event) {
+      $('ol.tree a.link').live('click', function(event) {
         add_url = $(this).attr('href').split('?')[0];
         tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
 

data/app/assets/stylesheets/admin/layout.css

@@ -670,9 +670,9 @@ table.component-table td a {
 
 /* --- tree ---- */
 
-#tree-browser {
+ol.tree {
   width: 400px;
-  height: 400px;
+  height: 300px;
   padding: 10px;
 }
 

data/app/assets/stylesheets/admin/skin.css

@@ -321,7 +321,7 @@ ul.choices li a:hover {
 
 /* PAGINATION */
 
-.pagination a, #tree-browser a {
+.pagination a, ol.tree a {
         color:#106bab;
 }
 
@@ -519,7 +519,7 @@ table#node_body_tbl,
         color:#D4954C;
 }
 
-#tree-browser span.expand {
+ol.tree a.expand {
    background:#82b452;
    border:3px solid #548126;
    color: #fff;
@@ -613,7 +613,7 @@ table.component-table,
         border-radius: 5px;
 }
 
-#tree-browser span.expand  {
+ol.tree a.expand  {
         -webkit-border-radius: 15px;
         -moz-border-radius: 15px;
         border-radius: 15px;

data/app/assets/stylesheets/admin/typography.css

@@ -11,11 +11,6 @@ body, textarea {
 
 /* -------------- FONT SIZES -------------- */
 
-  /* 10px */
-  #tree-browser li li {
-    font-size:1.0em;
-  }
-
   /* 11px */
 ul#status li,
 label,
@@ -55,7 +50,7 @@ table#versions-list td,
 #no-tags h2,
 #sub-form ol#slot-list li,
 #fancybox-topnav h1,
-#tree-browser li {
+ol.tree li {
     font-size:1.4em;
   }
 
@@ -114,7 +109,7 @@ legend,
 #errorExplanation,
 span.node-mover,
 div#flash a,
-#tree-browser span.expand  {
+ol.tree span.expand  {
     font-weight: bold;
   }
 

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

@@ -7,14 +7,14 @@ module Noodall
       sortable_attributes :position, :admin_title, :title, :type, :updated_at
 
       def index
-        
+
         if params[:node_id].nil?
           nodes = Node.roots
         else
           @parent = Node.find(params[:node_id])
           nodes = @parent.children
         end
-        
+
         per_page = 15
         @nodes = nodes.where( :title => /#{params[:f]}/i ).paginate(:per_page => (params[:limit] || per_page), :page => params[:page], :order => sort_order(:default => "ascending") )
 
@@ -25,9 +25,14 @@ module Noodall
       end
 
       def tree
-        @options = {}
+        if params[:id].nil?
+          @nodes = Node.roots
+        else
+          @parent = Node.find(params[:id])
+          @nodes = @parent.children
+        end
         respond_to do |format|
-          format.html
+          format.html { render :layout => false }
           format.js
         end
       end

data/app/models/asset.rb

@@ -39,7 +39,7 @@ class Asset
   def url(*args)
     if args.blank?
       # Use the transparent url just the file is required with no processing
-      file.url(:suffix => ".#{file_ext}")
+      file.url
     elsif video?
       file.encode(:tiff, { :offset => "#{video_thumbnail_offset}%" }).thumb(*args).url
     else

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

@@ -1,15 +1,22 @@
 <ol class="tree">
-<% for node in nodes %>
+<% if @parent.nil? %>
+  <% if params[:mode] == 'parent' %>
+  <li><a id="id-none" class="<%= params[:mode] %>" href="/">Root</a></li>
+  <% end %>
+<% elsif @parent.parent_id? %>
+  <li><%= link_to 'Up', tree_noodall_admin_node_path(@parent.parent_id, params), :class => 'expand' -%></li>
+<% else %>
+  <li><%= link_to 'Up', tree_noodall_admin_nodes_path(params.reject{|k,v| k == 'id'}), :class => 'expand' -%></li>
+<% end %>
+<% for node in @nodes %>
   <li>
-    <% if params[:allowed_types].nil? || ( params[:allowed_types].include?(node.class.to_s) && node.id.to_s != params[:not_branch] && !node.path.map(&:to_s).include?(params[:not_branch]) ) %>
-      <%= link_to h(node.title), node_path(node), :id => "id-#{node.id}" %>
+    <% if params[:mode] == 'link' or ( params[:allowed_types] && params[:allowed_types].include?(node.class.to_s) && node.id.to_s != params[:not_branch] && !node.path.map(&:to_s).include?(params[:not_branch]) ) %>
+      <%= link_to h(node.title), node_path(node), :id => "id-#{node.id}", :class => params[:mode] %>
     <% else %>
       <%= node.title %>
     <% end %>
-    <% unless (children = node.children.where(options)).empty? -%>
-      <span class="expand">+</span>
-      <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
-    <% end -%>
+    <%= link_to '+', tree_noodall_admin_node_path(node, params), :class => 'expand' unless node.children.count.zero? -%>
   </li>
 <% end -%>
 </ol>
+<%= javascript_tag "$('ol.tree li a.expand').fancybox()" %>

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

@@ -121,11 +121,18 @@
             <p>
               <span class="node-mover">Parent Content</span>
               <span class="input-wrap" id="parent-title">
-                <%= @node.root? ? "Root" : @node.parent.title %>
-                <a href="#" class="edit-item">Edit</a>
+                <strong><%= @node.root? ? "Root" : @node.parent.title %></strong>
+                <%= link_to 'Edit',
+                  tree_noodall_admin_nodes_path(
+                    :not_branch => @node.id,
+                    :allowed_types => @node.class.parent_classes.join(','),
+                    :mode => 'parent'
+                  ),
+                  :class => 'edit-item',
+                  :title => 'Select a parent',
+                %>
               </span>
               <%= f.hidden_field :parent, :value => @node.parent_id %>
-              <%= hidden_field_tag :parent_types, @node.class.parent_classes.join(','), :disabled => true %>
             </p>
 
             <!-- PAGE URL -->

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

@@ -1,3 +1 @@
-<h1>Tree</h1>
-
-<%= render :partial => 'branch', :locals => { :nodes => Noodall::Node.roots(@options), :options => @options } %>
+<%= render :partial => 'branch' %>

data/app/views/noodall/admin/nodes/tree.js.erb

@@ -1,2 +1,2 @@
-$('#tree-browser').html( "<%= escape_javascript(render :partial => 'branch', :locals => { :nodes => Noodall::Node.roots(@options), :options => @options }) %>" );
-$('#tree-browser ol.tree ol').hide();
+$('#tree-browser').html( "<%= escape_javascript(render :partial => 'branch' ) %>" );
+$('#tree-browser ol.tree ol').hide();

data/features/{choose_node_title.feature → set_content_browser_title.feature}

@@ -1,5 +1,5 @@
 @javascript
-Feature: Preview Content
+Feature: Set content browser title
   In order to have a succinct page title, with a more descriptive browser title
   A website editor
   Will be able to set a separate browser title
@@ -11,7 +11,7 @@ Feature: Preview Content
     Then the content should be visible on the website
     And the title should be "Bacon Ipsum"
     And the browser title should be "Bacon Ipsum"
-    
+
 
   Scenario: Set a browser title
     Given I am editing content
@@ -21,4 +21,4 @@ Feature: Preview Content
     And I press "Publish"
     And I follow "Show"
     Then the title should be "Bacon Ipsum"
-    And the browser title should be "Ice Cream"
+    And the browser title should be "Ice Cream"

data/features/step_definitions/asset_steps.rb

@@ -34,8 +34,8 @@ Then /^I should be able to browse assets by content type$/ do
   page.should_not have_content('Video asset')
   within(:css, "ul.choices") { click_link "Documents" }
   page.should_not have_content('Image asset')
-  page.should_not have_content('Video asset')
   if Asset.video_extensions.any?
+    page.should_not have_content('Video asset')
     within(:css, "ul.choices") { click_link "Videos" }
     page.should_not have_content('Document asset')
     page.should_not have_content('Image asset')

data/features/step_definitions/search_steps.rb

@@ -1,5 +1,5 @@
 Given /^there is content that can be searched$/ do
-  Given %q{the website has been populated with content based on the site map}
+  step %q{the website has been populated with content based on the site map}
   3.times do |i|
     Factory(:page_a, :title => "My Searchable Page #{i}", :publish => true)
   end

data/lib/noodall/routes.rb

@@ -12,6 +12,7 @@ module Noodall
                 get :change_template
                 get :move_up
                 get :move_down
+                get :tree
                 post :preview
               end
               collection do

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.5.13"
+    VERSION = "0.5.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-ui
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noodall-core
@@ -253,7 +253,6 @@ files:
 - config/cucumber.yml
 - config/routes.rb
 - features/change_templates.feature
-- features/choose_node_title.feature
 - features/content_templates.feature
 - features/group_access_control.feature
 - features/manage_assets.feature
@@ -266,6 +265,7 @@ files:
 - features/respond_with_correct_format.feature
 - features/save_draft.feature
 - features/search.feature
+- features/set_content_browser_title.feature
 - features/sitemap.feature
 - features/sort_nodes_by_column.feature
 - features/step_definitions/asset_steps.rb
@@ -365,9 +365,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/factories/asset.rb
-- spec/dummy/factories/node.rb
-- spec/dummy/factories/user.rb
 - spec/dummy/files/beef.png
 - spec/dummy/files/get_video.flv
 - spec/dummy/files/test.pdf
@@ -378,6 +375,9 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/factories/asset.rb
+- spec/factories/node.rb
+- spec/factories/user.rb
 - vendor/assets/images/fancybox/blank.gif
 - vendor/assets/images/fancybox/fancy_close.png
 - vendor/assets/images/fancybox/fancy_loading.png
@@ -722,7 +722,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3366708828992806581
+      hash: -3396913091192908078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: