Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

edit header on production #235

Merged
merged 10 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions app/assets/stylesheets/_custom_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ p {
letter-spacing: 0em;
text-align: left;
color: white;
margin-right: 20px;
}

}
Expand All @@ -133,8 +134,8 @@ p {

.btn-sign {
color: #00274c !important;
background-color: #FFCF01 !important;
// box-shadow: 0 0 0 0 rgba(0, 0, 0, 0.05);
background-color: #FFCF01 !important;
--bs-btn-focus-shadow-rgb: 0, 39, 76 !important;
}

.btn-sign:hover {
Expand Down Expand Up @@ -302,9 +303,16 @@ svg.wh6 {
display: block;
}

@media (max-width: 830px) {
.title-container {
display: none !important;
@media (max-width: 770px) {
#LSAlogo {
padding-left: 10px;
}
.logo_image {
width: 100px;
}
.nav-title {
font-size: 30px !important;
margin-right: 0px !important;
}
}

Expand All @@ -314,10 +322,6 @@ svg.wh6 {
}
}

.title-container {
margin-right: 20px;
}

.nowrap {
white-space: nowrap;
}
Expand Down Expand Up @@ -351,3 +355,7 @@ svg.wh6 {
margin-bottom: 1rem;
color: var(--bs-heading-color);
}

.btn-primary {
--bs-btn-focus-shadow-rgb: 255, 203, 5;
}
6 changes: 3 additions & 3 deletions app/controllers/reports_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ def index
{title: "No Access", url: no_access_report_reports_path, description: "This report shows information on Rooms that were not able to be accessed" },
{title: "No Access During Last Checks", url: no_access_for_n_times_report_reports_path, description: "This report shows information on Rooms that were not able to be accessed during several last checks" },
{title: "Rooms not Checked during Last Days", url: not_checked_rooms_report_reports_path, description: "This report shows information on Rooms that were not checked during last days" },
{title: "Common Attribute States", url: common_attribute_states_report_reports_path, description: "This report shows the repsonses to the Common Questions in the Rover form" },
{title: "Specific Attribute States", url: specific_attribute_states_report_reports_path, description: "This report shows the repsonses to the Specific Questions in the Rover form" },
{title: "Resource States", url: resource_states_report_reports_path, description: "This report shows the repsonses to the Resource Questions in the Rover form" },
{title: "Common Attribute States", url: common_attribute_states_report_reports_path, description: "This report shows the responses to the Common Questions in the Rover form" },
{title: "Specific Attribute States", url: specific_attribute_states_report_reports_path, description: "This report shows the responses to the Specific Questions in the Rover form" },
{title: "Resource States", url: resource_states_report_reports_path, description: "This report shows the responses to the Resource Questions in the Rover form" },
]
end

Expand Down
12 changes: 6 additions & 6 deletions app/views/buildings/_listing.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<table class="table text-center">
<thead class="table-group-divider">
<tr>
<th>Building Record Number</th>
<th>Name</th>
<th class="text-start">Name</th>
<th>Nickname</th>
<th>Address</th>
<th>Building Record Number</th>
<th>Zone</th>
<th>View</th>
<th>Edit</th>
Expand All @@ -17,10 +17,7 @@
<tbody class="table-group-divider">
<% @buildings.each do |building| %>
<tr class="building_tbody_tr">
<td class="building_tbody_td">
<%= building.bldrecnbr %>
</td>
<td class="building_tbody_td">
<td class="building_tbody_td text-start">
<%= link_to building_path(building), data: { turbo_frame: "_top" }, class: "link_to" do%>
<%= building.name %>
<% end %>
Expand All @@ -31,6 +28,9 @@
<td class="building_tbody_td">
<%= building.full_address %>
</td>
<td class="building_tbody_td">
<%= building.bldrecnbr %>
</td>
</td>
<td class="building_tbody_td">
<%= show_zone(building) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/reports/common_attribute_states_report.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>Common Attribute States Report</h1>
<%= link_to 'Back to Reports', reports_path, class: "link_to" %>
</div>
<p>This report shows the repsonses to the Common Questions in the Rover form.</p>
<p>This report shows the responses to the Common Questions in the Rover form.</p>

<div class="py-3">
<%= render 'filter_form', report_url: common_attribute_states_report_reports_path %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/reports/resource_states_report.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>Resource States Report</h1>
<%= link_to 'Back to Reports', reports_path, class: "link_to" %>
</div>
<p>This report shows the repsonses to the Resource Questions in the Rover form.</p>
<p>This report shows the responses to the Resource Questions in the Rover form.</p>

<div class="py-3">
<%= render 'filter_form', report_url: resource_states_report_reports_path do |form| %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>Specific Attribute States Report</h1>
<%= link_to 'Back to Reports', reports_path, class: "link_to" %>
</div>
<p>This report shows the repsonses to the Specific Questions in the Rover form.</p>
<p>This report shows the responses to the Specific Questions in the Rover form.</p>

<div class="py-3">
<%= render 'filter_form', report_url: specific_attribute_states_report_reports_path %>
Expand Down
3 changes: 0 additions & 3 deletions app/views/rovers/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<div class="d-flex flex-row justify-content-start align-items-center gap-3">
<%= form.text_field :uniqname, placeholder: "Uniqname", class: "w-50" %>
<%= form.submit "Create" %>
<a class="link_to" data-action="autosubmit#clearFilters">
Cancel
</a>
</div>
</div>
<% end %>
Expand Down
10 changes: 5 additions & 5 deletions app/views/shared/_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<nav class="navbar navbar-expand-md navbar-dark bg-um-blue">
<div class="container-fluid" style="--bs-focus-ring-color:#E5E5E5;" >
<%= link_to root_path, class: "a-nav focus-ring border-0 rounded-2" do %>
<div id="LSAlogo">
<div id="LSAlogo" class="d-flex align-items-center">
<div class="navbar-brand">
<%= image_tag 'LSA_Logo.svg', alt: 'LSA Logo' %>
<%= image_tag 'LSA_Logo.svg', alt: 'LSA Logo', class: 'logo_image' %>
</div>
<div class="nav-title d-none d-md-flex align-items-center gap-4 h-100 title-container">
<div class="nav-title h-100">
SpaceReady
</div>
</div>
Expand Down Expand Up @@ -89,7 +89,7 @@
</div>
<div class="d-flex flex-row justify-content-center align-items-center"><span><%= current_user.principal_name %></span> </div>
<div class="d-flex flex-row justify-content-center align-items-center mt-2">
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#00274c;" do %>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign" do %>
<span>Log Out</span>
<% end %>
</div>
Expand Down Expand Up @@ -136,7 +136,7 @@
</div>
<div class="d-flex flex-row justify-content-center align-items-center"><span><%= current_user.principal_name %></span> </div>
<div class="d-flex flex-row justify-content-center align-items-center mt-2">
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#00274c;" do %>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign " do %>
Log Out
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/static_pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<div class="d-grid w-25 mt-6 mb-8">
<% if user_signed_in? %>
<div>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#00274c;" do %>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign" do %>
<span>Log Out</span>
<% end %>
</div>
<% else %>
<div>
<%= button_to "Sign In", user_saml_omniauth_authorize_path, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#00274c;" %>
<%= button_to "Sign In", user_saml_omniauth_authorize_path, data: {turbo: "false"}, class: "btn btn-sign" %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/static_pages/welcome_rovers.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<div class="d-grid w-25 ms-6 mt-6 mb-8">
<% if user_signed_in? %>
<div>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#E5E5E5;" do %>
<%= button_to destroy_user_session_path, method: :delete, data: {turbo: "false"}, class: "btn btn-sign" do %>
<span>Log Out</span>
<% end %>
</div>
<% else %>
<div>
<%= button_to "Sign In", user_saml_omniauth_authorize_path, data: {turbo: "false"}, class: "btn btn-sign focus-ring", style: "--bs-focus-ring-color:#E5E5E5;" %>
<%= button_to "Sign In", user_saml_omniauth_authorize_path, data: {turbo: "false"}, class: "btn btn-sign" %>
</div>
<% end %>
</div>
Expand Down
12 changes: 6 additions & 6 deletions app/views/zones/buildings/_listing.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<table class="table text-center">
<thead class="table-group-divider">
<tr>
<th>Building Record Number</th>
<th>Name</th>
<th class="text-start">Name</th>
<th>Nickname</th>
<th>Address</th>
<th>Building Record Number</th>
<th>View</th>
<th>Edit</th>
<th>Remove from Zone</th>
Expand All @@ -14,10 +14,7 @@
<tbody class="table-group-divider">
<% @buildings.each do |building| %>
<tr class="building_tbody_tr">
<td class="building_tbody_td">
<%= building.bldrecnbr %>
</td>
<td class="building_tbody_td">
<td class="building_tbody_td text-start">
<%= link_to building_path(building, zone_id: @zone.id), data: { turbo_frame: "_top" }, class: "link_to" do%>
<%= building.name %>
<% end %>
Expand All @@ -28,6 +25,9 @@
<td class="building_tbody_td">
<%= building.full_address %>
</td>
<td class="building_tbody_td">
<%= building.bldrecnbr %>
</td>
<td class="building_tbody_td">
<%= link_to building_path(building, zone_id: @zone.id), 'data-bs-toggle': "tooltip", 'data-bs-placement': "bottom", 'title': "View", data: { turbo_frame: "_top" } do %>
<i class="bi bi-eye-fill text-primary"></i>
Expand Down
2 changes: 1 addition & 1 deletion app/views/zones/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-fluid" id="zones">
<div class="d-flex justify-content-between">
<h1>All Zones</h1>
<%= link_to "Add New Zone", new_zone_path, class: "btn btn-primary focus-ring h-50 mt-auto mb-auto", style: "--bs-focus-ring-color:#ffcb05;" %>
<%= link_to "Add New Zone", new_zone_path, class: "btn btn-primary h-50 mt-auto mb-auto" %>
</div>
<div class="row">
<% @zones.each do |zone| %>
Expand Down
Loading