alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed orbit bar lanugage and menu

This commit is contained in:
Harry Bomrah 2014-10-20 19:50:16 +08:00
parent 9c19a4a2fd
commit 051b165298
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/orbit_helper.rb
View File

@ -300,6 +300,10 @@ module OrbitHelper
else
res << "<li class='active'>#{params[:type].underscore.humanize.capitalize} #{t(:authorization_)}</li>"
end
when 'images'
id = AlbumImage.find(params[:id]).album.id.to_s rescue ""
res << "<li><a href='/admin/galleries/#{id}'>#{t('module_name.'+@module_app.key)}</a>#{divider}</li>"
res << "<li class='active'>#{t(:theater)}</li>"
when 'categories'
if @module_app.key!='category'
res << "<li>#{t('module_name.'+@module_app.key)}#{divider}</li>"

16
app/views/orbit_bar/index.html.erb
View File

@ -56,12 +56,14 @@
<i class="icons-users"></i> <%= t(:member_) %>
</a>
</li>
<li class="divider"></li>
<li>
<a href="/<%= locale.to_s %>/admin/items" tabindex="-1">
<i class="icons-cog"></i> <%= t(:settings) %>
</a>
</li>
<% if current_user.is_admin? %>
<li class="divider"></li>
<li>
<a href="/<%= locale.to_s %>/admin/items" tabindex="-1">
<i class="icons-cog"></i> <%= t(:settings) %>
</a>
</li>
<% end %>
</ul>
<% end %>
</li>
@ -104,6 +106,7 @@
</li>
<% end %>
<li>
<% if @site_in_use_locales.count > 1 %>
<% locale = session[:zh_cn] ? :zh_cn : I18n.locale %>
<span id="language"><%= t((locale==:zh_tw ? :zh_tw_ : locale.to_s)) %></span>
<ul>
@ -118,6 +121,7 @@
<% end %>
<% end %>
</ul>
<% end %>
</li>
<% if !current_user.nil? %>
<li>