a few minor UI tweeks after the bootstrap upgrade
Andrew Cantino
12 mainītis faili ar 69 papildinājumiem un 80 dzēšanām
+ 0
- 1
app/assets/javascripts/application.js.coffee.erb
@@ -62,7 +62,6 @@ $(document).ready -> |
||
| 62 | 62 |
setTimeout((-> $(".flash").slideUp(-> $(".flash").remove())), 5000)
|
| 63 | 63 |
|
| 64 | 64 |
# Agent Navigation |
| 65 |
- |
|
| 66 | 65 |
$agentNavigate = $('#agent-navigate')
|
| 67 | 66 |
|
| 68 | 67 |
# initialize typeahead listener |
+ 8
- 14
app/views/agents/_form.html.erb
@@ -1,16 +1,10 @@ |
||
| 1 | 1 |
<% if @agent.errors.any? %> |
| 2 |
-<div class="row"> |
|
| 3 |
- <div class="col-md-12"> |
|
| 4 |
- <div id="error_explanation"> |
|
| 5 |
- <h2><%= pluralize(@agent.errors.count, "error") %> prohibited this Agent from being saved:</h2> |
|
| 6 |
- <ul> |
|
| 7 |
- <% @agent.errors.full_messages.each do |msg| %> |
|
| 8 |
- <li><%= msg %></li> |
|
| 9 |
- <% end %> |
|
| 10 |
- </ul> |
|
| 11 |
- </div> |
|
| 2 |
+ <div class="row well"> |
|
| 3 |
+ <h2><%= pluralize(@agent.errors.count, "error") %> prohibited this Agent from being saved:</h2> |
|
| 4 |
+ <% @agent.errors.full_messages.each do |msg| %> |
|
| 5 |
+ <p class='text-warning'><%= msg %></p> |
|
| 6 |
+ <% end %> |
|
| 12 | 7 |
</div> |
| 13 |
-</div> |
|
| 14 | 8 |
<% end %> |
| 15 | 9 |
|
| 16 | 10 |
<%= form_for(@agent, |
@@ -27,13 +21,13 @@ |
||
| 27 | 21 |
<% if @agent.new_record? %> |
| 28 | 22 |
<div class="form-group type-select"> |
| 29 | 23 |
<%= f.label :type %> |
| 30 |
- <%= f.select :type, options_for_select(Agent.types.map(&:to_s).sort.map {|type| [type.gsub(/^.*::/, ''), type] }, @agent.type), {}, :class => 'select2 form-control' %>
|
|
| 24 |
+ <%= f.select :type, options_for_select(Agent.types.map(&:to_s).sort.map {|type| [type.gsub(/^.*::/, ''), type] }, @agent.type), {}, :class => 'select2 form-control' %>
|
|
| 31 | 25 |
</div> |
| 32 | 26 |
<% end %> |
| 33 | 27 |
|
| 34 | 28 |
<div class="form-group"> |
| 35 | 29 |
<%= f.label :name %> |
| 36 |
- <%= f.text_field :name, :class => 'form-control' %> |
|
| 30 |
+ <%= f.text_field :name, :class => 'form-control' %> |
|
| 37 | 31 |
</div> |
| 38 | 32 |
|
| 39 | 33 |
<div class="form-group"> |
@@ -47,7 +41,7 @@ |
||
| 47 | 41 |
<div class='event-related-region' data-can-create-events="<%= @agent.can_create_events? %>"> |
| 48 | 42 |
<div class="form-group"> |
| 49 | 43 |
<%= f.label :keep_events_for, "Keep events" %> |
| 50 |
- <%= f.select :keep_events_for, options_for_select(Agent::EVENT_RETENTION_SCHEDULES, @agent.keep_events_for), {}, :class => 'form-control' %>
|
|
| 44 |
+ <%= f.select :keep_events_for, options_for_select(Agent::EVENT_RETENTION_SCHEDULES, @agent.keep_events_for), {}, :class => 'form-control' %>
|
|
| 51 | 45 |
</div> |
| 52 | 46 |
</div> |
| 53 | 47 |
|
+ 1
- 2
app/views/agents/agent_views/manual_event_agent/_show.html.erb
@@ -9,8 +9,7 @@ |
||
| 9 | 9 |
</textarea> |
| 10 | 10 |
</div> |
| 11 | 11 |
|
| 12 |
- <%= submit_tag "Submit", :class => "btn btn-primary" %> |
|
| 13 |
- |
|
| 12 |
+ <%= submit_tag "Submit", :class => "btn btn-primary" %> |
|
| 14 | 13 |
<% end %> |
| 15 | 14 |
|
| 16 | 15 |
<script> |
+ 6
- 4
app/views/agents/show.html.erb
@@ -37,8 +37,8 @@ |
||
| 37 | 37 |
<% end %> |
| 38 | 38 |
</ul> |
| 39 | 39 |
</div> |
| 40 |
- <div class='col-md-10'> |
|
| 41 | 40 |
|
| 41 |
+ <div class='col-md-10'> |
|
| 42 | 42 |
<div class="tab-content"> |
| 43 | 43 |
<div class="tab-pane <%= agent_show_view(@agent).present? ? "active" : "disabled" %>" id="summary"> |
| 44 | 44 |
<h2><%= @agent.name %> Summary</h2> |
@@ -55,9 +55,11 @@ |
||
| 55 | 55 |
<div class='col-md-12'> |
| 56 | 56 |
<h2> |
| 57 | 57 |
<%= @agent.name %> Logs |
| 58 |
- <%= image_tag "spinner-arrows.gif", :class => "spinner" %> |
|
| 59 |
- <span class="glyphicon glyphicon-refresh action-icon refresh"></span> |
|
| 60 |
- <span class="glyphicon glyphicon-trash action-icon clear"></span> |
|
| 58 |
+ <small> |
|
| 59 |
+ <%= image_tag "spinner-arrows.gif", :class => "spinner" %> |
|
| 60 |
+ <span class="glyphicon glyphicon-refresh action-icon refresh"></span> |
|
| 61 |
+ <span class="glyphicon glyphicon-trash action-icon clear"></span> |
|
| 62 |
+ </small> |
|
| 61 | 63 |
</h2> |
| 62 | 64 |
</div> |
| 63 | 65 |
</div> |
+ 15
- 17
app/views/devise/confirmations/new.html.erb
@@ -1,23 +1,21 @@ |
||
| 1 |
+<div class='row'> |
|
| 2 |
+ <div class='col-md-8 col-md-offset-2'> |
|
| 3 |
+ <div class='well'> |
|
| 1 | 4 |
|
| 2 |
- <div class='row'> |
|
| 3 |
- <div class='col-md-8 col-md-offset-2'> |
|
| 4 |
- <div class='well'> |
|
| 5 |
+ <h2>Resend confirmation instructions</h2> |
|
| 5 | 6 |
|
| 6 |
- <h2>Resend confirmation instructions</h2> |
|
| 7 |
+ <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
|
|
| 8 |
+ <%= devise_error_messages! %> |
|
| 7 | 9 |
|
| 8 |
- <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
|
|
| 9 |
- <%= devise_error_messages! %> |
|
| 10 |
+ <div class="form-group"> |
|
| 11 |
+ <%= f.label :email %> |
|
| 12 |
+ <%= f.email_field :email, :class => 'form-control' %> |
|
| 13 |
+ </div> |
|
| 10 | 14 |
|
| 11 |
- <div class="form-group"> |
|
| 12 |
- <%= f.label :email %> |
|
| 13 |
- <%= f.email_field :email, :class => 'form-control' %> |
|
| 14 |
- </div> |
|
| 15 |
+ <%= f.submit "Resend confirmation instructions", :class => "btn btn-primary" %> |
|
| 16 |
+ <% end %> |
|
| 15 | 17 |
|
| 16 |
- <%= f.submit "Resend confirmation instructions", :class => "btn btn-primary" %> |
|
| 17 |
- |
|
| 18 |
- <% end %> |
|
| 19 |
- |
|
| 20 |
- <%= render "devise/shared/links" %> |
|
| 21 |
- </div> |
|
| 18 |
+ <%= render "devise/shared/links" %> |
|
| 22 | 19 |
</div> |
| 23 |
- </div> |
|
| 20 |
+ </div> |
|
| 21 |
+</div> |
+ 1
- 1
app/views/devise/registrations/edit.html.erb
@@ -48,7 +48,7 @@ |
||
| 48 | 48 |
<div class="form-group"> |
| 49 | 49 |
<div class="col-md-offset-4 col-md-10"> |
| 50 | 50 |
<%= f.submit "Update", :class => "btn btn-primary" %> |
| 51 |
- </div> |
|
| 51 |
+ </div> |
|
| 52 | 52 |
</div> |
| 53 | 53 |
|
| 54 | 54 |
<% end %> |
+ 1
- 1
app/views/devise/registrations/new.html.erb
@@ -47,7 +47,7 @@ |
||
| 47 | 47 |
<div class="form-group"> |
| 48 | 48 |
<div class="col-md-offset-4 col-md-10"> |
| 49 | 49 |
<%= f.submit "Sign Up", :class => "btn btn-primary" %> |
| 50 |
- </div> |
|
| 50 |
+ </div> |
|
| 51 | 51 |
</div> |
| 52 | 52 |
|
| 53 | 53 |
<% end %> |
+ 1
- 1
app/views/devise/sessions/new.html.erb
@@ -39,8 +39,8 @@ |
||
| 39 | 39 |
<% end %> |
| 40 | 40 |
|
| 41 | 41 |
<hr> |
| 42 |
- <%= render "devise/shared/links" %> |
|
| 43 | 42 |
|
| 43 |
+ <%= render "devise/shared/links" %> |
|
| 44 | 44 |
</div> |
| 45 | 45 |
</div> |
| 46 | 46 |
</div> |
+ 4
- 4
app/views/layouts/application.html.erb
@@ -14,15 +14,15 @@ |
||
| 14 | 14 |
<body> |
| 15 | 15 |
<nav class="navbar navbar-default navbar-fixed-top" role="navigation"> |
| 16 | 16 |
<div class="container"> |
| 17 |
- <%= render 'layouts/navigation' %> |
|
| 17 |
+ <%= render 'layouts/navigation' %> |
|
| 18 | 18 |
</div> |
| 19 | 19 |
</nav> |
| 20 | 20 |
|
| 21 | 21 |
<div id="main" role="main"> |
| 22 | 22 |
<div class="container"> |
| 23 |
- <div class="row"> |
|
| 24 |
- <%= render 'layouts/messages' %> |
|
| 25 |
- </div> |
|
| 23 |
+ <div class="row"> |
|
| 24 |
+ <%= render 'layouts/messages' %> |
|
| 25 |
+ </div> |
|
| 26 | 26 |
</div> |
| 27 | 27 |
|
| 28 | 28 |
<%= yield %> |
+ 25
- 31
app/views/user_credentials/_form.html.erb
@@ -1,50 +1,44 @@ |
||
| 1 | 1 |
<%= form_for(@user_credential, :method => @user_credential.new_record? ? "POST" : "PUT") do |f| %> |
| 2 | 2 |
<% if @user_credential.errors.any? %> |
| 3 |
- <div class="row"> |
|
| 4 |
- <div class="col-md-12"> |
|
| 5 |
- <div id="error_explanation"> |
|
| 6 |
- <h2><%= pluralize(@user_credential.errors.count, "error") %> prohibited this Credential from being saved:</h2> |
|
| 7 |
- <ul> |
|
| 8 |
- <% @user_credential.errors.full_messages.each do |msg| %> |
|
| 9 |
- <li><%= msg %></li> |
|
| 10 |
- <% end %> |
|
| 11 |
- </ul> |
|
| 12 |
- </div> |
|
| 13 |
- </div> |
|
| 3 |
+ <div class="row well"> |
|
| 4 |
+ <h2><%= pluralize(@user_credential.errors.count, "error") %> prohibited this Credential from being saved:</h2> |
|
| 5 |
+ <% @user_credential.errors.full_messages.each do |msg| %> |
|
| 6 |
+ <p class='text-warning'><%= msg %></p> |
|
| 7 |
+ <% end %> |
|
| 14 | 8 |
</div> |
| 15 | 9 |
<% end %> |
| 16 | 10 |
|
| 17 |
-<div class="row"> |
|
| 18 |
- <div class="col-md-4"> |
|
| 19 |
- <div class="form-group"> |
|
| 20 |
- <%= f.label :credential_name %> |
|
| 21 |
- <%= f.text_field :credential_name, :class => 'form-control' %> |
|
| 22 |
- </div> |
|
| 11 |
+ <div class="row"> |
|
| 12 |
+ <div class="col-md-4"> |
|
| 13 |
+ <div class="form-group"> |
|
| 14 |
+ <%= f.label :credential_name %> |
|
| 15 |
+ <%= f.text_field :credential_name, :class => 'form-control' %> |
|
| 16 |
+ </div> |
|
| 23 | 17 |
|
| 24 |
- <div class="form-group"> |
|
| 25 |
- <%= f.label :mode %> |
|
| 26 |
- <%= f.select :mode, options_for_select(UserCredential::MODES.map {|s| [s.classify, s] }, @user_credential.mode), {}, :class => 'form-control' %>
|
|
| 18 |
+ <div class="form-group"> |
|
| 19 |
+ <%= f.label :mode %> |
|
| 20 |
+ <%= f.select :mode, options_for_select(UserCredential::MODES.map {|s| [s.classify, s] }, @user_credential.mode), {}, :class => 'form-control' %>
|
|
| 21 |
+ </div> |
|
| 27 | 22 |
</div> |
| 28 | 23 |
</div> |
| 29 |
-</div> |
|
| 30 | 24 |
|
| 31 |
-<div class="row"> |
|
| 32 |
- <div class="col-md-12"> |
|
| 33 |
- <div class="form-group"> |
|
| 34 |
- <%= f.label :credential_value %> |
|
| 25 |
+ <div class="row"> |
|
| 26 |
+ <div class="col-md-12"> |
|
| 27 |
+ <div class="form-group"> |
|
| 28 |
+ <%= f.label :credential_value %> |
|
| 35 | 29 |
<%= f.text_area :credential_value, :class => 'form-control', :rows => 10 %> |
| 36 | 30 |
<div id="ace-credential-value"></div> |
| 31 |
+ </div> |
|
| 37 | 32 |
</div> |
| 38 | 33 |
</div> |
| 39 |
-</div> |
|
| 40 | 34 |
|
| 41 |
-<div class="row"> |
|
| 42 |
- <div class="col-md-12"> |
|
| 43 |
- <div class='form-actions' style='clear: both'> |
|
| 44 |
- <%= f.submit "Save Credential", :class => "btn btn-primary" %> |
|
| 35 |
+ <div class="row"> |
|
| 36 |
+ <div class="col-md-12"> |
|
| 37 |
+ <div class='form-actions' style='clear: both'> |
|
| 38 |
+ <%= f.submit "Save Credential", :class => "btn btn-primary" %> |
|
| 39 |
+ </div> |
|
| 45 | 40 |
</div> |
| 46 | 41 |
</div> |
| 47 |
-</div> |
|
| 48 | 42 |
<% end %> |
| 49 | 43 |
|
| 50 | 44 |
<%= javascript_include_tag "user_credentials" %> |
+ 7
- 3
app/views/user_credentials/edit.html.erb
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
<div class='container'> |
| 2 | 2 |
<div class='row'> |
| 3 |
- <div class='span12'> |
|
| 3 |
+ <div class='col-md-12'> |
|
| 4 | 4 |
<div class="page-header"> |
| 5 | 5 |
<h2> |
| 6 | 6 |
Editing your Credential |
@@ -9,8 +9,12 @@ |
||
| 9 | 9 |
|
| 10 | 10 |
<%= render 'form' %> |
| 11 | 11 |
|
| 12 |
- <div class="btn-group"> |
|
| 13 |
- <%= link_to '<i class="icon-chevron-left"></i> Back'.html_safe, user_credentials_path, class: "btn" %> |
|
| 12 |
+ <hr> |
|
| 13 |
+ |
|
| 14 |
+ <div class="row"> |
|
| 15 |
+ <div class="col-md-12"> |
|
| 16 |
+ <%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, user_credentials_path, class: "btn btn-default" %> |
|
| 17 |
+ </div> |
|
| 14 | 18 |
</div> |
| 15 | 19 |
</div> |
| 16 | 20 |
</div> |
+ 0
- 1
app/views/user_credentials/new.html.erb
@@ -16,7 +16,6 @@ |
||
| 16 | 16 |
<%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, user_credentials_path, class: "btn btn-default" %> |
| 17 | 17 |
</div> |
| 18 | 18 |
</div> |
| 19 |
- |
|
| 20 | 19 |
</div> |
| 21 | 20 |
</div> |
| 22 | 21 |
</div> |