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

Refactor layout flash usage and move to a partial

Browse Source
This commit is contained in:
kikito
2016-04-28 12:46:27 +02:00
parent 1d93207744
commit 8bcbe86064
5 changed files with 15 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/_flash.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<% flash.each do |flash_key, flash_message| %>
<div id="<%= flash_key %>" data-alert class="row" data-closable>
<div class="callout <%= flash_key %>">
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= flash_message %>
</div>
</div>
<% end %>

17
app/views/layouts/admin.html.erb
View File

@@ -23,23 +23,8 @@
</div> </div>
<div class="admin-content small-12 medium-9 column"> <div class="admin-content small-12 medium-9 column">
<% if notice %>
<div data-alert class="callout success" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= notice %>
</div>
<% end %>
<% if alert %> <%= render 'layouts/flash' %>
<div data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= alert %>
</div>
<% end %>
<%= yield %> <%= yield %>
</div> </div>

22
app/views/layouts/application.html.erb
View File

@@ -42,27 +42,7 @@
<% end %> <% end %>
<![endif]--> <![endif]-->
<% if notice %> <%= render 'layouts/flash' %>
<div id="notice" data-alert class="row" data-closable>
<div class="callout success">
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= notice %>
</div>
</div>
<% end %>
<% if alert %>
<div id="alert" data-alert class="row" data-closable>
<div class="callout alert">
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= alert %>
</div>
</div>
<% end %>
<%= yield %> <%= yield %>
<div class="push"></div> <div class="push"></div>

19
app/views/layouts/devise.html.erb
View File

@@ -27,23 +27,8 @@
<div class="row auth"> <div class="row auth">
<main> <main>
<div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom"> <div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom">
<% if notice %>
<div data-alert class="callout success" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= notice %>
</div>
<% end %>
<% if alert %> <%= render 'layouts/flash' %>
<div data-alert class="callout warning" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= alert %>
</div>
<% end %>
<%= yield %> <%= yield %>
</div> </div>
@@ -56,4 +41,4 @@
<%= render 'layouts/footer' %> <%= render 'layouts/footer' %>
</div> </div>
</body> </body>
</html> </html>

17
app/views/layouts/management.html.erb
View File

@@ -54,23 +54,8 @@
<%= render "management/account_info" %> <%= render "management/account_info" %>
<div class="admin-content small-12 medium-9 column"> <div class="admin-content small-12 medium-9 column">
<% if notice %>
<div data-alert class="callout success" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= notice %>
</div>
<% end %>
<% if alert %> <%= render 'layouts/flash' %>
<div data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<%= alert %>
</div>
<% end %>
<%= yield %> <%= yield %>
</div> </div>