Skip to content

Commit 71a7d83

Browse files
tomas-goncalvesNoRePercussions
authored andcommitted
Feat: Change navbar link to point to active-only members
1 parent fb166df commit 71a7d83

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

app/views/layouts/application.html.erb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
<body>
2323
<div id="loader"><%= image_tag "loader.gif" %></div>
24-
24+
2525
<div class="header">
2626
<% if Rails.env.development? %>
2727
<div style="float: left; font-size: 20pt; background-color: black; color: red;">DEVELOPMENT <br />ENVIRONMENT</div>
2828
<% end %>
29-
29+
3030
<%= link_to image_tag("header.png"), root_url %>
3131
</div>
32-
32+
3333
<% if kiosk_signed_in? %>
3434
<div class="loggedin loggedin-expanded">
3535
<b>KIOSK MODE</b><br/>
@@ -88,15 +88,15 @@
8888
<%= conditional_link_to "Reference", reference_events_url, :index, Event %>
8989
<%= conditional_link_to "Email (#{Email.where(unread: true).count})", emails_url, :read, Email %>
9090
<%= conditional_link_to "Finance", invoices_url, :read, :finance %>
91-
<%= conditional_link_to "Members", members_url, :index, Member %>
91+
<%= conditional_link_to "Members", members_url(active_only: 1), :index, Member %>
9292
<%= conditional_link_to "Timecards", timecard_entries_url, :read, TimecardEntry %>
9393
<%= conditional_link_to "Weather", weather_index_url, :index, WeatherController %>
9494
<%= link_to "Radio Checkout", 'https://bit.ly/techradios', target: :_blank if can? :read, Event %>
95-
95+
9696
<% if member_signed_in? or kiosk_signed_in? %>
9797
<%= link_to "Miscellaneous", "#", class: "toggle-div", data: {div: "misc-menu"} %>
9898

99-
<% if show_admin_link %>
99+
<% if show_admin_link %>
100100
<%= link_to "Tracker Admin", "#", class: "toggle-div", data: {div: "submenu"} %>
101101
<% end %>
102102
<% end %>
@@ -107,7 +107,7 @@
107107
<%= conditional_link_to "Organizations", organizations_url, :read, Organization %>
108108
<%= conditional_link_to "Attachments", attachments_url, :read, Attachment %>
109109
</div>
110-
110+
111111
<% if show_admin_link %>
112112
<div id="submenu" style="display: none;" class="main-nav">
113113
<%= conditional_link_to "Locations", locations_url, :read, Location %>
@@ -125,7 +125,7 @@
125125
<% if flash[:notice] %><div class="notice"><%= flash[:notice] %></div><% end %>
126126
<% if flash[:alert] %><div class="alert"><%= flash[:alert] %></div><% end %>
127127
<% if flash[:error] %> <div class="error"> <%= flash[:error] %> </div><% end %>
128-
128+
129129
<% if content_for?(:body) %>
130130
<%= yield :body %>
131131
<% else %>

0 commit comments

Comments
 (0)