noodall-ui 0.3.20 → 0.4.0

data/features/node_filtering.feature

@@ -0,0 +1,20 @@
+Feature: Filter Branch
+  In order to easily find content in branches with lots of content
+  a website editor
+  will be able to filter by title key word
+
+  Scenario: Filter Branch
+    Given a content branch has the follow nodes
+      | title           |
+      | home            |
+      | home and away   |
+      | neighbours      |
+      | australia       |
+      | home sweet home |
+    And I go to that page in the CMS
+    And I fill in "Filter by Title" with "Home"
+    And press "Filter"
+    Then I should see 3 nodes
+    And I fill in "Filter by Title" with "australia"
+    And press "Filter"    
+    Then I should see 1 node

data/features/publish_content.feature

@@ -5,7 +5,7 @@ In order to control when content is available on the website a website administr
     Given content exists
     When I publish the content
     Then the content should be visible on the website
-    When I save content as draft
+    When I hide the content
     Then the content should not be visible on the website
 
   Scenario: Publish content for set period

data/features/save_draft.feature

@@ -0,0 +1,34 @@
+Feature: Work with drafts
+  In order on a new new version of content without publishing
+  A website editor
+  Will be able to save a draft
+
+  Scenario: Save a draft
+    Given I am editing content
+    And I make some changes
+    And I press "Draft"
+    Then I should see "was successfully saved as version 1 (draft)"
+    And the live page should be at version 0
+    When I go to edit the content again
+    Then I should see "You are editing a draft version of this page"
+    And the form should contain version 1
+
+    Given I go to edit the content again
+    And I press "Publish"
+    Then I should see "was successfully published"
+    Then the live page should be at version 2
+
+    Given I go to edit the content again
+    And I follow "Versions"
+    Then I should see a list of previous versions
+    When I follow "Use" within version 1
+    Then the form should contain version 1
+    When I press "Publish"
+    Then the live page should be at version 1
+
+  Scenario: View a version
+    Given content exists with several versions
+    When I go to edit the content again
+    And I follow "Versions"
+    And I follow "View" within version 1
+    Then I should see version 1 of the content

data/features/step_definitions/choose_node_title_steps.rb

@@ -0,0 +1,7 @@
+Then /^the title should be "([^"]*)"$/ do |text|
+  find(:xpath, "//h1[contains(text(),'#{text}')]").should_not(be_nil, "Could not find the text '#{text}' within the h1 tag")
+end
+
+Then /^the browser title should be "([^"]*)"$/ do |text|
+find(:xpath, "//title[contains(text(),'#{text}')]").should_not(be_nil, "Could not find the text '#{text}' within the title tag")
+end

data/features/step_definitions/cms_node_steps.rb

@@ -81,7 +81,7 @@ Then /^I should be able to move a child content to another parent$/ do
   click_link "Advanced"
   within(:css, '#parent-title' ) { click_link "Edit" }
   within(:css, 'ol.tree' ) { click_link @_new_parent.title }
-  click_button 'Draft'
+  click_button 'Publish'
 end
 
 Then /^I should see the child listed within the other parent’s children$/ do

data/features/step_definitions/content_steps.rb

@@ -185,3 +185,11 @@ Then /^I should see the course information box$/ do
     course_info.should contain('AB1234')
   end
 end
+
+
+Given /^a content branch has the follow nodes$/ do |table|
+  @_content = Factory(:page_a, :title => 'Top Page', :publish => true)
+  table.hashes.each do |row|
+    @_subcontent = Factory(:page_a, :title => row['title'], :parent => @_content, :publish => true)
+  end
+end

data/features/step_definitions/draft_steps.rb

@@ -0,0 +1,39 @@
+Given /^I make some changes$/ do
+  fill_in 'Title', :with => 'A new version'
+end
+
+Then /^the live page should be at version (\d+)$/ do |version|
+  @_content = Noodall::Node.find(@_content.id) # Reload the model to remove memoized versions (reload does not do this)
+  visit node_path(@_content)
+  version = @_content.version_at(version.to_i)
+  page.should have_content(version.content(:title))
+end
+
+Then /^the form should contain version (\d+)$/ do |version|
+  @_content = Noodall::Node.find(@_content.id) # Reload the model to remove memoized versions (reload does not do this)
+  version = @_content.version_at(version.to_i)
+  Then %{the "Title" field should contain "#{version.content(:title)}"}
+end
+
+Then /^I should see a list of previous versions$/ do
+  page.should have_css("table#versions-list tr", :count => @_content.all_versions.count)
+end
+
+When /^I follow "([^"]*)" within version (\d+)$/ do |link_name, version_number|
+  within "tr:contains('Version #{version_number}')" do
+    click_link link_name
+  end
+end
+
+Given /^content exists with several versions$/ do
+  @_content = Factory(:page_a)
+  3.times do |i|
+    @_content.title = "Title #{i}"
+    @_content.save
+  end
+end
+
+Then /^I should see version (\d+) of the content$/ do |version|
+  version = @_content.version_at(version.to_i)
+  page.should have_content(version.content(:title))
+end

data/features/step_definitions/node_steps.rb

@@ -30,6 +30,9 @@ Then /^I should see a page of xml$/ do
 end
 
 When /^I view the page "([^"]*)" as "([^"]*)"$/ do |title, format|
-  visit node_path(Noodall::Node.find_by_title(title), format)
+  visit node_path(Noodall::Node.find_by_title(title), :format => format)
 end
 
+Then /^I should see (\d+) nodes?$/ do |count|
+  page.should have_selector "tr.node", :count => count.to_i
+end

data/features/step_definitions/pubish_content_steps.rb

@@ -7,9 +7,9 @@ When /^I publish the content$/ do
   click_button('Publish')
 end
 
-When /^I save content as draft$/ do
+When /^I hide the content$/ do
   visit noodall_admin_node_path(@_content)
-  click_button('Draft')
+  click_button('Hide')
 end
 
 Then /^the content should (not |)be visible on the website$/ do |is_not|
@@ -27,7 +27,7 @@ Given /^I publish content between "([^\"]*)" and "([^\"]*)"$/ do |from, to|
   select_datetime(from.to_time, :from => 'Publish at')
   select_datetime(to.to_time, :from => 'Publish until')
   click_button('Publish')
-  page.should have_content('was successfully updated')
+  page.should have_content('was successfully published')
 end
 
 

data/features/step_definitions/web_steps.rb

@@ -217,3 +217,7 @@ end
 Then /^show me the page$/ do
   save_and_open_page
 end
+
+Then /^debug$/ do
+  debugger
+end

data/features/support/env.rb

@@ -16,6 +16,8 @@ Spork.prefork do
   require 'cucumber/rails/world'
   require 'cucumber/web/tableish'
   require 'cucumber/rspec/doubles'
+  
+  require 'ruby-debug'
 
   require 'capybara/rails'
   require 'capybara/cucumber'
@@ -41,7 +43,7 @@ Spork.each_run do
   # pages, more or less in the same way your application would behave in the
   # default production environment. It's not recommended to do this for all
   # of your scenarios, as this makes it hard to discover errors in your application.
-  ActionController::Base.allow_rescue = false
+  #ActionController::Base.allow_rescue = false
 
   # How to clean your database when transactions are turned off. See
   # http://github.com/bmabey/database_cleaner for more info.

data/features/support/paths.rb

@@ -9,15 +9,17 @@ module NavigationHelpers
   def path_to(page_name)
     case page_name
 
-    when /the (home\s?page|website)/i
+    when /^the (home\s?page|website)/i
       root_path
-    when /the CMS/
+    when /^the CMS/
       '/admin'
     when /^the (?:root )?content titled "([^\"]*)" page$/i
       node = Node.find_by_title($1)
       node_path(node)
     when /^the content admin page$/
       noodall_admin_nodes_path
+    when /^edit the content again$/
+      noodall_admin_node_path(@_content)
     when /^the site ?map page$/
       noodall_sitemap_path
     when /^a page that's content is in the "([^\"]*)" template$/
@@ -35,7 +37,8 @@ module NavigationHelpers
       node_path(node)
     when /^that page$/
       node_path(@_content)
-
+    when /^that page in the CMS$/
+      noodall_admin_node_nodes_path(@_content)
     when /^the article list page$/
       node_path(@_content)
     when /content titled "([^\"]*)"$/

data/lib/noodall/routes.rb

@@ -7,6 +7,7 @@ module Noodall
           namespace 'noodall/admin', :as => 'noodall_admin', :path => 'admin' do
             resources :nodes do
               resources :nodes
+              resources :versions
               member do
                 get :change_template
                 get :move_up
@@ -15,6 +16,7 @@ module Noodall
               end
               collection do
                 get :tree
+                post :filter
               end
             end
 
@@ -38,10 +40,11 @@ module Noodall
             resources :groups
           end
 
+          get "v/:node_id/:id" => "noodall/nodes#version", :as => :noodall_version
           get "search" => "noodall/nodes#search", :as => :noodall_search
           get "sitemap" => "noodall/nodes#sitemap", :as => :noodall_sitemap
           get "*permalink.:format" =>  'noodall/nodes#show'
-          get "*permalink" =>  'noodall/nodes#show', :as => :node_permalink
+          get "*permalink(.:format)" =>  'noodall/nodes#show', :as => :node_permalink
         end
       end
     end

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.3.20"
+    VERSION = "0.4.0"
   end
 end

data/noodall-ui.gemspec

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

data/public/javascripts/admin/application.js

@@ -194,6 +194,8 @@ $(document).ready(function() {
     axis: 'y',
     handle: 'img'
   });
+  
+  $('#versions-button').fancybox({'autoDimensions':false});
 
   // 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>');

data/public/stylesheets/admin/forms.css

@@ -265,6 +265,17 @@ p.remove span{
           position:absolute;
 }
 
+#content form .fixed-form a#versions-button {
+          background:url(/images/admin/versions.gif) no-repeat;
+          width:110px;
+          height:26px;
+          left:440px;
+          top:20px;
+          border: none;
+          position:absolute;
+}
+
+
 #content form .fixed-form input.draft {
           background:url(/images/admin/draft.gif) no-repeat;
           width:110px;
@@ -276,12 +287,23 @@ p.remove span{
 
 }
 
+.fixed-form input#hide {
+          background:url(/images/admin/hide.gif) no-repeat;
+          width:160px;
+          height:56px;
+          cursor:pointer;
+          border: none;
+          position:absolute;
+          top:20px;
+          right:200px;
+}
+
 .fixed-form a.cancel, .fixed-form a.delete {
           background:url(/images/admin/cancel.gif) no-repeat;
           width:160px;
           height:56px;
           cursor:pointer;
-           border:none;
+          border:none;
           position:absolute;
           top:20px;
           right:20px;
@@ -392,6 +414,14 @@ div#flash div.error {
           color:#fff;
 }
 
+div#flash div.alert {
+          background: #E19449;
+          border:3px solid #C46F1C;
+          color:#fff;
+}
+
+
+
 div#flash a {
   color:#fff;
 }
@@ -522,4 +552,4 @@ fieldset.template label {
 
 .jqTransformHidden {
           display: none;
-}
+}

data/public/stylesheets/admin/layout.css

@@ -117,21 +117,21 @@ div#content-table {
         clear:both;
 }
 
-div#content-table table.content {
+table.content {
         width:100%;
 }
 
-div#content-table table.content th,
-div#content-table table.content td {
+table.content th,
+table.content td {
         padding:9px;
         vertical-align:middle;
 }
 
-div#content-table table.content th {
+table.content th {
         padding:14px;
 }
 
-div#content-table table.content td label {
+table.content td label {
         display:none;
 }
 
@@ -302,15 +302,15 @@ form#uploader {
 /* PAGINATION */
 
 .pagination {
-        clear:both;
-        margin:10px 0;
+				float:left;
+        margin:15px 0;
         height:26px;
 }
 
 .pagination span,
 .pagination em,
 .pagination a {
-        padding:0 1px;
+        padding:0 5px;
         vertical-align: middle;
 }
 
@@ -412,7 +412,7 @@ td.child a.child-no{
 }
 
 span.check,
-span.draft {
+span.hidden {
         width:26px;
         height:26px;
         display:block;
@@ -772,7 +772,39 @@ li.multi-file .file-detail img {clear:both;float:left;}
 }
 
 
+/* -------------- Admin filtering -------------- */
+#form-filter {
+  float: right;
+  margin: 0px 0 10px 0;
+  width: 321px;
+}
+
+#form-filter form input[type="text"] {
+  float:left;
+  margin: 0 20px 0 0;
+  width: 200px;
+  background: none repeat scroll 0 0 #FFFFFF;
+  border: 1px solid #C2C2C2;
+  padding: 8px;
+}
 
+#form-filter form input[type="submit"] {
+  float:left;
+  width: 80px;
+  background: none repeat scroll 0 0 #93bf65;
+  border: 5px solid #659132;
+  padding: 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  color: #fff;
+  font-weight: bold;
+  text-transform:uppercase;
+  font-size: 10px;
+  text-shadow: 2px 2px 2px #659132;
+  filter: dropshadow(color=#659132, offx=2, offy=2);
+  margin: 0;
+}
 
 /* -------------- CLEARFIX -------------- */