From ebbe7af9a748284ed15135e5aeef74d55b5d0d37 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Mon, 24 Mar 2025 17:23:02 +0000 Subject: [PATCH] * Mon Mar 24 2025 Brian Read 11.0.0-72.sme - Remove css files from template structure [SME: 12967] - Rationalise and merge css files - Adjust some gaps around panels - Remove HR lines --- .../default/public/css/sme_core.css/50body | 250 --------- .../public/css/sme_core.css/90contribs | 96 ---- .../public/css/sme_core.css/template-begin | 1 - .../default/public/css/sme_main.css/50body | 277 ---------- .../public/css/sme_main.css/90contribs | 50 -- .../public/css/sme_main.css/template-begin | 1 - .../default/public/css/sme_menu.css/50body | 229 -------- .../public/css/sme_menu.css/template-begin | 1 - .../default/public/css/styles.css/50body | 358 ------------- .../public/css/styles.css/template-begin | 1 - .../default/public/css/new-sme-main.css | 497 ++++++++++++++++++ .../themes/default/public/css/new_sme.css | 283 ++++++++++ .../default/templates/emaildeliver.html.ep | 6 +- .../default/templates/emailreceive.html.ep | 2 +- .../default/templates/emailsettings.html.ep | 13 +- .../default/templates/layouts/default.html.ep | 17 +- .../templates/partials/_dom_list.html.ep | 5 +- .../templates/partials/_header.html.ep | 39 +- .../templates/partials/_rma_pptp.html.ep | 2 +- .../default/templates/remoteaccess.html.ep | 10 +- .../themes/default/templates/yum.html.ep | 4 +- smeserver-manager.spec | 8 +- 22 files changed, 823 insertions(+), 1327 deletions(-) delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/template-begin delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/template-begin delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/template-begin delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body delete mode 100644 root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/template-begin create mode 100644 root/usr/share/smanager/themes/default/public/css/new-sme-main.css create mode 100644 root/usr/share/smanager/themes/default/public/css/new_sme.css diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body deleted file mode 100644 index 9152533..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body +++ /dev/null @@ -1,250 +0,0 @@ -{ - $OUT = <<'EOF'; - -/* from e-smith-manager to smanager (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. - *---------------------------------------------------------------------- - */ - -/* This is the stylesheet used as the basis for older broswers. - -Note that you CANNOT simly add styles here and hope they work. ONLY CSS -level 1 styles should be in this file. Everyting else goes into the other 3 -files. - -These basic styles ensire that browsers that don't understand the @import -method will still be usable. All modern browsers will use the styles in -sme_main.css, sme_menu.css or sme_header.css depending on the frame in which -the page is found. -*/ - -/* Default HTML styles */ -body { - background: #ffffff; - color: #000000; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - border-width: 0; -} - -table, tr, td, div, p, form { - color: #000000; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - -p { - margin-top: 8px; - margin-bottom: 2px; -} - -form { - margin-top: 2px; - margin-bottom: 2px; -} - -span { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - -.notsmall { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - -h1, .h1 { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #333333; - font-size: 18px; - margin-bottom: 4px; - margin-top: 12px; -} - -h2, .h2 { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #333333; - font-size: 14px; - margin-bottom: 3px; - margin-top: 12px; -} - -h3, .h3 { - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #333333; - font-size: 12px; - margin-bottom: 2px; - margin-top: 12px; -} - -h4, .h4 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-style: italic; - color: #333333; - font-size: 12px; - margin-bottom: 2px; - margin-top: 10px; -} - -ol, ul, li { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: normal; - color: black; -} - -ul { - list-style-type: circle; -} - -/* Core styles for use with sme_header.css*/ -body.header { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background: #cccccc; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; -} - -.hilightbar { - background-color: #ffc50a; - font-size: 4px; -} - -.infobar { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background-color: #cccccc; -} - -.darkergrey { - color: #666666; -} - -td.darkgrey { - background-color: #888888; -} - -a.update { - color: red; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background: #cccccc; -} - -/* Core styles for use with sme_menu.css */ - -body.menu { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background-color: #e8f3e1; -} - -td.section { - padding-bottom: 2px; - padding-top: 8px; -} - -.section { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight: bold; - background-color: #e8f3e1; -} - -a.item { - color: #00008b; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background: #e8f3e1; -} - -a.sl { - color: green; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background: #e8f3e1; -} - -a.alert { - color: red; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background: #e8f3e1; -} - -/* Core styles for use with sme_main.css */ -body.main { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background-color: #ffffff; - color: #000000; -} - -td.sme-noborders-label { - font-weight: bold; - width: 33%; - text-align: right; -} - -hr.sectionbar { - color: #666666; - background-color: #666666; - height: 1px; - width: 80%; - border: 0; -} - -hr.sme-copyrightbar { - color: #dddddd; - background-color: #dddddd; - height: 1px; - width: 100%; - border: 0; -} - -.sme-copyright { - color: #777777; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; -} - -/*These style definitions were found int he old css file (manager.css) -but don't seem to ever be referenced in the code. They're here -for reference. - -.centerit { - text-align: center; -} -.highlight { - background: #ffc61e; -} -.subheading { - background: #ffffff; - color: #1e385b; -} -*/ - -EOF -} diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs deleted file mode 100644 index cc20aa1..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs +++ /dev/null @@ -1,96 +0,0 @@ -{ - $OUT =<<'HERE'; - -/* from e-smith-manager to smanager (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. - *---------------------------------------------------------------------- - */ - -/*contribs.org styling -*/ -body.header { -background: #bee6a2; - } -.hilightbar { -background-color: #ffffff; - } -.infobar { -background-color: #98d36e; - } -a.update { -font-size: 11px; -background: #98d36e; - } - -/* Core styles for use with sme_menu.css */ -body.menu { -background-color: #e8f3e1; - } -td.section { -background-color: #e8f3e1; - } -a.item { -background: #e8f3e1; - } -a.sl { -background: #e8f3e1; - } -a.alert { -background: #e8f3e1; - } - -/* Core Styles for use with sme_main.css */ -hr.sectionbar { -color: #8ebe43; -background-color: #8ebe43; - } -hr.sme-copyrightbar { -color: #8ebe43; -background-color: #8ebe43; - } - -/* flag container*/ -#flag-container span { - font-size: 24px; - display: flex; /* Allows for easy centering */ - justify-content: center; /* Center horizontally */ - align-items: center; /* Center vertically */ - width: 100%; /* Full width of parent */ - height: 24px; /* Set a fixed height */ - border: 1px solid #ccc; /* Light gray border */ - border-radius: 5px; /* Rounded corners */ - cursor: default; /* Prevent text cursor */ - -} - -.fallback-box { - display: inline-block; /* Make it inline-block to fit around the content */ - border: 2px solid gray; /* Change the border color as desired */ - padding: 10px; /* Add some padding */ - border-radius: 10px; /* Round the corners of the box */ - font-size: 60px; /* Adjust size if needed */ - margin-top: 10px; /* Add some margin */ - text-align: center; /* Center text inside the box */ -} - -HERE -} \ No newline at end of file diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/template-begin b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/template-begin deleted file mode 100644 index 85538dc..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/template-begin +++ /dev/null @@ -1 +0,0 @@ -/* DO NOT MODIFY THIS FILE! It is updated automatically */ diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body deleted file mode 100644 index 52d2b89..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body +++ /dev/null @@ -1,277 +0,0 @@ -{ - $OUT = <<'EOF'; - -/* from e-smith-manager to smanager (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. - *---------------------------------------------------------------------- - */ - -/* This is the stylesheet used in the main panels only. - - This file inherits the styles use in sme_core in the "header" section, and - as noted in the code below. Note that some of the styles here are empty. - This is because the style definition has moved safely to sme_core.css - and the placeholder is left here for reference or future use. - - There are a lot of styles in here, so read carefully. Each one is documented. - - Styles that were in the old stylesheets, but are not used in the UI are at the - bottom, commented out. These can be removed at the end of the 6.0 cycle */ - -/* general page properties */ - body, body.main { - margin-top: 5px; - margin-right: 20px; - margin-bottom: 5px; - margin-left: 5px; -} -/* Table properties ****************************************/ -/* There are THREE types of tables 1. *.sme-layout* is used for layout purposes. It is the "master container" on a page. It controls the top-level table inside of which everything else is put. 2. *.sme-noborders* is used for layout, and defines a borderless table and cells used within it. 2. *.sme-border* is used for tabular data, and defines a header row and borders for tables that need borders */ -/*First, some defaults */ - td { - text-align: left; -} -/* sme-layout* : Used for top-level layout */ - table.sme-layout { - border-collapse: collapse; - margin-bottom: 2px; - margin-top: 2px; -} - tr.sme-layout { - border: 1px solid #dddddd; -} - td.sme-layout { - border: 1px solid #dddddd; -} -/*This special style is actually used only for the button row along the bottom of each page*/ - th.sme-layout { - border: 1px solid #dddddd; - background-color: #e8f3e1; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 9pt; - font-weight: bold; - color: #000000; - text-align: right; - padding: 4px; -} -/* sme-noborders* : Used for mid-level layout */ - table.sme-noborders { - padding: 0px; - margin-top: 0px; - margin-bottom: 20px; - margin-left: 0px; - margin-right: 0px; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - td.sme-noborders-label { - font-weight: bold; - /*width: 250px; - */ - text-align: right; - /*vertical-align: top; - */ - background-color: #e8f3e1; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - td.sme-noborders-content { - text-align: left; - vertical-align: top; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - td.sme-noborders-info, div.sme-noborders-info { - text-align: left; - vertical-align: top; -} -/* Used for a left-most column of radio buttons (see date/time panel) */ - td.sme-radiobutton { - width: 30px; -} -/* sme-border* : Used for tabular data */ - table.sme-border { - border-collapse: collapse; - border: 2px solid #cccccc; - empty-cells: show; - margin: 5px 5px 5px 2px; -} - td.sme-border, td.sme-border-warning, td.sme-border-right, td.sme-border-center { - border: 1px solid #cccccc; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: normal; - color: #000000; - text-align: left; - padding-left: 2px; - padding-right: 2px; - padding-top: 3px; - padding-bottom: 3px; -} - td.sme-border-warning { - color: red; -} - td.sme-border-right { - text-align: right; -} - td.sme-border-center { - text-align: center; -} - th.sme-border { - border: 1px solid #cccccc; - background-color: #bee6a2; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #000000; - text-align: center; - vertical-align: bottom; - padding-left: 3px; - padding-right: 3px; - padding-top: 3px; - padding-bottom: 3px; - /*border-width: 1px; - border-style: solid; - border-color: #F2F0EE #75736E #75736E #F2F0EE ; - */ -} - td.sme-border a, td.sme-border-right a, td.sme-border-center a { - font-size: 10px; -} -/* misc layout stuff*/ -/* these two are for any error messages that pop up*/ - div.error, div.sme-error, span.error, span.sme-error { - color: red; - background-color: #ffffff; - border-width: 1px; - border-style: solid; - border-color: red ; - padding: 2px; - /* margin-left: 20px; - /*margin-right: 20px;*/ - /(margin-top:0;*/ - /*margin-bottom:0;*/ - */ -} - div.error-noborders, div.sme-error-noborders, span.error-noborders, span.sme-error-noborders { - color: red; - background-color: #ffffff; - border-width: 0px; -} - div.error h2, span.error h2, div.error p, span.error p { - color: red; -} -/* These are for the special case of a link being inside an error message */ - div.sme-error a, div.error a, span.error a, span.sme-error a, div.error-noborders a, div.sme-error-noborders a, span.error-noborders a, span.sme-error-noborders a { - color: #ff0000; - font-weight: bold; - text-decoration: underline; -} -/* For when a link is the error message */ - a.error:link, a.error:visited, a.error:hover, a.error:active { - color: #ff0000; - font-weight: normal; - text-decoration: underline; -} -/* 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; - border-color: #006400 ; - padding: 2px; - /* - margin-left: 20px; - margin-right: 20px; - /* - /*margin-top:0;*/ - /*margin-bottom:4px;*/ - */ -} -/* These two are for the special case of a link being inside a success message */ - div.success a, span.success a { - color: #006400; - font-weight: bold; - text-decoration: underline; -} - div.success h2, span.success h2, div.success p, span.success p { - color: green; -} -/*These two define the copyright footer styles, one for the line and one for the text*/ - hr.sme-copyrightbar { -} - .sme-copyright { -} -/* These ones define styles for the links that are made to look like standard form submit buttons */ - a.button-like:link, a.button-like:visited, a.button-like:hover, a.button-like:active, a.button-like-small:link, a.button-like-small:visited, a.button-like-small:hover, a.button-like-small:active { - font-family: sans-serif; - font-size: 13px; - color: black; - background: #D4D0C8; - text-decoration: none; - text-align: left; - border-color: #F2F0EE #75736E #75736E #F2F0EE ; - margin-top: 10px; - margin-right: 2px; - margin-bottom: 10px; - margin-left: 2px; - border-style: solid; - border-top-width: 2px; - border-right-width: 2px; - border-bottom-width: 2px; - border-left-width: 2px; - padding-top: 2px; - padding-bottom: 2px; - padding-left: 6px; - padding-right: 6px; -} - a.button-like-small:link, a.button-like-small:visited, a.button-like-small:hover, a.button-like-small:active { - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - font-size: 10px; - padding-top: 0px; - padding-bottom: 0px; - padding-left: 1px; - padding-right: 1px; -} - a.button-like:active, a.button-like-small:active { - border-color: #75736E #F2F0EE #F2F0EE #75736E ; -} -/* EXPERIMENTAL SECTION */ -/* These are styles used to experiment with. */ -/* class for links, similar to the class in sme_menu.css, but for a red button */ - a.button-like-red:link, a.button-like-red:visited, a.button-like-red:hover, a.button-like-red:active { - border-left: #F1726C 2px solid; - border-right: #B42025 2px solid; - border-top: #F1726C 2px solid; - border-bottom: #B42025 2px solid; -} - a.button-like-red:active { - border-color: #75736E #F2F0EE #F2F0EE #75736E ; -} - - -EOF -} \ No newline at end of file diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs deleted file mode 100644 index b3a83bf..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs +++ /dev/null @@ -1,50 +0,0 @@ -{ - $OUT =<<'HERE'; - -/* from e-smith-manager to smanager (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. - *---------------------------------------------------------------------- - */ -/*contribs.org styling */ - -/* This special style is actually used only for the button row along the bottom of each page */ -th.sme-layout { -border: 1px solid #8ebe43; -background-color: #bee6a2; - } -table.sme-border { -border: 2px solid #dddddd; - } -td.sme-border-warning, -td.sme-border-right, -td.sme-border-center { -border: 1px solid #dddddd; - } -td.sme-border-right {text-align: right;} -td.sme-border-center {text-align: center;} -th.sme-border { -border: 1px solid #dddddd; -background-color: #e8f3e1; - } -HERE -} - diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/template-begin b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/template-begin deleted file mode 100644 index 85538dc..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/template-begin +++ /dev/null @@ -1 +0,0 @@ -/* DO NOT MODIFY THIS FILE! It is updated automatically */ diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body deleted file mode 100644 index 778ac89..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body +++ /dev/null @@ -1,229 +0,0 @@ -{ - $OUT = <<'EOF'; - -/* from e-smith-manager to smanager (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. - *---------------------------------------------------------------------- - */ - -/* This is the stylesheet used in the navigation panel only - - This file inherits the styles use in sme_core in the "navigation" section, - and as noted in the code below. Note that some of the styles here are empty. - This is because the style definition has moved safely to sme_core.css and - the placeholder is left here for reference or future use. - - There are a lot of styles in here, so read carefully. Each one is - documented. - - Styles that were in the old stylesheets, but are not used in the UI are at - the bottom, commented out. These can be removed at the end of the 6.0 - cycle */ - -/* Sets the general page properties */ -body, body.menu { - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 2px; -} - -/* This is the section heading style */ -.section { -} - -td.menu-cell { - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - padding-left: 0px; - padding-right: 0px; - padding-top: 0px; - padding-bottom: 0px; - -} - -/* -All the a links use pseudoclasses to control the two visual link styles. -For example: - a.item:link the general link item - a.item-current:link: the active link item - -The switch from item to item-current is done with a javascript script in the head of the -navigation page, using the onClick event. - -We are making heavy use of the cascade with these. -*/ - -/* a:link controls the look of a link when the mouse is nowhere near it */ -a.item:link, a.item-current:link, -a.warn:link, a.warn-current:link { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: black; - background: #e8f3e1; - text-decoration: none; - text-align: left; - border-color: #e8f3e1; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - border-style: solid; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - padding-right: 10px; - padding-left: 10px; - padding-top: 0px; - padding-bottom: 2px; - } - -/* a:visited controls the look of a visited link (one that has been clicked) */ -a.item:visited, a.item-current:visited, -a.warn:visited, a.warn-current:visited { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: black; - background: #e8f3e1; - text-decoration: none; - border-color: #e8f3e1; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - border-style: solid; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - padding-right: 10px; - padding-left: 10px; - padding-bottom: 2px; - text-align: left; -} - -/* a:hover controls the look of a link under the curser*/ -a.item:hover, a.item-current:hover, -a.warn:hover, a.warn-current:hover { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: black; - text-decoration: none; - background: #cccccc; - border-color: #888888; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - border-style: solid; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - padding-right: 10px; - padding-left: 10px; - padding-bottom: 2px; - text-align: left; -} - -/* a:active controls the look of a link as it is selected*/ -a.item:active, a.item-current:active, -a.warn:active, a.warn-current:active { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: white; - background: black; - text-decoration: none ; - border-color: #000000; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - border-style: solid; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - padding-right: 10px; - padding-left: 10px; - padding-bottom: 2px; - text-align: left; -} - -/* -These styles are to ensure that a selected link appears selected, even if the link -opens in another frame. This uses a javascript chunk in the head of the navigation -frame to change the style using the onClick event. -*/ -a.item-current:link, a.warn-current:link, -a.item-current:visited, a.warn-current:visited, -a.item-current:active, a.warn-current:active, -a.item-current:hover, a.warn-current:hover { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: black; - text-decoration: none; - background: #ffffff; - border-color: #888888; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - margin-left: 0px; - border-style: solid; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - padding-right: 10px; - padding-left: 10px; - padding-bottom: 2px; - text-align: left; -} - -/* these two add a border on the styles defined directly above when -the mouse is hovering over them */ -a.item-current:hover, a.warn-current:hover { - border-color: #888888; -} - -/* These redefine a few elements to make room for the icon to the left of the warn class*/ -a.warn:link, a.warn-current:link, -a.warn:visited, a.warn-current:visited, -a.warn:active, a.warn-current:active, -a.warn:hover, a.warn-current:hover { - background-image: url(/server-common/warn.gif); - background-repeat: no-repeat; - background-position: 10px; - padding-left: 25px; -} -/*end*/ - -EOF -} diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/template-begin b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/template-begin deleted file mode 100644 index 85538dc..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/template-begin +++ /dev/null @@ -1 +0,0 @@ -/* DO NOT MODIFY THIS FILE! It is updated automatically */ diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body deleted file mode 100644 index d7ec567..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body +++ /dev/null @@ -1,358 +0,0 @@ -{ - $OUT = <<'EOF'; - -/* 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 - * - * 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. - *---------------------------------------------------------------------- - */ - -/* This is the basic stylesheet originally used in the mojo version. - */ - - body{ - background-color: #FFF; -} - #container{ - max-width: 100%; - position: relative; - margin: auto; -} - #header2 { - width:94.2%; - margin-left:1px; - /*margin-right:0;*/ - 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); - margin-left:10px!important; - margin-top:10px!important; - /*margin-right:10px !important;*/ -} - #navigation{ - width: 190px; - position: absolute; - /*margin-left: 0px;*/ - padding: 5px; - background-color: #E8F3E1; - /* height: 600px; - */ - overflow: auto; -} - #main{ - margin-left: 195px; - padding: 10px; -} - #central{ - /*margin-left: 0px;*/ - padding: 5px; -} - #footer{ - /*margin-left: 0px; - */ - padding-left : 5px; -} - #header { - /*background: #bee6a2; - */ - width:100%; - margin:auto; -} - #header h1, a:link, a:visited { - color: black; - text-decoration: none; - /* contribs.org styling */ -} - a:link { - color: #006921; - text-decoration: none; -} - a:visited { - color: #063; - text-decoration: none; -} - a:hover { - color: #F00; - text-decoration: none; -} - a:active { - color: #606060; - text-decoration: none; -} - .sme-error { - color: red; - display:block; - background-color: #ffffff; - border-width: 1px; - border-style: solid; - border-color: red ; - padding: 2px; - /* margin-left: 10px;*/ - /* margin-right: 10px;*/ - /*margin-top:0;*/ - /*margin-bottom:0;*/ -} - .sme-warning { - color: orange; - display:block; - background-color: #ffffff; - border-width: 1px; - border-style: solid; - border-color: orange ; - padding: 2px; - /* margin-left: 20px; - /* margin-right: 20px;*/ - /*margin-top:2px;*/ - /*margin-bottom:2px;*/ -} - #footer img { - float: right; - position: fixed; - /*margin-left: 40%;*/ -} - label.field-with-error { - color: #dd7e5e -} - input.field-with-error { - background-color: #fd9e7e -} - span.label { - display: inline-block; - font-weight: bold; - background-color: #e8f3e1; - /*lightgreen; - */ - width: 30%; - text-align: right; -} - td.label { - font-weight: bold; - background-color: #e8f3e1; - /*lightgreen; - */ - width: 30%; - text-align: right; -} - span.label2 { - display: inline-block; - font-weight: bold; - background-color: #e8f3e1; - /*lightgreen; - */ - text-align: right; -} - span.data { - padding: 2px; - font-weight: bold; - margin-left:0; - /* background-color: lightblue; - */ -} - span.data2 { - padding: 2px; - /* background-color: lightblue; - */ -} - input.action { - margin-left: 0px; - background-color: #bee6a2; - /*lightgreen; - */ - color: darkgreen; - border-radius: 8px; - border: 2px solid #4CAF50; - /* Green */ - display: flex; - justify-content: center; - align-items: center; -} - input.action:hover { - background-color: #3e8e41; - color:white; -} - input.action:active { - background-color: #3e8e41; - transform: translate(-2px,2px); -} - .center { - display: flex; - justify-content: center; -} - input.action2 { - margin-left: 0px; - color: black; - background-color: #d4d0c8; - display: flex; - justify-content: center; -} - #modul.desc { - padding: 3px; - background-color: grey; -} - [type = 'text'] { - margin-left: 0px; - /*background-color: lightblue; - */ -} - .a, .return { - color: #661866; - font-weight: bold; -} - a.section { -} - .a, .item { - line-height: 12px; -} - a.section-title { - display: inline-block; - color: #6CA345; - /*#888; - */ - padding-left: 5px; - padding-right: 5px; - line-height: 18px; - font-weight: bold; -} - .toggle-password { - margin-left: -30px; -} - .tg-icon { - position: relative; - top: 5px; - left: 2px; -} - .roundcube div { - height:462px; - width:85%; - margin-bottom:1%; -} - .roundcube object { - margin-top:1%; - height:95%; - 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; - position: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 -} \ No newline at end of file diff --git a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/template-begin b/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/template-begin deleted file mode 100644 index 85538dc..0000000 --- a/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/template-begin +++ /dev/null @@ -1 +0,0 @@ -/* DO NOT MODIFY THIS FILE! It is updated automatically */ diff --git a/root/usr/share/smanager/themes/default/public/css/new-sme-main.css b/root/usr/share/smanager/themes/default/public/css/new-sme-main.css new file mode 100644 index 0000000..65b5876 --- /dev/null +++ b/root/usr/share/smanager/themes/default/public/css/new-sme-main.css @@ -0,0 +1,497 @@ + { + margin-left: 0; +} + +a.alert { + color: red; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background: #e8f3e1; +} + +a.item { + color: #00008b; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background: #e8f3e1; +} + +a.item-current:hover, a.warn-current:hover { + border-color: #888; +} + +a.item-current:link, a.warn-current:link, +a.item-current:visited, a.warn-current:visited, +a.item-current:active, a.warn-current:active, +a.item-current:hover, a.warn-current:hover { + display: block; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + color: black; + text-decoration: none; + background: #fff; + border-color: #888; + margin: 0; + border-style: solid; + border-width: 1px; + padding-right: 10px; + padding-left: 10px; + padding-bottom: 2px; + text-align: left; +} + +a.item:active, a.item-current:active, +a.warn:active, a.warn-current:active { + display: block; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + color: white; + background: black; + text-decoration: none; + border-color: #000; + margin: 0; + border-style: solid; + border-width: 1px; + padding-right: 10px; + padding-left: 10px; + padding-bottom: 2px; + text-align: left; +} + +a.item:hover, a.item-current:hover, +a.warn:hover, a.warn-current:hover { + display: block; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + color: black; + text-decoration: none; + background: #ccc; + border-color: #888; + margin: 0; + border-style: solid; + border-width: 1px; + padding-right: 10px; + padding-left: 10px; + padding-bottom: 2px; + text-align: left; +} + +a.item:link, a.item-current:link, +a.warn:link, a.warn-current:link { + display: block; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + color: black; + background: #e8f3e1; + text-decoration: none; + text-align: left; + border-color: #e8f3e1; + margin: 0; + border-style: solid; + border-width: 1px; + padding: 0 10px 2px; +} + +a.item:visited, a.item-current:visited, +a.warn:visited, a.warn-current:visited { + display: block; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + color: black; + background: #e8f3e1; + text-decoration: none; + border-color: #e8f3e1; + margin: 0; + border-style: solid; + border-width: 1px; + padding-right: 10px; + padding-left: 10px; + padding-bottom: 2px; + text-align: left; +} + +a.section-title { + display: inline-block; + color: #6CA345; + padding-left: 5px; + padding-right: 5px; + line-height: 18px; + font-weight: bold; +} + +a.sl { + color: green; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background: #e8f3e1; +} + +a.update { + color: red; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background: #98d36e; +} + +a.warn:link, a.warn-current:link, +a.warn:visited, a.warn-current:visited, +a.warn:active, a.warn-current:active, +a.warn:hover, a.warn-current:hover { + background-image: url("/server-common/warn.gif"); + background-repeat: no-repeat; + background-position: 10px; + padding-left: 25px; +} + +a:active { + color: #606060; + text-decoration: none; +} + +a:hover { + color: #F00; + text-decoration: none; +} + +a:link { + color: #006921; + text-decoration: none; +} + +a:visited { + color: #063; + text-decoration: none; +} + +body { + background-color: #FFF; + color: #000; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + border-width: 0; +} + +body, body.main { + margin: 5px 20px 5px 5px; +} + +body, body.menu { + margin: 0 0 0 2px; +} + +body.header { + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background-color: #bee6a2; + margin: 0; +} + +body.main { + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background-color: #fff; + color: #000; +} + +body.menu { + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background-color: #e8f3e1; +} + +div.error, div.sme-error, span.error, span.sme-error { + color: red; + background-color: #fff; + border-width: 1px; + border-style: solid; + border-color: red; + padding: 2px; +} + +form { + margin-top: 2px; + margin-bottom: 2px; +} + +h1, .h1 { + font-family: Verdana, Tahoma, sans-serif; + color: #333; + font-size: 18px; + margin-bottom: 4px; + margin-top: 12px; +} + +h2, .h2 { + font-family: Verdana, Tahoma, sans-serif; + color: #333; + font-size: 14px; + margin-bottom: 3px; + margin-top: 12px; +} + +h3, .h3 { + font-family: Verdana, Tahoma, sans-serif; + color: #333; + font-size: 12px; + margin-bottom: 2px; + margin-top: 12px; +} + +h4, .h4 { + font-family: Verdana, Tahoma, sans-serif; + font-style: italic; + color: #333; + font-size: 12px; + margin-bottom: 2px; + margin-top: 10px; +} + +hr.sectionbar { + color: #8ebe43; + background-color: #8ebe43; + height: 1px; + width: 80%; + border: 0; +} + +hr.sme-copyrightbar { + color: #8ebe43; + background-color: #8ebe43; + height: 1px; + width: 100%; + border: 0; +} + +input.action { + margin-left: 0; + background-color: #bee6a2; + color: darkgreen; + border-radius: 8px; + border: 2px solid #4CAF50; + display: flex; + justify-content: center; + align-items: center; +} + +input.action2 { + margin-left: 0; + color: black; + background-color: #d4d0c8; + display: flex; + justify-content: center; +} + +input.action:active { + background-color: #3e8e41; + transform: translate(-2px,2px); +} + +input.action:hover { + background-color: #3e8e41; + color: white; +} + +input.field-with-error { + background-color: #fd9e7e; +} + +label.field-with-error { + color: #dd7e5e; +} + +ol, ul, li { + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + font-weight: normal; + color: black; +} + +p { + margin-top: 8px; + margin-bottom: 2px; +} + +span { + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; +} + +span.data { + padding: 2px; + font-weight: bold; + margin-left: 0; +} + +span.data2 { + padding: 2px; +} + +span.label { + display: inline-block; + font-weight: bold; + background-color: #e8f3e1; + width: 30%; + text-align: right; +} + +span.label2 { + display: inline-block; + font-weight: bold; + background-color: #e8f3e1; + text-align: right; +} + +table, tr, td, div, p, form { + color: #000; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; +} + +table.sme-border { + border-collapse: collapse; + border: 2px solid #cccccc; + empty-cells: show; + margin: 5px; +} + +table.sme-layout { + border-collapse: collapse; + margin-bottom: 2px; + margin-top: 2px; +} + +table.sme-noborders { + padding: 0; + margin: 0 0 20px; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; +} + +td { + text-align: left; +} + +td.darkgrey { + background-color: #888; +} + +td.label { + font-weight: bold; + background-color: #e8f3e1; + width: 30%; + text-align: right; +} + +td.menu-cell { + margin: 0; + padding: 0; +} + +td.section { + padding-bottom: 2px; + padding-top: 8px; + background-color: #e8f3e1; +} + +td.sme-border a, td.sme-border-right a, td.sme-border-center a { + font-size: 10px; +} + +td.sme-border, td.sme-border-warning, td.sme-border-right, td.sme-border-center { + border: 1px solid #cccccc; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + font-weight: normal; + color: #000; + text-align: left; + padding: 3px 2px; +} + +td.sme-border-center { + text-align: center; +} + +td.sme-border-right { + text-align: right; +} + +td.sme-border-warning { + color: red; +} + +/* sme-layout* : Used for top-level layout */ + table.sme-layout { + border-collapse: collapse; + margin-bottom: 2px; + margin-top: 2px; +} + tr.sme-layout { + border: 1px solid #dddddd; +} + td.sme-layout { + border: 1px solid #dddddd; +} + +td.sme-noborders-content { + text-align: left; + vertical-align: top; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; +} + +td.sme-noborders-info, div.sme-noborders-info { + text-align: left; + vertical-align: top; +} + +td.sme-noborders-label { + font-weight: bold; + text-align: right; + background-color: #e8f3e1; + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + width: 33%; +} + +td.sme-radiobutton { + width: 30px; +} + +th.sme-border { + border: 1px; + background-color: #bee6a2; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; + font-weight: bold; + color: #000; + text-align: center; + vertical-align: bottom; + padding: 3px; +} + +th.sme-layout { + border: 1px; + background-color: #e8f3e1; + font-family: Verdana, Tahoma, sans-serif; + font-size: 9pt; + font-weight: bold; + color: #000; + text-align: right; + padding: 4px; +} + +tr.sme-layout { + border: 1px; +} + +ul { + list-style-type: circle; +} + +div.success, span.success { + color: #006400; + border-width: 1px; + border-style: solid; + border-color: #006400 ; + padding: 8px; +} \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/public/css/new_sme.css b/root/usr/share/smanager/themes/default/public/css/new_sme.css new file mode 100644 index 0000000..c676aa7 --- /dev/null +++ b/root/usr/share/smanager/themes/default/public/css/new_sme.css @@ -0,0 +1,283 @@ +/* css/sme-password.css */ +.input-container { + position: relative; + display: inline-block; +} +.sme-password { + padding-right: 5px; /* Ensure space for the toggle icon */ +} +.toggle-password { + position: absolute; + right: 4px; /* Position it towards the right */ + top: 50%; /* Center vertically */ + transform: translateY(-50%); /* Adjust for exact centering */ + cursor: pointer; + width: 20px; /* Set the width of the icon */ + height: 20px; /* Set the height of the icon */ +} + +.module { + padding: 20px; + border: 1px ; + border-radius: 10px; + background-color: #f9f9f9; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + margin-left: 10px !important; + margin-top: 10px; +} + +.sme-copyright { + color: #777; + font-family: Verdana, Tahoma, sans-serif; + font-size: 10px; +} + +.logo { + height: 142%; + width: auto; + margin-left: -16px; +} + +.gradient-panel { + width: 100%; + height: 40px; + background: linear-gradient(to right, white ,#c0e7a5 ); + display: flex; + align-items: center; + position: relative; +} + +.sme-error { + color: #d9534f; + display: block; + background-color: #fff; + border-width: 1px; + border-style: solid; + border-color: red; + padding: 2px; + font-weight: bold; + margin-bottom: 15px; +} + +.login-button { + position: absolute; + left: 7%; + transform: translateX(-50%); + background-color: #4caf50b8; + color: white !important; + border: none; + padding: 8px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 14px; + cursor: pointer; + border-radius: 4px; + margin-left: 77%; +} + +.sme-warning { + color: orange; + display: block; + background-color: #fff; + border-width: 1px; + border-style: solid; + border-color: orange; + padding: 2px; +} + +.infobar { + font-family: Verdana, Tahoma, sans-serif; + font-size: 11px; + background-color: #98d36e; +} + +.module-content { + font-family: Georgia, Garamond, serif; + font-size: 13px; + line-height: 1.2; + color: #555; +} + +#help-button { + text-decoration: none; + font-size: 20px; + padding: 8px; + background-color: #98d36e; + border-radius: 4px; + color: #000; +} + +/* +#module { + padding: 20px; + border: 1px; + border-radius: 10px; + background-color: #f9f9f9; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); +} +*/ + +#container { + max-width: 100%; + position: relative; + margin: auto; +} + +#header2 { + width: 94.2%; + margin-left: 1px; + margin-top: 4px; +} + +#main { + margin-left: 200px; + padding: 10px; +} + +#central { + padding: 5px; +} + +#footer { + padding-left: 5px; +} + +#header { + width: 100%; + margin: auto; +} + +#navigation { + width: 190px; + position: absolute; + padding: 5px; + background-color: #E8F3E1; + overflow: auto; + margin-top:20px; +} + +#footer img { + float: right; + position: fixed; + /*margin-left: 40%;*/ +} + +.flag-style { + position: absolute; + transform: translateY(-50%); + left: 95%; + /*right: 20px; + */ + width: 24px; + height: 14px; + display: inline-block; + vertical-align: middle; +} + + +/* flag container*/ +#flag-container span { + font-size: 24px; + display: flex; /* Allows for easy centering */ + justify-content: center; /* Center horizontally */ + align-items: center; /* Center vertically */ + width: 100%; /* Full width of parent */ + height: 24px; /* Set a fixed height */ + border: 1px solid #ccc; /* Light gray border */ + border-radius: 5px; /* Rounded corners */ + cursor: default; /* Prevent text cursor */ + +} + +.fallback-box { + display: inline-block; /* Make it inline-block to fit around the content */ + border: 2px solid gray; /* Change the border color as desired */ + padding: 10px; /* Add some padding */ + border-radius: 10px; /* Round the corners of the box */ + font-size: 60px; /* Adjust size if needed */ + margin-top: 10px; /* Add some margin */ + text-align: center; /* Center text inside the box */ +} + + table.sme-border { + border-collapse: collapse; + border: 2px solid #cccccc; + empty-cells: show; + margin: 5px 5px 5px 2px; +} + td.sme-border, td.sme-border-warning, td.sme-border-right, td.sme-border-center { + border: 1px solid #cccccc; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + font-weight: normal; + color: #000000; + text-align: left; + padding-left: 2px; + padding-right: 2px; + padding-top: 3px; + padding-bottom: 3px; +} + td.sme-border-warning { + color: red; +} + td.sme-border-right { + text-align: right; +} + td.sme-border-center { + text-align: center; +} + th.sme-border { + border: 1px solid #cccccc; + background-color: #bee6a2; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + font-weight: bold; + color: #000000; + text-align: center; + vertical-align: bottom; + padding-left: 3px; + padding-right: 3px; + padding-top: 3px; + padding-bottom: 3px; + /*border-width: 1px; + border-style: solid; + border-color: #F2F0EE #75736E #75736E #F2F0EE ; + */ +} + td.sme-border a, td.sme-border-right a, td.sme-border-center a { + font-size: 10px; +} + +th.sme-layout { +border: 1px solid #8ebe43; +background-color: #bee6a2; + } +table.sme-border { +border: 2px solid #dddddd; + } +td.sme-border-warning, +td.sme-border-right, +td.sme-border-center { +border: 1px solid #dddddd; + } +td.sme-border-right {text-align: right;} +td.sme-border-center {text-align: center;} +th.sme-border { +border: 1px solid #dddddd; +background-color: #e8f3e1; + } + +.no-visited-state { + color: inherit; + /* Or specify the desired color */ + text-decoration: none; + /* Or any other style you want to reset */ +} + +.no-visited-state:visited { + color: inherit; + /* Or specify the desired color */ + text-decoration: none; + /* Or any other style you want to reset */ +} \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/emaildeliver.html.ep b/root/usr/share/smanager/themes/default/templates/emaildeliver.html.ep index d60b5aa..7895529 100644 --- a/root/usr/share/smanager/themes/default/templates/emaildeliver.html.ep +++ b/root/usr/share/smanager/themes/default/templates/emaildeliver.html.ep @@ -33,7 +33,7 @@ %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => 'input'

-
+

%=l 'mai_TITLE_DELEGATE'

@@ -47,7 +47,7 @@ %= text_field 'DelegateMailServer', class => 'input'

-
+

%=l 'mai_TITLE_SMARTHOST'

@@ -89,4 +89,4 @@ % end -%end +%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/emailreceive.html.ep b/root/usr/share/smanager/themes/default/templates/emailreceive.html.ep index cb0c5f4..c1d146c 100644 --- a/root/usr/share/smanager/themes/default/templates/emailreceive.html.ep +++ b/root/usr/share/smanager/themes/default/templates/emailreceive.html.ep @@ -92,7 +92,7 @@ %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input'

-
+

%=l 'mai_TITLE_SECONDARY'

diff --git a/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep index cbca93f..13b749c 100644 --- a/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep +++ b/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep @@ -47,9 +47,10 @@ %= hidden_field 'trt' => 'ACC' - % end + % end +
-
+ %= form_for 'emailsettings' => (method => 'POST') => begin

@@ -76,9 +77,10 @@ %= hidden_field 'trt' => 'FIL' - % end + % end +
-

+ %= form_for 'emailsettings' => (method => 'POST') => begin

@@ -118,8 +120,9 @@ %= hidden_field 'trt' => 'REC' % end +
-

+ %= form_for 'emailsettings' => (method => 'POST') => begin

diff --git a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep index 13001d8..e18fc76 100644 --- a/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep +++ b/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep @@ -7,11 +7,18 @@ <%= $title %> - %= stylesheet '/css/sme_core.css' - %= stylesheet '/css/sme_main.css' - %= stylesheet '/css/sme_menu.css' - %= stylesheet '/css/styles.css' - %= stylesheet '/css/sme-password.css' + + %= stylesheet '/css/new_sme.css' + %= stylesheet '/css/new-sme-main.css' + + + %# Replaced by consolidated (and rationlised) CSS files as above March 2025 + %#= stylesheet '/css/sme_core.css' + %#= stylesheet '/css/sme_main.css' + %#= stylesheet '/css/sme_menu.css' + %#= stylesheet '/css/styles.css' + %#= stylesheet '/css/sme-password.css' + %= content_for 'head_contrib' % if (config 'hasJquery') { %= include 'partials/_js_imports' diff --git a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep index cb29878..7427640 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep @@ -85,7 +85,8 @@ %= form_for '/domains' => (method => 'POST') => begin -

+ +
% my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); @@ -119,4 +120,4 @@ - + \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep index 8144827..70be42e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep @@ -1,47 +1,10 @@ - -
% if ( not defined $c->session->{username} ) { % } else { - + % }
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep index 6e4ccec..edfa6de 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep @@ -11,4 +11,4 @@

-
+ \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep index 35f9b9f..037bae9 100644 --- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep +++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep @@ -17,7 +17,7 @@ %} -
+ <% my $btn = l('SAVE'); %> @@ -50,7 +50,7 @@

-
+ %} @@ -115,7 +115,7 @@ %= text_field 'ValidFromMask', class => 'input' -
+

%=l 'rma_TITLE_SSH' @@ -154,7 +154,7 @@
-
+

%=l 'rma_TITLE_FTP_ACCESS' @@ -183,7 +183,7 @@ % my $mode = $c->get_telnet_mode(); % if ( $mode ne 'off') { -
+

%=l 'rma_TITLE_TELNET_ACCESS' diff --git a/root/usr/share/smanager/themes/default/templates/yum.html.ep b/root/usr/share/smanager/themes/default/templates/yum.html.ep index 1aeeaba..3745d0c 100644 --- a/root/usr/share/smanager/themes/default/templates/yum.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yum.html.ep @@ -55,7 +55,7 @@ % end %} -

+ %= form_for 'yum' => (method => 'POST') => begin @@ -97,4 +97,4 @@

-% end +% end \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 2e9d43a..82de64e 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 71 +%define release 72 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,12 @@ true %defattr(-,root,root) %changelog +* Mon Mar 24 2025 Brian Read 11.0.0-72.sme +- Remove css files from template structure [SME: 12967] +- Rationalise and merge css files +- Adjust some gaps around panels +- Remove HR lines + * Thu Mar 20 2025 Brian Read 11.0.0-71.sme - Sort out navigation menu error on startup [SME: 12946] - More places where floating panel needed