Added the logo

This commit is contained in:
Will Bradley 2013-01-26 02:40:30 -07:00
parent 1865123201
commit 37106f65e0
5 changed files with 11 additions and 3 deletions

BIN
app/assets/images/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -47,6 +47,11 @@ div {
margin-right: 1em; margin-right: 1em;
} }
#logo {
height: 2.0em;
width: 2.0em;
}
#notice { #notice {
color: green; color: green;
} }

View File

@ -1,7 +1,7 @@
<h1>Welcome to the HeatSync Labs Members App.</h1> <h1>Welcome to the HeatSync Labs Members App.</h1>
<% if !user_signed_in? then %> <% if !user_signed_in? then %>
<p>You can sign up to become a member here, but you'll need to visit the lab to get full access.</p> <p>You can sign up to become a member here!</p>
<% end %> <% end %>
<% if user_signed_in? && current_user.member.to_i < current_user.member_level.to_i then %> <% if user_signed_in? && current_user.member.to_i < current_user.member_level.to_i then %>
@ -17,4 +17,6 @@
<dd><%= @num_door_opens %> (<%= @recent_door_opens %> in the last 7 days)</dd> <dd><%= @num_door_opens %> (<%= @recent_door_opens %> in the last 7 days)</dd>
<dt># of Accesses Denied:</dt> <dt># of Accesses Denied:</dt>
<dd><%= @num_door_denieds %> (<%= @recent_door_denieds %> in the last 7 days)</dd> <dd><%= @num_door_denieds %> (<%= @recent_door_denieds %> in the last 7 days)</dd>
<dt># of Accesses Denied:</dt>
<dd><%= @num_door_denieds %> (<%= @recent_door_denieds %> in the last 7 days)</dd>
</dl> </dl>

View File

@ -8,6 +8,7 @@
</head> </head>
<body> <body>
<div id="header"> <div id="header">
<a href="/" title="Home"><img src="/assets/logo.png" id="logo" /></a>
<%= link_to 'People', users_path if can? :read, User %> <%= link_to 'People', users_path if can? :read, User %>
<%= link_to 'Access Cards', cards_path if can? :manage, Card %> <%= link_to 'Access Cards', cards_path if can? :manage, Card %>
<% if can? :manage, UserCertification %> <% if can? :manage, UserCertification %>
@ -22,9 +23,9 @@
<%= link_to 'Login', new_user_session_path unless user_signed_in? %> <%= link_to 'Login', new_user_session_path unless user_signed_in? %>
<%= link_to 'Become a Member', new_user_registration_path unless user_signed_in? %> <%= link_to 'Become a Member', new_user_registration_path unless user_signed_in? %>
</div> </div>
<p class="notice"><%= raw(notice) %></p>
<p class="alert"><%= raw(alert) %></p>
<div id="content"> <div id="content">
<p class="notice"><%= raw(notice) %></p>
<p class="alert"><%= raw(alert) %></p>
<%= yield %> <%= yield %>
</div> </div>
</body> </body>