Side bar for dashboard

lib/orbit_app/helper/context_link_renderer.rb

@@ -8,7 +8,7 @@ module ContextLinkRenderer
     @params = params
     @current_user = current_user
     if display?
-      content_tag :li, link_to((I18n.t(@label_i18n) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, eval(@path)), :class => (active?  ? 'active' : nil) 
+      content_tag :li, link_to(content_tag(:span, I18n.t(@label_i18n)), eval(@path)), :class => (active?  ? 'active' : nil) 
     end
   end
 

lib/orbit_app/helper/renderer.rb

@@ -9,10 +9,14 @@ module Renderer
 protected
   def active_for_app_auth?
     module_app = get_module_app
-    if module_app.nil?
-      false
+    if controller.eql?('admin/module_apps_new_interface')
+      if module_app.nil?
+        false
+      else
+        module_app.id.to_s == @params[:module_app_id] ? true : false  
+      end
     else
-      module_app.id.to_s == @params[:module_app_id] ? true : false  
+      false
     end
   end
 
@@ -28,6 +32,19 @@ protected
     end
   end
 
+  def active_for_tag?
+    module_app = get_module_app
+    if controller.eql?('admin/module_tags')
+      if module_app.nil?
+        false
+      else
+        module_app.id.to_s == @params[:module_app_id] ? true : false  
+      end
+    else
+      false
+    end
+  end
+
   def current_user
     current_or_guest_user
   end

lib/orbit_app/helper/side_bar_renderer.rb

@@ -1,21 +1,39 @@
 module SideBarRenderer
   include Renderer
   include AdminHelper
+  include ActionView::Helpers::TextHelper
 
   def render(request,params,user,current_module_app)
+    @belong_module_app = get_module_app
+    @current_module_app = current_module_app
+    @request = request
+    @params = params
+    @current_user = user
+    if display? 
+      content_tag :div, class: "sub-nav-block" do
+        concat content_tag :h4, I18n.t(@head_label)
+        concat (content_tag :ul, class: "nav nav-list" do
+          @context_links.sort_by {| obj | obj.priority}.map{ |link|
+            link.render(request, params, @current_module_app, @current_user, @belong_module_app)
+          }.join.html_safe
+        end)
+      end
+    end
+  end
+
+  def render_head(request, params, user, current_module_app)
     @belong_module_app = get_module_app
     @current_module_app = current_module_app
     @request = request
     @params = params
     @current_user = user
     if display?
-       content_tag :li, :class => (module_sidebar_active? ? 'active' : nil) do 
-        buf =  link_to( content_tag(:i, nil, :class => @icon_class ) + content_tag(:span, I18n.t( @head_label )), eval(@head_link))
-        buf  << content_tag( :ul, :class => ("nav nav-list active") )do # visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory")) 
-          @context_links.sort_by! {| obj | obj.priority}.collect do |link|
-            link.render(request,params,@current_module_app,@current_user,@belong_module_app)
-          end.join.html_safe
-        end 
+      content_tag :li, class: (module_sidebar_active? ? 'active' : nil) do
+        link_to eval(@head_link) do
+          content_tag :span do
+            content_tag(:i, nil, class: @icon_class)
+          end
+        end
       end 
     end
   end
@@ -35,7 +53,7 @@ module SideBarRenderer
   end
 
   def module_sidebar_active?
-    active_for_controller? or active_for_app_auth? or active_for_ob_auths?
+    active_for_controller? or active_for_app_auth? or active_for_ob_auths? or active_for_tag?
   end
 
   def active_for_controller?

lib/orbit_app/module/side_bar.rb

@@ -48,6 +48,7 @@ module OrbitApp
             @active_for_controllers = []
             @active_for_object_auth = []
             @active_for_app_auth = []
+            @active_for_tag = []
             @head_link = ""
             @app_base_path = ''
             @module_app_key = key
@@ -147,6 +148,7 @@ module OrbitApp
             @active_for_action = options[:active_for_action] || []
             @active_for_object_auth = options[:active_for_object_auth] || []
             @active_for_app_auth = options[:active_for_app_auth] || []
+            @active_for_tag = options[:active_for_tag] || []
             @module_app_key = options[:module_app_key]
             @get_module_app = options[:get_module_app]
           end
@@ -177,7 +179,8 @@ module OrbitApp
             for_action = @active_for_action.blank? ? false : active_for_action?
             for_app_auth = @active_for_app_auth.blank? ? false : active_for_app_auth?
             for_ob_auth = @active_for_object_auth.blank? ? false : active_for_ob_auths?
-            for_action || for_app_auth || for_ob_auth
+            for_tag = @active_for_tag.blank? ? false : active_for_tag?
+            for_action || for_app_auth || for_ob_auth || for_tag
           end
 
           def active_for_action?