noodall-ui 0.3.20 → 0.4.0

data/Gemfile

@@ -3,10 +3,13 @@ source 'http://gems.github.com'
 
 gemspec
 
+#temp
+gem 'noodall-core', '~> 0.7.3'
+
 # Required for running as demo rails app
 gem 'rails', '~> 3.0.1'
 gem 'rmagick', :require => 'RMagick'
-gem 'dragonfly', '~> 0.7.6'
+gem 'dragonfly', '~> 0.9.4'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
@@ -16,11 +19,13 @@ group :development, :test do
   gem 'database_cleaner'
   gem 'cucumber-rails'
   gem 'cucumber'
-  gem 'rspec-rails', "~> 2.0.0.beta.22"
+  gem 'rspec-rails', "~> 2.0.0"
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
   gem 'jeweler', '~> 1.4.0'
   gem 'factory_girl_rails'
   gem "faker", "~> 0.3.1"
-  gem "haml"
+  gem "SystemTimer", ">= 1.2.0"
+  gem "bson_ext", "~> 1.3.0"
+  gem "ruby-debug"
 end

data/Rakefile

@@ -12,6 +12,6 @@ end
 
 task :default => :spec
 
-#require File.expand_path('../config/application', __FILE__)
+require File.expand_path('../config/application', __FILE__)
 
-#Noodall::Application.load_tasks
+Noodall::Application.load_tasks

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

@@ -7,12 +7,16 @@ module Noodall
       sortable_attributes :position, :admin_title, :title, :type, :updated_at
 
       def index
+        
         if params[:node_id].nil?
-          @nodes = Node.roots.paginate(:per_page => 20, :page => params[:page], :order => sort_order(:default => "ascending") )
+          nodes = Node.roots
         else
           @parent = Node.find(params[:node_id])
-          @nodes = @parent.children.paginate(:per_page => 20, :page => params[:page], :order => sort_order(:default => "ascending") )
+          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") )
 
         respond_to do |format|
           format.html # index.html.erb
@@ -41,6 +45,14 @@ module Noodall
         enforce_update_permission(@node)
         enforce_publish_permission(@node) if @node.published?
 
+        if !params[:version_number].blank?
+          @node.rollback(params[:version_number].to_i)
+          flash[:alert] = "You are viewing draft version '#{@node.version_number}' of this page"
+        elsif @node.has_draft?
+          @node.rollback(:latest)
+          flash[:alert] = "You are editing a draft version of this page"
+        end
+
         respond_to do |format|
           format.html
           format.xml  { render :xml => @node }
@@ -91,20 +103,25 @@ module Noodall
         # Set user stamp
         @node.updater = current_user
 
-        respond_to do |format|
+        if params[:draft].blank?
           if @node.update_attributes(params[:node])
-            flash[:notice] = "#{@node.class.name.titleize} '#{@node.title}' was successfully updated."
-            format.html {
-              if @node.parent.nil?
-                redirect_to noodall_admin_nodes_path
-              else
-                redirect_to noodall_admin_node_nodes_path(@node.parent.id)
-              end
-            }
-            format.xml  { head :ok }
+            flash[:notice] = "#{@node.class.name.titleize} '#{@node.title}' was successfully published."
+            if @node.parent.nil?
+              redirect_to noodall_admin_nodes_path
+            else
+              redirect_to noodall_admin_node_nodes_path(@node.parent.id)
+            end
           else
-            format.html { render :action => "show" }
-            format.xml  { render :xml => @node.errors, :status => :unprocessable_entity }
+            render :action => "show"
+          end
+        else
+          @node.attributes = params[:node]
+          @node.save_version(current_user.id)
+          flash[:notice] = "#{@node.class.name.titleize} '#{@node.title}' was successfully saved as version #{@node.version_number} (draft)."
+          if @node.parent.nil?
+            redirect_to noodall_admin_nodes_path
+          else
+            redirect_to noodall_admin_node_nodes_path(@node.parent.id)
           end
         end
       end

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

@@ -0,0 +1,13 @@
+module Noodall
+  module Admin
+    class VersionsController < BaseController
+
+      def index
+        @node = Node.find(params[:node_id])
+        @versions = @node.all_versions.order('pos DESC').paginate(:page => params[:page], :per_page => 10)
+        render :index, :layout => false
+      end
+
+    end
+  end
+end

data/app/controllers/noodall/nodes_controller.rb

@@ -12,7 +12,7 @@ module Noodall
         #Check view permissions
         enforce_view_permission(@node)
 
-        @page_title = @node.title
+        @page_title = @node.browser_title.blank? ? @node.title : @node.browser_title
         @page_description = @node.description
         @page_keywords = @node.keywords
 
@@ -24,6 +24,16 @@ module Noodall
       end
     end
 
+    def version
+      @node = Node.find!(params[:node_id])
+      version = @node.all_versions.find!(params[:id])
+      @node.rollback(version.pos)
+      @page_title = @node.browser_title.blank? ? @node.title : @node.browser_title
+      @page_description = @node.description
+      @page_keywords = @node.keywords
+      render "nodes/#{@node.class.name.underscore}"
+    end
+
     def sitemap
       if stale?(:last_modified => GlobalUpdateTime::Stamp.read, :public => true)
         @page_title = 'Sitemap'

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

@@ -19,21 +19,35 @@
 <% end %>
 
 </ul>
-<%= will_paginate(@nodes, :previous_label => 'Previous', :next_label => 'Next') %>
+
 <div id="content-table">
+  
+  <div id="form-filter">
+    <%= form_tag '', :method => :get, :id => 'filter' do %>
+      <%= label_tag :f, 'Filter by Title' %>
+      <%= text_field_tag :f %>
+      <%= submit_tag "Filter" %>
+    <% end %>
+
+    <% if params[:f] %>
+      <%= link_to "reset", url_for(:only_path => false, :f => nil), :class => 'button' %>
+    <% end %>
+  </div>
+  
+  <%= will_paginate(@nodes) %>
  <table border="0" cellspacing="0" cellpadding="0" class="content">
   <thead>
     <tr>
       <%= sortable_table_header :name => "Title", :sort => "admin_title", :class => 'sort' %>
       <%= sortable_table_header :name => "Type", :sort => "_type", :class => 'sort' %>
-      
+
       <%# Change 'position' header if we are sorting by position %>
       <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
         <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort' %>
       <% else %>
         <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort', :colspan => 2 %>
       <% end %>
-      
+
       <th width="120">Sub Section</th>
       <%= sortable_table_header :name => "Updated", :sort => "updated_at", :class => 'sort' %>
       <th width="45">Show</th>
@@ -43,20 +57,20 @@
   </thead>
   <tbody>
 <% @nodes.each do |node| %>
-    <tr id="node-<%= node.id %>" class="<%=cycle('odd', 'even')%>">
-      <td class="edit"><%= link_to h(node.admin_title), noodall_admin_node_path(node), :class => 'edit', :title => "Edit #{node.title}" %></td>
+    <tr id="node-<%= node.id %>" class="node <%=cycle('odd', 'even')%>">
+      <td class="edit"><%= link_to "#{ node.admin_title } #{ '(draft)' if node.has_draft? }", noodall_admin_node_path(node), :class => 'edit', :title => "Edit #{node.title}" %></td>
       <td><%= node.class.name.titleize %></td>
-      
+
       <%# Change 'position' content if we are sorting by position %>
       <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
         <td width="55"><%= node.position %></td>
       <% else %>
-        
+
         <td width="25"><%= link_to 'up', move_up_noodall_admin_node_path(node), { :class => "page_up", :title => 'Move this content higher in the navigation' } unless node.first? %></td>
         <td width="30" class="down"><%= link_to 'down', move_down_noodall_admin_node_path(node), { :class => 'page_down', :title => 'Move this content lower in the navigation' } unless node.last? %></td>
       <% end %>
-      
-      
+
+
       <td class="child">
 <% unless node.class.template_classes.blank? -%>
         <%= link_to pluralize(node.children.size, "Child"), noodall_admin_node_nodes_path(node), :title => "View content under #{h(node.title)}", :class => 'child-no' %>
@@ -65,7 +79,7 @@
       </td>
       <td class="date" title="by <%= node.updater.full_name if node.updater %>"><%=h node.updated_at.to_formatted_s(:short_ordinal) %></td>
       <td class=""><%= link_to 'Show', node_path(node), :class => 'show', :title => 'View this content' if node.published? %></td>
-      <td class="date" title="<%= node.published? ? 'Published ':'Draft' %><%= node.published_at.to_formatted_s(:short_ordinal) unless node.published_at.nil? %><%= " - #{node.published_to.to_formatted_s(:short_ordinal)}" unless node.published_to.nil? %>"><%= (node.published? ? '<span class="check">Published</span>' : '<span class="draft">Draft</span>').html_safe %></td>
+      <td class="date" title="<%= node.published? ? 'Published ':'Hidden' %><%= node.published_at.to_formatted_s(:short_ordinal) unless node.published_at.nil? %><%= " - #{node.published_to.to_formatted_s(:short_ordinal)}" unless node.published_to.nil? %>"><%= (node.published? ? '<span class="check">Published</span>' : '<span class="hidden">Hidden</span>').html_safe %></td>
       <td><%= link_to 'Delete', noodall_admin_node_path(node), :confirm => 'Are you sure?', :method => :delete, :class => 'delete', :title => 'Delete this content' unless node.in_site_map? %></td>
     </tr>
 <% end %>
@@ -74,14 +88,14 @@
     <tr>
       <%= sortable_table_header :name => "Title", :sort => "admin_title", :class => 'sort' %>
       <%= sortable_table_header :name => "Type", :sort => "_type", :class => 'sort' %>
-      
+
       <%# Change 'position' header if we are sorting by position %>
       <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
         <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort' %>
       <% else %>
         <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort', :colspan => 2 %>
       <% end %>
-      
+
       <th width="120">Sub Section</th>
       <%= sortable_table_header :name => "Updated", :sort => "updated_at", :class => 'sort' %>
       <th width="45">Show</th>
@@ -90,5 +104,6 @@
     </tr>
   </tfoot>
 </table>
-</div>
 <%= will_paginate(@nodes, :previous_label => 'Previous', :next_label => 'Next') %>
+
+</div>

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

@@ -39,7 +39,9 @@
   <div class="fixed-form">
     <div id="buttons">
       <%= f.submit 'Publish', :class => 'publish', :name => 'node[publish]' if can_publish?(@node) %>
-      <%= f.submit 'Draft', :name => 'node[hide]', :class => 'draft' %>
+      <%= f.submit 'Draft', :name => "draft", :class => 'draft' %>
+      <%= link_to 'Versions', noodall_admin_node_versions_path(@node), :id => "versions-button" %>
+      <%= f.submit 'Hide', :name => 'node[hide]', :id => 'hide' %>
       <%= link_to 'Cancel', @node.root? ? noodall_admin_nodes_path : noodall_admin_node_nodes_path(@node.parent), :class => 'cancel'  %>
     </div>
 
@@ -49,7 +51,7 @@
         <fieldset>
           <legend class="advanced">Advanced</legend>
           <div id="advanced">
-           
+
              <div class="published-section">
                   <p class="published">
                      <%= f.label :published_at, "Publish at" %><br/>
@@ -103,27 +105,36 @@
                    </div>
                  <% end -%>
 
-             
-             
-             
-             <div class="position-section">
-                <% unless @node.in_site_map? %>
-                   <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>
-                     </span>
-                     <%= f.hidden_field :parent, :value => @node.parent_id %>
-                     <%= hidden_field_tag :parent_types, @node.class.parent_classes.join(','), :disabled => true %>
-                   </p>
-                   <p>
-                     <span class="tooltip" title="Enter a custom url or leave it as the default value shown.">&nbsp;</span>
-                     <%= f.label :permalink, 'Page Url' %><br/>
-                     <span class="input-wrap"><%= f.text_field :permalink %></span>
-                   </p>
-                 <% end %>
-            </div>
+
+
+
+        <div class="position-section">
+          <% unless @node.in_site_map? %>
+            <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>
+              </span>
+              <%= f.hidden_field :parent, :value => @node.parent_id %>
+              <%= hidden_field_tag :parent_types, @node.class.parent_classes.join(','), :disabled => true %>
+            </p>
+            
+            <!-- PAGE URL -->
+            <p>
+              <span class="tooltip" title="Enter a custom url or leave it as the default value shown."> &nbsp; </span>
+              <%= f.label :permalink, 'Page Url' %><br/>
+              <span class="input-wrap"><%= f.text_field :permalink %></span>
+            </p>
+            
+            <!-- BROWSER TITLE -->
+            <p>
+              <span class="tooltip" title="This is normally the title shown at the very top of your browser window."> &nbsp; </span>
+              <%= f.label :browser_title, 'Browser Title' %><br/>
+              <span class="input-wrap"><%= f.text_field :browser_title %></span>
+            </p>
+          <% end %>
+        </div>
       </div>
     </fieldset>
   </div>

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

@@ -0,0 +1,17 @@
+<table id="versions-list" class="content">
+  <thead>
+    <th> Version </th>
+    <th> Date </th>
+    <th colspan="2"> Actions </th>
+  </thead>
+  <tbody>
+    <% for version in @versions %>
+      <tr class="<%= "active" if version.pos == @node.version_number %>">
+        <td> Version <%= version.pos  %> </td>
+        <td> <%= l version.date %> </td>
+        <td> <%= link_to "View", noodall_version_path(@node, version) %> </td>
+        <td> <%= link_to "Use", noodall_admin_node_path(@node, :version_number => version.pos) %> </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/config/application.rb

@@ -26,6 +26,6 @@ module Noodall
     paths.config.routes 'demo/routes.rb'
     paths.config.initializers << "demo/initializers"
 
-    config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :noodall_assets, '/media'
+    config.middleware.insert 0, 'Dragonfly::Middleware', :noodall_assets
   end
 end

data/config/environments/development.rb

@@ -4,7 +4,7 @@ Noodall::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
@@ -22,9 +22,6 @@ Noodall::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-  
-  # Set up SASS for development with firebug plugin 
-  Sass::Plugin.options[:debug_info] = true
-  
+    
 end
 

data/config/environments/test.rb

@@ -33,3 +33,32 @@ Noodall::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end
+
+require 'dragonfly'
+require 'stringio'
+require 'tempfile'
+module Dragonfly 
+  class TempObject
+    private
+    def initialize_from_object!(obj)
+      case obj
+      when TempObject
+        @initialized_data = obj.initialized_data
+        @initialized_tempfile = copy_to_tempfile(obj.initialized_tempfile.path) if obj.initialized_tempfile
+        @initialized_file = obj.initialized_file
+      when String
+        @initialized_data = obj
+      when Tempfile
+        @initialized_tempfile = obj
+      when File
+        @initialized_file = obj
+        self.name = File.basename(obj.path)
+      when ::ActionDispatch::Http::UploadedFile
+        @initialized_tempfile = obj.tempfile
+      else
+        raise ArgumentError, "#{self.class.name} must be initialized with a String, a File, a Tempfile, an ActionDispatch::Http::UploadedFile or another TempObject"
+      end
+      self.name = obj.original_filename if obj.respond_to?(:original_filename)
+    end
+  end
+end

data/demo/initializers/zdragonfly.rb

@@ -0,0 +1,5 @@
+# Configuration for processing and encoding
+app = Dragonfly::App[:noodall_assets]
+app.configure_with(:imagemagick)
+app.configure_with(:rails)
+app.datastore = Dragonfly::DataStorage::MongoDataStore.new :db => MongoMapper.database

data/demo/models/page_a.rb

@@ -3,7 +3,7 @@ class PageA < Noodall::Node
   root_template!
 
   main_slots 1
-  small_slots 4
+  small_slots 20
   wide_slots 3
 
   searchable_keys :title, :body, :description, :keywords

data/features/choose_node_title.feature

@@ -0,0 +1,24 @@
+@javascript
+Feature: Preview Content
+  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
+
+  Scenario: Don't set a browser title
+    Given I am editing content
+    And I fill in "Title" with "Bacon Ipsum"
+    When I press "Publish"
+    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
+    When I fill in "Title" with "Bacon Ipsum"
+    And I follow "Advanced"
+    And I fill in "Browser Title" with "Ice Cream"
+    And I press "Publish"
+    And I follow "Show"
+    Then the title should be "Bacon Ipsum"
+    And the browser title should be "Ice Cream"