smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Wed Mar 19 2025 Brian Read <brianr@koozali.org> 11.0.0-70.sme

Browse Source 
- Re-cast the default theme - use proper koozali logo image, unwind multiple divs
- Enhance responsiveness
- Revert Ibay menu name to Ibays
- Remove legacy SM1 button on header
- Remove "?" access to wiki help on header
This commit is contained in:
Brian Read
2025-03-19 13:45:03 +00:00
parent 77ca17c851
commit 33daeec84c
14 changed files with 159 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body
View File

@@ -230,6 +230,7 @@ a.error:link, a.error:visited, a.error:hover, a.error:active {
/* these two are for any success messages that pop up*/
div.success, span.success {
color: #006400;
/*
background-color: #ffffff;
border-width: 1px;
border-style: solid;
@@ -238,7 +239,8 @@ div.success, span.success {
margin-left: 20px;
margin-right: 20px;
margin-top:0px;
margin-bottom:0px;
*/
margin-bottom:4px;
}
@@ -437,4 +439,4 @@ buttons (used in forms) [HTML.pm]
*/
EOF
}
}

114
root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body
View File

@@ -3,6 +3,32 @@
/* smeserver_manager2 */
/*----------------------------------------------------------------------
* copyright (C) 1999-2003 Mitel Networks Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Technical support for this program is available from Mitel Networks
* Please visit our web site www.mitel.com for details.
*----------------------------------------------------------------------
*/
/* DO NOT MODIFY THIS FILE! It is updated automatically */
/* smeserver_manager2 */
/*----------------------------------------------------------------------
* copyright (C) 1999-2003 Mitel Networks Corporation
*
@@ -38,6 +64,21 @@ body{
margin: auto;
}
#header2 {
width:96.5%;
margin-left:1px;
margin-right:0px;
margin-top:4px;
}
.module {
padding: 20px;
border: 1px solid #ccc;
border-radius: 10px;
background-color: #f9f9f9;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
#navigation{
width: 190px;
position: absolute;
@@ -64,7 +105,9 @@ body{
}
#header {
background: #bee6a2;
/*background: #bee6a2;*/
width:100%
margin:auto;
}
#header h1, a:link, a:visited {
@@ -227,7 +270,7 @@ a.menu-title {
#module {
/* height: 600px; */
overflow: auto;
/* overflow: auto; */
}
@@ -287,7 +330,72 @@ a.menu-title {
width:100%;
}
#help-button {
text-decoration: none; /* Remove underline from link */
font-size: 20px; /* Adjust font size as needed */
padding: 8px 12px; /* Add padding to the help link */
background-color: #98d36e; /* Background for visibility */
border-radius: 4px; /* Rounded corners */
color: #000; /* Button text color */
}
#help-button:hover {
background-color: #82c961; /* Change background on hover */
}
.gradient-panel {
width: 100%;
height: 40px; /* Fixed height for the panel */
background: linear-gradient(to right, white , #c0e7a5 ); /* Deep green to light green */
display: flex;
align-items: center;
postion:relative;
}
.logo {
height: 142%; /* Fixed height for the logo */
width: auto; /* Width will adjust to maintain aspect ratio */
margin-left: -16px;
}
.login-button {
position: absolute;
left: 7%; /* Positions the button 2/3 across the panel */
transform: translateX(-50%); /* Centers the button on its position */
background-color: #4caf50b8;
color: white !important;
border: none;
padding: 8px 16px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 14px;
cursor: pointer;
border-radius: 4px;
margin-left:77%
}
.login-button:hover {
background-color: #45a049;
}
.flag-style {
position: absolute;
transform: translateY(-50%);
left: 95%;
/*right: 20px;*/
width: 24px;
height: 14px;
display: inline-block;
vertical-align: middle;
}
.no-visited-state:visited {
color: inherit; /* Or specify the desired color */
text-decoration: none; /* Or any other style you want to reset */
}
/*end*/
EOF
}
}

2
root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
View File

@@ -2,7 +2,7 @@ package SrvMngr::Controller::Ibays;
#----------------------------------------------------------------------
# heading : Network
# description : Shared areas (was ibays)
# description : Ibays
# navigation : 6000 100
#
#

BIN
root/usr/share/smanager/themes/default/public/images/KoozaliServerManager.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

4
root/usr/share/smanager/themes/default/templates/exception_development.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central" class="sme-error">
<div id="central module" class="sme-error">
<p><br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"
@@ -14,4 +14,4 @@
</p>
</div>
% end
% end

2
root/usr/share/smanager/themes/default/templates/initial.html.ep
View File

@@ -8,7 +8,7 @@
</p>
% }
<div id='central' class='central initial-panel'>
<div id='central' class='central initial-panel module'>
% if ( stash 'error' ) {
<br><div class=sme-error>

8
root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
View File

@@ -70,7 +70,7 @@
%= content 'js_toggleMenu'
% }
<div id="navigation" class="col-md-3">
<div id="navigation" class="col-md-3 module">
%= include 'partials/_nav_menu'
% if ( $c->is_logged_in ) {
%= include 'partials/_user_menu'
@@ -84,17 +84,17 @@
%= include 'partials/_info'
% if (flash 'success') {
<br><div class=success>
<br><div class="success module">
%= $c->render_to_string(inline => flash 'success')
</div>
% }
% if ( flash 'warning' ) {
<br><div class=sme-warning>
<br><div class="sme-warning module">
%= $c->render_to_string(inline => flash 'warning')
</div>
%}
% if ( flash 'error' ) {
<br><div class=sme-error>
<br><div class="sme-error module">
%= $c->render_to_string(inline => flash 'error')
</div>
%}

4
root/usr/share/smanager/themes/default/templates/not_found.development.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central" class="sme-error">
<div id="central module" class="sme-error">
<p><br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"
@@ -12,4 +12,4 @@
</p>
</div>
% end
% end

4
root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep
View File

@@ -1,5 +1,5 @@
<div id="footer">
<HR class="sme-copyrightbar">
<div id="footer" class="module">
<!--<HR class="sme-copyrightbar">-->
<a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
<font class="sme-copyright">
% if ( $c->is_logged_in && $c->is_admin) {

113
root/usr/share/smanager/themes/default/templates/partials/_header.html.ep
View File

@@ -1,98 +1,5 @@
<style>
#h2l1 {
display: flex; /* Use flexbox layout */
justify-content: space-between; /* Space between child elements */
align-items: center; /* Center items vertically */
}
#h2e11 {
flex: 1; /* Allow the first div to take available space on the left */
}
#h2e12 {
display: flex; /* Make this div a flex container */
align-items: center; /* Vertically center content in this div */
margin-left: 20px; /* Add margin to the left of this div */
}
#flag-container {
display: flex; /* Make this div a flex container */
align-items: center; /* Vertically center content in this div */
margin-left: 20px; /* Add margin to the left of the flag container */
padding-right: 20px; /* Add padding to the right side of the flag container */
}
.flag-icon {
width: 43px;
font-size: 20px;
}
#legacy-button button {
background-color: #98d36e; /* Button background color */
font-weight: lighter; /* Lighter text for the button */
color: #063; /* Button text color */
padding: 5px 10px; /* Padding for the button */
border: none; /* Remove default button border */
border-radius: 4px; /* Rounded corners for button */
cursor: pointer; /* Change cursor on hover */
}
#legacy-button button:hover {
background-color: #82c961; /* Change color on hover */
}
.infobar {
display: flex; /* Use flexbox for alignment */
justify-content: space-between; /* Space between child elements */
align-items: center; /* Center items vertically */
padding: 10px; /* Adjust padding as desired */
}
#h2e21 {
flex: 1; /* Allow the first div to take available space on the left */
}
#h2e22 {
display: flex; /* Make this div a flex container */
justify-content: center; /* Center the help button */
align-items: center; /* Center vertically */
flex: none; /* Prevent this div from growing */
position: relative; /* Relative position for centering */
width: 100px; /* Set a width for the help button container */
}
#h2e23 {
margin-left: auto; /* Push the third div to the right */
}
.login-button {
background-color: #98d36e; /* Button background color */
font-weight: bold; /* Bold text */
color: #ffffff; /* Button text color */
padding: 8px 12px; /* Adjust padding for button height */
border: none; /* Remove default border */
border-radius: 4px; /* Rounded corners */
cursor: pointer; /* Change cursor on hover */
}
.login-button:hover {
background-color: #82c961; /* Change color on hover */
}
#help-button {
text-decoration: none; /* Remove underline from link */
font-size: 20px; /* Adjust font size as needed */
padding: 8px 12px; /* Add padding to the help link */
background-color: #98d36e; /* Background for visibility */
border-radius: 4px; /* Rounded corners */
color: #000; /* Button text color */
}
#help-button:hover {
background-color: #82c961; /* Change background on hover */
}
</style>
<!--
<div id="header2" class="hd2">
<div id="h2l1">
<div id="h2e11">
@@ -103,9 +10,11 @@
<button type='button'class="login-button"><a id="help-button" target="_parent" href="manual">?</a></button>
</div>
<div id="h2e12">
<button type='button' class="login-button"><a id="legacy-button" href="/server-manager" target='_blank'>Legacy SM</a></button>
</div>
<div id="h2e23">
% if ( not defined $c->session->{username} ) {
<button type='button' class="login-button"><a target="_parent" href="login">Login</a></button>
@@ -114,7 +23,7 @@
% }
</div>
<div id="flag-container">
<!-- The flag icon will be inserted here -->
The flag icon will be inserted here
</div>
</div>
<div id="h2l2" class="infobar">
@@ -125,4 +34,16 @@
</div>
</div>
</div>-->
<div id="header2" class="hd2 module gradient-panel">
<img src="images/KoozaliServerManager.png" alt="Koozali Logo" class="logo" >
% if ( not defined $c->session->{username} ) {
<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="login">Login</a></button>
% } else {
<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="logout"><%= $c->session->{username} %> Logout</a></button>
% }
<div id="flag-container" class = "flag-style">
<!-- The flag icon will be inserted here -->
</div>
</div>

6
root/usr/share/smanager/themes/default/templates/partials/_info.html.ep
View File

@@ -1,16 +1,16 @@
<% use POSIX qw(strftime); %>
<div id="info">
<% if (! $c->session->{PwdSet} ) { %>
<div class="sme-error"><h5>
<div class="sme-error module"><h5>
Warning: you have not yet changed the default system password.</h5></div>
<% } %>
<% if ( $c->is_unsafe ) { %>
<div class="sme-error"><h5>
<div class="sme-error module"><h5>
Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
may leave your system in an unknown state!</h5></div>
<% } %>
<% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
<div class="sme-error"><h5>
<div class="sme-error module"><h5>
Warning: Development or debug mode enabled AND public access is offered !
</h5></div>
<% } %>

4
root/usr/share/smanager/themes/default/templates/review.html.ep
View File

@@ -1,7 +1,7 @@
% layout 'default', title => 'Sme server 2 - Review';
% content_for 'module' => begin
<div id='central' class='central review-panel'>
<div id='central' class='central review-panel module'>
<h1> <%= $title %> </h1>
<%= $modul %><br><br>
@@ -134,4 +134,4 @@
</div>
% end
% end

4
root/usr/share/smanager/themes/default/templates/whatever.html.ep
View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="central" class="sme-error">
<div id="central module" class="sme-error">
<p><br>dev<br> What else !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"
@@ -14,4 +14,4 @@
</p>
</div>
% end
% end

9
smeserver-manager.spec
View File

@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
%define release 69
%define release 70
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -143,6 +143,13 @@ true
%defattr(-,root,root)
%changelog
* Wed Mar 19 2025 Brian Read <brianr@koozali.org> 11.0.0-70.sme
- Re-cast the default theme - use proper koozali logo image, unwind multiple divs
- Enhance responsiveness
- Revert Ibay menu name to Ibays
- Remove legacy SM1 button on header
- Remove "?" access to wiki help on header
* Mon Mar 17 2025 Brian Read <brianr@koozali.org> 11.0.0-69.sme
- Add a total summary report across all existing logs [SME: 12951]