Skip to content

Commit

Permalink
Added badge button for moderate to top menu
Browse files Browse the repository at this point in the history
  • Loading branch information
brzaik committed Jul 8, 2012
1 parent baf3544 commit fd2265c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
15 changes: 13 additions & 2 deletions app/assets/stylesheets/application/layout/topmenu.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nav#TM {
color: #666;
text-shadow: 0 1px #eee;
margin: 0px 2px;
padding: 4px 10px;
padding: 4px 7px;
font-size: 11px;
border: solid 1px #999;
float: left;
Expand All @@ -32,7 +32,12 @@ nav#TM {
background: transparent image-url('layout/TM/button_TM_states.png') top left repeat-x;
text-shadow: 0 1px #eee;
background-position: 100% -31px;
border: solid 1px #2f84da;
border: solid 1px #2f84da;

.badge {
background-color: $concerto-blue-1;
color: $white;
}
}

&:active {
Expand Down Expand Up @@ -64,6 +69,12 @@ nav#TM {
}

}

.badge {
background-color: #666;
color: $grayLight;
text-shadow: 0 0 0;
}

a#TM-logobutton {
@include vertical-gradient($concerto-blue-1, $concerto-blue-2);
Expand Down
7 changes: 3 additions & 4 deletions app/views/elements/_topmenu_contents.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
<div class="TM-sectop">
<%= link_to t(:browse), feeds_path, :class => "btn #{ current_page?(feeds_path) || (controller.controller_name == 'submissions' && ['index', 'show'].include?(controller.action_name)) ? 'selected' : '' }" %>
<%= link_to t(:add), new_content_path, :class => "btn #{ current_page?(new_content_path) ? 'selected' : '' }" if can? :create, Content %>
<%= link_to '#', :class => "btn" do %>
<%= t(:moderate) %>&nbsp;<span class="badge">0</span>
<% end %>
</div>
<div class="TM-secbot">
<h1><%= t(:content) %></h1>
Expand All @@ -59,11 +62,7 @@
<section>
<div class="TM-sectop">
<%= link_to t(:screens), screens_path, :class => "btn #{ controller.controller_name == 'screens' ? 'selected' : '' }" %>
<%#= link_to t(:templates), templates_path, :class => "btn #{ controller.controller_name == 'templates' ? 'selected' : '' }" %>
<%= link_to t(:users_and_groups), groups_path, :class => "btn #{ controller.controller_name == 'groups' ? 'selected' : '' }" %>
<%# if can? :list, User %>
<%#= link_to t(:accounts), users_path, :class => "btn #{ controller.controller_name == 'users' ? 'selected' : '' }" %>
<%# end %>
</div>
<div class="TM-secbot">
<h1><%= t(:network) %></h1>
Expand Down

0 comments on commit fd2265c

Please sign in to comment.