noodall-ui 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    noodall-ui (0.0.4)
+    noodall-ui (0.0.5)
       dynamic_form
       noodall-core
       thoughtbot-sortable_table (= 0.0.6)
@@ -68,7 +68,7 @@ GEM
     culerity (0.2.12)
     database_cleaner (0.6.0)
     diff-lcs (1.1.2)
-    dragonfly (0.7.6)
+    dragonfly (0.7.7)
       rack
     dynamic_form (1.1.3)
     erubis (2.6.6)
@@ -85,7 +85,7 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     git (1.2.5)
-    haml (3.0.22)
+    haml (3.0.23)
     i18n (0.4.2)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
@@ -104,19 +104,22 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mm-multi-parameter-attributes (0.1.1)
+      mongo_mapper
     mongo (1.1.1)
       bson (>= 1.1.1)
-    mongo_mapper (0.8.4)
+    mongo_mapper (0.8.6)
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.5)
+      plucky (~> 0.3.6)
     newbamboo-rvideo (0.9.6)
       activesupport
     nokogiri (1.4.3.1)
-    noodall-core (0.1.0)
+    noodall-core (0.3.2)
       canable (= 0.1.1)
-      mongo_mapper (= 0.8.4)
-      ramdiv-mongo_mapper_acts_as_tree (= 0.1.1)
+      mm-multi-parameter-attributes (~> 0.1.1)
+      mongo_mapper (~> 0.8.6)
+      ramdiv-mongo_mapper_acts_as_tree (~> 0.1.1)
       ruby-stemmer
     open4 (0.9.6)
     plucky (0.3.6)
@@ -141,7 +144,7 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    ramdiv-mongo_mapper_acts_as_tree (0.1.1)
+    ramdiv-mongo_mapper_acts_as_tree (0.1.2)
       mongo_mapper (>= 0.6.8)
     rmagick (2.13.1)
     rspec (2.0.1)
@@ -167,7 +170,7 @@ GEM
       rubyzip
     spork (0.8.4)
     term-ansicolor (1.0.5)
-    thor (0.14.3)
+    thor (0.14.4)
     thoughtbot-sortable_table (0.0.6)
     treetop (1.4.8)
       polyglot (>= 0.3.1)

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

@@ -41,7 +41,7 @@ module Noodall
       def tags
         options = { :order => '_id' } # Order by name which is _id in the map/reduce
         if params[:asset_type]
-          options.merge!(asset_options(params[:asset_type])) 
+          options.merge!(asset_options(params[:asset_type]))
           @page_title << " Tags"
         else
           @page_title = "Tags"

data/app/helpers/noodall/components_helper.rb

@@ -9,27 +9,22 @@ module Noodall::ComponentsHelper
     # render each slot in the row
     args.map do |slot_code|
       index = args.index(slot_code)
-      component = components[index] 
-      
+      component = components[index]
+
       additional_classes = []
       additional_classes << slot_code.split("_").shift unless slot_code.split("_").shift.nil?
       additional_classes << 'penultimate' if slot_code == args[args.size - 2]
       additional_classes << 'last' if args.last == slot_code
       additional_classes << 'first' if args.first == slot_code
-      
+
       # pass a flag to the view to add an expanded html class
       component(node, slot_code, ( components[index + 1].nil? && index < (args.size - 1) ), additional_classes.join(' ')).to_s
-    end
+    end.to_s.html_safe
   end
-  
+
   def component(node, slot_code, expand = false, additional_classes = '')
     component = node.send(slot_code)
-    # Add an empty blank to fill in
-    if component.respond_to?(:contents)
-      component.contents.reject!{|c| c.asset_id.blank? }
-      component.contents << Content.new
-    end
-    
+
     additional_classes = []
     additional_classes << slot_code.split("_").shift unless slot_code.split("_").shift.nil?
 

data/app/models/asset.rb

@@ -23,18 +23,22 @@ class Asset
   validates_presence_of :file, :title, :description
   validates_length_of :tags, :minimum => 3, :message => "must have at least 3 items"
 
+  # Set up video format
+  cattr_accessor :video_extensions
+  self.video_extensions = []
+
   def image?
     !(file_mime_type =~ self.class.image_reg_ex).nil?
   end
 
   def video?
-    file_ext == 'flv'
+    @@video_extensions.include?(file_ext)
   end
 
   def url(*args)
     if args.blank?
       # Use the transparent url just the file is required with no processing
-      file.url
+      file.url(:suffix => ".#{file_ext}")
     elsif video?
       file.encode(:tiff, { :offset => "#{video_thumbnail_offset}%" }).thumb(*args).url
     else
@@ -82,10 +86,6 @@ class Asset
     def image_extensions
       ['png','gif','jpg','jpeg']
     end
-
-    def video_extensions
-      ['flv', 'avi', 'mpeg', 'mpg']
-    end
   end
   extend ClassMethods
 

data/app/views/noodall/admin/assets/_menu.html.erb

@@ -1,8 +1,8 @@
 <ul class="choices">
   <%= content_tag :li, '<a>Done</a>'.html_safe, :class => 'action' if params[:mode] == 'multi' %>
-  <%= content_tag :li, '<a>Cancel</a>'.html_safe, :class => 'cancel' %>
+  <%= content_tag :li, '<a>Cancel</a>'.html_safe, :class => 'cancel' if params[:mode] %>
   <li class="upload"><%= link_to 'Upload', new_noodall_admin_asset_path(:readonly => readonly) %></li>
   <%= content_tag :li, link_to( 'Images', noodall_admin_assets_path(:readonly => readonly) ), :class => 'images' if params[:allowed_types].blank? or params[:allowed_types].include?('images') %>
   <%= content_tag :li, link_to( 'Documents', documents_noodall_admin_assets_path(:readonly => readonly) ), :class => 'documents' if params[:allowed_types].blank? or params[:allowed_types].include?('documents') %>
-  <%= content_tag :li, link_to( 'Videos', videos_noodall_admin_assets_path(:readonly => readonly) ), :class => 'videos' if params[:allowed_types].blank? or params[:allowed_types].include?('videos') %>
+  <%= content_tag :li, link_to( 'Videos', videos_noodall_admin_assets_path(:readonly => readonly) ), :class => 'videos' if Asset.video_extensions.any? and (params[:allowed_types].blank? or params[:allowed_types].include?('videos')) %>
 </ul>

data/app/views/noodall/admin/assets/form.html.erb

@@ -4,9 +4,7 @@
 
 <h1><%= @asset.new_record? ? 'New' : 'Editing' %> Asset</h1>
 
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
-
-  <%= render 'form' %>
+<%= render 'form' %>
 
 <%= javascript_tag('setUpPlupload()') if @asset.new_record?  %>
 

data/app/views/noodall/admin/assets/index.html.erb

@@ -1,6 +1,5 @@
 <h1><%= admin_page_title %></h1>
 
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
 <%= render 'menu' %>
 <%= will_paginate(@assets, :previous_label => 'Previous', :next_label => 'Next') %>
 <div id="content-table">

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

@@ -1,3 +1,2 @@
 <h1>Viewing Asset</h1>
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
 <%= render 'show' %>

data/app/views/noodall/admin/assets/tags.html.erb

@@ -1,3 +1,2 @@
 <h1><%= page_title %></h1>
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
 <%= render 'tags' %>

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

@@ -1,7 +1,7 @@
 <ol class="tree">
 <% for node in nodes %>
   <li><%= link_to h( node.title), node_path(node), :id => "id-#{node.id}" %>
-<% unless (children = node.children(options)).empty? -%>
+<% unless (children = node.children.where(options)).empty? -%>
   <span class="expand">+</span>
   <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
 <% end -%>

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

@@ -1,5 +1,3 @@
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
-
 <h1>Change Template</h1>
 
 <%= form_for(@node, :as => :node, :url => noodall_admin_node_path(@node), :html => {:method => :put, :id => "node-form"}) do |f| %>

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

@@ -17,8 +17,6 @@
 
 </ul>
 
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
-
 <div id="content-table">
  <table border="0" cellspacing="0" cellpadding="0" class="content">
   <thead>

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

@@ -1,4 +1,3 @@
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
 
 <h1>New Content<%= " under '#{@parent.title}'" unless @parent.nil? %></h1>
 <p>* Required Fields</p>

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

@@ -1,5 +1,3 @@
-<a class="tooltip" href="/cms_help.pdf">&nbsp;</a>
-
 <% content_for :header, javascript_include_tag( 'tiny_mce/jquery.tinymce.js', 'admin/tiny_mce_config', 'admin/nodes', 'admin/assets' ) %>
 
 
@@ -125,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) %>
+<% if can_publish?(@node) and !@node.is_a?(Home) %>
 <%= link_to "Change Template", change_template_noodall_admin_node_path(@node), :class => 'change' %>
 <% end -%>
 <div id="modules-list">

data/demo/models/home.rb

@@ -0,0 +1,3 @@
+class Home < Noodall::Node
+
+end

data/features/step_definitions/asset_steps.rb

@@ -23,9 +23,9 @@ Given /^files have been uploaded to the asset library$/ do
   20.times { Factory(:asset) }
   20.times { Factory(:document_asset) }
   20.times { Factory(:video_asset) }
-  
+
   20.times { Factory(:asset, :title => "Tagged Asset", :tags => ['RAC','lorem','dolar']) }
-  
+
 end
 
 Then /^I should be able to browse assets by content type$/ do
@@ -35,10 +35,11 @@ Then /^I should be able to browse assets by content type$/ do
   within(:css, "ul.choices") { click_link "Documents" }
   page.should_not have_content('Image asset')
   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')
-  
+  if Asset.video_extensions.any?
+    within(:css, "ul.choices") { click_link "Videos" }
+    page.should_not have_content('Document asset')
+    page.should_not have_content('Image asset')
+  end
 end
 
 Then /^I should be able to browse assets by tags$/ do

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/public/javascripts/admin/application.js

@@ -57,7 +57,7 @@ $(document).ready(function() {
   //video previews
   domain = window.location.href.replace(/http:\/\/([^\/]+)\/.*/i,'$1');
   var videoUrl = 'video=http://'+ domain + escape($('a.lightboxVideo').attr('href')) + '&standalone=true';
-  
+
   $('a.lightboxVideo').fancybox({
     'padding': 10,
     'autoScale': true,
@@ -120,7 +120,7 @@ $(document).ready(function() {
 
   $("#advanced").hide();
   $("legend.advanced").hide();
-    
+
   $(".show-advanced").append("<a class='advanced' href='#advanced'>Advanced</a>");
 
   $(".show-advanced a.advanced").click(
@@ -134,11 +134,11 @@ $(document).ready(function() {
       $(".show-advanced a.advanced.open").fadeIn("fast");
     }
   });
-  
-  
-  
-  
-  
+
+
+
+
+
 
   $('body#assets.index .file').click(function() {
     document.location = $(this).find("a.show").attr('href');
@@ -259,7 +259,7 @@ var Component = {
 
     // Reset
     Component.slot_form = $(Component.slot_form_id);
-    
+
     // Make file selectors sortable
     Component.slot_form.find('.multi-file-files ol').sortable({
       axis: 'y',
@@ -281,7 +281,7 @@ var Component = {
   },
   add_all_assets: function() {
     $.each(Browser.assets_to_add, function(i, asset_id){
-       Component.add_asset(asset_id); 
+       Component.add_asset(asset_id);
     });
     Component.reopen_slot();
   }
@@ -350,7 +350,7 @@ var Browser = {
     action = '/';
     if (Browser.allowed_types.length > 0) {
       action += Browser.allowed_types[0];
-    } 
+    }
     $.get("/admin/assets" + action, {
       allowed_types: Browser.allowed_types,
       mode: Browser.mode,
@@ -371,8 +371,8 @@ var Browser = {
   after_ajax: function() {
     if (Browser.mode == 'multi') {
       $.each(Browser.assets_to_add, function(i, asset_id){
-        $('#asset-' + asset_id).siblings('a.add').addClass('selected'); 
-      }); 
+        $('#asset-' + asset_id).siblings('a.add').addClass('selected');
+      });
     }
   },
   do_action_and_close: function() {
@@ -466,10 +466,11 @@ $('#asset-browser li.cancel a').live('click', Browser.close);
 // Action button
 $('#asset-browser li.action a').live('click', Browser.do_action_and_close);
 
-// Open the file select 
+// Open the file select
 $('span.select-file').live('click', function(event) {
   Browser.set_opener($(this));
   Browser.action = Browser.attach_asset;
+  Browser.after_close = $.fancybox.close;
   Browser.open();
 });
 // After close the file select in component form reopen slot form
@@ -565,22 +566,14 @@ $('#tree-browser.link a').live('click', function(e) {
 $('span.link-asset').live('click', {readonly:true}, function(event) {
   Component.link_input = $(this).siblings('input').first();
   Component.allowed_types = [];
-  // open asset lightbox
-  $.get("/admin/assets", function() {
-    // reopen the opening form if you close this form
-    $.fancybox({
-      href: '#asset-browser'
-    });
-    $('#asset-browser').attr('class', 'link');
-  },
-  'script');
+  Browser.action = function() {
+    asset_id = Browser.assets_to_add[0]
+    Component.link_input.val($('#asset-' + asset_id).siblings('a.add').attr('href'));
+  }
+  Browser.after_close = Component.reopen_slot;
+  Browser.open();
 
-  event.stopImmediatePropagation();
-  return false;
-});
 
-$('#asset-browser.link a.add').live('click', function(e) {
-  $(Component.link_input).val($(this).attr('href'));
-  Component.reopen_slot();
+  event.stopImmediatePropagation();
   return false;
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +00:00
+date: 2010-11-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,6 +171,7 @@ files:
 - demo/initializers/secret_token.rb
 - demo/initializers/session_store.rb
 - demo/models/gallery.rb
+- demo/models/home.rb
 - demo/models/page_a.rb
 - demo/models/page_b.rb
 - demo/models/page_c.rb