Better styles for default layout and small improvements in the UI

(ActionItem2928)

Better styles for default layout and small improvements in the UI
(ActionItem2928)
Joenio Costa
1 parent 9a799cfa
Showing 7 changed files with 37 additions and 49 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/views/shared/_select_categories.rhtml
app/views/shared/_select_subcategories.rhtml
public/stylesheets/application.css
test/functional/environment_design_controller_test.rb
@@ -99,17 +99,6 @@ 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
@@ -221,11 +221,10 @@ class CmsController &lt; MyProfileController
   def update_categories
     @object = params[:id] ? @profile.articles.find(params[:id]) : Article.new
+    @categories = @toplevel_categories = environment.top_level_categories
     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 => 'article', :multiple => true}, :layout => false
   end
@@ -55,11 +55,10 @@ class ProfileEditorController &lt; MyProfileController
   def update_categories
     @object = profile
+    @categories = @toplevel_categories = environment.top_level_categories
     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 => 'profile_data', :multiple => true}, :layout => false
   end
 <% extend CategoriesHelper %>
-<% categories_for_selection = @categories.select{|i| !@object.respond_to?(:accept_category?) || @object.accept_category?(i)} %>
-
 <% if !@current_category.nil? %>
   <%= 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 %>
@@ -26,24 +24,11 @@
     page.insert_html :bottom, 'selected-categories', content_tag('div',
       hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
       selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
+    page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
+      :locals => {:object_name => object_name, :categories => @toplevel_categories}
   end if multiple %>
-  <% unless categories_for_selection.empty? %>
-    <hr>
-    <div class="category-helper-label"><%= _('Click to select a subcategory') %></div>
-  <% end %>
-<% else %>
-  <div class="category-helper-label"><%= _('Click to select a category') %></div>
 <% end %>
 <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 %>
+  <%= render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @categories} %>
 </div>
@@ -0,0 +1,16 @@
+<% if !categories.nil? && !categories.empty? && !@object.nil? %>
+  <hr>
+  <div class="category-helper-label"><%= _('Click to select a category') %></div>
+
+  <% categories.select{|i| @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 %>
+<% end %>
@@ -355,7 +355,8 @@ div.pending-tasks {
 }
 /* * * category ajax selector * * */
 #category-ajax-selector .category-helper-label {
-  font-size: 8pt; color: rgb(158, 158, 158);
+  font-size: 16px;
+  color: rgb(158, 158, 158);
   padding: 5px 0px;
 }
 #category-ajax-selector {
@@ -364,6 +365,7 @@ div.pending-tasks {
   margin: 0px 0px 0px 0px;
   position: relative;
   font-size: 10px;
+  background-color: #fcfcf9;
 }
 #category-ajax-selector a {
   font-size: 12px;
@@ -372,8 +374,9 @@ div.pending-tasks {
   padding-bottom: 5px;
 }
 #selected-categories .label {
-  font-weight: bold;
+  font-size: 16px;
   margin-bottom: 10px;
+  margin-top: 5px;
 }
 .selected-category {
   padding: 2px 0;
@@ -399,8 +402,12 @@ div.pending-tasks {
   margin: 0px 1px;
   text-decoration: none;
   white-space: nowrap;
-  font-size: 11px;
-  line-height: 18px;
+  font-size: 12px;
+  line-height: 20px;
+  border-radius: 3px;
+}
+#category-ajax-selector .selected-category .select-subcategory-link {
+  border: 0;
 }
 #category-ajax-selector .select-subcategory-link:hover,
 .select-subcategory-link:hover {
@@ -410,6 +417,11 @@ div.pending-tasks {
   top: 4px;
   right: 2px;
 }
+#category-ajax-selector hr {
+  border: 0;
+  border-bottom: 1px solid #EEE;
+  margin-top: 15px;
+}
 #profile-header, #profile-footer {
   clear: both;
   max-height: 150px;
@@ -366,16 +366,4 @@ 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
	@@ -99,17 +99,6 @@ class BoxOrganizerController < ApplicationController		@@ -99,17 +99,6 @@ 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	-
113	protected :boxes_editor?	102	protected :boxes_editor?
114		103
115	end	104	end
1	<% extend CategoriesHelper %>	1	<% extend CategoriesHelper %>
2		2
3	-<% categories_for_selection = @categories.select{\|i\| !@object.respond_to?(:accept_category?) \|\| @object.accept_category?(i)} %>
4	-
5	<% if !@current_category.nil? %>	3	<% if !@current_category.nil? %>
6	<%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>	4	<%= hidden_field_tag "#{object_name}[#{object_name}_category_id]", @current_category.id unless multiple %>
7	<%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>	5	<%= hidden_field_tag "#{object_name}[category_ids][]", @current_category.id if multiple %>
	@@ -26,24 +24,11 @@		@@ -26,24 +24,11 @@
26	page.insert_html :bottom, 'selected-categories', content_tag('div',	24	page.insert_html :bottom, 'selected-categories', content_tag('div',
27	hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +	25	hidden_field_tag("#{object_name}[category_ids][]", categories.first.id) +
28	selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")	26	selected_category_link(categories.first), :id => "selected-category-#{categories.first.id}")
		27	+ page.replace_html 'select-categories', :partial => 'shared/select_subcategories',
		28	+ :locals => {:object_name => object_name, :categories => @toplevel_categories}
29	end if multiple %>	29	end if multiple %>
30	- <% unless categories_for_selection.empty? %>
31	- <hr>
32	- <div class="category-helper-label"><%= _('Click to select a subcategory') %></div>
33	- <% end %>
34	-<% else %>
35	- <div class="category-helper-label"><%= _('Click to select a category') %></div>
36	<% end %>	30	<% end %>
37		31
38	<div class="toplevel-categories">	32	<div class="toplevel-categories">
39	-<% categories_for_selection.each do \|category\| %>
40	- <%= link_to_remote category.name,
41	- { :update => "select-categories",
42	- :url => { :action => "update_categories", :category_id => category.id, :id => @object},
43	- :loaded => visual_effect(:highlight, "select-categories")
44	- },
45	- :class => 'select-subcategory-link',
46	- :id => "select-category-#{category.id}-link"
47	- %>
48	-<% end %>	33	+ <%= render :partial => 'shared/select_subcategories', :locals => {:object_name => object_name, :categories => @categories} %>
49	</div>	34	</div>
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<% if !categories.nil? && !categories.empty? && !@object.nil? %>
	2	+ <hr>
	3	+ <div class="category-helper-label"><%= _('Click to select a category') %></div>
	4	+
	5	+ <% categories.select{\|i\| @object.accept_category?(i)}.each do \|category\| %>
	6	+
	7	+ <%= link_to_remote category.name,
	8	+ { :update => "select-categories",
	9	+ :url => { :action => "update_categories", :category_id => category.id, :id => @object},
	10	+ :loaded => visual_effect(:highlight, "select-categories")
	11	+ },
	12	+ :class => 'select-subcategory-link',
	13	+ :id => "select-category-#{category.id}-link"
	14	+ %>
	15	+ <% end %>
	16	+<% end %>
	@@ -366,16 +366,4 @@ class EnvironmentDesignControllerTest < ActionController::TestCase		@@ -366,16 +366,4 @@ 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	-
381	end	369	end