Initial changes in announcement for sorting and filtering

app/helpers/application_helper.rb

@@ -55,5 +55,33 @@ module ApplicationHelper
       render :partial => partial, :object => new_object, :locals => {:f => f}
     end
   end
+  
+  def active_for_controllers(*controller_names)
+    controller_names.include?(controller.controller_name) ? 'active' : nil
+  end
+
+  def visible_for_controllers(*controller_names)
+    controller_names.include?(controller.controller_name) ? '' : 'hide'
+  end
+  
+  def active_for_action(controller_name, action_name)
+    (controller.controller_name.eql?(controller_name) && controller.action_name.eql?(action_name)) ? 'active' : nil
+  end
+
+  def sortable(column)
+    direction = (column == params[:sort] && params[:direction] == "asc") ? "desc" : "asc"
+    {:sort => column, :direction => direction}
+  end
+
+  def add_filter(param_name, value)
+    filter = params[:filter] rescue nil
+    if filter && filter.has_key(param_name)
+      filter[param_name] << value
+    elsif filter
+      filter.merge({param_name => [value]})
+    else
+      {param_name => [value]}
+    end
+  end
 
 end

app/views/layouts/_orbit_bar.html.erb

@@ -15,7 +15,6 @@
 			</div>
 			<ul class="nav">
 				<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
-				<li><a class="orbit-bar-desktop" href="#">Desktop</a></li>
 			</ul>
 			<ul class="nav pull-right">
 				<% if user_signed_in? %>
@@ -26,6 +25,7 @@
 							<span class="member-name"><%= current_user.name %></span>
 						</a>
 						<ul class="dropdown-menu account-menu">
+							<li><a class="orbit-bar-desktop" href="#">Desktop</a></li>
 							<li>
 								<a href="#">
 									<i class="icons-wrench"></i>

app/views/layouts/_side_bar.html.erb

@@ -1,15 +1,37 @@
-<li><%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %></li>
-<li class="active">
+<%= content_tag :li, :class => active_for_controllers('purchases') do -%>
+	<%= 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') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
-	<ul class="nav nav-list">
-		<li class="active"><%= link_to t('admin.all_articles'), panel_announcement_back_end_bulletins_path %></li>
-		<li><%= link_to t('admin.add_new'), new_panel_announcement_back_end_bulletin_path %></li>
-		<li><%= link_to t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path %></li>
-		<li><%= link_to t('admin.tags'), panel_announcement_back_end_tags_path %></li>
-	</ul>
-</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-page') + t('admin.page'), admin_items_path %></li>
-<li><%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %></li>
-<li><%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %></li>
-<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %></li>
+  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys')) do -%>
+	<%= content_tag :li, link_to(t('admin.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
+	<%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
+	<%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
+	<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+	<% end -%>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('users') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), admin_pages_path %>
+  <%#= content_tag :ul, :class => "nav nav-list" do -%>
+	<%#= content_tag :li, link_to(t('admin.all_pages'), panel_page_content_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
+	<%#= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
+	<%# end -%>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('designs') do -%>
+<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers(nil) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
+<% end -%>