noodall-ui 0.5.0.pre.1 → 0.5.0.pre.2

data/app/assets/javascripts/admin/application.js

@@ -42,6 +42,18 @@ function setup_tooltips() {
   }
 }
 
+function set_up_tags() {
+  $('span.tags a').click(function() {
+    target = $($(this).attr('href'));
+    if (target.val()) {
+      target.val(target.val() + ', ' + $(this).text());
+    } else {
+      target.val($(this).text());
+    }
+    return false;
+  });
+}
+
 $(document).ready(function() {
 
   //video previews
@@ -130,7 +142,7 @@ $(document).ready(function() {
 
 
 
-
+  set_up_tags();
 
 
   $('body#assets.index .file').click(function() {

data/app/assets/stylesheets/admin/layout.css

@@ -812,6 +812,16 @@ li.multi-file .file-detail img {clear:both;float:left;}
   margin: 0;
 }
 
+/* -------------- Popular Tags -------------- */
+span.tags {
+  font-size: 15px;
+  padding: 10px 0;
+  display: block;
+  line-height: 1.5;
+}
+
+
+
 /* -------------- CLEARFIX -------------- */
 
 #header:after,

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

@@ -57,6 +57,12 @@ module Noodall
         end
       end
 
+      def popular_tags(limit = 10)
+        Noodall::Node.tag_cloud(:limit => limit).map do |tagging|
+          link_to tagging.name, '#node_keywords', :class => "count#{tagging.count}"
+        end.join(', ').html_safe
+      end
+
       def admin_nodes_column_headings
         html = Array.new
         html << sortable_table_header(:name => "Name", :sort => "admin_title", :class => 'sort')

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

@@ -1,4 +1,4 @@
-<% content_for :header, javascript_include_tag( 'tiny_mce/jquery.tinymce.js', 'admin/tiny_mce_config', 'admin/nodes', 'admin/assets' ) %>
+<% content_for :header, javascript_include_tag( 'tiny_mce/jquery.tinymce', 'admin/tiny_mce_config', 'admin/nodes', 'admin/assets' ) %>
 
 
 <h1>Editing Content</h1>
@@ -31,7 +31,10 @@
     <p>
       <span class="tooltip" title="Enter a comma seperated list of keywords to describe this content.&quot;website,launch,event&quot;">&nbsp;</span>
       <%= f.label :keywords, "Keywords" %><br/>
-      <span class="input-wrap"><%= f.text_field :keywords, :class => "keywords-completer" %></span>
+      <span class="input-wrap">
+        <%= f.text_field :keywords, :class => "keywords-completer" %><br/>
+        <span class="tags"><strong>Popular Tags: </strong><%= popular_tags %></span>
+      </span>
     </p>
 
   </div>
@@ -66,14 +69,14 @@
                    %>
                  <span class="input-wrap"><%= f.datetime_select :published_to, :include_blank => true %></span>
                </p>
-               
+
                <div class="version_message_section advanced-block">
                  <p>
                    <%= f.label :version_message %><br />
                    <span class="input-wrap"><%= f.text_field :version_message -%></span>
                  </p>
                </div>
-               
+
             </div>
 
                 <% if current_user.admin? -%>

data/features/popular_tags.feature

@@ -0,0 +1,17 @@
+@javascript
+Feature: Show popular tags
+  In order that I don't reuse tags as can see what other tags are
+  As a website editor
+  I want to see popular tags next to the tag input box
+
+  Scenario: Popular tags selector
+    Given the following page as exists:
+      | Title | Tag list                |
+      | One   | stuff, things, what, eh |
+      | Two   | stuff, things, what     |
+      | One   | stuff, things           |
+      | One   | stuff                   |
+    And I am editing content
+    Then I should see the tags list
+    When I follow "stuff" within the tag list
+    Then the "Keywords" field should contain "stuff"

data/features/step_definitions/tags_steps.rb

@@ -0,0 +1,9 @@
+Then /^I should see the tags list$/ do
+  page.should have_content('stuff, things, what, eh')
+end
+
+When /^I follow "([^"]*)" within the tag list$/ do |tag|
+  within 'span.tags' do
+    click_link tag
+  end
+end

data/features/support/mm_factory_steps.rb

@@ -1,5 +1,6 @@
 require 'factory_girl_rails'
 require 'faker'
+require 'factory_girl/step_definitions'
 
 FactoryGirl.factories.each do |factory|
   factory.human_names.each do |human_name|

data/lib/noodall/ui/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-ui
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.1
+  version: 0.5.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noodall-core
-  requirement: &19504440 !ruby/object:Gem::Requirement
+  requirement: &18391560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *19504440
+  version_requirements: *18391560
 - !ruby/object:Gem::Dependency
   name: thoughtbot-sortable_table
-  requirement: &19503960 !ruby/object:Gem::Requirement
+  requirement: &18391100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *19503960
+  version_requirements: *18391100
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &19503480 !ruby/object:Gem::Requirement
+  requirement: &18390600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19503480
+  version_requirements: *18390600
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &19503000 !ruby/object:Gem::Requirement
+  requirement: &18390120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19503000
+  version_requirements: *18390120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19502520 !ruby/object:Gem::Requirement
+  requirement: &18389660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19502520
+  version_requirements: *18389660
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email:
 - steve@wearebeef.co.uk
@@ -234,6 +234,7 @@ files:
 - features/manage_assets.feature
 - features/manage_content_tree.feature
 - features/node_filtering.feature
+- features/popular_tags.feature
 - features/preview.feature
 - features/promo_component.feature
 - features/publish_content.feature
@@ -256,6 +257,7 @@ files:
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sign_in_steps.rb
 - features/step_definitions/sorting_steps.rb
+- features/step_definitions/tags_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/cucumber.css
 - features/support/env.rb
@@ -666,7 +668,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4317634813251499206
+      hash: 600226257778950845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: