Fix and clean vizual. views (servers component alignment + bg colors)

nanego · Jul 4, 2024 · ab237eb · ab237eb
1 parent ad4b668
commit ab237eb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -80,6 +80,8 @@ body {
 
 .frame .server {
   page-break-inside: avoid;
+
+  background-color: var(--bs-light-bg-subtle);
 }
 
 .frame {
@@ -167,6 +169,11 @@ table.card_layout {
       background-color: #a2b9ff !important;
     }
   }
+
+  .server-component {
+    display: inherit;
+    flex-direction: inherit;
+  }
 }
 
 .portRJ, .portFC, .portSCSI, .portALIM {
@@ -625,6 +632,8 @@ body {
   }
 
   &-sidebar {
+    font-size: 16px;
+
     &:not(.offcanvas) {
       @include media-breakpoint-up(lg) {
         position: sticky;

diff --git a/app/assets/stylesheets/rooms.css.scss b/app/assets/stylesheets/rooms.css.scss
@@ -39,7 +39,7 @@
     align-items: center;
     justify-content: center;
     display: flex;
-    background-color: #F5F5F5;
+    background-color: var(--bs-tertiary-bg);
     border: 1px solid #e3e3e3;
     writing-mode: vertical-rl;
     text-orientation: upright;

diff --git a/app/helpers/servers_helper.rb b/app/helpers/servers_helper.rb
@@ -102,14 +102,10 @@ def ports_by_card(port_type:, port_quantity:, ports_data:, card_id: nil, selecte
 
       html += content_tag(:span,
                           link_to_port(index + 1, port_data, port_type, card_id, port_id),
-                          class: "port_container d-inline-flex
+                          class: "port_container float-start
                                   #{twin_card_used_ports && port_data && port_data.cable_name && twin_card_used_ports.exclude?(port_data.position) ? "no_client" : ""}
                           #{twin_card_used_ports && (port_data.blank? || port_data.cable_name.blank?) && twin_card_used_ports.include?(index + 1) ? "unreferenced_client" : ""}
                           #{selected_port.present? && port_id == selected_port.try(:id) ? "selected" : ""}")
-
-      if (index + 1) % MAX_PORTS_PER_LINE == 0 # Every XX ports do
-        html += '<div style="clear:both;" />'
-      end
     end
     html.html_safe
   end

diff --git a/app/views/servers/_draw_component.html.erb b/app/views/servers/_draw_component.html.erb
@@ -1,13 +1,13 @@
-<% server.cards.includes(:ports => :cable).select {|card| card.composant_id == component.id}.each do |card| %>
-
+<% server.cards.includes(ports: :cable).select { |card| card.composant_id == component.id }.each do |card| %>
   <% if card.twin_card_id
        twin_card = Card.find(card.twin_card_id)
        connections = twin_card.ports.map(&:connection)
        twin_card_used_ports = []
-       connections.each {|c| twin_card_used_ports << c.port.position if c && c.port}
-     end %>
+       connections.each { |c| twin_card_used_ports << c.port.position if c && c.port }
+  end %>
 
-  <span data-server-name="<%= server.name %>"
+  <span class="server-component"
+        data-server-name="<%= server.name %>"
         data-server-id="<%= server.id %>"
         data-composant-id="<%= card.id %>"
         data-composant-type="<%= card.class %>"
@@ -27,7 +27,5 @@
                         moved_connections: @moved_connections,
                         twin_card_used_ports: twin_card_used_ports) %>
     <% end %>
-
-
   </span>
 <% end %>
diff --git a/app/views/servers/_draw_u_scale_unit.html.erb b/app/views/servers/_draw_u_scale_unit.html.erb
@@ -1,4 +1,4 @@
-<span class="float-start u_scale position_in_frame <%= u_disponibles.even? ? 'even': 'odd' %>"
+<span class="float-start u_scale position_in_frame border-end <%= u_disponibles.even? ? "even": "odd" %>"
       title="<%= u_disponibles %>"
       style="
       <%= "cursor: pointer; " if clickable_lines %>