diff --git a/interface/web/themes/default-v2/CHANGELOG b/interface/web/themes/default-v2/CHANGELOG
index 239514f64fa61be1868235b3c811365ed25f580f..7e3a0e7f18fa0eac78f4cfaacc80c42794bdd1ad 100644
--- a/interface/web/themes/default-v2/CHANGELOG
+++ b/interface/web/themes/default-v2/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG
default -> default-v2
source: default $3241 07/06/2012 @ 12:00 UTC+2
+- changed doctype to <!DOCTYPE html> (HTML5)
- rm yaml/*
- rm css/patches/*
- cp yaml/patches/iehacks.css css/*
@@ -18,10 +19,10 @@ source: default $3241 07/06/2012 @ 12:00 UTC+2
- mv css media-recognition from css-files to <head>-link tag
- change most div-containers to new html5 tags in main.tpl.htm
- rm dom elements from main.tpl.htm
-- add html5shiv.js
+- add html5shiv.js (https://github.com/aFarkas/html5shiv) for better HTML5-compatibility
- reduction of dom elements
- reduction of css rules
- removed all single icons
- all icons separate: https://github.com/downloads/foe-services/ispc-larry/ispc-default_separate.zip
- all used icons as layers and sprite as .psd: https://github.com/downloads/foe-services/ispc-larry/ispc-default_psd.zip
-- added sprites for all used icons
+- added sprites for (nearly) all used icons where suitable
diff --git a/interface/web/themes/default-v2/TODO b/interface/web/themes/default-v2/TODO
index 3e531e914f3bf930a410dbc162f1a9c2ffa22b2f..8470d4599b681c64076e7e69858b9d87de23094f 100644
--- a/interface/web/themes/default-v2/TODO
+++ b/interface/web/themes/default-v2/TODO
@@ -1,2 +1,4 @@
+TODO
- css/print.css is useless in current state
-- css/iehacks.css is useless in current state
\ No newline at end of file
+- css/iehacks.css is useless in current state
+- some more icons need to be changed into sprites
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default-v2/css/styles.css
index c29cb1309a25ff50cf8228a11f713e95cee725bd..2aa3e264e185604537b9f25eb5d3bff549550009 100644
--- a/interface/web/themes/default-v2/css/styles.css
+++ b/interface/web/themes/default-v2/css/styles.css
@@ -23,25 +23,20 @@ body {
background: url("../images/screen_bg.png") repeat-x top left fixed #EEEEEE;
padding: 10px 0;
}
-
-header, #nav, #main, footer {
- clear: both;
-}
-ul, ol, dl {
- margin: 0 0 1em 1em;
-}
-.skip, .hideme, .print {
- height: 1px;
- left: -1000em;
- position: absolute;
- top: -1000em;
- width: 1px;
+ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em }
+li { margin-left: 1.5em; line-height: 1.5em }
+dt { font-weight: bold }
+dd { margin: 0 0 1em 2em }
+a {
+ color: #4D87C7;
+ text-decoration:none;
}
-a {color: #4D87C7; text-decoration:none;}
a:focus,
a:hover,
-a:active {color:#182E7A; text-decoration:underline;}
-
+a:active {
+ color:#182E7A;
+ text-decoration:underline;
+}
hr {
color: #fff;
background:transparent;
@@ -50,10 +45,43 @@ hr {
border:0;
border-bottom: 1px #eee solid;
}
+textarea, pre, tt, code {
+ font-family: Consolas,"Lucida Console","Courier New",monospace;
+ font-size: 0.9em;
+}
+
+h1,h2,h3,h4,h5,h6 {
+ font-family: "Trebuchet MS", sans-serif;
+ font-weight:bold;
+ color:#666;
+ margin: 0 0 0.25em 0;
+}
+h1 { font-size: 200% } /* 24px */
+h2 { font-size: 200% } /* 24px */
+h3 { font-size: 150% } /* 18px */
+h4 { font-size: 133.33% } /* 16px */
+h5 { font-size: 116.67% } /* 14px */
+h6 { font-size: 116.67%; font-style:italic } /* 14px */
+p { line-height: 1.5em; margin: 0 0 1em 0; }
+cite, blockquote { font-style:italic }
+blockquote { margin: 0 0 1em 1.5em }
+strong,b { font-weight: bold }
+em,i { font-style:italic }
+
+pre, code { font-family: monospace; font-size: 1.1em; }
+acronym, abbr {
+ letter-spacing: .07em;
+ border-bottom: .1em dashed #c00;
+ cursor: help;
+}
+
+header, #nav, #main, footer {
+ clear: both;
+}
#page {
min-width: 980px;
max-width: 80%;
@@ -62,6 +90,13 @@ hr {
margin: 0 auto;
padding: 10px;
}
+.skip, .hideme, .print {
+ height: 1px;
+ left: -1000em;
+ position: absolute;
+ top: -1000em;
+ width: 1px;
+}
/* header
-------------------------------------------------------------- */
@@ -89,10 +124,18 @@ header span {
right: 10px;
text-align: right;
}
-#topsubnav a { color: #f0f8ff; font-weight: normal; background:transparent; text-decoration:none; }
+#topsubnav a {
+ color: #f0f8ff;
+ font-weight: normal;
+ background:transparent;
+ text-decoration:none;
+}
#topsubnav a:focus,
#topsubnav a:hover,
-#topsubnav a:active { text-decoration:underline; background-color: transparent;}
+#topsubnav a:active {
+ text-decoration:underline;
+ background-color: transparent;
+}
/* nav
TODO: sprite image
@@ -110,7 +153,7 @@ header span {
}
#topNav a {
- background: url("../images/x32_sprite.png") no-repeat #D3D3D3;
+ background: url("../icons/x32_sprite.png") no-repeat #D3D3D3;
color:black;
display:inline-block;
height:20px;
@@ -129,20 +172,19 @@ header span {
color: black;
background-color: #ffffff;
}
-
+.topnav-tools { background-position: 22px -10px !important; }
.topnav-admin { background-position: 22px -74px !important; }
-.topnav-client { background-position: 22px -1098px !important; }
-.topnav-mail { background-position: 22px -780px !important; }
-.topnav-mailuser { background-position: 22px -780px !important; }
-.topnav-monitor { background-position: 22px -585px !important; }
.topnav-sites { background-position: 22px -523px !important; }
-.topnav-dns { background-position: 22px -970px !important; }
-.topnav-tools { background-position: 22px -10px !important; }
-.topnav-help { background-position: 22px -715px !important; }
+.topnav-monitor { background-position: 22px -585px !important; }
.topnav- { background-position: 22px -650px !important; }
+.topnav-help { background-position: 22px -715px !important; }
+.topnav-mail { background-position: 22px -780px !important; }
+.topnav-mailuser { background-position: 22px -780px !important; }
+.topnav-vm { background-position: 22px -842px !important; }
.topnav-domain { background-position: 22px -905px !important; }
+.topnav-dns { background-position: 22px -970px !important; }
.topnav-dashboard { background-position: 22px -1035px !important; }
-.topnav-vm { background-position: 22px -842px !important; }
+.topnav-client { background-position: 22px -1098px !important; }
.topnav-billing { background-position: 22px -1162px !important; }
/* main
@@ -154,9 +196,10 @@ header span {
/* main/sideNav + submenu
-------------------------------------------------------------- */
-#sideNav { width: 200px;
- float:left;
- padding: 0 10px 0 0;
+#sideNav {
+ width: 200px;
+ float:left;
+ padding: 0 10px 0 0;
}
#submenu {
@@ -167,8 +210,18 @@ header span {
border-bottom: 2px #ddd solid;
}
-#submenu ul { list-style-type: none; margin:0; padding: 0; }
-#submenu li { float:left; width: 100%; margin:0; padding: 0; font-size:0.9em; }
+#submenu ul {
+ list-style-type: none;
+ margin:0;
+ padding: 0;
+}
+#submenu li {
+ float:left;
+ width: 100%;
+ margin:0;
+ padding: 0;
+ font-size:0.9em;
+}
#submenu a,
#submenu strong {
@@ -219,10 +272,18 @@ header span {
border-bottom: 1px #eee solid;
}
-#submenu li a { width: 90%; padding-left: 10%; background-color:#fff; color: #444; }
+#submenu li a {
+ width: 90%;
+ padding-left: 10%;
+ background-color:#fff;
+ color: #444;
+}
#submenu li a:focus,
#submenu li a:hover,
-#submenu li a:active { background-color:#f63; color: #fff; }
+#submenu li a:active {
+ background-color:#f63;
+ color: #fff;
+}
/* Form-Elements in the Menu*/
#submenu * select#server_id {
@@ -251,68 +312,17 @@ footer {
font-size: 0.8em;
text-align: center;
}
-footer a { color: #999; background:transparent; font-weight: bold;}
+footer a {
+ color: #999;
+ background:transparent;
+ font-weight: bold;
+}
footer a:hover, footer a:active {
color: #4D87C7;
background-color: transparent;
text-decoration:underline;
}
-
-
-
-
-textarea, pre, tt, code {
- font-family: Consolas,"Lucida Console","Courier New",monospace;
- font-size: 0.9em;
-}
-
-/* (en) base layout gets standard font size 12px */
-/* (de) Basis-Layout erhält Standardschriftgröße von 12 Pixeln */
-
-
-h1,h2,h3,h4,h5,h6 {
- font-family: "Trebuchet MS", sans-serif;
- font-weight:bold;
- color:#666;
- margin: 0 0 0.25em 0;
-}
-
-h1 { font-size: 200% } /* 24px */
-h2 { font-size: 200% } /* 24px */
-h3 { font-size: 150% } /* 18px */
-h4 { font-size: 133.33% } /* 16px */
-h5 { font-size: 116.67% } /* 14px */
-h6 { font-size: 116.67%; font-style:italic } /* 14px */
-
-
-
-p { line-height: 1.5em; margin: 0 0 1em 0; }
-
-/* ### Lists | Listen #### */
-
-ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em }
-li { margin-left: 1.5em; line-height: 1.5em }
-
-dt { font-weight: bold }
-dd { margin: 0 0 1em 2em }
-
-/* ### text formatting | Textauszeichnung ### */
-
-cite, blockquote { font-style:italic }
-blockquote { margin: 0 0 1em 1.5em }
-
-strong,b { font-weight: bold }
-em,i { font-style:italic }
-
-pre, code { font-family: monospace; font-size: 1.1em; }
-
-acronym, abbr {
- letter-spacing: .07em;
- border-bottom: .1em dashed #c00;
- cursor: help;
-}
-
/* Set a background-color, no system backgorund used anymore */
select, input, textarea {
background: #FFFFFF;
@@ -325,35 +335,43 @@ table { width: auto; border-collapse:collapse; margin-bottom: 0.5em; }
table.full { width: 100%; }
table.fixed { table-layout:fixed }
-table.list td{max-width:350px;min-width: 32px;white-space: nowrap;overflow:hidden;text-overflow: ellipsis; -o-text-overflow: ellipsis; -icab-text-overflow: ellipsis; -khtml-text-overflow: ellipsis; -moz-text-overflow: ellipsis; -webkit-text-overflow: ellipsis;}
-th,td { padding: 0.5em;text-align:left;}
-thead th { background: #444 url("../images/lists_thead_bg.png") repeat-x; color: #fff }
-tbody th { background: #ccc; color: #333 }
-tbody th.sub { background: #ddd; color: #333 }
-
-/**
- * Miscellaneous | Sonstiges
- *
- * @section content-misc
-*/
-
-
-
-/* Sorting cusror and backgorund */
-.pnl_listarea th[class^="tbl_col"]{cursor:pointer}
-.pnl_listarea th[class^="tbl_col"]:hover{background-position:0 -15px!important}
+table.list td {
+ max-width: 350px;
+ min-width: 32px;
+ white-space: nowrap;
+ overflow:hidden;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ -icab-text-overflow: ellipsis;
+ -khtml-text-overflow: ellipsis;
+ -moz-text-overflow: ellipsis;
+ -webkit-text-overflow: ellipsis;
+}
+th,
+td {
+ padding: 0.5em;
+ text-align:left;
+}
+thead th {
+ background: #444 url("../images/lists_thead_bg.png") repeat-x;
+ color: #fff;
+}
+tbody th {
+ background: #ccc;
+ color: #333;
+}
+tbody th.sub {
+ background: #ddd;
+ color: #333;
+}
-/* content_ispc
--------------------------------------------------------------- */
+.pnl_listarea th[class^="tbl_col"] { cursor:pointer; }
+.pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; }
-.pageForm_description {
- font-size: 12px;
-}
+.pageForm_description { font-size: 12px; }
/* Tab-Box */
-.tabbox_tabs {
- border-bottom: 1px solid #d3d3d3;
-}
+.tabbox_tabs { border-bottom: 1px solid #d3d3d3; }
.tabbox_tabs ul {
list-style: none;
padding: 0;
@@ -379,7 +397,6 @@ tbody th.sub { background: #ddd; color: #333 }
color: #ff6600;
background: #ffffff;
}
-
.pnl_toolsarea fieldset, .pnl_listarea fieldset, .pnl_formsarea fieldset {
border-top: 1px solid #949494;
margin: 20px 0;
@@ -391,11 +408,9 @@ tbody th.sub { background: #ddd; color: #333 }
.pnl_formarea fieldset {
font-weight: bold;
}
-
/* hide line and legend when inside tabbed content */
#tabbox_content * .pnl_toolsarea fieldset, #tabbox_content * .pnl_listarea fieldset, #tabbox_content * .pnl_formsarea fieldset { border: none !important; }
#tabbox_content * .pnl_toolsarea fieldset legend, #tabbox_content * .pnl_listarea fieldset legend, #tabbox_content * .pnl_formsarea fieldset legend { display: none !important; }
-
.codeview {
margin:20px 0;
padding:2px;
@@ -404,7 +419,6 @@ tbody th.sub { background: #ddd; color: #333 }
font-family: Consolas, "Lucida Console", "Courier New", monospace;
font-size: 0.9em;
}
-
/* Lists */
table.list {
width: 100%;
@@ -432,6 +446,8 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
}
/* Systemmonitor */
+.systemmonitor-server,
+.systemmonitor-ve,
.systemmonitor-state {
margin: 10px 5px;
font-family: Consolas, "Lucida Console", "Courier New", monospace;
@@ -439,113 +455,87 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
float: left;
width: 100%;
}
-.systemmonitor-state.state-no_state {
+.systemmonitor-server:hover,
+.systemmonitor-vm:hover { background-color: #FFFACD; }
+.state-no_state,
+.state-no_state-ve {
border-top: 4px solid #95A19F;
background-color: #f8f8ff;
}
-.systemmonitor-state.state-unknown {
+.state-unknown,
+.state-unknown-ve {
border-top: 4px solid #30302e;
background-color: #cecfc5;
}
-.systemmonitor-state.state-ok {
+.state-ok,
+.state-ok-ve {
border-top: 4px solid #23fb00;
background-color: #adffa2;
}
-.systemmonitor-state.state-info {
+.state-info,
+.state-info-ve {
border-top: 4px solid #183e99;
background-color: #d4e2ff;
}
-.systemmonitor-state.state-warning {
+.state-warning,
+.state-warning-ve {
border-top: 4px solid #ffa800;
background-color: #ffda93;
}
-.systemmonitor-state.state-critical {
+.state-critical,
+.state-critical-ve {
border-top: 4px solid #ff0000;
background-color: #ffb9b9;
}
-.systemmonitor-state.state-error {
+.state-error,
+.state-error-ve {
border-top: 4px solid #ff0000;
background-color: #ff7f7f;
-}
-.systemmonitor-state.state-no_state-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #95A19F;
- background-color: #f8f8ff;
-}
-.systemmonitor-state.state-unknown-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #30302e;
- background-color: #cecfc5;
-}
-.systemmonitor-state.state-ok-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #23fb00;
- background-color: #adffa2;
-}
-.systemmonitor-state.state-info-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #183e99;
- background-color: #d4e2ff;
-}
-.systemmonitor-state.state-warning-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #ffa800;
- background-color: #ffda93;
-}
-.systemmonitor-state.state-critical-ve {
+}
+div.icoDevice {
float: left;
- width: 213px;
- border-top: 4px solid #ff0000;
- background-color: #ffb9b9;
-}
-.systemmonitor-state.state-error-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #ff0000;
- background-color: #ff7f7f;
-}
-.systemmonitor-state:hover {
- background-color: #FFFACD;
-}
-.systemmonitor-state p {
- float:left;
+ width: 64px;
+ height: 64px;
margin: 5px;
-}
-.systemmonitor-device {
- background-position: -6px 4px;
- background-repeat: no-repeat;
- min-height: 80px;
-}
-.systemmonitor-device.device-system { background-image: url("../icons/x64/network.png"); }
-.systemmonitor-device.device-server {
- background-image: url("../icons/x64/server.png");
-}
-.systemmonitor-device.device-ve {
- background-image: url("../icons/x64/server.png");
- width: 213px;
+ background: url("../icons/device_sprite.png") no-repeat transparent;
+}
+.systemmonitor-server div.icoDevice { background-position: 0 0; }
+.systemmonitor-ve div.icoDevice { background-position: -64px 0; }
+.systemmonitor-network div.icoDevice { background-position: -128px 0; }
+div.statusDevice,
+div.statusMsg { float: left; }
+div.statusMsg p {
float: left;
- border: 1px dashed #aaaaaa;
- border-top: none;
+ padding: 5px;
}
-
-.systemmonitor-content.icons32 {
- padding:2px 10px 2px 56px;
- background-repeat: no-repeat;
- background-position: 12px 4px;
+.systemmonitor-state .status {
+ margin: 5px;
}
-.systemmonitor-content.icons32.ico-no_state { /*background-image:url("../icons/x32/state_no.png"); */ }
-.systemmonitor-content.icons32.ico-unknown { background-image:url("../icons/x32/state_unknown.png"); }
-.systemmonitor-content.icons32.ico-ok { background-image:url("../icons/x32/state_ok.png"); }
-.systemmonitor-content.icons32.ico-info { background-image:url("../icons/x32/state_info.png"); }
-.systemmonitor-content.icons32.ico-warning { background-image:url("../icons/x32/state_warning.png"); }
-.systemmonitor-content.icons32.ico-critical { background-image:url("../icons/x32/state_critical.png"); }
-.systemmonitor-content.icons32.ico-error { background-image:url("../icons/x32/state_error.png"); }
-
+.status {
+ float: right;
+ width: 32px;
+ height: 32px;
+ background: url("../icons/x32_sprite.png") no-repeat transparent;
+}
+div.status {
+ float: left !important;
+}
+.state-warning .status,
+.state-warning-ve .status { background-position: 0 -143px; }
+.state-no_state .status,
+.state-no_state-ve .status,
+.state-unknown .status,
+.state-unknown-ve .status { background-position: 0 -207px; }
+.state-ok .status,
+.state-ok-ve .status { background-position: 0 -270px; }
+.state-info .status,
+.state-info-ve .status { background-position: 0 -336px; }
+.state-error .status,
+.state-error-ve .status { background-position: 0 -400px; }
+.state-critical .status,
+.state-critical-ve .status { background-position: 0 -463px; }
+
+/* Usage unknown
.systemmonitor-content table {
border: none;
margin-top: 10px;
@@ -562,7 +552,7 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
background-color: #d12f19;
color:#ffffff;
padding:0px 5px;
-}
+}*/
/* Dashboard */
.dashboard-modules {
@@ -576,10 +566,9 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
background-repeat: no-repeat;
text-align: center;
}
-
.dashboard-modules a,
.dashboard-modules a:hover {
- background: url("../images/x32_sprite.png") no-repeat transparent;
+ background: url("../icons/x32_sprite.png") no-repeat transparent;
color:Black;
display:block;
font-weight:bold;
@@ -588,29 +577,36 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
width:60px;
text-decoration: none;
}
-
+.dashboard-modules.tools a { background-position: 12px -9px; }
.dashboard-modules.admin a { background-position: 12px -73px; }
-.dashboard-modules.vm a { background-position: 14px -842px; }
-.dashboard-modules.client a { background-position: 13px -1096px; }
-.dashboard-modules.mail a { background-position: 12px -776px; }
+.dashboard-modules.sites a { background-position: 12px -520px; }
.dashboard-modules.monitor a { background-position: 13px -585px; }
-.dashboard-modules.dns a { background-position: 12px -970px; }
-.dashboard-modules.tools a { background-position: 12px -9px; }
.dashboard-modules.help a { background-position: 13px -716px; }
+.dashboard-modules.mail a { background-position: 12px -776px; }
+.dashboard-modules.vm a { background-position: 14px -842px; }
.dashboard-modules.domain a { background-position: 12px -905px; }
-.dashboard-modules.sites a { background-position: 12px -520px; }
+.dashboard-modules.dns a { background-position: 12px -970px; }
+.dashboard-modules.client a { background-position: 13px -1096px; }
.dashboard-modules.billing a { background-position: 14px -1162px; }
-.panel_dashboard h2 {
- font-size:20px;
-}
+.panel_dashboard h2 { font-size:20px; }
/* Image-Replacement */
.swap { background-repeat:no-repeat; }
.swap span { display:none; height:16px; }
-#ir-HeaderLogo { background-image:url("../images/header_logo.png"); height:32px;margin:0 0 0.2em; }
-#ir-Yes { background-image:url("../icons/x16/tick_circle.png"); height:16px; }
-#ir-No { background-image:url("../icons/x16/cross_circle.png"); height:16px; }
+#ir-HeaderLogo {
+ background-image: url("../images/header_logo.png");
+ height:32px;
+ margin:0 0 0.2em;
+}
+#ir-Yes {
+ background-image: url("../icons/x16/tick_circle.png");
+ height:16px;
+}
+#ir-No {
+ background-image: url("../icons/x16/cross_circle.png");
+ height:16px;
+}
/* BUTTONS */
a.button,
@@ -640,7 +636,6 @@ input.button:focus,
-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
outline: none;
}
-
.buttons button[type]{
padding:5px 10px 5px 7px; /* Firefox */
line-height:17px; /* Safari */
@@ -648,7 +643,8 @@ input.button:focus,
*:first-child+html button[type]{
padding:4px 10px 3px 7px; /* IE7 */
}
-.buttons button img, .buttons a img{
+.buttons button img,
+.buttons a img {
margin:0 3px -3px 0 !important;
padding:0;
border:none;
@@ -657,49 +653,52 @@ input.button:focus,
}
/* BUTTONS STANDARD */
-button:hover, .buttons a:hover{
+button:hover,
+.buttons a:hover {
background-color:#dff4ff;
border:1px solid #c2e1ef;
color:#336699;
}
-.buttons a:active{
+.buttons a:active {
background-color:#6299c5;
border:1px solid #6299c5;
color:#fff;
}
/* BUTTONS POSITIVE */
-button.positive, .buttons a.positive{
- color:#529214;
-}
-.buttons a.positive:hover, button.positive:hover{
+button.positive,
+.buttons a.positive { color:#529214; }
+.buttons a.positive:hover,
+button.positive:hover {
background-color:#E6EFC2;
border:1px solid #C6D880;
color:#529214;
}
-.buttons a.positive:active{
+.buttons a.positive:active {
background-color:#529214;
border:1px solid #529214;
color:#fff;
}
/* BUTTONS NEGATIVE */
-.buttons a.negative, button.negative{
+.buttons a.negative,
+button.negative {
color:#d12f19;
}
-.buttons a.negative:hover, button.negative:hover{
+.buttons a.negative:hover,
+button.negative:hover {
background-color:#fbe3e4;
border:1px solid #fbc2c4;
color:#d12f19;
}
-.buttons a.negative:active{
+.buttons a.negative:active {
background-color:#d12f19;
border:1px solid #d12f19;
color:#fff;
}
/* Button with icon and text */
-.iconstxt { background: url("../images/button_sprite.png") no-repeat transparent; }
+.iconstxt { background: url("../icons/button_sprite.png") no-repeat transparent; }
.iconstxt span { padding-left: 20px; font-weight: bold; }
.iconstxt.icoPositive { background-position: 6px -130px; }
.iconstxt.icoNegative { background-position: 6px -98px; }
@@ -715,32 +714,30 @@ a.icons16 {
height: 18px;
width: 18px;
padding: 0;
- background: url("../images/x16_sprite.png") no-repeat transparent;
+ background: url("../icons/x16_sprite.png") no-repeat transparent;
}
button.icons16 {
height: 20px;
width: 20px;
padding: 0;
- background: url("../images/x16_sprite.png") no-repeat transparent;
+ background: url("../icons/x16_sprite.png") no-repeat transparent;
}
-
-.icons16.icoDelete { background-position: -1px -141px; }
-.icons16.icoFilter { background-position: -1px -161px; }
.icons16.icoEdit { background-position: -1px -1px; }
-.icons16.icoDbAdmin { background-position: -1px -221px; }
.icons16.icoLoginAs { background-position: -1px -21px; }
-.icons16.icoWebmailer { background-position: -1px -81px; }
.icons16.icoPDF { background-position: -1px -61px; }
+.icons16.icoWebmailer { background-position: -1px -81px; }
+.icons16.icoDelete { background-position: -1px -141px; }
+.icons16.icoFilter { background-position: -1px -161px; }
+.icons16.icoDbAdmin { background-position: -1px -221px; }
.icons16.icoAction { background-position: -1px -241px; }
#ajaxloader {
text-align:center;
margin-top: 180px;
}
-
.blockLabel.email_at {
width: 20px !important;
- margin: 1.6em 0.3em 0 0 !important
+ margin: 1.6em 0.3em 0 0 !important;
}
.textDisplay { display: block; }
@@ -758,14 +755,20 @@ button.icons16 {
.formLengthDouble { width: 50% !important; }
/* Individual Form Lengths */
-.textInput#username, .textInput#password, .textInput#passwort, .textInput#source_password { width: 100px; }
+.textInput#username,
+.textInput#password,
+.textInput#passwort,
+.textInput#source_password { width: 100px; }
.selectInput#language { width: 75px; }
.selectInput#client_group_id, .selectInput#default_group { width: 125px; }
input#refresh, input#retry, input#expire, input#minimum, input#ttl { width: 50px !important; }
/* --- */
-a[href $="#logout"] { padding-right: 20px; background: url("../images/x16_sprite.png") no-repeat right -123px transparent !important; }
+a[href $="#logout"] {
+ padding-right: 20px;
+ background: url("../icons/x16_sprite.png") no-repeat right -123px transparent !important;
+}
/* Select Menu with Images */
select.withicons option {
@@ -778,7 +781,6 @@ select.flags option {
background-repeat: no-repeat;
padding: 1px 0 1px 30px;
}
-
select.flags option[value=EL] {background-position:0 -1475px}
select.flags option[value=AD], select.flags option[value=ad] {background-position:0 -1px}
select.flags option[value=AE], select.flags option[value=ae] {background-position:0 -23px}
@@ -1026,7 +1028,6 @@ select.flags option[value=ZW], select.flags option[value=zw] {background-positio
max-width: 80%;
min-width: 680px;
}
-
div.subsectiontoggle {
border:1px solid #ccc;
font-weight:bold;
@@ -1045,18 +1046,18 @@ div.subsectiontoggle {
-ms-border-radius:5px;
border-radius:5px;
}
-div.subsectiontoggle span{
+div.subsectiontoggle span {
display:inline-block;
margin-bottom:-3px;
margin-right:10px;
width:16px;
height:16px;
- background:url(../icons/x16/plus_circle_frame.png) top left no-repeat;
+ background:url("../icons/x16/plus_circle_frame.png") top left no-repeat;
}
div.subsectiontoggle span.showing{
- background:url(../icons/x16/minus_circle_frame.png) top left no-repeat;
+ background:url("../icons/x16/minus_circle_frame.png") top left no-repeat;
}
-div.subsectiontoggle em{
+div.subsectiontoggle em {
display:block;
position:relative;
left:425px;
@@ -1084,7 +1085,7 @@ div.subsectiontoggle em{
-ms-transition-property: -ms-transform;
transition-property: transform;
}
-div.subsectiontoggle em.showing{
+div.subsectiontoggle em.showing {
display:block;
position:relative;
left:425px;
@@ -1099,7 +1100,7 @@ div.subsectiontoggle em.showing{
-ms-transform:rotate(90deg);
transform:rotate(90deg);
}
-div.subsectiontoggle:hover em{
+div.subsectiontoggle:hover em {
-webkit-transform:rotate(90deg);
-moz-transform:rotate(90deg);
-khtml-transform:rotate(90deg);
@@ -1108,18 +1109,19 @@ div.subsectiontoggle:hover em{
transform:rotate(90deg);
}
-div.gs-container{
+
+div.gs-container {
margin-top:10px;
}
-div.gs-container *{
+div.gs-container * {
margin: 0;
padding: 0;
background-position: 0 0;
text-decoration: none;
font-size: 1em;
}
-div.gs-container input{
- background: url("../images/x16_sprite.png") no-repeat 2px -99px #FFFFFF;
+div.gs-container input {
+ background: url("../icons/x16_sprite.png") no-repeat 2px -99px #FFFFFF;
height:20px;
border:1px solid #444;
padding:0 22px 2px;
@@ -1131,12 +1133,12 @@ div.gs-container input{
-ms-border-radius:5px;
border-radius:5px;
}
-input.gs-loading{
+input.gs-loading {
background-image: url("../images/loading.gif");
background-repeat: no-repeat;
background-position: center right;
}
-ul.gs-resultbox{
+ul.gs-resultbox {
margin: 0 !important;
padding: 0 !important;
width: 300px;
@@ -1158,13 +1160,13 @@ ul.gs-resultbox{
-ms-border-radius:5px;
border-radius:5px;
}
-ul.gs-resultbox li{
+ul.gs-resultbox li {
float: left;
width: 100%;
clear: both;
cursor: pointer;
}
-ul.gs-resultbox li.gs-cheader{
+ul.gs-resultbox li.gs-cheader {
height: 13px;
overflow: hidden;
padding: 5px 0;
@@ -1173,51 +1175,51 @@ ul.gs-resultbox li.gs-cheader{
cursor:default;
padding-bottom:10px;
}
-ul.gs-resultbox li.gs-cheader p.gs-cheader-title{
+ul.gs-resultbox li.gs-cheader p.gs-cheader-title {
margin: 0 !important;
padding: 0 0 0 10px !important;
float: left;
font-size: 12px;
font-weight: bold;
}
-ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{
+ul.gs-resultbox li.gs-cheader p.gs-cheader-limit {
margin: 0 !important;
padding: 0 10px 0 0 !important;
float: right;
font-size: 11px;
font-weight: normal;
}
-ul.gs-resultbox li.gs-cdata{
+ul.gs-resultbox li.gs-cdata {
margin: 0 !important;
padding: 0 !important;
border-bottom: 1px solid #c5c5c5;
}
-ul.gs-resultbox li.gs-cdata:last-child{
+ul.gs-resultbox li.gs-cdata:last-child {
border-bottom: none;
}
-ul.gs-resultbox li.gs-cdata:hover{
+ul.gs-resultbox li.gs-cdata:hover {
background: #eaf4fd;
}
-ul.gs-resultbox li.gs-cdata a{
+ul.gs-resultbox li.gs-cdata a {
display: block;
padding: 5px 10px;
text-decoration: none !important;
background: #fff;
}
-ul.gs-resultbox li.gs-cdata a:hover{
+ul.gs-resultbox li.gs-cdata a:hover {
background: #cde0ff;
}
-ul.gs-resultbox li.gs-cdata img{
+ul.gs-resultbox li.gs-cdata img {
margin-right: 12px;
}
-ul.gs-resultbox li.gs-cdata p{
+ul.gs-resultbox li.gs-cdata p {
margin: 0 !important;
padding: 0 !important;
color: #444;
font-size: 10px;
min-height:30px;
}
-ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{
+ul.gs-resultbox li.gs-cdata p span.gs-cdata-title {
display: inline !important;
margin: 0 !important;
padding: 0 !important;
@@ -1225,7 +1227,7 @@ ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{
font-weight: bold;
color: #000;
}
-ul.gs-resultbox li:first-child{
+ul.gs-resultbox li:first-child {
-moz-border-radius:5px 5px 0 0;
-webkit-border-radius:5px 5px 0 0;
-khtml-border-radius:5px 5px 0 0;
@@ -1233,7 +1235,7 @@ ul.gs-resultbox li:first-child{
-ms-border-radius:5px 5px 0 0;
border-radius:5px 5px 0 0;
}
-ul.gs-resultbox li:last-child{
+ul.gs-resultbox li:last-child {
-moz-border-radius:0 0 5px 5px;
-webkit-border-radius:0 0 5px 5px;
-khtml-border-radius:0 0 5px 5px;
@@ -1242,23 +1244,23 @@ ul.gs-resultbox li:last-child{
border-radius:0 0 5px 5px;
}
-div.df-container{
+div.df-container {
}
-div.df-container *{
+div.df-container * {
margin: 0;
padding: 0;
background-position: 0 0;
text-decoration: none;
font-size: 1em;
}
-div.df-container input{
+div.df-container input {
}
-input.df-loading{
+input.df-loading {
background-image: url("../images/loading.gif");
background-repeat: no-repeat;
background-position: center right;
}
-ul.df-resultbox{
+ul.df-resultbox {
margin: 0 !important;
padding: 0 !important;
min-width: 250px;
@@ -1281,13 +1283,13 @@ ul.df-resultbox{
-ms-border-radius:5px;
border-radius:5px;
}
-ul.df-resultbox li{
+ul.df-resultbox li {
float: left;
width: 100%;
clear: both;
cursor: pointer;
}
-ul.df-resultbox li.df-cheader{
+ul.df-resultbox li.df-cheader {
height: 13px;
overflow: hidden;
padding: 5px 0;
@@ -1296,51 +1298,51 @@ ul.df-resultbox li.df-cheader{
cursor:default;
padding-bottom:10px;
}
-ul.df-resultbox li.df-cheader p.df-cheader-title{
+ul.df-resultbox li.df-cheader p.df-cheader-title {
margin: 0 !important;
padding: 0 0 0 10px !important;
float: left;
font-size: 12px;
font-weight: bold;
}
-ul.df-resultbox li.df-cheader p.df-cheader-limit{
+ul.df-resultbox li.df-cheader p.df-cheader-limit {
margin: 0 !important;
padding: 0 10px 0 0 !important;
float: right;
font-size: 11px;
font-weight: normal;
}
-ul.df-resultbox li.df-cdata{
+ul.df-resultbox li.df-cdata {
margin: 0 !important;
padding: 0 !important;
border-bottom: 1px solid #c5c5c5;
}
-ul.df-resultbox li.df-cdata:last-child{
+ul.df-resultbox li.df-cdata:last-child {
border-bottom: none;
}
-ul.df-resultbox li.df-cdata:hover{
+ul.df-resultbox li.df-cdata:hover {
background: #eaf4fd;
}
-ul.df-resultbox li.df-cdata a{
+ul.df-resultbox li.df-cdata a {
display: block;
padding: 5px 10px;
text-decoration: none !important;
background: #fff;
}
-ul.df-resultbox li.df-cdata a:hover{
+ul.df-resultbox li.df-cdata a:hover {
background: #cde0ff;
}
-ul.df-resultbox li.df-cdata img{
+ul.df-resultbox li.df-cdata img {
margin-right: 12px;
}
-ul.df-resultbox li.df-cdata p{
+ul.df-resultbox li.df-cdata p {
margin: 0 !important;
padding: 0 !important;
color: #444;
font-size: 10px;
min-height:30px;
}
-ul.df-resultbox li.df-cdata p span.df-cdata-title{
+ul.df-resultbox li.df-cdata p span.df-cdata-title {
display: inline !important;
margin: 0 !important;
padding: 0 !important;
@@ -1348,7 +1350,7 @@ ul.df-resultbox li.df-cdata p span.df-cdata-title{
font-weight: bold;
color: #000;
}
-ul.df-resultbox li:first-child{
+ul.df-resultbox li:first-child {
-moz-border-radius:5px 5px 0 0;
-webkit-border-radius:5px 5px 0 0;
-khtml-border-radius:5px 5px 0 0;
@@ -1356,7 +1358,7 @@ ul.df-resultbox li:first-child{
-ms-border-radius:5px 5px 0 0;
border-radius:5px 5px 0 0;
}
-ul.df-resultbox li:last-child{
+ul.df-resultbox li:last-child {
-moz-border-radius:0 0 5px 5px;
-webkit-border-radius:0 0 5px 5px;
-khtml-border-radius:0 0 5px 5px;
@@ -1365,7 +1367,7 @@ ul.df-resultbox li:last-child{
border-radius:0 0 5px 5px;
}
-span.icons16-empty{
+span.icons16-empty {
float:left;
display:block;
height:20px;
@@ -1373,11 +1375,11 @@ span.icons16-empty{
margin:0 7px 0 0;
}
-.ttip{
+.ttip {
width:16px;
height:16px;
cursor:pointer;
- background: url("../images/x16_sprite.png") no-repeat center center transparent;
+ background: url("../icons/x16_sprite.png") no-repeat center center transparent;
float:right;
display:inline;
position:relative;
@@ -1401,17 +1403,37 @@ p.value {
/* content_ispc
-------------------------------------------------------------- */
-.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
-.tipsy-inner { background-color: #000; color: #FFF; max-width: 350px; padding: 5px 8px 4px 8px; text-align: left; }
+.tipsy {
+ font-size: 10px;
+ position: absolute;
+ padding: 5px;
+ z-index: 100000;
+}
+.tipsy-inner {
+ background-color: #000;
+ color: #FFF;
+ max-width: 350px;
+ padding: 5px 8px 4px 8px;
+ text-align: left;
+}
/* Rounded corners */
-.tipsy-inner { border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+.tipsy-inner {
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
/* Uncomment for shadow */
/*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/
-.tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
-
+.tipsy-arrow {
+ position: absolute;
+ width: 0;
+ height: 0;
+ line-height: 0;
+ border: 5px dashed #000;
+}
/* Rules to colour arrows */
.tipsy-arrow-n { border-bottom-color: #000; }
.tipsy-arrow-s { border-top-color: #000; }
@@ -1434,8 +1456,6 @@ p.value {
/* Some rights reserved - http: //creativecommons.org/licenses/by-sa/2.5/ */
/* Do not edit this file directly, make your changes to uni-form.css in the same folder */
-/* ------------------------------------------------------------------------------ */
-
.uniForm{ margin: 0; padding: 0; position: relative; z-index: 1; } /* reset stuff */
/* Some generals and more resets */
@@ -1463,8 +1483,6 @@ p.value {
.uniForm .inlineLabels .inlineLabel input,
.uniForm .blockLabels .inlineLabel input{ border: none; padding: 0; margin: 0; }
-/* ------------------------------------------------------------------------------ */
-
/* Styles for form controls where labels are above the input elements */
/* Set the class of the parent (preferably to a fieldset) to .blockLabels */
@@ -1501,8 +1519,6 @@ p.value {
.uniForm .blockLabels .multiField .blockLabel .selectInput,
.uniForm .blockLabels .multiField .blockLabel select{ width: 100%; margin: 0; }
-/* ------------------------------------------------------------------------------ */
-
/* Styles for form controls where labels are in line with the input elements */
/* Set the class of the parent (preferably to a fieldset) to .inlineLabels */
.uniForm .inlineLabels label,
@@ -1525,8 +1541,6 @@ p.value {
.uniForm .inlineLabels .multiField .blockLabel select{ display: block; width: 100%; float: none; }
.uniForm .inlineLabels .multiField select{ float: left; }
-/* ------------------------------------------------------------------------------ */
-
/* Required fields asterisk styling for .blockLabels */
.uniForm label em,
.uniForm .label em,
@@ -1538,28 +1552,16 @@ p.value {
.uniForm .inlineLabels .label em{ display: block; position: absolute; left: auto; right: 0; font-style: normal; font-weight: bold; }
.uniForm .inlineLabel em{ position: absolute; left: 7px; }
-/* ------------------------------------------------------------------------------ */
-
/* Messages */
.uniForm #errorMsg,
-.uniForm .error{
-}
+.uniForm .error{}
.uniForm #errorMsg dt,
-.uniForm #errorMsg h3{
-}
-.uniForm #errorMsg dd{
-}
-.uniForm #errorMsg ol{
-}
-.uniForm #errorMsg ol li{
-}
-.uniForm .errorField{
-}
-
-.uniForm #OKMsg{
-}
-
-/* ------------------------------------------------------------------------------ */
+.uniForm #errorMsg h3{}
+.uniForm #errorMsg dd{}
+.uniForm #errorMsg ol{}
+.uniForm #errorMsg ol li{}
+.uniForm .errorField{}
+.uniForm #OKMsg{}
/* Columns */
@@ -1684,12 +1686,6 @@ p.value {
.uniForm #OKMsg, .confirmpasswordok{ background: #C8FFBF; border: 1px solid #A2EF95; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }
.uniForm #OKMsg p{ margin: 0; }
-/*
-IT IS STRONGLY ADVISED TO MAKE YOUR CHANGES AFTER THIS COMMENT BY REPEATING (COPYING) THE SELECTOR FROM ABOVE,
-AND MODIFYING IT WITH YOUR OWN PROPERTIES/VALUES. THIS IS RECOMMENDED BECAUSE IF YOU HAPPEN TO RUN INTO TROUBLE,
-YOU CAN VERY EASILY REVERT TO A GENERIC STYLE OF UNI-FORM. BEST OF LUCK...
-*/
-
/* ------------------------------------------------------------------------------ */
/* This is the main unit that contains our form elements */
diff --git a/interface/web/themes/default-v2/images/button_sprite.png b/interface/web/themes/default-v2/icons/button_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/images/button_sprite.png
rename to interface/web/themes/default-v2/icons/button_sprite.png
diff --git a/interface/web/themes/default-v2/icons/device_sprite.png b/interface/web/themes/default-v2/icons/device_sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..af531d7fba6139a1a0e5afb176e43a4b65376ced
Binary files /dev/null and b/interface/web/themes/default-v2/icons/device_sprite.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__plus.png b/interface/web/themes/default-v2/icons/x16/printer__plus.png
deleted file mode 100644
index 4608a84025ee3104ae1a9baf49f5eff565107d0b..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/default-v2/icons/x16/printer__plus.png and /dev/null differ
diff --git a/interface/web/themes/default-v2/images/x16_sprite.png b/interface/web/themes/default-v2/icons/x16_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/images/x16_sprite.png
rename to interface/web/themes/default-v2/icons/x16_sprite.png
diff --git a/interface/web/themes/default-v2/images/x32_sprite.png b/interface/web/themes/default-v2/icons/x32_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/images/x32_sprite.png
rename to interface/web/themes/default-v2/icons/x32_sprite.png
diff --git a/interface/web/themes/default-v2/icons/x64/network.png b/interface/web/themes/default-v2/icons/x64/network.png
deleted file mode 100644
index e9aa4a22980d781de7a6a80f75c192d93703c55a..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/default-v2/icons/x64/network.png and /dev/null differ
diff --git a/interface/web/themes/default-v2/icons/x64/server.png b/interface/web/themes/default-v2/icons/x64/server.png
deleted file mode 100644
index bcde9dcc5ca190c446b86ae32be731dc2e712f1a..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/default-v2/icons/x64/server.png and /dev/null differ
diff --git a/interface/web/themes/default-v2/images/loading.gif b/interface/web/themes/default-v2/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..19afda1a39b4543b4745fe34a973988b77787f4d
Binary files /dev/null and b/interface/web/themes/default-v2/images/loading.gif differ
diff --git a/interface/web/themes/default-v2/images/x64_sprite.png b/interface/web/themes/default-v2/images/x64_sprite.png
deleted file mode 100644
index 26ee099365a6fbdbad840e5bb5a6647ba0cd7606..0000000000000000000000000000000000000000
Binary files a/interface/web/themes/default-v2/images/x64_sprite.png and /dev/null differ
diff --git a/interface/web/themes/default-v2/templates/dashboard/dashboard.htm b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
index 383d6b95c8f056ebf9b99299762e056a0a1c6374..09aa1587062d425d266f687386f5bcf5ded50c67 100644
--- a/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
+++ b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
@@ -4,23 +4,32 @@
<div>
<tmpl_if name='error'>
<div class="systemmonitor-state state-error">
- <tmpl_loop name="error">
- <p>{tmpl_var name='error_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="error">
+ {tmpl_var name='error_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
<tmpl_if name='warning'>
<div class="systemmonitor-state state-warning">
- <tmpl_loop name="warning">
- <p>{tmpl_var name='warning_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="warning">
+ {tmpl_var name='warning_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
<tmpl_if name='info'>
<div class="systemmonitor-state state-info">
- <tmpl_loop name="info">
- <p>{tmpl_var name='info_msg'}</p>
- </tmpl_loop>
+ <div class="status"></div>
+ <div class="statusMsg">
+ <tmpl_loop name="info">
+ {tmpl_var name='info_msg'}
+ </tmpl_loop>
+ </div>
</div>
</tmpl_if>
</div>