Skip to content

Commit

Permalink
Update Move#frame page
Browse files Browse the repository at this point in the history
  • Loading branch information
@B-Rass
B-Rass committed Jun 27, 2024
1 parent c5c4d5f commit 8925664
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 86 deletions.
19 changes: 8 additions & 11 deletions app/assets/stylesheets/palette-color-picker.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$cpfp-border: #bbb;

// Button
.palette-color-picker-button {
position: relative;
Expand All @@ -11,13 +9,13 @@ $cpfp-border: #bbb;

// Bubble
.palette-color-picker-bubble {
display: inline-block;
bottom: 100%;
width: 100%;
padding: 10px 8px 8px 8px;
border: 1px solid $cpfp-border;
border-radius: 3px;
background-color: #fff;
display: inline-block;
bottom: 100%;
width: 100%;
padding: 10px 8px 8px 8px;
border: 1px solid var(--bs-border-color);
border-radius: 3px;
background-color: var(--bs-body-bg);

// Open below
&.downside {
Expand All @@ -33,7 +31,7 @@ $cpfp-border: #bbb;
max-width: 26px;
padding-top: 22px;
margin: 2px 4px;
outline: 1px solid $cpfp-border;
outline: 1px solid var(--bs-border-color);
border: 2px solid #fff;
border-radius: 3px;
cursor: pointer;
Expand Down Expand Up @@ -91,5 +89,4 @@ $cpfp-border: #bbb;
}
}
}

}
129 changes: 64 additions & 65 deletions app/views/moves/_moved_connection_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,74 @@
<div class="row gy-4">
<div class="col-12">
<%= form_for(@moved_connection, url: update_connection_moves_path,
remote: true,
html: { class: "moved_connection p-4 rounded border my-4", role: "form" }) do |f| %>
<div class="row g-3">
<fieldset class="col-12">
<%= f.label :port_from_id, class: "form-label" %>
<%= render CardComponent.new() do |card| %>
<div id="back_departure_server" class="back_server overflow-scroll">
<%= render partial: "servers/draw_server_compact",
locals: { server: @selected_port.server, selected_port: @selected_port } %>
</div>
<% end %>
<%= f.hidden_field :port_from_id, value: @selected_port.id %>
</fieldset>
</div>
<%= form_for(@moved_connection, url: update_connection_moves_path,
remote: true,
html: {
class: "moved_connection p-4 rounded border bg-body-tertiary", role: "form"
}) do |f| %>
<div class="row g-3">
<fieldset class="col-12">
<%= f.label :port_from_id, class: "form-label" %>
<%= render CardComponent.new() do |card| %>
<div id="back_departure_server" class="back_server overflow-scroll">
<%= render partial: "servers/draw_server_compact",
locals: { server: @selected_port.server, selected_port: @selected_port } %>
</div>
<% end %>
<%= f.hidden_field :port_from_id, value: @selected_port.id %>
</fieldset>
</div>

<fieldset class="col-12 mt-4">
<%= f.label :port_to_id, class: "form-label" %>
<%= render CardComponent.new() do |card| %>
<% card.with_header do %>
<div class="text-center" id="select_destination_bay">
<span id="all_destinations">
<%= select_tag "to_server",
options_for_select(
@selected_port.server.frame.servers.map { |v| [v.name, v.id] },
{ selected: @destination_port.present? ? @destination_port.server&.id : nil }
),
include_blank: true,
onchange: "select_destination_server(this.value)",
style: 'max-width: 185px;'
%>
</span>
</div>
<% end %>
<div id="back_destination_server" class="back_server overflow-scroll">
<% if @destination_port && @destination_port.server %>
<%= render partial: "servers/draw_server_compact",
locals: { server: @destination_port.server, selected_port: @destination_port } %>
<% end %>
</div>
<fieldset class="col-12 mt-4">
<%= f.label :port_to_id, class: "form-label" %>
<%= render CardComponent.new() do |card| %>
<% card.with_header do %>
<div id="select_destination_bay">
<span id="all_destinations">
<%= select_tag "to_server",
options_for_select(
@selected_port.server.frame.servers.map { |v| [v.name, v.id] },
{ selected: @destination_port.present? ? @destination_port.server&.id : nil }
),
include_blank: true,
onchange: "select_destination_server(this.value)",
class: "form-select mx-auto",
style: "max-width: 185px;"
%>
</span>
</div>
<% end %>
<div id="back_destination_server" class="back_server overflow-scroll">
<% if @destination_port && @destination_port.server %>
<%= render partial: "servers/draw_server_compact",
locals: { server: @destination_port.server, selected_port: @destination_port } %>
<% end %>
<%= f.hidden_field :port_to_id, value: @destination_port.try(:id) %>
</fieldset>
</div>
<% end %>
<%= f.hidden_field :port_to_id, value: @destination_port.try(:id) %>
</fieldset>

<fieldset class="col-12 mt-4">
<%= f.label :vlans, class: "form-label" %>
<%= f.text_field :vlans, class: "form-control", value: @moved_connection.vlans %>
</fieldset>
<fieldset class="col-12 mt-4">
<%= f.label :vlans, class: "form-label" %>
<%= f.text_field :vlans, class: "form-control", value: @moved_connection.vlans %>
</fieldset>

<fieldset class="col-12 mt-4">
<%= f.label :color, class: "form-label" %>
<%= f.hidden_field :color, value: @moved_connection.color %>
</fieldset>
<fieldset class="col-12 mt-4">
<%= f.label :color, class: "form-label" %>
<%= f.hidden_field :color, value: @moved_connection.color %>
</fieldset>

<fieldset class="col-12 mt-4">
<%= f.label :cablename, class: "form-label" %>
<%= f.text_field :cablename, class: "form-control", value: @moved_connection.cablename %>
</fieldset>
<fieldset class="col-12 mt-4">
<%= f.label :cablename, class: "form-label" %>
<%= f.text_field :cablename, class: "form-control", value: @moved_connection.cablename %>
</fieldset>

<div class="col-12 mt-4 justify-content-between d-flex align-items-center">
<%= f.submit t("action.save"), class: "btn btn-primary",
disabled: @destination_port.present? ? false : :disabled %>
<span>
<%= f.hidden_field :remove_connection, value: "0" %>
<%= link_to t(".action.delete"), "#", class:"text-danger", onclick: "remove_connection()" %>
</span>
</div>
<% end %>
<div class="col-12 mt-4 justify-content-between d-flex align-items-center">
<%= f.submit t("action.save"), class: "btn btn-primary",
disabled: @destination_port.present? ? false : :disabled %>
<span>
<%= f.hidden_field :remove_connection, value: "0" %>
<%= link_to t(".action.delete"), "#", class:"text-danger", onclick: "remove_connection()" %>
</span>
</div>
</div>
<% end %>

<script>
$(document).ready(function(){
Expand Down
22 changes: 12 additions & 10 deletions app/views/moves/frame.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% provide(:title, "#{Move.model_name.human(count: 2)} | Baie #{@frame}") %>
<%= render "layouts/breadcrumb", breadcrumb_steps: {
Move.model_name.human(count: 2) => moves_path,
"Baie #{@frame}" => ''
"Baie #{@frame}" => ""
} %>

<div class="row my-5">
<div class="col-11 col-md-10 col-lg-8 mx-auto">
<div class="col-12 mx-auto">
<div class="d-flex justify-content-between pb-5">
<%= link_to moves_path, class: "btn btn-outline-secondary align-self-center d-inline-flex",
title: t("action.back") do %>
Expand All @@ -16,13 +16,13 @@
<div class="flex-grow-1"></div>
</div>

<div class="bg-body-tertiary p-4 rounded border">
<div class="card-islet">
<div class="bg-body p-4 rounded border">
<div class="card-islet mb-4">
<% if @room.present? %>
<div><h3>Salle <%= @room.name %> - Ilot <%= @frame.islet %></h3></div>
<% end %>
<ul class="frames p-0">
<div class="view-back">
<div class="frames row g-4 p-0">
<div class="view-back col-12 col-lg-6">
<%= render partial: "frames/show_frame",
locals: {
frame: @frame,
Expand All @@ -33,11 +33,13 @@
}
%>
</div>
<div id="moved_connection_form_loading" class="text-center text-bg-warning fw-bold pt-1">
<%= t(".loading") %>
<div class="col-12 col-lg-6">
<div id="moved_connection_form_loading" class="text-center text-bg-warning fw-bold pt-1">
<%= t(".loading") %>
</div>
<div class="moved_connection_form" id="connection_form"></div>
</div>
<div class="moved_connection_form" id="connection_form"></div>
</ul>
</div>
</div>

<h3><%= t(".applied_moves") %></h3>
Expand Down

0 comments on commit 8925664

Please sign in to comment.