noodall-ui 0.4.11 → 0.5.0.pre.1

data/{public → app/assets}/stylesheets/admin/skin.css

@@ -198,7 +198,7 @@ table.content td.down {
 }
 
 a.change {
-        background: url(/images/admin/change.gif) no-repeat 0 0;
+        background: url(/assets/admin/change.gif) no-repeat 0 0;
         height:27px;
         margin:5px 0 0px;
         width:280px;
@@ -206,15 +206,15 @@ a.change {
 
 ul.choices li a {
         color:#000;
-        background: url(/images/admin/media.gif) no-repeat 0 0;
+        background: url(/assets/admin/media.gif) no-repeat 0 0;
 }
 
 ul.choices li a.button {
-        background: url(/images/admin/nav.gif) no-repeat 0 0;
+        background: url(/assets/admin/nav.gif) no-repeat 0 0;
 }
 
 ul.choices li a.up.button {
-        background: url(/images/admin/nav-2.gif) no-repeat 0 -44px;
+        background: url(/assets/admin/nav-2.gif) no-repeat 0 -44px;
 }
 
   ul.choices li a.up.button:hover  {
@@ -310,7 +310,7 @@ ul.choices li a:hover {
 }
 
 #tags a, div.tags a {
-        background:#fff url(/images/admin/tag.png) no-repeat -3px -2px;
+        background:#fff url(/assets/admin/tag.png) no-repeat -3px -2px;
         color:#000;
 }
 
@@ -335,7 +335,7 @@ ul.choices li a:hover {
 
 .pagination .previous_page,
 .pagination .next_page {
-        background:url("/images/admin/pagination.gif") no-repeat scroll;
+        background:url("/assets/admin/pagination.gif") no-repeat scroll;
 
 }
 
@@ -358,7 +358,7 @@ ul.choices li a:hover {
 /* -------------- TABLE ICONS -------------- */
 
 a.edit, span.edit {
-        background:url(/images/admin/edit.png) no-repeat right -4px;
+        background:url(/assets/admin/edit.png) no-repeat right -4px;
 }
 
   a.edit:hover, span.edit:hover {
@@ -366,7 +366,7 @@ a.edit, span.edit {
   }
 
 a.delete, span.delete {
-        background:url(/images/admin/delete.png) no-repeat -1px -4px;
+        background:url(/assets/admin/delete.png) no-repeat -1px -4px;
 }
 
 td.spam {
@@ -374,42 +374,42 @@ td.spam {
 }
 
 td.spam.flagged {
-  background:url(/images/admin/spam-flag.png) no-repeat 8px 8px;
+  background:url(/assets/admin/spam-flag.png) no-repeat 8px 8px;
 }
 
 a.download {
-  background:url(/images/admin/download.png) no-repeat -1px -4px;
+  background:url(/assets/admin/download.png) no-repeat -1px -4px;
 }
 
 a.show {
-  background:url(/images/admin/view.png) no-repeat -1px -4px;
+  background:url(/assets/admin/view.png) no-repeat -1px -4px;
 }
 
 a.page_up {
-  background:url(/images/admin/up.png) no-repeat -1px -4px;
+  background:url(/assets/admin/up.png) no-repeat -1px -4px;
 }
 
 a.page_down {
-  background:url(/images/admin/down.png) no-repeat -1px -4px;
+  background:url(/assets/admin/down.png) no-repeat -1px -4px;
 }
 
 span.check {
-  background:url(/images/admin/check.png) no-repeat -1px -4px;
+  background:url(/assets/admin/check.png) no-repeat -1px -4px;
 }
 
 span.hidden {
-  background:url(/images/admin/hidden.png) no-repeat -1px -4px;
+  background:url(/assets/admin/hidden.png) no-repeat -1px -4px;
 }
 
 a.child, a.add{
-  background:url(/images/admin/add.png) no-repeat -1px -4px;
+  background:url(/assets/admin/add.png) no-repeat -1px -4px;
 }
 
 #asset-browser.multi a.add {
-  background:url(/images/admin/select_image.gif) no-repeat 4px;
+  background:url(/assets/admin/select_image.gif) no-repeat 4px;
 }
 #asset-browser.multi a.add.selected {
-  background:url(/images/admin/select_image.gif) no-repeat -22px;
+  background:url(/assets/admin/select_image.gif) no-repeat -22px;
 }
 a.delete:hover,
 span.delete:hover,
@@ -434,7 +434,7 @@ td.file:hover a.show {
 td.file:hover {cursor:pointer;}
 
 th.sort a {
-          background:url(/images/admin/sort.png) no-repeat right 1px !important;
+          background:url(/assets/admin/sort.png) no-repeat right 1px !important;
           padding:10px 42px 10px 0;
 }
 
@@ -444,7 +444,7 @@ th.sort a:hover {
 }
 
 .edit-item {
-          background:url(/images/admin/edit.gif) no-repeat;
+          background:url(/assets/admin/edit.gif) no-repeat;
           width:89px;
           height:26px;
           position:absolute;
@@ -536,13 +536,13 @@ table#node_body_tbl,
 
 span.tooltip,
 #content form .fixed-form span.tooltip {
-        background:url(/images/admin/info.png) no-repeat center center;
+        background:url(/assets/admin/info.png) no-repeat center center;
         cursor:help;
 }
 
 a.tooltip,
 th .tooltip {
-        background:url(/images/admin/info-white.png) no-repeat center center;
+        background:url(/assets/admin/info-white.png) no-repeat center center;
 }
 
 .tooltip-show {
@@ -552,15 +552,15 @@ th .tooltip {
 }
 
 /*.tooltip-top {
-        background:url(/images/admin/tooltip-top.png) no-repeat;
+        background:url(/assets/admin/tooltip-top.png) no-repeat;
 }
 
 .tooltip-middle {
-        background:url(/images/admin/tooltip-middle.png) repeat;
+        background:url(/assets/admin/tooltip-middle.png) repeat;
 }
 
 .tooltip-bottom {
-        background:url(/images/admin/tooltip-bottom.png) no-repeat;
+        background:url(/assets/admin/tooltip-bottom.png) no-repeat;
 }
 */
 
@@ -698,7 +698,7 @@ a:hover {
 
 /*download button*/
 #content form input.download-button{
-  background:url("/images/admin/nav.gif") no-repeat scroll 0 -88px transparent;
+  background:url("/assets/admin/nav.gif") no-repeat scroll 0 -88px transparent;
   border:0 none;
   color:#FFFFFF;
   font-size:0;
@@ -733,7 +733,7 @@ a:hover {
   float: left;
   padding: 0 0 0 10px;
   width: auto;
-  
+
 }
 
 .breadcrumb li a:after{

data/app/assets/stylesheets/admin.css

@@ -0,0 +1,8 @@
+/* ...
+*= require fancybox
+*= require admin/reset
+*= require admin/layout
+*= require admin/skin
+*= require admin/typography
+*= require admin/forms
+*/

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

@@ -66,8 +66,8 @@ module Noodall
       end
 
       def pending
-        @asset = Asset.first(:tags => { '$size' => 0 }, :order => "created_at DESC")
-        if !@asset.blank?
+        @asset = Asset.first(:tags => nil, :offset => params[:offset], :order => "created_at DESC")
+        unless @asset.blank?
           respond_to do |format|
             format.html { render :form }
             format.js { render :form }
@@ -230,7 +230,7 @@ module Noodall
       helper_method :admin_assets_type_url
 
       def pending_count
-        @pending_count ||= Asset.count(:tags => { '$size' => 0 })
+        @pending_count ||= Asset.count(:tags => nil)
       end
       helper_method :pending_count
 

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

@@ -26,6 +26,14 @@ module Noodall
 
       def tree
         @options = {}
+        @options[:_type] = params[:allowed_types] if params[:allowed_types]
+        if params[:not_branch]
+          @options.merge!(
+            :_id => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])},
+            Node.path_field => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])}
+          )
+        end
+
         respond_to do |format|
           format.html
           format.js

data/app/controllers/noodall/nodes_controller.rb

@@ -37,8 +37,9 @@ module Noodall
     def sitemap
       if stale?(:last_modified => GlobalUpdateTime::Stamp.read, :public => true)
         @page_title = 'Sitemap'
-        @nodes = Node.all
       end
+
+      @nodes = Node.all
     end
 
     def search

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

@@ -33,7 +33,7 @@ module Noodall
       end
 
       def slot_link(node,type,index)
-        link_to( "#{type.to_s.titleize} Slot", {:anchor => "#{type}_component_form_#{index}"}, :id=> "#{type}_slot_#{index}_selector", :class => 'slot_link') +
+        link_to( "#{type.to_s.titleize} Slot", "##{type}_component_form_#{index}", :id=> "#{type}_slot_#{index}_selector", :class => 'slot_link') +
           "<span id=\"#{type}_slot_#{index}_tag\" class=\"slot_tag\">#{node.send("#{type}_slot_#{index}").class.name.titleize unless @node.send("#{type}_slot_#{index}").nil?}</span>".html_safe
       end
 

data/app/views/layouts/noodall_admin.html.erb

@@ -13,21 +13,21 @@
 
 <!-- END META TAGS -->
 <title><%= admin_page_title %> | <%= Noodall::UI.app_name %> <%= Noodall::UI.system_name %></title>
-<%= stylesheet_link_tag 'admin/reset', 'admin/layout', 'admin/skin', 'admin/typography', 'admin/forms', 'admin/fancybox',  :media=>'screen,tv,projection' %>
+<%= stylesheet_link_tag 'admin',  :media=>'screen,tv,projection' %>
 <%= stylesheet_link_tag 'admin/print', :media=>'print' %>
 <%= stylesheet_link_tag 'admin/handheld', :media=>'handheld' %>
 <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/themes/base/jquery.ui.all.css' %>
 
-<!--[if IE 6]><link href="/stylesheets/admin/ie6.css" media="screen" rel="Stylesheet" type="text/css" /><![endif]-->
-<!--[if IE 7]><link href="/stylesheets/admin/ie.css" media="screen" rel="Stylesheet" type="text/css" /><![endif]-->
-<!--[if IE 8]><link href="/stylesheets/admin/ie8.css" media="screen" rel="Stylesheet" type="text/css" /><![endif]-->
+<!--[if IE 6]><%= stylesheet_link_tag 'admin/ie6',  :media=>'screen,tv,projection' %><![endif]-->
+<!--[if IE 7]><%= stylesheet_link_tag 'admin/ie',  :media=>'screen,tv,projection' %><![endif]-->
+<!--[if IE 8]><%= stylesheet_link_tag 'admin/ie8',  :media=>'screen,tv,projection' %><![endif]-->
 
 <script src="http://www.google.com/jsapi" type="text/javascript"></script>
 <script type="text/javascript">
   google.load("jquery", "1.4.2");
   google.load("jqueryui", "1.8");
 </script>
-<%= javascript_include_tag 'rails', 'fancybox', 'ajaxify', 'admin/application' %>
+<%= javascript_include_tag 'admin' %>
 <%= csrf_meta_tag %>
 
 <%= yield :header %>

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

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

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

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

data/app/views/noodall/nodes/{sitemap.xml.rxml → sitemap.xml.builder}

@@ -1,11 +1,11 @@
 xml.instruct!
- 
+
 xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
 # homepage
     xml.url do
       xml.loc         root_path(:only_path => false)
       #w3c formatted time
-      time = File.new("#{Rails.root.to_s}/app/views/nodes/home.html.erb").mtime
+      time = Noodall::GlobalUpdateTime::Stamp.read
       xml.lastmod     "#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{time.strftime("%z")[0..2]}:#{time.strftime("%z")[3..4]}"
       xml.changefreq  "daily"
       xml.priority    1

data/config/routes.rb

@@ -0,0 +1,2 @@
+Rails.application.routes.draw do
+end

data/features/sitemap.feature

@@ -1,4 +1,4 @@
-@website
+@,website
 Feature: Site Map
   In order to allow website visitors to see on overview of the entire site the website will
   provide a site map showing all content on the website

data/features/step_definitions/asset_steps.rb

@@ -5,7 +5,7 @@ end
 When /^I upload a file$/ do
   click_link "Upload"
   fill_in "Title", :with => "A loverly asset"
-  attach_file("File", "#{Rails.root}/spec/files/beef.png")
+  attach_file("File", "#{Rails.root}/files/beef.png")
 end
 
 When /^enter tags$/ do

data/features/step_definitions/cms_node_steps.rb

@@ -1,5 +1,5 @@
 Given /^the website has been populated with content based on the site map$/ do
-  seed_file = File.join(Rails.root, "demo", "seeds.rb")
+  seed_file = File.join(Rails.root, "db", "seeds.rb")
   load(seed_file)
 end
 

data/features/step_definitions/component_steps.rb

@@ -11,13 +11,13 @@ When /^(?:|I )click a "([^"]*)" component slot$/ do |slot_name|
 end
 
 When /^(?:|I )select the "([^\"]+)" component$/ do |component_name|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     select component_name, :from => 'Select the type of component'
   end
 end
 
 When /^(?:|I )fill in the following within the component:$/ do |fields|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     fields.rows_hash.each do |name, value|
       When %{I fill in "#{name}" with "#{value}"}
     end
@@ -25,7 +25,7 @@ When /^(?:|I )fill in the following within the component:$/ do |fields|
 end
 
 When /^(?:|I )press "([^"]*)" within the component$/ do |button|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     click_button(button)
   end
   sleep 3
@@ -33,7 +33,7 @@ end
 
 When /^(?:|I )select an image from the asset library$/ do
   asset = Factory(:asset, :title => "My Image")
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     pending
   end
 end

data/features/support/env.rb

@@ -9,7 +9,7 @@ Spork.prefork do
   # files.
 
   ENV["RAILS_ENV"] ||= "test"
-  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+  require File.expand_path(File.dirname(__FILE__) + '/../../spec/dummy/config/environment')
 
   require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
   require 'cucumber/rails/rspec'

data/features/support/mm_factory_steps.rb

@@ -1,3 +1,6 @@
+require 'factory_girl_rails'
+require 'faker'
+
 FactoryGirl.factories.each do |factory|
   factory.human_names.each do |human_name|
     if factory.build_class.respond_to?(:keys)

data/lib/noodall/engine.rb

@@ -5,8 +5,12 @@ require 'noodall/site'
 module Noodall
   class Engine < Rails::Engine
 
-    initializer "static assets" do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
+    if Rails::VERSION::MINOR == 0 # if rails 3.0.x
+      initializer "static assets" do |app|
+        app.middleware.use ::ActionDispatch::Static, File.join(root, 'app', 'assets')
+        app.middleware.use ::ActionDispatch::Static, File.join(root, 'vendor', 'assets')
+        app.middleware.use ::ActionDispatch::Static, File.join(root, 'public')
+      end
     end
 
     initializer "load site map" do |app|

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.4.11"
+    VERSION = "0.5.0.pre.1"
   end
 end

data/lib/tasks/noodall-ui_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :noodall-ui do
+#   # Task goes here
+# end

data/noodall-ui.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency 'noodall-core', ">= 0.7.2"
+  s.add_dependency 'noodall-core', ">= 0.7.5"
   s.add_dependency 'thoughtbot-sortable_table', ">= 0.0.6"
   s.add_dependency 'will_paginate', "~> 3.0"
   s.add_dependency 'dynamic_form', ">= 0"