a few minor UI tweeks after the bootstrap upgrade

app/assets/javascripts/application.js.coffee.erb

@@ -62,7 +62,6 @@ $(document).ready ->
     setTimeout((-> $(".flash").slideUp(-> $(".flash").remove())), 5000)
 
   # Agent Navigation
-
   $agentNavigate = $('#agent-navigate')
 
   # initialize typeahead listener

app/views/agents/_form.html.erb

@@ -1,16 +1,10 @@
 <% if @agent.errors.any? %>
-<div class="row">
-  <div class="col-md-12">
-    <div id="error_explanation">
-      <h2><%= pluralize(@agent.errors.count, "error") %> prohibited this Agent from being saved:</h2>
-      <ul>
-      <% @agent.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
+  <div class="row well">
+    <h2><%= pluralize(@agent.errors.count, "error") %> prohibited this Agent from being saved:</h2>
+    <% @agent.errors.full_messages.each do |msg| %>
+      <p class='text-warning'><%= msg %></p>
+    <% end %>
   </div>
-</div>
 <% end %>
 
 <%= form_for(@agent,
@@ -27,13 +21,13 @@
           <% if @agent.new_record? %>
             <div class="form-group type-select">
               <%= f.label :type %>
-                <%= f.select :type, options_for_select(Agent.types.map(&:to_s).sort.map {|type| [type.gsub(/^.*::/, ''), type] }, @agent.type), {}, :class => 'select2 form-control' %>
+              <%= f.select :type, options_for_select(Agent.types.map(&:to_s).sort.map {|type| [type.gsub(/^.*::/, ''), type] }, @agent.type), {}, :class => 'select2 form-control' %>
             </div>
           <% end %>
 
           <div class="form-group">
             <%= f.label :name %>
-              <%= f.text_field :name, :class => 'form-control' %>
+            <%= f.text_field :name, :class => 'form-control' %>
           </div>
 
           <div class="form-group">
@@ -47,7 +41,7 @@
           <div class='event-related-region' data-can-create-events="<%= @agent.can_create_events? %>">
             <div class="form-group">
               <%= f.label :keep_events_for, "Keep events" %>
-                <%= f.select :keep_events_for, options_for_select(Agent::EVENT_RETENTION_SCHEDULES, @agent.keep_events_for), {}, :class => 'form-control' %>
+              <%= f.select :keep_events_for, options_for_select(Agent::EVENT_RETENTION_SCHEDULES, @agent.keep_events_for), {}, :class => 'form-control' %>
             </div>
           </div>
 

app/views/agents/agent_views/manual_event_agent/_show.html.erb

@@ -9,8 +9,7 @@
     </textarea>
   </div>
 
-    <%= submit_tag "Submit", :class => "btn btn-primary" %>
-    
+  <%= submit_tag "Submit", :class => "btn btn-primary" %>
 <% end %>
 
 <script>

app/views/agents/show.html.erb

@@ -37,8 +37,8 @@
           <% end %>
         </ul>
       </div>
-      <div class='col-md-10'>
 
+      <div class='col-md-10'>
         <div class="tab-content">
           <div class="tab-pane <%= agent_show_view(@agent).present? ? "active" : "disabled" %>" id="summary">
             <h2><%= @agent.name %> Summary</h2>
@@ -55,9 +55,11 @@
               <div class='col-md-12'>
                 <h2>
                   <%= @agent.name %> Logs
-                  <%= image_tag "spinner-arrows.gif", :class => "spinner" %>
-                  <span class="glyphicon glyphicon-refresh action-icon refresh"></span>
-                  <span class="glyphicon glyphicon-trash action-icon clear"></span>
+                  <small>
+                    <%= image_tag "spinner-arrows.gif", :class => "spinner" %>
+                    <span class="glyphicon glyphicon-refresh action-icon refresh"></span>
+                    <span class="glyphicon glyphicon-trash action-icon clear"></span>
+                  </small>
                 </h2>
               </div>
             </div>

app/views/devise/confirmations/new.html.erb

@@ -1,23 +1,21 @@
+<div class='row'>
+  <div class='col-md-8 col-md-offset-2'>
+    <div class='well'>
 
-  <div class='row'>
-    <div class='col-md-8 col-md-offset-2'>
-      <div class='well'>
+      <h2>Resend confirmation instructions</h2>
 
-        <h2>Resend confirmation instructions</h2>
+      <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
+        <%= devise_error_messages! %>
 
-        <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
-          <%= devise_error_messages! %>
+        <div class="form-group">
+          <%= f.label :email %>
+          <%= f.email_field :email, :class => 'form-control' %>
+        </div>
 
-          <div class="form-group">
-            <%= f.label :email %>
-            <%= f.email_field :email, :class => 'form-control' %>
-          </div>
+        <%= f.submit "Resend confirmation instructions", :class => "btn btn-primary" %>
+      <% end %>
 
-            <%= f.submit "Resend confirmation instructions", :class => "btn btn-primary" %>
-
-        <% end %>
-
-        <%= render "devise/shared/links" %>
-      </div>
+      <%= render "devise/shared/links" %>
     </div>
-  </div>
+  </div>
+</div>

app/views/devise/registrations/edit.html.erb

@@ -48,7 +48,7 @@
           <div class="form-group">
             <div class="col-md-offset-4 col-md-10">
               <%= f.submit "Update", :class => "btn btn-primary" %>
-              </div>
+            </div>
           </div>
 
         <% end %>

app/views/devise/registrations/new.html.erb

@@ -47,7 +47,7 @@
           <div class="form-group">
             <div class="col-md-offset-4 col-md-10">
               <%= f.submit "Sign Up", :class => "btn btn-primary" %>
-              </div>
+            </div>
           </div>
 
         <% end %>

app/views/devise/sessions/new.html.erb

@@ -39,8 +39,8 @@
       <% end %>
 
       <hr>
-        <%= render "devise/shared/links" %>
 
+      <%= render "devise/shared/links" %>
     </div>
   </div>
 </div>

app/views/layouts/application.html.erb

@@ -14,15 +14,15 @@
   <body>
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
-          <%= render 'layouts/navigation' %>
+        <%= render 'layouts/navigation' %>
       </div>
     </nav>
 
     <div id="main" role="main">
       <div class="container">
-          <div class="row">
-            <%= render 'layouts/messages' %>
-          </div>
+        <div class="row">
+          <%= render 'layouts/messages' %>
+        </div>
       </div>
       
       <%= yield %>

app/views/user_credentials/_form.html.erb

@@ -1,50 +1,44 @@
 <%= form_for(@user_credential, :method => @user_credential.new_record? ? "POST" : "PUT") do |f| %>
   <% if @user_credential.errors.any? %>
-    <div class="row">
-      <div class="col-md-12">
-        <div id="error_explanation">
-          <h2><%= pluralize(@user_credential.errors.count, "error") %> prohibited this Credential from being saved:</h2>
-          <ul>
-          <% @user_credential.errors.full_messages.each do |msg| %>
-            <li><%= msg %></li>
-          <% end %>
-          </ul>
-        </div>
-      </div>
+    <div class="row well">
+      <h2><%= pluralize(@user_credential.errors.count, "error") %> prohibited this Credential from being saved:</h2>
+      <% @user_credential.errors.full_messages.each do |msg| %>
+        <p class='text-warning'><%= msg %></p>
+      <% end %>
     </div>
   <% end %>
 
-<div class="row">
-  <div class="col-md-4">
-    <div class="form-group">
-      <%= f.label :credential_name %>
-      <%= f.text_field :credential_name, :class => 'form-control' %>
-    </div>
+  <div class="row">
+    <div class="col-md-4">
+      <div class="form-group">
+        <%= f.label :credential_name %>
+        <%= f.text_field :credential_name, :class => 'form-control' %>
+      </div>
 
-    <div class="form-group">
-      <%= f.label :mode %>
-      <%= f.select :mode, options_for_select(UserCredential::MODES.map {|s| [s.classify, s] }, @user_credential.mode), {}, :class => 'form-control' %>
+      <div class="form-group">
+        <%= f.label :mode %>
+        <%= f.select :mode, options_for_select(UserCredential::MODES.map {|s| [s.classify, s] }, @user_credential.mode), {}, :class => 'form-control' %>
+      </div>
     </div>
   </div>
-</div>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="form-group">
-      <%= f.label :credential_value %>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="form-group">
+        <%= f.label :credential_value %>
         <%= f.text_area :credential_value, :class => 'form-control', :rows => 10 %>
         <div id="ace-credential-value"></div>
+      </div>
     </div>
   </div>
-</div>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class='form-actions' style='clear: both'>
-      <%= f.submit "Save Credential", :class => "btn btn-primary" %>
+  <div class="row">
+    <div class="col-md-12">
+      <div class='form-actions' style='clear: both'>
+        <%= f.submit "Save Credential", :class => "btn btn-primary" %>
+      </div>
     </div>
   </div>
-</div>
 <% end %>
 
 <%= javascript_include_tag "user_credentials" %>

app/views/user_credentials/edit.html.erb

@@ -1,6 +1,6 @@
 <div class='container'>
   <div class='row'>
-    <div class='span12'>
+    <div class='col-md-12'>
       <div class="page-header">
         <h2>
           Editing your Credential
@@ -9,8 +9,12 @@
 
       <%= render 'form' %>
 
-      <div class="btn-group">
-        <%= link_to '<i class="icon-chevron-left"></i> Back'.html_safe, user_credentials_path, class: "btn" %>
+      <hr>
+
+      <div class="row">
+        <div class="col-md-12">
+          <%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, user_credentials_path, class: "btn btn-default" %>
+        </div>
       </div>
     </div>
   </div>

app/views/user_credentials/new.html.erb

@@ -16,7 +16,6 @@
           <%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, user_credentials_path, class: "btn btn-default" %>
         </div>
       </div>
-    
     </div>
   </div>
 </div>