285239 - Update params menu (#115)

* Update params menu organization * Rebase update
nanego · Dec 20, 2023 · eafd63d · eafd63d
1 parent 43dcd3c
commit eafd63d
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 48 deletions.
diff --git a/app/views/contract_types/edit.html.erb b/app/views/contract_types/edit.html.erb
@@ -1,6 +1,6 @@
 <%= render 'layouts/breadcrumb', breadcrumb_variables: {
   t("inventories") => modeles_url,
-  ContractType.model_name.human.pluralize => contract_types_path,
+  ContractType.model_name.human(count: 2) => contract_types_path,
   @contract_type => '',
 } %>
 

diff --git a/app/views/contract_types/index.html.erb b/app/views/contract_types/index.html.erb
@@ -1,6 +1,6 @@
 <%= render 'layouts/breadcrumb', breadcrumb_variables: {
   t("inventories") => contract_types_path,
-  ContractType.model_name.human.pluralize => ""}
+  ContractType.model_name.human(count: 2) => ""}
 %>
 
 <div class="container-fluid">

diff --git a/app/views/contract_types/new.html.erb b/app/views/contract_types/new.html.erb
@@ -1,6 +1,6 @@
 <%= render 'layouts/breadcrumb', breadcrumb_variables: {
   t("inventories") => modeles_url,
-  ContractType.model_name.human.pluralize => contract_types_path,
+  ContractType.model_name.human(count: 2) => contract_types_path,
   t(".title") => '',
 } %>
 

diff --git a/app/views/contract_types/show.html.erb b/app/views/contract_types/show.html.erb
@@ -1,21 +1,28 @@
-<div class="page-header">
-  <%= link_to contract_types_path, class: 'btn btn-default' do %>
-    <span class="glyphicon glyphicon-list-alt"></span>
-    <%= t("action.back") %>
-  <% end %>
-  <%= link_to edit_contract_type_path(@contract_type), class: 'btn btn-primary' do %>
-    <span class="glyphicon glyphicon-pencil"></span>
-    <%= t("action.edit") %>
-  <% end %>
-  <h1>
-    <%= t(".title") %>
-  </h1>
-</div>
+<%= render 'layouts/breadcrumb', breadcrumb_variables: {
+  t("inventories") => modeles_url,
+  ContractType.model_name.human(count: 2) => contract_types_path,
+  @contract_type => '',
+} %>
 
-<dl class="dl-horizontal">
-  <dt>
-    <%= ContractType.human_attribute_name(:name) %> :
-  </dt>
-  <dd><%= @contract_type %></dd>
+<div class="container">
+  <div class="page-header">
+    <%= link_to contract_types_path, class: 'btn btn-default' do %>
+      <span class="glyphicon glyphicon-list-alt"></span>
+      <%= t("action.back") %>
+    <% end %>
+    <%= link_to edit_contract_type_path(@contract_type), class: 'btn btn-primary' do %>
+      <span class="glyphicon glyphicon-pencil"></span>
+      <%= t("action.edit") %>
+    <% end %>
+    <h1>
+      <%= t(".title") %>
+    </h1>
+  </div>
 
-</dl>
+  <dl class="dl-horizontal">
+    <dt>
+      <%= ContractType.human_attribute_name(:name) %> :
+    </dt>
+    <dd><%= @contract_type %></dd>
+  </dl>
+</div>
diff --git a/app/views/layouts/_inventories_dropdown.html.erb b/app/views/layouts/_inventories_dropdown.html.erb
@@ -3,7 +3,6 @@
     <%= t("inventories") %> <span class="caret"></span>
   </a>
   <ul class="dropdown-menu">
-
     <li class="dropdown-header">Localisation</li>
     <li><a href="<%= sites_path %>">Sites</a></li>
     <li><a href="<%= rooms_path %>">Salles</a></li>
@@ -12,24 +11,25 @@
     <li><a href="<%= frames_path %>">Châssis</a></li>
 
     <li role="separator" class="divider"></li>
-
     <li class="dropdown-header">Matériel</li>
     <li><a href="<%= servers_path %>">Matériels</a></li>
 
     <li role="separator" class="divider"></li>
-
-    <li class="dropdown-header">Gestion du matériel</li>
+    <li class="dropdown-header"><%= t("pages.params_menu.features.title")%></li>
     <li><a href="<%= modeles_path %>">Modèles</a></li>
     <li><a href="<%= categories_path %>">Types de matériel</a></li>
     <li><a href="<%= architectures_path %>">Architectures</a></li>
     <li><a href="<%= manufacturers_path %>">Fabricants</a></li>
-    <li><a href="<%= domaines_path %>">Domaines</a></li>
-    <li><a href="<%= gestions_path %>">Gestionnaires</a></li>
-    <li><a href="<%= clusters_path %>">Clusters</a></li>
     <li><a href="<%= stacks_path %>">Stacks</a></li>
     <li><a href="<%= card_types_path %>">Types de carte</a></li>
     <li><a href="<%= port_types_path %>"><%= PortType.model_name.human(count: 2) %></a></li>
 
+    <li role="separator" class="divider"></li>
+    <li class="dropdown-header"><%= t("pages.params_menu.exploitation.title")%></li>
+    <li><a href="<%= domaines_path %>">Domaines</a></li>
+    <li><a href="<%= gestions_path %>">Gestionnaires</a></li>
+    <li><a href="<%= clusters_path %>">Clusters</a></li>
+
     <!--
     <li><a href="<%= colors_path %>">Couleurs</a></li>
     <li><a href="<%= maintainers_path %>">Mainteneurs</a></li>

diff --git a/app/views/pages/_params_menu.html.erb b/app/views/pages/_params_menu.html.erb
@@ -1,5 +1,4 @@
 <p>
-
   <div class="list-group">
     <a href="#" class="list-group-item disabled">
       <%= t(".location.title") %>
@@ -18,23 +17,34 @@
 
   <div class="list-group">
     <a href="#" class="list-group-item disabled">
-      <%= t(".material_management.title") %>
+      <%= t(".features.title") %>
     </a>
     <a href="<%= modeles_path %>" class="list-group-item <%= controller.controller_name == "modeles" ? "active" : "" %>"><%= Modele.model_name.human.pluralize %></a>
     <a href="<%= categories_path %>" class="list-group-item <%= controller.controller_name == "categories" ? "active" : "" %>"><%= Category.model_name.human.pluralize %></a>
     <a href="<%= architectures_path %>" class="list-group-item <%= controller.controller_name == "architectures" ? "active" : "" %>"><%= Architecture.model_name.human.pluralize %></a>
     <a href="<%= manufacturers_path %>" class="list-group-item <%= controller.controller_name == "manufacturers" ? "active" : "" %>"><%= Manufacturer.model_name.human.pluralize %></a>
-    <a href="<%= domaines_path %>" class="list-group-item <%= controller.controller_name == "domaines" ? "active" : "" %>"><%= Domaine.model_name.human.pluralize %></a>
-    <a href="<%= gestions_path %>" class="list-group-item <%= controller.controller_name == "gestions" ? "active" : "" %>"><%= Gestion.model_name.human.pluralize %></a>
-    <a href="<%= clusters_path %>" class="list-group-item <%= controller.controller_name == "clusters" ? "active" : "" %>"><%= Cluster.model_name.human.pluralize %></a>
     <a href="<%= stacks_path %>" class="list-group-item <%= controller.controller_name == "stacks" ? "active" : "" %>"><%= Stack.model_name.human.pluralize %></a>
     <a href="<%= card_types_path %>" class="list-group-item <%= controller.controller_name == "card_types" ? "active" : "" %>"><%= CardType.model_name.human(count: 2) %></a>
     <a href="<%= port_types_path %>" class="list-group-item <%= controller.controller_name == "port_types" ? "active" : "" %>"><%= PortType.model_name.human(count: 2) %></a>
-    <a href="<%= colors_path %>" class="list-group-item <%= controller.controller_name == "colors" ? "active" : "" %>"><%= Color.model_name.human.pluralize %></a>
-    <a href="<%= maintainers_path %>" class="list-group-item <%= controller.controller_name == "maintainers" ? "active" : "" %>"><%= Maintainer.model_name.human.pluralize %></a>
-    <a href="<%= contract_types_path %>" class="list-group-item <%= controller.controller_name == "contract_types" ? "active" : "" %>"><%= ContractType.model_name.human(count: 2) %></a>
     <a href="<%= disk_types_path %>" class="list-group-item <%= controller.controller_name == "disk_types" ? "active" : "" %>"><%= DiskType.model_name.human(count: 2) %></a>
     <a href="<%= memory_types_path %>" class="list-group-item <%= controller.controller_name == "memory_types" ? "active" : "" %>"><%= MemoryType.model_name.human(count: 2) %></a>
   </div>
 
+  <div class="list-group">
+    <a href="#" class="list-group-item disabled">
+      <%= t(".exploitation.title") %>
+    </a>
+    <a href="<%= domaines_path %>" class="list-group-item <%= controller.controller_name == "domaines" ? "active" : "" %>"><%= Domaine.model_name.human.pluralize %></a>
+    <a href="<%= gestions_path %>" class="list-group-item <%= controller.controller_name == "gestions" ? "active" : "" %>"><%= Gestion.model_name.human.pluralize %></a>
+    <a href="<%= clusters_path %>" class="list-group-item <%= controller.controller_name == "clusters" ? "active" : "" %>"><%= Cluster.model_name.human.pluralize %></a>
+    <a href="<%= colors_path %>" class="list-group-item <%= controller.controller_name == "colors" ? "active" : "" %>"><%= Color.model_name.human.pluralize %></a>
+  </div>
+
+  <div class="list-group">
+    <a href="#" class="list-group-item disabled">
+      <%= t(".maintenance.title") %>
+    </a>
+    <a href="<%= maintainers_path %>" class="list-group-item <%= controller.controller_name == "maintainers" ? "active" : "" %>"><%= Maintainer.model_name.human.pluralize %></a>
+    <a href="<%= contract_types_path %>" class="list-group-item <%= controller.controller_name == "contract_types" ? "active" : "" %>"><%= ContractType.model_name.human(count: 2) %></a>
+  </div>
 </p>
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -49,8 +49,12 @@ fr:
       location:
         title: Localisation
         bays: Baies / Doubles-baies
-      material_management:
-        title: Gestion du matériel
+      features:
+        title: Caractéristiques
+      exploitation:
+        title: Exploitation
+      maintenance:
+        title: Maintenance
   inventories: Inventaires
   visualization: Visualisation
   sites:
@@ -212,24 +216,24 @@ fr:
         destroyed: Le mainteneur a bien été supprimé.
   contract_types:
     index:
-      title: Types de contrat
-      add_contract_type: Ajouter un type de contrat
-      delete_confirmation: Toutes les données concernant ce type de contrat seront supprimées, ainsi que les contrats de maintenance associés. Voulez-vous continuer ?
+      title: Contrats de maintenance
+      add_contract_type: Ajouter un contrat de maintenance
+      delete_confirmation: Toutes les données concernant ce contrat de maintenance seront supprimées, ainsi que les contrats de maintenance associés. Voulez-vous continuer ?
     show:
-      title: Voir le type de contrat
+      title: Voir le contrat de maintenance
     new:
-      title: Nouveau type de contrat
+      title: Nouveau contrat de maintenance
     create:
       flashes:
-        created: Le type de contrat a bien été créé.
+        created: Le contrat de maintenance a bien été créé.
     edit:
-      title: Edition d'un type de contrat
+      title: Edition du contrat de maintenance
     update:
       flashes:
-        updated: Le type de contrat a bien été modifié.
+        updated: Le contrat de maintenance a bien été modifié.
     destroy:
       flashes:
-        destroyed: Le type de contrat a bien été supprimé.
+        destroyed: Le contrat de maintenance a bien été supprimé.
   disk_types:
     index:
       title: Liste des types de disque