Changes in orbit_bar and js in announcements

This commit is contained in:
Christophe Vilayphiou committed 2012-02-23 15:51:33 +08:00
1 parent 48d94d5e15
commit ba4d71a026
18 files changed
+127 -51

No files matched your search

+26 -6
View File
@@ -19,7 +19,29 @@
</ul>
<ul class="nav pull-right">
<% if user_signed_in? %>
<li><%= link_to t(:logout), destroy_user_session_path, :class => 'orbit-bar-logout' %></li>
<li class="dropdown active clear">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
<img src="images/menber-pic.png" />
<span class="member-name"><%= current_user.name %></span>
</a>
<ul class="dropdown-menu account-menu">
<li>
<a href="#">
<i class="icons-wrench"></i>
Account settings
</a>
</li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + t(:logout), destroy_user_session_path %></li>
<li class="divider"></li>
<li>
<a href="#">
<i class="icons-help"></i>
Help
</a>
</li>
</ul>
</li>
<% else %>
<li class="dropdown bar-login">
<a class="brand dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
@@ -57,12 +79,10 @@
</div>
</li>
<% end %>
<li>
<form class="navbar-search pull-left" action="">
<input class="search-query span2" type="text" placeholder="Search">
</form>
</li>
</ul>
<form class="navbar-search span6" action="">
<input class="search-query span4" type="text" placeholder="Search Ruling University">
</form>
</div>
</div>
</header>
+9 -1
View File
@@ -1,5 +1,13 @@
<li><%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %></li>
<li class="active">
<%= 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>