Skip to content

Align new pages to style guide #856

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.

Sign up for GitHub

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

Merged
newbee1905 merged 1 commit into from
Feb 1, 2026
Merged

Align new pages to style guide #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/Components/HMI/ui/public/admin/component/sidebar-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<li>
<a href="/admin/admin-request.html" style="display:block;padding:0 16px;height:40px;line-height:40px;color:#1F2D23;text-decoration:none;font-weight:500;font-size:14px;">User Activity</a>
</li>
<li>
<a href="/admin/feedback.html" style="display:block;padding:0 16px;height:40px;line-height:40px;color:#1F2D23;text-decoration:none;font-weight:500;font-size:14px;">Feedback</a>
</li>

<!-- Echo Section -->
<li style="padding:24px 16px 8px 16px;font-family:Inter, system-ui, Segoe UI, Roboto, Arial;">
Expand Down
3 changes: 3 additions & 0 deletions src/Components/HMI/ui/public/admin/component/sidebar-component2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
<li>
<a href="./requests" style="display:block;padding:0 16px;height:40px;line-height:40px;color:#1F2D23;text-decoration:none;font-weight:500;font-size:14px;">User Activity</a>
</li>
<li>
<a href="./feedback.html" style="display:block;padding:0 16px;height:40px;line-height:40px;color:#1F2D23;text-decoration:none;font-weight:500;font-size:14px;">Feedback</a>
</li>

<!-- Echo Section -->
<li style="padding:24px 16px 8px 16px;font-family:Inter, system-ui, Segoe UI, Roboto, Arial;">
Expand Down
56 changes: 42 additions & 14 deletions src/Components/HMI/ui/public/admin/feedback.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<!-- Bootstrap -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"/>
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css" rel="stylesheet"/>
<link type="text/css" rel="stylesheet" href="/admin/css/styles.min.css" />

<style>
:root{
Expand All @@ -34,7 +35,8 @@
color:var(--text);
}

.page-wrapper{ padding: 1.5rem; max-width: 1150px; margin: 0 auto; }
/* Scoped container for feedback page content to avoid overriding global admin layout */
.feedback-content{ padding: 1.5rem; max-width: 1150px; margin: 0 auto; }
.card{
border-radius: var(--radius);
border: 1px solid var(--border);
Expand Down Expand Up @@ -67,8 +69,8 @@
border-radius: 14px;
}
.form-control:focus, .form-select:focus{
border-color: rgba(13,110,253,.55);
box-shadow: 0 0 0 .2rem rgba(13,110,253,.15);
border-color: rgba(47,110,79,.55);
box-shadow: 0 0 0 .2rem rgba(47,110,79,.15);
}

.section-title{ font-weight: 700; }
Expand Down Expand Up @@ -106,10 +108,10 @@
}
.chip input{ display:none; }
.chip.active{
border-color: rgba(13,110,253,.35);
background: rgba(13,110,253,.08);
color: var(--brand);
box-shadow: 0 8px 20px rgba(13,110,253,.10);
border-color: rgba(47,110,79,.35);
background: rgba(47,110,79,.08);
color: var(--echo-green, #2F6E4F);
box-shadow: 0 8px 20px rgba(47,110,79,.10);
}

.severity-btn{
Expand Down Expand Up @@ -149,8 +151,8 @@
transition: border-color .15s ease, background .15s ease;
}
.dropzone.drag{
border-color: rgba(13,110,253,.65);
background: rgba(13,110,253,.06);
border-color: rgba(47,110,79,.65);
background: rgba(47,110,79,.06);
}
.file-item{
display:flex;
Expand All @@ -172,9 +174,10 @@

.btn-primary{
border-radius: 14px;
background: linear-gradient(135deg, var(--brand), #4f8bff);
background: linear-gradient(135deg, var(--echo-green, #2F6E4F), #376e53);
border: none;
box-shadow: 0 10px 24px rgba(13,110,253,.22);
box-shadow: 0 10px 24px rgba(47,110,79,.18);
color: #ffffff;
}
.btn-outline-secondary{ border-radius: 14px; }
.btn-outline-danger{ border-radius: 14px; }
Expand All @@ -199,10 +202,16 @@
.req{ color: var(--danger); }
.spinner-border{ width: 1.1rem; height: 1.1rem; }
</style>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
</head>

<body>
<div class="page-wrapper">
<div class="page-wrapper" id="main-wrapper" data-layout="vertical" data-navbarbg="skin6" data-sidebartype="full" data-sidebar-position="fixed" data-header-position="fixed">
<div id="sidebar"></div>
<div class="body-wrapper">
<div id="header"></div>
<div class="container-fluid">
<div class="feedback-content">

<!-- TOP HERO -->
<div class="hero mb-4">
Expand All @@ -226,6 +235,15 @@ <h2 class="fw-bold mb-1">Help us improve Project Echo</h2>
</div>
</div>

<!-- Page Toolbar -->
<div class="page-toolbar mb-3 d-flex justify-content-between align-items-center">
<div class="toolbar-left"></div>
<div class="toolbar-right">
<button class="btn btn-primary me-2" id="toolbarSubmit" type="button"><i class="bi bi-send me-1"></i> Submit Feedback</button>
<button class="btn btn-outline-danger" id="toolbarClear" type="button"><i class="bi bi-trash3 me-1"></i> Clear</button>
</div>
</div>

<!-- ALERTS -->
<div id="successBanner" class="success-banner">
<i class="bi bi-check-circle-fill me-2"></i>
Expand Down Expand Up @@ -424,10 +442,20 @@ <h5 class="section-title mb-1">Submit feedback</h5>
</div>
</div>

</div>
</div>
</div> <!-- .feedback-content -->
</div> <!-- .container-fluid -->
</div> <!-- .body-wrapper -->
</div> <!-- .page-wrapper -->

<script>
$(document).ready(function() {
$("#sidebar").load("/admin/component/sidebar-component.html", function() { $.getScript('/admin/js/sidebarmenu.js'); });
$("#header").load("/admin/component/header-component.html");
// toolbar hookups
document.getElementById('toolbarSubmit')?.addEventListener('click', () => document.getElementById('submitBtn').click());
document.getElementById('toolbarClear')?.addEventListener('click', () => document.getElementById('clearBtn').click());
});

const form = document.getElementById("feedbackForm");
const successBanner = document.getElementById("successBanner");
const errorBanner = document.getElementById("errorBanner");
Expand Down
Loading