Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

app/assets/javascripts/page_edit.js

@@ -24,6 +24,10 @@ $("#module_app_list select").live('change', function() {
 	$.getScript($(this).attr('rel') + '/' + $(this).val() + '/reload_widgets');
 });
 
+$("#tag_list select").live('change', function() {
+	$.getScript($(this).attr('rel') + '/' + $(this).val() + '/reload_r_tag_options');
+});
+
 $('.part_kind').live('click', function() {
 	$('.part_kind_partial').hide();
 	$('#part_' + $(this).attr('value')).show();

app/controllers/admin/page_parts_controller.rb

@@ -25,7 +25,7 @@ class Admin::PagePartsController < ApplicationController
     @module_apps = ModuleApp.all(:conditions => {:enable_frontend => true})
     @module_app = @part.module_app ? @part.module_app : @module_apps[0]
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
-    @tag_objects = @r_tag.classify.constantize.all
+    @tag_objects = @r_tag.classify.constantize.all rescue nil
       case @module_app.key
         when 'bulletin'
           @categories =  BulletinCategory.all
@@ -77,5 +77,13 @@ class Admin::PagePartsController < ApplicationController
       format.js  {}
     end
   end
+
+  def reload_r_tag_options
+    @r_tag = (ModuleApp.find(params[:id]) rescue nil) || params[:id]
+    @tag_objects = @r_tag.classify.constantize.all rescue nil
+    respond_to do |format|
+      format.js  {}
+    end
+  end
   
 end

app/helpers/application_helper.rb

@@ -75,11 +75,12 @@ module ApplicationHelper
   end
   
   def active_for_controllers(*controller_names)
-    controller_names.include?(controller.controller_name) ? 'active' : nil
+    (controller_names.include?(controller.controller_name) || controller_names.include?(request.fullpath)) ? 'active' : nil
   end
 
   def visible_for_controllers(*controller_names)
-    controller_names.include?(controller.controller_name) ? '' : 'hide'
+    puts controller_names
+    (controller_names.include?(controller.controller_name) || controller_names.include?(request.fullpath)) ? '' : 'hide'
   end
   
   def active_for_action(controller_name, action_name)

app/models/page_part.rb

@@ -7,7 +7,7 @@ class PagePart
   field :content
   field :kind
   field :public_r_tag
-  field :public_r_tag_object_id, :type => BSON::ObjectId, :default => nil
+  field :public_r_tag_object_id, :default => nil
   field :widget_path
   
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy

app/views/admin/page_parts/_public_r_tag.html.erb

@@ -1,7 +1,11 @@
 <span id='tag_list'>
-	<%= f.select :public_r_tag, LIST[:public_r_tags].collect{|tag| [t(tag), tag]}, :selected => @r_tag %>
+	<%= f.select :public_r_tag, LIST[:public_r_tags].collect{|tag| [t(tag), tag]}, {:selected => @r_tag}, {:rel => admin_page_parts_path}  %>
 </span>
 
 <span id='name_list'>
-	<%= f.select :public_r_tag_object_id, options_from_collection_for_select(@tag_objects, :id, :title, :selected => @part.public_r_tag_object_id) %>
+	<% if @r_tag.eql?('sub_menu') %>
+		<%= f.select :public_r_tag_object_id, options_for_select([t(:horizontal), t(:vertical)], t(:horizontal)) %>
+	<% else %>
+		<%= f.select :public_r_tag_object_id, options_from_collection_for_select(@tag_objects, :id, :title, :selected => @part.public_r_tag_object_id) %>
+	<% end %>
 </span>

app/views/admin/page_parts/reload_r_tag_options.js.erb

@@ -0,0 +1,5 @@
+<% if @r_tag.eql?('sub_menu') %>
+	$('#name_list select').html("<%= j options_for_select(t(:horizontal) => :horizontal, t(:vertical) => :vertical) %>")
+<% else %>
+	$('#name_list select').html("<%= j options_from_collection_for_select(@tag_objects, :id, :title) %>")
+<% end %>

app/views/layouts/_side_bar.html.erb

@@ -2,13 +2,13 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks') do -%>
+<%= content_tag :li, :class => active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'fact_checks') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks')) do -%>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'fact_checks')) do -%>
 		<%= content_tag :li, link_to(t('announcement.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('panel/bulletin/back_end/tags', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('fact_checks', 'setting')  if (is_manager? rescue nil) %>
 	<% end -%>
 
@@ -38,13 +38,13 @@
 	<% end %>
 <% end %>
 
-<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%>
+<%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
 		<%= content_tag :li, link_to(t('admin.announcement.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
 		<%= content_tag :li, link_to(t('admin.announcement.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
 		<%= content_tag :li, link_to(t('admin.announcement.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('panel/web_resource/back_end/tags', 'index') %>
+		<%= content_tag :li, link_to(t('admin.announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %>
 	<% end -%>
 <% end -%>