Commit a9c5c19a authored by cfoe's avatar cfoe
Browse files

rc1 of default-v2

parent d7bde08e
......@@ -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
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
......@@ -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; }