consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into poll-shifts-search-officers

Browse Source
This commit is contained in:
BertoCQ
2017-09-11 00:07:12 +02:00
committed by GitHub
parent 3b4e80a34d 4ba232a165
commit dd02c83fa3
17 changed files with 117 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/admin/_menu.html.erb
View File

@@ -73,12 +73,15 @@
<%= link_to t('admin.menu.poll_officers'), admin_officers_path %>
</li>
<li <%# "class=active" if controller_name == "booths" %>>
<li <%= "class=active" if controller_name == "booths" &&
action_name != "available" %>>
<%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
</li>
<li <%= "class=active" if controller_name == "booths" %>>
<%= link_to t('admin.menu.poll_shifts'), admin_booths_path %>
<li <%= "class=active" if controller_name == "shifts" ||
controller_name == "booths" &&
action_name == "available" %>>
<%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
</li>
</ul>
</li>