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

adds close button to alert boxes, also adds

Browse Source 
data-alert attribute to enable javascript
on them
This commit is contained in:
Álvaro Durán Tovar
2015-09-06 19:54:09 +02:00
parent 9a6d064b4b
commit 92ae988251
8 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/debates/_comments.html.erb
View File

@@ -13,7 +13,8 @@
<% else %> <% else %>
<br> <br>
<div class="alert-box radius info"> <div data-alert class="alert-box radius info">
<a href="#" class="close">&times;</a>
<%= t("debates.show.login_to_comment", <%= t("debates.show.login_to_comment",
signin: link_to(t("votes.signin"), new_user_session_path), signin: link_to(t("votes.signin"), new_user_session_path),
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>

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

@@ -24,11 +24,17 @@
<div class="admin-content small-12 medium-9 column"> <div class="admin-content small-12 medium-9 column">
<% if notice %> <% if notice %>
<div class="alert-box radius success"><%= notice %></div> <div data-alert class="alert-box radius success">
<a href="#" class="close">&times;</a>
<%= notice %>
</div>
<% end %> <% end %>
<% if alert %> <% if alert %>
<div class="alert-box radius alert"><%= alert %></div> <div data-alert class="alert-box radius alert">
<a href="#" class="close">&times;</a>
<%= alert %>
</div>
<% end %> <% end %>
<%= yield %> <%= yield %>

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

@@ -16,7 +16,8 @@
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<% if notice %> <% if notice %>
<div class="alert-box success alert-layout"> <div data-alert class="alert-box success alert-layout">
<a href="#" class="close">&times;</a>
<div class="row"> <div class="row">
<%= notice %> <%= notice %>
</div> </div>
@@ -24,7 +25,8 @@
<% end %> <% end %>
<% if alert %> <% if alert %>
<div class="alert-box alert alert-layout"> <div data-alert class="alert-box alert alert-layout">
<a href="#" class="close">&times;</a>
<div class="row"> <div class="row">
<%= alert %> <%= alert %>
</div> </div>

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

@@ -15,7 +15,8 @@
<body class="auth-page"> <body class="auth-page">
<% if notice %> <% if notice %>
<div class="alert-box success alert-layout"> <div data-alert class="alert-box success alert-layout">
<a href="#" class="close">&times;</a>
<div class="row"> <div class="row">
<%= notice %> <%= notice %>
</div> </div>
@@ -23,7 +24,8 @@
<% end %> <% end %>
<% if alert %> <% if alert %>
<div class="alert-box alert alert-layout"> <div data-alert class="alert-box alert alert-layout">
<a href="#" class="close">&times;</a>
<div class="row"> <div class="row">
<%= alert %> <%= alert %>
</div> </div>

3
app/views/shared/_errors.html.erb
View File

@@ -1,5 +1,6 @@
<% if resource.errors.any? %> <% if resource.errors.any? %>
<div id="error_explanation" class="alert-box alert radius"> <div id="error_explanation" data-lert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<strong> <strong>
<%= pluralize resource.errors.count, t("form.error"), t("form.errors") %> <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %>

5
app/views/verification/letter/edit.html.erb
View File

@@ -29,7 +29,10 @@
<div class="small-12 medium-6"> <div class="small-12 medium-6">
<%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %> <%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
<% if @error %> <% if @error %>
<div class="alert-box alert radius"><%= @error %></div> <div data-alert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<%= @error %>
</div>
<% end %> <% end %>
<%= f.text_field :verification_code, label: t("verification.letter.edit.confirmation_code") %> <%= f.text_field :verification_code, label: t("verification.letter.edit.confirmation_code") %>

3
app/views/verification/residence/_errors.html.erb
View File

@@ -1,6 +1,7 @@
<% if @residence.errors[:residence_in_madrid].present? %> <% if @residence.errors[:residence_in_madrid].present? %>
<div id="error_explanation" class="alert-box alert radius"> <div id="error_explanation" data-alert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<%= t("verification.residence.new.error_verifying_census") %> <%= t("verification.residence.new.error_verifying_census") %>
<%= mail_to "web.gobiernoabierto@madrid.es" %> <%= mail_to "web.gobiernoabierto@madrid.es" %>
</div> </div>

5
app/views/verification/sms/edit.html.erb
View File

@@ -26,7 +26,10 @@
<%= form_for @sms, as: "sms", url: sms_path, method: :put do |f| %> <%= form_for @sms, as: "sms", url: sms_path, method: :put do |f| %>
<% if @error %> <% if @error %>
<div class="alert-box alert radius"><%= @error %></div> <div data-alert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<%= @error %>
</div>
<% end %> <% end %>
<div class="small-12 medium-6"> <div class="small-12 medium-6">