New way to categorize contents

Victor Costa
1 parent bd4954d3
Showing 11 changed files with 134 additions and 98 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/helpers/application_helper.rb
app/helpers/categories_helper.rb
app/views/shared/_select_categories.rhtml
app/views/shared/_select_categories_top.rhtml
public/stylesheets/application.css
test/functional/cms_controller_test.rb
test/functional/environment_design_controller_test.rb
test/functional/profile_editor_controller_test.rb
@@ -99,6 +99,17 @@ class BoxOrganizerController &lt; ApplicationController
     end
   end
+  def update_categories
+    @object = params[:id] ? boxes_holder.blocks.find(params[:id]) : nil
+    if params[:category_id]
+      @current_category = Category.find(params[:category_id])
+      @categories = @current_category.children
+    else
+      @categories = environment.top_level_categories
+    end
+    render :partial => 'shared/select_categories', :locals => {:object_name => 'block', :multiple => true}, :layout => false
+  end
+
   protected :boxes_editor?
 end
@@ -208,7 +208,7 @@ class CmsController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
+      @categories = environment.top_level_categories
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
   end
@@ -59,7 +59,7 @@ class ProfileEditorController &lt; MyProfileController
       @current_category = Category.find(params[:category_id])
       @categories = @current_category.children
     else
-      @categories = environment.top_level_categories.select{|i| !i.children.empty?}
+      @categories = environment.top_level_categories
     end
     render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
   end
@@ -619,49 +619,18 @@ module ApplicationHelper
   end
   attr_reader :environment
+
   def select_categories(object_name, title=nil, title_size=4)
     return nil if environment.enabled?(:disable_categories)
     if title.nil?
       title = _('Categories')
     end
-    object = instance_variable_get("@#{object_name}")
-
-    result = content_tag 'h'+title_size.to_s(), title
-    result << javascript_tag( 'function open_close_cat( link ) {
-      var div = link.parentNode.getElementsByTagName("div")[0];
-      var end = function(){
-        if ( div.style.display == "none" ) {
-          this.link.className="button icon-button icon-down"
-        } else {
-          this.link.className="button icon-button icon-up-red"
-        }
-      }
-      Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
-    }')
-    environment.top_level_categories.select{|i| !i.children.empty?}.each do |toplevel|
-      next unless object.accept_category?(toplevel)
-      # FIXME
-      ([toplevel] + toplevel.children_for_menu).each do |cat|
-        if cat.top_level?
-          result << '<div class="categorie_box">'.html_safe
-          result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
-          result << content_tag('h5', toplevel.name)
-          result << '<div style="display:none"><ul class="categories">'.html_safe
-        else
-          checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
-          result << content_tag('li', labelled_check_box(
-                      cat.full_name_without_leading(1, " &rarr; "),
-                      "#{object_name}[category_ids][]", cat.id,
-                      object.category_ids.include?(cat.id), :id => checkbox_id,
-                      :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
-                    :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
-        end
-      end
-      result << '</ul></div></div>'.html_safe
-    end
+    @object = instance_variable_get("@#{object_name}")
+    @categories = environment.top_level_categories
-    content_tag('div', result)
+    @current_categories = environment.top_level_categories.select{|i| !i.children.empty?}
+    render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
   end
   def theme_option(opt = nil)
@@ -48,4 +48,9 @@ module CategoriesHelper
     labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
   end
+  #FIXME make this test
+  def selected_category_link(cat)
+    link_to_function(cat.full_name, nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {|page| page["selected-category-#{cat.id}"].remove}
+  end
+
 end
-<div id="category-ajax-selector">
+<% extend CategoriesHelper %>
+
+<% categories_for_selection = @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)} %>
+
 <% if !@current_category.nil? %>
-  <h3 class="box-title"><%= _('Current category:') %></h3>
+  <div class="category-helper-label"><%= _('Selected:') %></div>
   <%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
+  <%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
+  <%= button_to_remote_without_text(:back, _('Back'),
+      { :update => "select-categories",
+        :url => { :action => 'update_categories', :id => @object },
+        :loaded => visual_effect(:highlight, "select-categories")
+      },
+      :id => 'cancel-category-button') %>
   <%
     categories = [@current_category]
     categories.push(@current_category) while @current_category = @current_category.parent
@@ -13,34 +23,28 @@
       :loaded => visual_effect(:highlight, "select-categories"),
       :class => 'select-current-category-link')}.join(' &rarr; ')
   %>
-  <strong>
-  <%= button_to_function_without_text(:save, _('Save'), nil, :id => 'save-category-button') do |page|
-    page.insert_html :bottom, 'selected-categories', content_tag('li', categories.first.full_name +
+  <%= button_to_function_without_text(:add, _('Add'), nil, :id => 'save-category-button') do |page|
+    page.insert_html :bottom, 'selected-categories', content_tag('span', 
       hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
-      button_to_function_without_text(:cancel, _('Remove'), nil, :id => "remove-selected-category-#{categories.first.id}-button") {|page| page["selected-category-#{categories.first.id}"].remove}, :id => "selected-category-#{categories.first.id}")
+      selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
   end if multiple %>
-  <%= button_to_remote_without_text(:cancel, _('Cancel'),
-      { :update => "select-categories",
-        :url => { :action => 'update_categories', :id => @object },
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :id => 'cancel-category-button') %>
-  </strong>
+  <% unless categories_for_selection.empty? %>
+    <hr>
+    <div class="category-helper-label"><%= _('Click to select a subcategory') %></div>
+  <% end %>
 <% else %>
-  <h3 class="box-title"><%= _('Select a category:') %></h3>
+  <div class="category-helper-label"><%= _('Click to select a category') %></div>
 <% end %>
-<% if !@categories.empty? %>
-  <h3><%= _('Categories:') %></h3>
-  <% @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)}.each do |category| %>
-    <%= link_to_remote category.name,
-      { :update => "select-categories",
-        :url => { :action => "update_categories", :category_id => category.id, :id => @object},
-        :loaded => visual_effect(:highlight, "select-categories")
-      },
-      :class => 'select-subcategory-link',
-      :id => "select-category-#{category.id}-link"
-    %>
-  <% end %> &nbsp;
+<div class="toplevel-categories">
+<% categories_for_selection.each do |category| %>
+  <%= link_to_remote category.name,
+    { :update => "select-categories",
+      :url => { :action => "update_categories", :category_id => category.id, :id => @object},
+      :loaded => visual_effect(:highlight, "select-categories")
+    },
+    :class => 'select-subcategory-link',
+    :id => "select-category-#{category.id}-link"
+  %>
 <% end %>
 </div>
@@ -0,0 +1,28 @@
+<% categories_selected ||= nil %>
+<% title ||= nil %>
+
+<% extend CategoriesHelper %>
+
+<%= content_tag "h#{title_size}", title, :class => "box-title" %>
+
+<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
+
+<div id="category-ajax-selector">
+<div id="select-categories">
+    <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
+</div>
+
+<% unless categories_selected.nil? %>
+<hr>
+<div id="selected-categories">
+  <span class="label"><%= _('Selected categories:') %></span>
+  <% categories_selected.each do |cat| %>
+    <span id="selected-category-<%= cat.id %>">
+      <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
+      <%= selected_category_link(cat) %>
+    </span>
+  <% end %>
+</div>
+<div style="clear: both;"></div>
+<% end %>
+</div>
@@ -346,21 +346,25 @@ div.pending-tasks {
   margin-bottom: 1px;
 }
 /* * * category ajax selector * * */
-
+#category-ajax-selector .category-helper-label {
+  font-size: 8pt; color: rgb(158, 158, 158);
+  padding: 5px 0px;
+}
 #category-ajax-selector {
   border: 1px solid #AAA;
-  background: #EEE;
-  padding: 15px 0px 15px 20px;
-  margin: 30px 0px 0px 0px;
+  padding: 3px 10px 10px 10px;
+  margin: 0px 0px 0px 0px;
   position: relative;
-  font-size: 18px;
+  font-size: 10px;
 }
 #category-ajax-selector a {
-  font-size: 14px;
+  font-size: 12px;
 }
-#category-ajax-selector h3 {
-  margin: 10px 0px;
-  font-size: 14px;
+#selected-categories span {
+  float: left;
+}
+#selected-categories .label {
+  font-weight: bold;
 }
 #category-ajax-selector .box-title {
   position: absolute;
@@ -376,25 +380,28 @@ div.pending-tasks {
 .msie6 #category-ajax-selector .box-title {
   top: -29px;
 }
-#category-ajax-selector .select-subcategory-link {
+#category-ajax-selector .select-subcategory-link,
+.select-subcategory-link {
   border: 1px solid #BBB;
   padding: 1px 3px;
   margin: 0px 1px;
   text-decoration: none;
   white-space: nowrap;
   font-size: 11px;
+  line-height: 18px;
 }
-#category-ajax-selector .select-subcategory-link:hover {
+#category-ajax-selector .select-subcategory-link:hover,
+.select-subcategory-link:hover {
   background-color: black;
 }
 #category-ajax-selector .button {
-  display: block;
-  position: absolute;
   top: 4px;
   right: 2px;
 }
-#category-ajax-selector .icon-save {
+#category-ajax-selector .icon-add {
   right: 25px;
+  display: block;
+  position: absolute;
 }
 #profile-header, #profile-footer {
   clear: both;
@@ -451,24 +451,23 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'h3', :content => /max size #{UploadedFile.max_size.to_humanreadable}/
   end
-  should 'display link for selecting categories' do
-    # FIXME
-    assert true
-    #env = Environment.default
-    #top = env.categories.build(:display_in_menu => true, :name => 'Top-Level category'); top.save!
-    #c1  = env.categories.build(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id); c1.save!
-    #c2  = env.categories.build(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id); c2.save!
-    #c3  = env.categories.build(:display_in_menu => true, :name => "Test Category 3", :parent_id => top.id); c3.save!
-
-    #article = Article.new(:name => 'test')
-    #article.profile = profile
-    #article.save!
-
-    #get :edit, :profile => profile.identifier, :id => article.id
-
-    #[c1,c2,c3].each do |item|
-    #  assert_tag :tag => 'a', :attributes => { :id => "select-category-#{item.id}-link" }
-    #end
+  should 'display link for selecting top categories' do
+    env = Environment.default
+    top = env.categories.build(:display_in_menu => true, :name => 'Top-Level category'); top.save!
+    top2 = env.categories.build(:display_in_menu => true, :name => 'Top-Level category 2'); top2.save!
+    c1  = env.categories.build(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id); c1.save!
+    c2  = env.categories.build(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id); c2.save!
+    c3  = env.categories.build(:display_in_menu => true, :name => "Test Category 3", :parent_id => top.id); c3.save!
+
+    article = Article.new(:name => 'test')
+    article.profile = profile
+    article.save!
+
+    get :edit, :profile => profile.identifier, :id => article.id
+
+    [top, top2].each do |item|
+      assert_tag :tag => 'a', :attributes => { :id => "select-category-#{item.id}-link" }
+    end
   end
   should 'be able to associate articles with categories' do
@@ -366,4 +366,16 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
   end
+  should 'update categories' do
+    env = Environment.default
+    login_as(create_admin_user(env))
+    top = env.categories.create!(:display_in_menu => true, :name => 'Top-Level category')
+    c1  = env.categories.create!(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id)
+    c2  = env.categories.create!(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id)
+    get :update_categories, :category_id => top.id
+    assert_template 'shared/_select_categories'
+    assert_equal top, assigns(:current_category)
+    assert_equal [c1, c2], assigns(:categories)
+  end
+
 end
@@ -73,7 +73,8 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     get :edit, :profile => profile.identifier
     assert_response :success
     assert_template 'edit'
-    assert_tag :tag => 'input', :attributes => {:name => 'profile_data[category_ids][]', :value => cat2.id}
+    assert_tag :tag => 'input', :attributes => {:name => 'profile_data[category_ids][]'}
+    assert_tag :tag => 'a', :attributes => { :class => 'select-subcategory-link', :id => "select-category-#{cat1.id}-link" }
   end
   should 'save categorization of profile' do
@@ -236,7 +237,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     cat2 = Environment.default.categories.create!(:display_in_menu => true, :name => 'sub category', :parent => cat1)
     person = create_user('testuser').person
     get :edit, :profile => 'testuser'
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'profile_data[category_ids][]', :value => cat2.id}
+    assert_tag :tag => 'a', :attributes => { :class => 'select-subcategory-link', :id => "select-category-#{cat1.id}-link" }
   end
   should 'render edit template' do
	@@ -99,6 +99,17 @@ class BoxOrganizerController < ApplicationController		@@ -99,6 +99,17 @@ class BoxOrganizerController < ApplicationController
99	end	99	end
100	end	100	end
101		101
		102	+ def update_categories
		103	+ @object = params[:id] ? boxes_holder.blocks.find(params[:id]) : nil
		104	+ if params[:category_id]
		105	+ @current_category = Category.find(params[:category_id])
		106	+ @categories = @current_category.children
		107	+ else
		108	+ @categories = environment.top_level_categories
		109	+ end
		110	+ render :partial => 'shared/select_categories', :locals => {:object_name => 'block', :multiple => true}, :layout => false
		111	+ end
		112	+
102	protected :boxes_editor?	113	protected :boxes_editor?
103		114
104	end	115	end
	@@ -208,7 +208,7 @@ class CmsController < MyProfileController		@@ -208,7 +208,7 @@ class CmsController < MyProfileController
208	@current_category = Category.find(params[:category_id])	208	@current_category = Category.find(params[:category_id])
209	@categories = @current_category.children	209	@categories = @current_category.children
210	else	210	else
211	- @categories = environment.top_level_categories.select{\|i\| !i.children.empty?}	211	+ @categories = environment.top_level_categories
212	end	212	end
213	render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false	213	render :partial => 'shared/select_categories', :locals => {:object_name => 'article', :multiple => true}, :layout => false
214	end	214	end
	@@ -59,7 +59,7 @@ class ProfileEditorController < MyProfileController		@@ -59,7 +59,7 @@ class ProfileEditorController < MyProfileController
59	@current_category = Category.find(params[:category_id])	59	@current_category = Category.find(params[:category_id])
60	@categories = @current_category.children	60	@categories = @current_category.children
61	else	61	else
62	- @categories = environment.top_level_categories.select{\|i\| !i.children.empty?}	62	+ @categories = environment.top_level_categories
63	end	63	end
64	render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false	64	render :partial => 'shared/select_categories', :locals => {:object_name => 'profile_data', :multiple => true}, :layout => false
65	end	65	end
	@@ -619,49 +619,18 @@ module ApplicationHelper		@@ -619,49 +619,18 @@ module ApplicationHelper
619	end	619	end
620		620
621	attr_reader :environment	621	attr_reader :environment
		622	+
622	def select_categories(object_name, title=nil, title_size=4)	623	def select_categories(object_name, title=nil, title_size=4)
623	return nil if environment.enabled?(:disable_categories)	624	return nil if environment.enabled?(:disable_categories)
624	if title.nil?	625	if title.nil?
625	title = _('Categories')	626	title = _('Categories')
626	end	627	end
627		628
628	- object = instance_variable_get("@#{object_name}")
629	-
630	- result = content_tag 'h'+title_size.to_s(), title
631	- result << javascript_tag( 'function open_close_cat( link ) {
632	- var div = link.parentNode.getElementsByTagName("div")[0];
633	- var end = function(){
634	- if ( div.style.display == "none" ) {
635	- this.link.className="button icon-button icon-down"
636	- } else {
637	- this.link.className="button icon-button icon-up-red"
638	- }
639	- }
640	- Effect.toggle( div, "slide", { link:link, div:div, afterFinish:end } )
641	- }')
642	- environment.top_level_categories.select{\|i\| !i.children.empty?}.each do \|toplevel\|
643	- next unless object.accept_category?(toplevel)
644	- # FIXME
645	- ([toplevel] + toplevel.children_for_menu).each do \|cat\|
646	- if cat.top_level?
647	- result << '<div class="categorie_box">'.html_safe
648	- result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
649	- result << content_tag('h5', toplevel.name)
650	- result << '<div style="display:none"><ul class="categories">'.html_safe
651	- else
652	- checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+\|\//, '_')}"
653	- result << content_tag('li', labelled_check_box(
654	- cat.full_name_without_leading(1, " → "),
655	- "#{object_name}[category_ids][]", cat.id,
656	- object.category_ids.include?(cat.id), :id => checkbox_id,
657	- :onchange => 'this.parentNode.className=(this.checked?"cat_checked":"")' ),
658	- :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
659	- end
660	- end
661	- result << '</ul></div></div>'.html_safe
662	- end	629	+ @object = instance_variable_get("@#{object_name}")
		630	+ @categories = environment.top_level_categories
663		631
664	- content_tag('div', result)	632	+ @current_categories = environment.top_level_categories.select{\|i\| !i.children.empty?}
		633	+ render :partial => 'shared/select_categories_top', :locals => {:object_name => object_name, :title => title, :title_size => title_size, :multiple => true, :categories_selected => @object.categories }, :layout => false
665	end	634	end
666		635
667	def theme_option(opt = nil)	636	def theme_option(opt = nil)
	@@ -48,4 +48,9 @@ module CategoriesHelper		@@ -48,4 +48,9 @@ module CategoriesHelper
48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))	48	labelled_form_field(_('Type of category'), select_tag('type', options_for_select(TYPES, value)))
49	end	49	end
50		50
		51	+ #FIXME make this test
		52	+ def selected_category_link(cat)
		53	+ link_to_function(cat.full_name, nil, :id => "remove-selected-category-#{cat.id}-button", :class => 'select-subcategory-link') {\|page\| page["selected-category-#{cat.id}"].remove}
		54	+ end
		55	+
51	end	56	end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+<% categories_selected \|\|= nil %>
	2	+<% title \|\|= nil %>
	3	+
	4	+<% extend CategoriesHelper %>
	5	+
	6	+<%= content_tag "h#{title_size}", title, :class => "box-title" %>
	7	+
	8	+<%= hidden_field_tag "#{object_name}[category_ids][]", nil %>
	9	+
	10	+<div id="category-ajax-selector">
	11	+<div id="select-categories">
	12	+ <%= render :partial => 'shared/select_categories', :locals => {:object_name => object_name, :multiple => true, :categories_selected => categories_selected }, :layout => false %>
	13	+</div>
	14	+
	15	+<% unless categories_selected.nil? %>
	16	+<hr>
	17	+<div id="selected-categories">
	18	+ <span class="label"><%= _('Selected categories:') %></span>
	19	+ <% categories_selected.each do \|cat\| %>
	20	+ <span id="selected-category-<%= cat.id %>">
	21	+ <%= hidden_field_tag("#{object_name}[category_ids][]", cat.id) %>
	22	+ <%= selected_category_link(cat) %>
	23	+ </span>
	24	+ <% end %>
	25	+</div>
	26	+<div style="clear: both;"></div>
	27	+<% end %>
	28	+</div>
	@@ -366,4 +366,16 @@ class EnvironmentDesignControllerTest < ActionController::TestCase		@@ -366,4 +366,16 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
366	assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)	366	assert @controller.instance_variable_get('@side_block_types').include?(CustomBlock8)
367	end	367	end
368		368
		369	+ should 'update categories' do
		370	+ env = Environment.default
		371	+ login_as(create_admin_user(env))
		372	+ top = env.categories.create!(:display_in_menu => true, :name => 'Top-Level category')
		373	+ c1 = env.categories.create!(:display_in_menu => true, :name => "Test category 1", :parent_id => top.id)
		374	+ c2 = env.categories.create!(:display_in_menu => true, :name => "Test category 2", :parent_id => top.id)
		375	+ get :update_categories, :category_id => top.id
		376	+ assert_template 'shared/_select_categories'
		377	+ assert_equal top, assigns(:current_category)
		378	+ assert_equal [c1, c2], assigns(:categories)
		379	+ end
		380	+
369	end	381	end