Skip to content

Commit bd4cc7e

Browse files
committed
Update style on CMS example. Add Logout button, fixes alerts.
1 parent afbcf55 commit bd4cc7e

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

app/views/layouts/application.html.erb

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</head>
99
<body>
1010
<nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse">
11-
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarColor03" aria-controls="navbarColor03" aria-expanded="false" aria-label="Toggle navigation">
11+
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarColor03"
12+
aria-controls="navbarColor03" aria-expanded="false" aria-label="Toggle navigation">
1213
<span class="navbar-toggler-icon"></span>
1314
</button>
1415
<a class="navbar-brand" href="/">Rails TDD Examples</a>
@@ -18,7 +19,13 @@
1819
<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
1920
</li>
2021
<li class="nav-item">
21-
<%= link_to('New Achievement', new_achievement_path, :class => 'nav-link') %>
22+
<%= link_to('New Achievement', new_achievement_path, :class => 'nav-link') %>
23+
</li>
24+
</ul>
25+
26+
<ul class="nav navbar-nav navbar-right">
27+
<li class="nav-item">
28+
<%= link_to('Logout', destroy_user_session_path, :method => 'delete', :class => 'nav-link') %>
2229
</li>
2330
</ul>
2431
</div>
@@ -30,13 +37,15 @@
3037
<div class="notice">
3138
<p class="alert alert-success"> <%= flash[:notice] %> </p>
3239
</div>
33-
<% elsif flash[:error].present? %>
40+
<% end %>
41+
42+
<% if flash[:alert].present? %>
3443
<div class="error">
35-
<p class="alert alert-danger"> <%= flash[:error] %> </p>
44+
<p class="alert alert-danger"> <%= flash[:alert] %> </p>
3645
</div>
37-
<% else %>
3846
<% end %>
3947

48+
4049
<%= yield %>
4150

4251
</div>

0 commit comments

Comments
 (0)