Revert "Alert improvement and adding byebug gem (publiclab#383)"

This reverts commit 7502b53.
avsingh999 · Mar 30, 2019 · 19edb4e · 19edb4e
1 parent 7502b53
commit 19edb4e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,3 @@ public/lib
 node_modules
 todo.txt
 .sass-cache
-.byebug_history
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,6 @@ group :test do
 end
 
 group :development do
-  gem "byebug"
   gem "jshintrb"
   gem "therubyracer"
 end

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -64,7 +64,7 @@ def successful_login(back_to, id)
   def logout
     session[:user_id] = nil 
     flash[:success] = "You have successfully logged out."
-    redirect_to '/' + '?_=' + Time.now.to_i.to_s
+    redirect_to '/'
   end
 
   protected

diff --git a/app/views/layouts/_alerts.html.erb b/app/views/layouts/_alerts.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,8 +17,15 @@
   </head>
   <body>
     <%= render 'layouts/header' %>
-    <%= render 'layouts/alerts' %>
+
+    <div class="container-fluid" id="alerts">
+      <% if flash[:notice] %><div class="alert alert-success"><button type="button" class="close" data-dismiss="alert"><i class="fa fa-close"></i></button><%=raw flash[:notice] %></div><% end %>
+      <% if flash[:error] %><div class="alert alert-error"><button type="button" class="close" data-dismiss="alert"><i class="fa fa-close"></i></button><%=raw flash[:error] %></div><% end %>
+      <% if flash[:warning] %><div class="alert alert-warning"><button type="button" class="close" data-dismiss="alert"><i class="fa fa-close"></i></button><%=raw flash[:warning] %></div><% end %>
+    </div>
+
     <%= yield; %>
+
     <%= render 'layouts/footer' %>
 
     <script>

diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
@@ -10,7 +10,7 @@
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
 
 <div class="container-fluid">
-  <div id="mapknitter-unique" style="height: 300px ; width: 100% ;  margin-bottom: 1%; z-index: 5;"></div> 
+  <div id="mapknitter-unique" style="height: 300px ; width: 100% ;  margin-bottom: 1%"></div> 
   <div class="row">
     <div class="col-md-3">
       <% if logged_in? %>