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 index 7e7f1c7..52d2b89 100644 --- 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 @@ -38,405 +38,240 @@ 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; + 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 - - */ - +/* 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; + td { + text-align: left; } - - -/* -sme-layout* : Used for top-level layout -*/ - -table.sme-layout { - border-collapse: collapse; - margin-bottom: 2px; - margin-top: 2px; +/* 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; + tr.sme-layout { + border: 1px solid #dddddd; } - -td.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; + 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; +/* 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-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-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; + 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; + 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; +/* 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, 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; + td.sme-border-warning { + color: red; +} + td.sme-border-right { + text-align: right; +} + td.sme-border-center { text-align: center; - vertical-align: bottom; - padding-left: 2px; - padding-right: 2px; - 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-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:0px; - margin-bottom:0px; - + 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-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; + 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; + 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; + 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:0px; - */ - margin-bottom:4px; - + 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 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; + 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 { + hr.sme-copyrightbar { } -.sme-copyright { + .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; +/* 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:active, -a.button-like-small:active { - border-color: #75736E #F2F0EE #F2F0EE #75736E ; + 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 ; + 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 ; } -/*These are style definitions found in the UI but not defined in any file I - could locate. They're listed here for historical purposes, but have been - removed from the UI - -pagedescription (used in the first paragraph of text on a page) [HTML.pm] -label (used in forms) [HTML.pm] -field (used in forms) [HTML.pm] -fielddescription (used ???)[HTML.pm] -buttons (used in forms) [HTML.pm] -*/ -/*td.sme-submitbutton { - text-align: right; -} -*/ - -/*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. - -.banner { - background: #000000; - color: #ffffff; -} -.banner-right { - font-family: Verdana, Arial, Helvetica, sans-serif; - background: #e17200; - color: #ffffff; -} -.border { - background: #000000; - color: #000000; - border-color: #000000; -} -.sidebar { - width: 200px; - background: #ffffff; - font-size: smaller; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: normal; -} -.sidebar-title { - background: #1e385b; - color: #ffffff; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; -} -.newsitem { - background: #ffffff; - color: #000000; - font-family: Verdana, Arial, Helvetica, sans-serif; - margin-left: 5px; - margin-right: 5px; - margin-top: 5px; - margin-bottom: 5px; -} -.newsitem-title { - background: #cccccc; - color: #ffffff; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; -} -.newsitem-footer { - background: #cccccc; - color: #000000; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: smaller; - text-align: right; -} -.newsitem-detail { - font-size: smaller; - font-weight: normal; -} -.formlabel { - background: #c0c0c0; - color: #000000; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: small; - font-weight: bold; - text-align: right; -} -.welcome-link { - background: #ffffff; - color: #1e385b; -} -.littlelink { - font-family: Verdana, Arial, Helvetica, sans-serif; -} -#textlayer { - position: absolute; - visibility: inherit; - top: 160px; - left: 50px; - z-index: 2; -} -#para { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - color: #000000; -} -#title { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - padding: 7px 7px 7px 7px; - color: #ffffff; -} -*/ EOF } \ No newline at end of file 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 index 35ca26f..d7ec567 100644 --- 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 @@ -54,348 +54,305 @@ /* This is the basic stylesheet originally used in the mojo version. */ -body{ - background-color: #FFF; + body{ + background-color: #FFF; } - -#container{ - max-width: 100%; - position: relative; - margin: auto; + #container{ + max-width: 100%; + position: relative; + margin: auto; } - -#header2 { - width:96.5%; - margin-left:1px; - margin-right:0px; - margin-top:4px; + #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); + .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; + #navigation{ + width: 190px; + position: absolute; + /*margin-left: 0px;*/ + padding: 5px; + background-color: #E8F3E1; + /* height: 600px; + */ + overflow: auto; } - -#main{ - margin-left: 195px; - padding: 10px; + #main{ + margin-left: 195px; + padding: 10px; } - -#central{ - margin-left: 0px; - padding: 5px; + #central{ + /*margin-left: 0px;*/ + padding: 5px; } - -#footer{ - margin-left: 0px; - padding: 5px; + #footer{ + /*margin-left: 0px; + */ + padding-left : 5px; } - -#header { - /*background: #bee6a2;*/ - width:100% - margin:auto; + #header { + /*background: #bee6a2; + */ + width:100%; + margin:auto; } - -#header h1, a:link, a:visited { - color: black; - text-decoration: none; -/* contribs.org styling */ + #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:0px; - margin-bottom:0px; + a:link { + color: #006921; + text-decoration: none; } - -.sme-warning { - color: orange; - display:block; - background-color: #ffffff; - border-width: 1px; - border-style: solid; - border-color: orange ; - padding: 4px; - margin-left: 20px; - margin-right: 20px; - margin-top:2px; - margin-bottom:2px; + a:visited { + color: #063; + text-decoration: none; } - -#footer img { - float: right; - position: fixed; - margin-left: 40%; + a:hover { + color: #F00; + text-decoration: none; } - -label.field-with-error { - color: #dd7e5e + a:active { + color: #606060; + text-decoration: none; } - -input.field-with-error { - background-color: #fd9e7e + .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;*/ } - -span.label { - display: inline-block; - font-weight: bold; - background-color: #e8f3e1; /*lightgreen;*/ - width: 30%; - text-align: right; + .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;*/ } - -td.label { - font-weight: bold; - background-color: #e8f3e1; /*lightgreen;*/ - width: 30%; - text-align: right; + #footer img { + float: right; + position: fixed; + /*margin-left: 40%;*/ } - -span.label2 { - display: inline-block; - font-weight: bold; - background-color: #e8f3e1; /*lightgreen;*/ - text-align: right; + label.field-with-error { + color: #dd7e5e } - -span.data { - padding: 2px; - font-weight: bold; - margin-left: 0%; -/* background-color: lightblue;*/ + input.field-with-error { + background-color: #fd9e7e } - -span.data2 { - padding: 2px; -/* background-color: lightblue; */ + span.label { + display: inline-block; + font-weight: bold; + background-color: #e8f3e1; + /*lightgreen; + */ + width: 30%; + text-align: right; } - -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; + td.label { + font-weight: bold; + background-color: #e8f3e1; + /*lightgreen; + */ + width: 30%; + text-align: right; } - -input.action:hover {background-color: #3e8e41; color:white;} - -input.action:active { - background-color: #3e8e41; - transform: translate(-2px,2px); + span.label2 { + display: inline-block; + font-weight: bold; + background-color: #e8f3e1; + /*lightgreen; + */ + text-align: right; } - -.center { - display: flex; - justify-content: center; + span.data { + padding: 2px; + font-weight: bold; + margin-left:0; + /* background-color: lightblue; + */ } - -input.action2 { - margin-left: 0px; - color: black; - background-color: #d4d0c8; - display: flex; - justify-content: center; + span.data2 { + padding: 2px; + /* background-color: lightblue; + */ } - - -#modul.desc { - padding: 3px; - background-color: grey; + 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; } - -[type = 'text'] { - margin-left: 0px; - /*background-color: lightblue;*/ + input.action:hover { + background-color: #3e8e41; + color:white; } - -.a, .return { - color: #661866; - font-weight: bold; + input.action:active { + background-color: #3e8e41; + transform: translate(-2px,2px); } - -a.section { + .center { + display: flex; + justify-content: center; } -.a, .item { - line-height: 12px; + input.action2 { + margin-left: 0px; + color: black; + background-color: #d4d0c8; + display: flex; + justify-content: center; } - -a.section-title { - display: inline-block; - color: #6CA345; /*#888;*/ - padding-left: 5px; - padding-right: 5px; - line-height: 18px; - font-weight: bold; + #modul.desc { + padding: 3px; + background-color: grey; } - -a.menu-title { - display: inline-block; - color: #1A6D1A; /*#666;*/ - padding-left: 1px; - padding-right: 1px; - font-weight: bold; + [type = 'text'] { + margin-left: 0px; + /*background-color: lightblue; + */ } - - -#module { -/* height: 600px; */ -/* overflow: auto; */ + .a, .return { + color: #661866; + font-weight: bold; } - - -#h2l1 { - height: 40px; - width: 100%; + a.section { } -#h2e11 { - width: 50%; - float: left; + .a, .item { + line-height: 12px; } -#h2e12 { - background-color: #C0E7A6; - float: left; - text-align: right; + a.section-title { + display: inline-block; + color: #6CA345; + /*#888; + */ + padding-left: 5px; + padding-right: 5px; + line-height: 18px; + font-weight: bold; } - -#h2l2 { -/* background-color: #A8F9E7;*/ - border-top: solid white 3px; - border-bottom: solid white 2px; - height: 14px; - width: 100%; - padding: 1px; + .toggle-password { + margin-left: -30px; } - -#h2e21 { - float: left; - width: 70%; + .tg-icon { + position: relative; + top: 5px; + left: 2px; } - -#h2e22,#h2e23,#h2e12 { - float: left; - width: 14em; - text-align: center; + .roundcube div { + height:462px; + width:85%; + margin-bottom:1%; } - -.toggle-password { - margin-left: -30px; + .roundcube object { + margin-top:1%; + height:95%; + width:100%; } - -.tg-icon { - position: relative; - top: 5px; - left: 2px; + #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 */ } - -.roundcube div { - height:462px; - width:85%; - margin-bottom:1%; + #help-button:hover { + background-color: #82c961; + /* Change background on hover */ } - -.roundcube object { - margin-top:1%; - height:95%; - width:100%; + .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; } - -#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 */ + .logo { + height: 142%; + /* Fixed height for the logo */ + width: auto; + /* Width will adjust to maintain aspect ratio */ + margin-left: -16px; } - -#help-button:hover { - background-color: #82c961; /* Change background on hover */ + .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% } - - .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; + .login-button:hover { + background-color: #45a049; } - -.no-visited-state:visited { - color: inherit; /* Or specify the desired color */ - text-decoration: none; /* Or any other style you want to reset */ + .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/usr/share/smanager/lib/SrvMngr.pm b/root/usr/share/smanager/lib/SrvMngr.pm index bf078e6..280eac1 100644 --- a/root/usr/share/smanager/lib/SrvMngr.pm +++ b/root/usr/share/smanager/lib/SrvMngr.pm @@ -31,7 +31,7 @@ use SrvMngr::Plugin::WithoutCache; use esmith::I18N; #this is overwrittrn with the "release" by the spec file - release can be "99.el8.sme" -our $VERSION = '51.el8.sme'; +our $VERSION = '70.el8.sme'; #Extract the release value if ($VERSION =~ /^(\d+)/) { $VERSION = $1; # $1 contains the matched numeric digits @@ -565,8 +565,8 @@ sub getNavigation { # Determine the directory where the functions are kept #----------------------------------------------------- my $navigation_ctlr_ignore = - "(\.\.?|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)"; -# "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)"; + "(\.\.?|.*\-Custom\.pm|Swttheme\.pm|Login\.pm|Request\.pm|Modules\.pm|Legacypanel\.pm(-.*)?)"; +# "(\.\.?|Initial\.pm|.*Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm(-.*)?)"; my $navigation_cgi_ignore = "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)"; @@ -925,4 +925,4 @@ sub get_reg_mask { } -1; +1; \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/exception_development.html.ep b/root/usr/share/smanager/themes/default/templates/exception_development.html.ep index d6d9bba..8b8a189 100644 --- a/root/usr/share/smanager/themes/default/templates/exception_development.html.ep +++ b/root/usr/share/smanager/themes/default/templates/exception_development.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+


dev
Oups !!! The page you were requesting "<%= $self->req->url->path || '/' %>" diff --git a/root/usr/share/smanager/themes/default/templates/not_found.development.html.ep b/root/usr/share/smanager/themes/default/templates/not_found.development.html.ep index 4c0d15f..c9cde0b 100644 --- a/root/usr/share/smanager/themes/default/templates/not_found.development.html.ep +++ b/root/usr/share/smanager/themes/default/templates/not_found.development.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+


dev
Oups !!! The page you were requesting "<%= $self->req->url->path || '/' %>" diff --git a/root/usr/share/smanager/themes/default/templates/not_found.html.ep b/root/usr/share/smanager/themes/default/templates/not_found.html.ep index 1a283f6..6be10d4 100644 --- a/root/usr/share/smanager/themes/default/templates/not_found.html.ep +++ b/root/usr/share/smanager/themes/default/templates/not_found.html.ep @@ -1,5 +1,5 @@ % layout 'defaultlight', title => 'Sme server 2 - Error P'; -

+



The page you were requesting "<%= $self->req->url->path || '/' %>" @@ -7,4 +7,4 @@

%= link_to Welcome => '/'

-
+
\ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/roundcube.html.ep b/root/usr/share/smanager/themes/default/templates/roundcube.html.ep index dcf6cbe..f6550bc 100644 --- a/root/usr/share/smanager/themes/default/templates/roundcube.html.ep +++ b/root/usr/share/smanager/themes/default/templates/roundcube.html.ep @@ -3,7 +3,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -37,4 +37,4 @@

-%end +%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/welcome.html.ep b/root/usr/share/smanager/themes/default/templates/welcome.html.ep index f9fe125..9aa28c3 100644 --- a/root/usr/share/smanager/themes/default/templates/welcome.html.ep +++ b/root/usr/share/smanager/themes/default/templates/welcome.html.ep @@ -1,7 +1,7 @@ % layout 'default', title => 'Sme server 2 - IndexT'; % content_for 'module' => begin -
+

Index on line - Welcome page

diff --git a/root/usr/share/smanager/themes/default/templates/whatever.html.ep b/root/usr/share/smanager/themes/default/templates/whatever.html.ep index 0683610..674d4f7 100644 --- a/root/usr/share/smanager/themes/default/templates/whatever.html.ep +++ b/root/usr/share/smanager/themes/default/templates/whatever.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+


dev
What else !!! The page you were requesting "<%= $self->req->url->path || '/' %>" diff --git a/smeserver-manager.spec b/smeserver-manager.spec index fbe554b..2e9d43a 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 70 +%define release 71 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -143,6 +143,12 @@ true %defattr(-,root,root) %changelog +* 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 +- Adjust floating panel to make space around it the same +- clean up some css + * Wed Mar 19 2025 Brian Read 11.0.0-70.sme - Re-cast the default theme - use proper koozali logo image, unwind multiple divs - Enhance responsiveness