From 772118d2463997c2b056fe811a3d3dc03543fe66 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Mon, 20 Jan 2020 14:02:42 +0100
Subject: [PATCH] change html structure for flash msg, change columns buttons

---
 app/views/my_modules/repository.html.erb |  2 +-
 app/views/repositories/show.html.erb     |  2 +-
 app/views/shared/_flash_alerts.html.erb  | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/views/my_modules/repository.html.erb b/app/views/my_modules/repository.html.erb
index e4413cec9..8ba965f98 100644
--- a/app/views/my_modules/repository.html.erb
+++ b/app/views/my_modules/repository.html.erb
@@ -18,7 +18,7 @@
   </div>
 
   <div class="repo-datatables-buttons pull-right" style="display: inline;">
-    <button class="btn btn-primary help_tooltips manage-repo-column-index"
+    <button class="btn btn-secondary help_tooltips manage-repo-column-index"
             data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
             data-action="new"
             data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>"
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 8caf7cf0d..abb09c5ea 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -44,7 +44,7 @@
         <% end %>
       </div>
 
-      <button class="btn btn-primary help_tooltips manage-repo-column-index"
+      <button class="btn btn-secondary help_tooltips manage-repo-column-index"
               data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
               data-action="new"
               data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>"
diff --git a/app/views/shared/_flash_alerts.html.erb b/app/views/shared/_flash_alerts.html.erb
index d9a822426..a2121f550 100644
--- a/app/views/shared/_flash_alerts.html.erb
+++ b/app/views/shared/_flash_alerts.html.erb
@@ -1,29 +1,23 @@
 <div id="notifications">
   <% if flash[:success] %>
   <div id="alert-flash" class="alert alert-success alert-dismissable alert-floating">
-    <div>
-      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
       <span class="fas fa-check-circle"></span>
-      <span><%= sanitize_input(flash[:success]) %></span>
-    </div>
+      <span class="message"><%= sanitize_input(flash[:success]) %></span>
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
   </div>
   <% end %>
   <% if notice %>
   <div id="alert-flash" class="alert alert-info alert-dismissable alert-floating">
-    <div>
-      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
       <span class="fas fa-info-circle"></span>
-      <span><%= notice %></span>
-    </div>
+      <span class="message"><%= notice %></span>
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
   </div>
   <% end %>
   <% if alert and !alert.empty? or flash[:error]%>
   <div id="alert-flash" class="alert alert-danger alert-dismissable alert-floating">
-    <div>
-      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
       <span class="fas fa-exclamation-circle"></span>
-      <span><%= alert || sanitize_input(flash[:error]) %></span>
-    </div>
+      <span class="message"><%= alert || sanitize_input(flash[:error]) %></span>
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
   </div>
   <% end %>
 </div>