Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

app/controllers/admin/ad_banners_controller.rb

@@ -1,7 +1,7 @@
 class Admin::AdBannersController < OrbitBackendController
-  layout "new_admin"
+
   before_filter :force_order_for_visitor,:only=>[:index]
-  #before_filter :force_order_for_user,:except => [:index]
+  before_filter :force_order_for_user,:except => [:index]
   before_filter :for_app_sub_manager,:except => [:index]
   before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview] 
   

app/controllers/admin/ad_images_controller.rb

@@ -1,7 +1,13 @@
-class Admin::AdImagesController < OrbitBackendController
-  layout 'new_admin'
-  before_filter :authenticate_user!
-  before_filter :for_app_sub_manager
+class Admin::AdImagesController < Admin::AdBannersController
+  
+  # before_filter :force_order_for_user
+  # before_filter :for_app_sub_manager
+  # before_filter :for_app_manager
+  
+  def initialize
+    super
+    @app_title = "ad_banner"
+  end
 
   def edit
     @ad_banner = AdBanner.find params[:ad_banner_id]

app/controllers/admin/dashboards_controller.rb

@@ -5,9 +5,9 @@ class Admin::DashboardsController < OrbitBackendController
 #  before_filter :is_admin?
   
   def index
-  	@module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'news_bulletin', 'page_context', 'web_link')
-  	@recent_updated = get_recently_updated('bulletin', 'news_bulletin', 'page_context', 'web_link')
-    @most_visited = get_most_visited('bulletin', 'news_bulletin', 'page_context')
+  	@module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'page_context', 'web_link')
+  	@recent_updated = get_recently_updated('bulletin', 'page_context', 'web_link')
+    @most_visited = get_most_visited('bulletin', 'page_context')
   end
 
   protected

app/controllers/admin/designs_controller.rb

@@ -52,7 +52,7 @@ class Admin::DesignsController < OrbitBackendController
     case params[:type]
     when 'layout', 'css_default', 'css_reset'
       @object = @design.send(params[:type])
-    when 'image', 'javascript', 'theme'
+    when 'javascripts', 'themes'#, 'images'
       @object = @design.send(params[:type]).find(params[:object_id])
     end
 

app/controllers/admin/infos_controller.rb

@@ -22,6 +22,7 @@ class Admin::InfosController < ApplicationController
   
   def edit
     @attribute = Info.find(params[:id])
+    @attribute_fields_upper_object = [@attribute]
     render :template => 'admin/attributes/edit'
   end
   

app/controllers/admin/links_controller.rb

@@ -1,10 +1,4 @@
-class Admin::LinksController < ApplicationController
-
-  layout "site_editor"
-  
-  before_filter :authenticate_user!
-  before_filter :find_parent_item
-  before_filter :is_admin?
+class Admin::LinksController < Admin::ItemsController
   
   def show
     @item ||= Link.find(params[:id])

app/controllers/admin/member_selects_controller.rb

@@ -0,0 +1,73 @@
+class Admin::MemberSelectsController < ApplicationController
+  
+  layout "new_admin"
+  
+  def index
+  
+    # @member_selects = OrbitApp::Module::Role.all
+    @member_selects = Role.excludes('disabled' => true)
+
+    if(!params[:show_plugin_profile].nil?)
+      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary'
+    else
+      @right_partial = "admin/users_new_interface/plugin_summary"
+    end
+  
+    @member_select_results = Role.excludes('disabled' => true)
+	@member_select_search_url = admin_member_selects_path
+	
+	
+	# @aa = User.where(:role_ids.in => [ "4f45f3b9e9d02c5db900001c"])
+  
+  end
+  
+  # def show
+  
+	# @aa = admin_member_selects_path
+	
+	
+    # respond_to do |format|
+      # format.js{ render 'member_select_search' }
+    # end
+	
+  # end
+
+  def member_select_add
+  
+    # @users = User.where(:ids.in => [params[:users].collect{|x| x[0]}])
+    @users = params[:users].collect{|key,value| User.find key }  rescue []
+  # debugger
+    respond_to do |format|
+      format.js
+    end
+  
+  end
+  
+  def member_select_search
+  
+    @pdatas = params[:member_selects]
+	
+	@users = Role.excludes('disabled' => true)
+	
+	
+	# debugger
+	
+	# User.where(:role_ids.in => [ "4f45f3b9e9d02c5db900001c"])
+	
+    # @users = User.where(:role_ids.in => [ "your role_id"])
+    # @users.where(:sub_role_ids.in => [id, id, id])
+
+  
+    # @member_select_results = Role.excludes('disabled' => true)
+    @member_select_results = User.where(:sub_role_ids.in => params[:member_selects][:sub_role])
+	
+	@member_select_search_url = admin_member_select_member_select_add_path('member_select_add')
+	
+	
+    respond_to do |format|
+      format.js
+    end
+	
+  end
+
+end

app/controllers/admin/page_parts_controller.rb

@@ -5,6 +5,8 @@ class Admin::PagePartsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :is_admin?
   before_filter :set_current_item
+
+  helper 'admin/items'
   
   def show
     @part = PagePart.find(params[:id])

app/controllers/admin/pages_controller.rb

@@ -1,11 +1,4 @@
-class Admin::PagesController < ApplicationController
-
-  layout "site_editor"
-  
-  before_filter :authenticate_user!
-  before_filter :find_parent_item
-  before_filter :is_admin?
-  before_filter :set_current_item
+class Admin::PagesController < Admin::ItemsController
   
   def show
     @item = Page.find(params[:id])
@@ -40,7 +33,7 @@ class Admin::PagesController < ApplicationController
 	
 	  @frontend_path = @item.app_frontend_url ? @item.app_frontend_url : @module_app.widgets.keys[0]
 	  
-	  if @module_app.widgets.any?{|b| b.class == Array}
+	  if @module_app && @module_app.widgets && @module_app.widgets.any?{|b| b.class == Array}
         @frontend_style =  @module_app.widgets[@frontend_path] if !@frontend_path.blank? && !@module_app.widgets.blank?
 	  end
 	  

app/controllers/admin/roles_controller.rb

@@ -1,9 +1,10 @@
 class Admin::RolesController < ApplicationController
   
-  layout "admin"
+  layout "new_admin"
   before_filter :authenticate_user!
   before_filter :is_admin?
   before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  helper Admin::AttributeValuesViewHelper
 
   def index
     @attributes = Role.all.entries
@@ -21,6 +22,7 @@ class Admin::RolesController < ApplicationController
   
   def edit
     @attribute = Role.find(params[:id])
+    @attribute_fields_upper_object = @attribute.sub_roles
     render :template => 'admin/attributes/edit'
   end
   

app/controllers/admin/users_new_interface_controller.rb

@@ -1,9 +1,13 @@
-class Admin::UsersNewInterfaceController < ApplicationController
+class Admin::UsersNewInterfaceController <  OrbitBackendController
   
   layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  # before_filter :authenticate_user!
+  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
   
+  before_filter :force_order_for_visitor,:only=>[:index,:show]
+  before_filter :force_order_for_user,:except => [:index,:show]
+  before_filter :set_attribute,:except => [:index,:show]
+
   def index
     get_tags
     get_sub_roles
@@ -102,7 +106,6 @@ class Admin::UsersNewInterfaceController < ApplicationController
   end
   
   def update
-    binding.pry
     @user = User.find(params[:id])
     
     @user.update_attributes(params[:user])