Download as
Browse Code »

Commit 40b4aab6092d828be4b74c770d1a21eee51b6d39

Authored by Guilherme Rojas V. de Lima
Committed by Diego Camarinha
1 parent 2520e29b
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Fixed popover for mezuro range description 

signed-off-by: Diego Araújo <diegoamc90@gmail.com>
Showing 6 changed files with 14 additions and 11 deletions   Show diff stats
app/assets/images/magnifying_glass.png 0 → 100644
View file @40b4aab

1.23 KB
app/assets/javascripts/application.js
  Diff comments   View file @40b4aab
@@ -18,8 +18,3 @@ @@ -18,8 +18,3 @@
18 //= require modules 18 //= require modules
19 //= require Chart 19 //= require Chart
20 //= require_tree . 20 //= require_tree .
21 -  
22 -  
23 -$(function ()  
24 -{ $("#comments").popover();  
25 -});  
26 \ No newline at end of file 21 \ No newline at end of file
app/assets/javascripts/popover.js 0 → 100644
  Diff comments   View file @40b4aab
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +$('.popover_element').popover();
  2 +$('.popover_element').on('click', function () {
  3 + $('.popover_element').not(this).popover('hide');
  4 +});
app/assets/stylesheets/bootstrap_and_overrides.css
  Diff comments   View file @40b4aab
@@ -36,4 +36,8 @@ footer div { @@ -36,4 +36,8 @@ footer div {
36 .field_with_errors .form-control{ 36 .field_with_errors .form-control{
37 border-color: #B94A48; 37 border-color: #B94A48;
38 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; 38 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
39 -}  
40 \ No newline at end of file 39 \ No newline at end of file
  40 +}
  41 +
  42 +.popover-title{
  43 + font-weight: bolder;
  44 +}
app/views/metric_configurations/_ranges.html.erb
  Diff comments   View file @40b4aab
1 <tr> 1 <tr>
2 - <td style="color: #<%= mezuro_range.color %>"> 2 + <td>
3 <div> 3 <div>
4 - <a type="button" id="comments" rel="popover" data-placement="left" data-original-title="Comments" data-content="<%= mezuro_range.comments %>">  
5 - Popover on left  
6 - </a> 4 + <a class="popover_element" rel="popover" data-placement="left" data-original-title="Comments" data-content="<%= mezuro_range.comments %>"><%= image_tag "magnifying_glass.png" %></a>
  5 + <span style="color: #<%= mezuro_range.color %>"><%= mezuro_range.label %></span>
7 </div> 6 </div>
8 </td> 7 </td>
9 <td><%= mezuro_range.beginning %></td> 8 <td><%= mezuro_range.beginning %></td>
@@ -17,4 +16,4 @@ @@ -17,4 +16,4 @@
17 class: 'btn btn-danger' %> 16 class: 'btn btn-danger' %>
18 <% end %> 17 <% end %>
19 </td> 18 </td>
20 -</tr>  
21 \ No newline at end of file 19 \ No newline at end of file
  20 +</tr>
app/views/metric_configurations/show.html.erb
  Diff comments   View file @40b4aab
@@ -81,3 +81,4 @@ @@ -81,3 +81,4 @@
81 </p> 81 </p>
82 82
83 83
  84 +<%= javascript_include_tag "popover.js" %>