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

Merge pull request #381 from hermesdt/add_close_button_to_alert_boxes

Browse Source 
Add close button to alert boxes
This commit is contained in:
Juanjo Bazán
2015-09-06 20:31:43 +02:00
parent 4aadc7af5e 7fd7f2cc81
commit a8552a2c06
8 changed files with 33 additions and 14 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 %>
<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",
signin: link_to(t("votes.signin"), new_user_session_path),
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">
<% 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 %>
<% 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 %>
<%= yield %>

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

@@ -16,7 +16,8 @@
<%= render 'layouts/header' %>
<% 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">
<%= notice %>
</div>
@@ -24,7 +25,8 @@
<% end %>
<% 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">
<%= alert %>
</div>

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

@@ -15,7 +15,8 @@
<body class="auth-page">
<% 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">
<%= notice %>
</div>
@@ -23,7 +24,8 @@
<% end %>
<% 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">
<%= alert %>
</div>

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

@@ -1,6 +1,8 @@
<% if resource.errors.any? %>
<div id="error_explanation" class="alert-box alert radius">
<strong>
<div id="error_explanation" data-lert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<strong>
<%= pluralize resource.errors.count, t("form.error"), t("form.errors") %>
<% if local_assigns[:message].present? %>
@@ -8,7 +10,6 @@
<% else %>
<%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %>
<% end %>
</strong>
</strong>
</div>
<% end %>

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

@@ -29,7 +29,10 @@
<div class="small-12 medium-6">
<%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
<% 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 %>
<%= 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? %>
<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") %>
<%= mail_to "web.gobiernoabierto@madrid.es" %>
</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| %>
<% 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 %>
<div class="small-12 medium-6">