noodall-ui 0.0.7 → 0.0.8

data/Gemfile.lock

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

data/app/models/asset.rb

@@ -1,6 +1,7 @@
 class Asset
   include MongoMapper::Document
   plugin Noodall::Tagging
+  plugin Noodall::GlobalUpdateTime
 
   # Set up dragonfly
   extend Dragonfly::ActiveModelExtensions

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

@@ -1 +1 @@
-$('#asset-browser').html( "<%= escape_javascript(%{<h2 class="title">#{page_title}</h2> #{render( 'tags' )}}) %>" )
+$('#asset-browser').html( "<%= escape_javascript(%{<h2 class="title">#{page_title}</h2> #{render( 'tags' )}}.html_safe) %>" )

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

@@ -2,18 +2,19 @@
 
 <ul class="choices">
 
-<% if !@parent.nil? -%>
-  <li><%= link_to 'New', new_noodall_admin_node_node_path(@parent), :class => 'button', :title =>  "Add content under #{@parent.title}" %></li>
-<% else  %>
+<% if @parent.nil? -%>
   <li><%= link_to 'New', new_noodall_admin_node_path, :class => 'button', :title => "Add new" %></li>
+<% else  %>
+  <li><%= link_to 'New', new_noodall_admin_node_node_path(@parent), :class => 'button', :title =>  "Add content under #{@parent.title}" %></li>
 <% end -%>
 
-<% if !@parent.nil? and @parent.parent.nil? %>
-  <li><%= link_to "Top Level", noodall_admin_nodes_path, :class => "top button" %></li>
-<% elsif !@parent.nil?  %>
+<% if !@parent.nil? and !@parent.parent.nil? %>
   <li><%= link_to "Up to #{@parent.parent.title}", noodall_admin_node_nodes_path(@parent.parent), :class => "up button" %></li>
 <% end %>
 
+<% if !@parent.nil?  %>
+  <li><%= link_to "Top Level", noodall_admin_nodes_path, :class => "top button" %></li>
+<% end %>
 
 </ul>
 

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

@@ -46,7 +46,7 @@
     <div id="buttons">
       <%= f.submit 'Publish', :class => 'publish', :name => 'node[publish]' if can_publish?(@node) %>
       <%= f.submit 'Draft', :name => 'node[hide]', :class => 'draft' %>
-      <%= link_to 'Cancel', noodall_admin_nodes_path, :class => 'cancel'  %>
+      <%= link_to 'Cancel', @node.root? ? noodall_admin_nodes_path : noodall_admin_node_nodes_path(@node.parent), :class => 'cancel'  %>
     </div>
 
 <% if can_publish?(@node) %>

data/lib/noodall/ui/version.rb

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

data/public/javascripts/admin/tiny_mce_config.js

@@ -34,7 +34,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
     editor_selector : "editor",
     theme_advanced_buttons1 : "bold,italic,underline,|,formatselect,removeformat ,|,bullist,numlist,|,link,unlink,anchor,|,outdent,indent,blockquote,|,justifyleft,justifycenter,justifyright,justifyfull",
     theme_advanced_buttons2 : "table,delete_table,col_before,col_after,row_before,row_after,delete_col,delete_row,|,code,attribs,image,media, assetbrowser,nodebrowser",
-    
+
     setup : function(ed) {
       // Add a custom button
       ed.addButton('assetbrowser', {
@@ -54,10 +54,11 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
             }
             return false;
           };
+          Browser.after_close = $.fancybox.close;
           Browser.open();
         }
       });
-      
+
       ed.addButton('nodebrowser', {
         title : 'Insert an internal link',
         image : '/images/admin/top-level_small.png',
@@ -75,35 +76,35 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
           'script');
         }
       });
-      
+
       ed.onPostProcess.add(function(ed, o) {
         if(o.save){
           // remove mce empty spans
           o.content = o.content.replace(/<span id=._mce_start. .*?><\/span>/ig, '');
         }
       });
-      
+
       // 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) {
         add_url = $(this).attr('href').split('?')[0];
-        
+
         if(tinyMCE.activeEditor.selection.getContent().length === 0){
           tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id, 'mceInsertRawHTML', false, '<span class="tmp_tag">' + $(this).text() + '</span>');
           spans = tinyMCE.activeEditor.dom.select('span');
-          
+
           $.each(spans, function(i, span){
             if($(span).hasClass('tmp_tag')) {
               tinyMCE.activeEditor.selection.select(span);
             }
           });
         }
-        
+
         tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id, 'mceInsertLink', false, add_url, true);
         $.fancybox.close();
-        
+
         tinyMCE.activeEditor.setContent(tinyMCE.activeEditor.getContent().replace(/<span class="tmp_tag">(.*?)<\/span>/i, "$1"));
-        
+
         event.stopImmediatePropagation();
         return false;
       });
@@ -112,7 +113,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
 });
 
 
-    
+
 $(function() {
   $('textarea.editor').tinymce(tiny_mce_config);
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +00:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency