complete visitor dashbroad

app/controllers/application_controller.rb

@@ -48,29 +48,29 @@ class ApplicationController < ActionController::Base
      redirect_to root_path
   end
   
-  # Check if the current_user is admin
+  # Check if the current_user is admin,if not redirect
   def is_admin?
     current_or_guest_user.admin? ? true : auth_failed_in_backend
   end
   
-  def is_manager?
+  # def is_manager?
-     @module_app.is_manager?(current_or_guest_user) || is_admin?
+  #    @module_app.is_manager?(current_or_guest_user) || is_admin?
-  end
+  # end
   
-  # Check if the current_user is admin
+  # # Check if the current_user is admin
-  def is_member?
+  # def is_member?
-    if (current_user rescue false)
+  #   if (current_user rescue false)
-      return true
+  #     return true
-    end
+  #   end
-    return false
+  #   return false
-  end
+  # end
   
-  def is_guest?
+  # def is_guest?
-    if session[:guest_user_id]
+  #   if session[:guest_user_id]
-      return true
+  #     return true
-    end
+  #   end
-    return false
+  #   return false
-  end
+  # end
   
   def for_admin_only
     if is_admin?

app/helpers/admin_helper.rb

@@ -18,4 +18,20 @@ module AdminHelper
   def is_admin?
     current_or_guest_user.admin?
   end
+
+  def is_member?
+    if (current_user rescue false)
+      return true
+    end
+    return false
+  end
+  
+
+  def is_guest?
+    if session[:guest_user_id]
+      return true
+    end
+    return false
+  end
+
 end

app/views/layouts/_orbit_bar.html.erb

@@ -9,9 +9,11 @@
 			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t('admin.content') %></li>
 							<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %></li>
 							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
+							<%if (is_admin? rescue false)%>
 			        <li class="divider"></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
+							<% end -%>
 			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
 			    </ul>
 			    <% else %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb

@@ -1,7 +1,7 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<%= link_to t(:top), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_top')}" %>
 	<%= link_to t(:hot), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hot')}" %>
-	<%= link_to t(:hidden), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" %>
+	<%= link_to t(:hidden), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" unless(is_guest?)%>
 	<%= link_to t(:pending), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_pending'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_pending')}"  if(is_manager?)%>
 	<%= link_to t(:passed), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_checked')}" if(is_manager?)%>
 	<%= link_to t(:rejected), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_rejected'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_rejected')}" if(is_manager?)%>

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb

@@ -1,7 +1,7 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<%= link_to t(:top), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_top')}" %>
 	<%= link_to t(:hot), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hot')}" %>
-	<%= link_to t(:hidden), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" %>
+	<%= link_to t(:hidden), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" unless(is_guest?)%>
 	<%= link_to t(:pending), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_pending'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_pending')}" if(is_manager?) %>
 	<%= link_to t(:passed), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_checked')}"  if(is_manager?)%>
 	<%= link_to t(:rejected), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_rejected'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_rejected')}"  if(is_manager?)%>