developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for nccu

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-02-29 16:01:50 +08:00
1 parent 5223a7a3e9
commit 6b2aeadde6
18 files changed
+999 -956
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/layouts/_orbit_bar.html.erb
+5 -5
View File
@@ -26,10 +26,10 @@
</ul>
</li>
<% if user_signed_in? %>
<li class="dropdown active clear">
<li class="dropdown active">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
<!-- <img src="images/menber-pic.png" /> -->
<%= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
<img class="member-img" src="/assets/menber-pic.png" />
<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
<span class="member-name"><%= current_user.name %></span>
</a>
<ul class="dropdown-menu account-menu">
@@ -45,7 +45,7 @@
<%= t(:desktop) %>
</a>
</li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + t(:logout), destroy_user_session_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + ' ' + t(:logout), destroy_user_session_path %></li>
<li class="divider"></li>
<li>
@@ -95,7 +95,7 @@
<% end %>
</ul>
<form class="navbar-search span6" action="">
<input class="search-query span4" type="text" placeholder="Search NCCU">
<input class="search-query span4" type="text" placeholder="<%= t(:search_nccu) %>">
</form>
</div>
</div>
app/views/layouts/_side_bar.html.erb
+2 -2
View File
@@ -13,7 +13,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('users') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %>
<%= 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 -%>
@@ -25,7 +25,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers(nil) do -%>