Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved naming.

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-26 14:52:25 +02:00
parent a2aa99e9fd
commit 62b07e2f35
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/app/controllers/navigation.js.coffee
View file

@ -6,7 +6,7 @@ class App.Navigation extends App.Controller
# rerender view # rerender view
@bind 'ui:rerender', (data) => @bind 'ui:rerender', (data) =>
@renderMenu() @renderMenu()
@renderPrivate() @renderPersonal()
# update selected item # update selected item
@bind 'navupdate', (data) => @bind 'navupdate', (data) =>
@ -25,7 +25,7 @@ class App.Navigation extends App.Controller
# rebuild recent viewed data # rebuild recent viewed data
@bind 'update_recent_viewed', (data) => @bind 'update_recent_viewed', (data) =>
@recent_viewed_build(data) @recent_viewed_build(data)
@renderPrivate() @renderPersonal()
# bell on / bell off # bell on / bell off
@bind 'bell', (data) => @bind 'bell', (data) =>
@ -61,7 +61,7 @@ class App.Navigation extends App.Controller
active_tab: active_tab active_tab: active_tab
) )
renderPrivate: => renderPersonal: =>
items = @getItems( navbar: @Config.get( 'NavBarRight' ) ) items = @getItems( navbar: @Config.get( 'NavBarRight' ) )
# get open tabs to repopen on rerender # get open tabs to repopen on rerender
@ -78,9 +78,9 @@ class App.Navigation extends App.Controller
active_tab[href] = true active_tab[href] = true
) )
@el.find('.navbar-items-right .navbar-private').remove() @el.find('.navbar-items-right .navbar-personal').remove()
@el.find('.navbar-items-right').append App.view('navigation/private')( @el.find('.navbar-items-right').append App.view('navigation/personal')(
items: items items: items
open_tab: open_tab open_tab: open_tab
active_tab: active_tab active_tab: active_tab
@ -133,8 +133,8 @@ class App.Navigation extends App.Controller
# renderMenu # renderMenu
@renderMenu() @renderMenu()
# renderPrivate # renderPersonal
@renderPrivate() @renderPersonal()
# set focus to search box # set focus to search box
if @searchFocus if @searchFocus

2
app/assets/javascripts/app/views/navigation/private.jst.eco → app/assets/javascripts/app/views/navigation/personal.jst.eco
View file

@ -1,6 +1,6 @@
<% for item in @items: %> <% for item in @items: %>
<% if item.child: %> <% if item.child: %>
<li class="dropdown <% if @open_tab[item.target] : %>open<% end %> navbar-private"> <li class="dropdown <% if @open_tab[item.target] : %>open<% end %> navbar-personal">
<a href="<%= item.target %>" class="dropdown-toggle" data-toggle="dropdown"><%- @T( item.name ) %> <b class="caret"></b></a> <a href="<%= item.target %>" class="dropdown-toggle" data-toggle="dropdown"><%- @T( item.name ) %> <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<% for item in item.child: %> <% for item in item.child: %>