Display statistics table in gray mode for referential show

4 files changed, 121 insertions, 145 deletions

diff --git a/app/assets/stylesheets/main/referentials.css.scss b/app/assets/stylesheets/main/referentials.css.scss
index bb4661405..715b152e8 100644
--- a/app/assets/stylesheets/main/referentials.css.scss
+++ b/app/assets/stylesheets/main/referentials.css.scss
@@ -25,27 +25,20 @@
         font-weight: bold;
     }
     
-    .count td {
-      border: 1px solid #61970b;
-      padding-left: 5px;
-      padding-right: 5px;
-      height: 30px;
-    }
-    .count thead td {
-      background: #61970b;
-      color: white;
-    }
-    .count td.image {
-      padding-left: 25px;
-    }
-    .count td.value {
-      text-align: right;
+    .panel{
+        font-size:12px;
+        width: 75%;
+
+        .panel-heading{ font-weight: bold;}
+
+        li.list-group-item {
+            padding: 5px 15px;
+        }
     }
         
 }
 #sidebar div#clean_up {
-  form {
-    border-bottom: 1px solid #BBB;
+  form {    
     fieldset {
       padding: 0;
       border: 0;
diff --git a/app/views/referentials/_counts.html.erb b/app/views/referentials/_counts.html.erb
index 35841b271..3ade4e945 100644
--- a/app/views/referentials/_counts.html.erb
+++ b/app/views/referentials/_counts.html.erb
@@ -1,72 +1,63 @@
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td  colspan="2"><%= t(".objects") %></td>
-  		<td><%= t(".count") %></td>		
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("networks") %></td>
-  		<td class="value"> <%= @referential.networks.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("companies") %></td>
-  		<td class="value"> <%= @referential.companies.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("group_of_lines") %></td>
-  		<td class="value"> <%= @referential.group_of_lines.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("lines") %></td>
-  		<td class="value"> <%= @referential.lines.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("vehicle_journeys") %></td>
-  		<td class="value"> <%= @referential.vehicle_journeys.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("time_tables") %></td>
-  		<td class="value"> <%= @referential.time_tables.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("connection_links") %></td>
-  		<td class="value"> <%= @referential.connection_links.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("stop_areas") %></td>
-  		<td class="value"> <%= @referential.stop_areas.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/boarding_position.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("boarding_positions") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","BoardingPosition").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/quay.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("quays") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","Quay").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/commercial_stop_point.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("commercial_stops") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","CommercialStopPoint").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/stop_place.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("stop_places") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","StopPlace").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/itl.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("itls") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","ITL").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/access_in_out.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("access_points") %></td>
-  		<td class="value"> <%= @referential.access_points.size %></td>		
-  		</tr>
-  	</tbody>
-  </table>
+<div class="panel panel-default">
+  <!-- Default panel contents -->
+  <div class="panel-heading"><%= t(".objects") %></div>
+
+  <ul class="list-group"  width="75%">
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.networks.size %></span>
+      <%= Referential.human_attribute_name("networks") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.companies.size %></span>
+      <%= Referential.human_attribute_name("companies") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.group_of_lines.size %></span>
+      <%= Referential.human_attribute_name("group_of_lines") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.lines.size %></span>
+      <%= Referential.human_attribute_name("lines") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.vehicle_journeys.size %></span>
+      <%= Referential.human_attribute_name("vehicle_journeys") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.time_tables.size %></span>
+      <%= Referential.human_attribute_name("time_tables") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.connection_links.size %></span>
+      <%= Referential.human_attribute_name("connection_links") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.size %></span>
+      <%= Referential.human_attribute_name("stop_areas") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.where("area_type = ?","BoardingPosition").size %></span>
+      <%= image_tag "map/boarding_position.png"%><%= Referential.human_attribute_name("boarding_positions") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.where("area_type = ?","Quay").size %></span>
+      <%= image_tag "map/quay.png"%><%= Referential.human_attribute_name("quays") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.where("area_type = ?","CommercialStopPoint").size %></span>
+      <%= image_tag "map/commercial_stop_point.png"%><%= Referential.human_attribute_name("commercial_stops") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.where("area_type = ?","StopPlace").size %></span>
+      <%= image_tag "map/stop_place.png"%><%= Referential.human_attribute_name("stop_places") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.stop_areas.where("area_type = ?","ITL").size %></span>
+      <%= image_tag "map/itl.png"%><%= Referential.human_attribute_name("itls") %>
+    </li>
+    <li class="list-group-item">
+      <span class="badge"><%= @referential.access_points.size %></span>
+      <%= image_tag "map/access_in_out.png"%><%= Referential.human_attribute_name("access_points") %>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/referentials/_validity_out.html.erb b/app/views/referentials/_validity_out.html.erb
index e285d2c8a..1ee930577 100644
--- a/app/views/referentials/_validity_out.html.erb
+++ b/app/views/referentials/_validity_out.html.erb
@@ -1,35 +1,29 @@
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td><%= t('.validity_out_time_tables') %>: <%= tm_cnt = @referential.time_tables.validity_out_from_on?(Date.today).size %></td>
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<% if tm_cnt > 0 %>
-	  		<% @referential.time_tables.validity_out_from_on?(Date.today,5).each do |tm| %>
-	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
-	  		<% end %>
-	  		<% if tm_cnt > 5 %>
-	  			<tr><td>...</td></tr>
-            <% end %>
-  		<% end %>
-  	</tbody>
-  	</table>
-  	<p/>
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td><%= t('.validity_out_soon_time_tables', :count => "7") %>: <%= tm_cnt = @referential.time_tables.validity_out_between?(Date.today,Date.today+7).size %></td>
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<% if tm_cnt > 0 %>
-	  		<% @referential.time_tables.validity_out_between?(Date.today,Date.today+7,5).each do |tm| %>
-	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
-	  		<% end %>
-	  		<% if tm_cnt > 5 %>
-	  			<tr><td>...</td></tr>
-            <% end %>
-  		<% end %>
-  	</tbody>
-  	</table>
+<div class="panel panel-default">
+  <!-- Default panel contents -->
+  <div class="panel-heading"><%= t('.validity_out_time_tables') %>: <%= tm_cnt = @referential.time_tables.validity_out_from_on?(Date.today).size %></div>
+  <ul class="list-group">
+  	<% if tm_cnt > 0 %>
+	  <% @referential.time_tables.validity_out_from_on?(Date.today,5).each do |tm| %>
+	  <li class="list-group-item"><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></li>
+	  <% end %>
+	  <% if tm_cnt > 5 %>
+	  <li class="list-group-item">...</li>
+    <% end %>
+  	<% end %>
+  </ul>
+</div>
+
+<div class="panel panel-default">
+  <!-- Default panel contents -->
+  <div class="panel-heading"><%= t('.validity_out_soon_time_tables', :count => "7") %>: <%= tm_cnt = @referential.time_tables.validity_out_between?(Date.today,Date.today+7).size %></div>
+  <ul class="list-group">
+  	<% if tm_cnt > 0 %>
+	  <% @referential.time_tables.validity_out_between?(Date.today,Date.today+7,5).each do |tm| %>
+	  <li class="list-group-item"><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></li>
+	  <% end %>
+	  <% if tm_cnt > 5 %>
+	  <li class="list-group-item">...</li>
+    <% end %>
+  	<% end %>
+  </ul>
+</div>
diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb
index 1e63ccf99..5286f7ee7 100644
--- a/app/views/referentials/show.html.erb
+++ b/app/views/referentials/show.html.erb
@@ -34,31 +34,29 @@
   <table width="100%">
   	<tr>
   	  <td valign="top" width="50%">	
-  <%= render "counts" %>
-  </td>
-  <td valign="top" >
-  <%= render "validity_out" %>
-  </td>
-  </tr>
+        <%= render "counts" %>
+      </td>
+      <td valign="top" >
+        <%= render "validity_out" %>
+      </td>
+    </tr>
   </table>
 
-<h3 class="api_keys"><%= t('.api_keys') %></h3>
-
-<div class="api_keys">
-  <%= render :partial => "api_keys/api_key", :collection => @referential.api_keys %>
-</div>
+  <h3 class="api_keys"><%= t('.api_keys') %></h3>
+  
+  <div class="api_keys">
+    <%= render :partial => "api_keys/api_key", :collection => @referential.api_keys %>
+  </div>
 </div>  
 
 <% content_for :sidebar do %>
-  <ul class="actions">
-    <li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
-    <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :data => {:confirm =>  t('referentials.actions.destroy_confirm')}, :class => "remove" %></li>
-    <li><%= link_to t('api_keys.actions.new'), new_referential_api_key_path(@referential), :class => "add" %></li>
-    <br>
-  </ul>
-
-  <h4><%= t('.clean_up') %></h4>
-  <%= render "clean" %>
-
+<ul class="actions">
+  <li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
+  <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :data => {:confirm =>  t('referentials.actions.destroy_confirm')}, :class => "remove" %></li>
+  <li><%= link_to t('api_keys.actions.new'), new_referential_api_key_path(@referential), :class => "add" %></li>
+  <br>
+</ul>
 
+<h4><%= t('.clean_up') %></h4>
+<%= render "clean" %>
 <% end %>