From ae6d914aae490fb025e91c5eb72abb3d80d5e91a Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 15 Aug 2012 10:04:32 -0400
Subject: [PATCH] Fixed bug that added Listen directive to apps vhost even on port 80 and 443
---
interface/web/themes/default/css/screen/content_ispc.css | 245 ++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 131 deletions(-)
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index 6026ddf..64e2df3 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -84,7 +84,7 @@
}
table.list thead th { font-size: 10px; }
table.list tbody { border: 1px solid #d3d3d3 !important; }
- table.list tfoot td { text-align: center; background: #f8f8f8 url(../../images/lists_tfoot_bg.png) repeat-x bottom left; padding: 24px 8px 8px 8px; }
+ table.list tfoot td { text-align: center; background: #f8f8f8 url("../../images/lists_tfoot_bg.png") repeat-x bottom left; padding: 24px 8px 8px 8px; }
table.list .tbl_row_even { background: #fcfcfc; }
table.list .tbl_row_uneven { background: #f0f8ff; }
table.list tr:hover { background: #fffacd; }
@@ -94,7 +94,7 @@
/* Password Strength */
#passBar {
width: 101px; height: 10px;
- background: url(../../images/meter_bg.gif) repeat-x bottom left;
+ background: url("../../images/meter_bg.gif") repeat-x bottom left;
margin: 2px 0;
float: left;
}
@@ -103,138 +103,119 @@
float: left;
}
- /* Systemmonitor */
+ /* Systemmonitor */
+ .systemmonitor-server,
+ .systemmonitor-ve,
.systemmonitor-state {
- margin: 10px 5px;
- font-family: Consolas, "Lucida Console", "Courier New", monospace;
- font-size: 0.9em;
- float: left;
- width: 100%;
+ margin: 10px 5px;
+ font-family: Consolas, "Lucida Console", "Courier New", monospace;
+ font-size: 0.9em;
+ float: left;
+ width: 100%;
}
- .systemmonitor-state.state-no_state {
- border-top: 4px solid #95A19F;
- background-color: #f8f8ff;
+ .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 {
- border-top: 4px solid #30302e;
- background-color: #cecfc5;
+ .state-unknown,
+ .state-unknown-ve {
+ border-top: 4px solid #30302e;
+ background-color: #cecfc5;
}
- .systemmonitor-state.state-ok {
- border-top: 4px solid #23fb00;
- background-color: #adffa2;
+ .state-ok,
+ .state-ok-ve {
+ border-top: 4px solid #23fb00;
+ background-color: #adffa2;
}
- .systemmonitor-state.state-info {
- border-top: 4px solid #183e99;
- background-color: #d4e2ff;
+ .state-info,
+ .state-info-ve {
+ border-top: 4px solid #183e99;
+ background-color: #d4e2ff;
}
- .systemmonitor-state.state-warning {
- border-top: 4px solid #ffa800;
- background-color: #ffda93;
+ .state-warning,
+ .state-warning-ve {
+ border-top: 4px solid #ffa800;
+ background-color: #ffda93;
}
- .systemmonitor-state.state-critical {
- border-top: 4px solid #ff0000;
- background-color: #ffb9b9;
+ .state-critical,
+ .state-critical-ve {
+ border-top: 4px solid #ff0000;
+ background-color: #ffb9b9;
}
- .systemmonitor-state.state-error {
- border-top: 4px solid #ff0000;
- background-color: #ff7f7f;
+ .state-error,
+ .state-error-ve {
+ border-top: 4px solid #ff0000;
+ background-color: #ff7f7f;
+ }
+ div.icoDevice {
+ float: left;
+ width: 64px;
+ height: 64px;
+ margin: 5px;
+ background: url("../../icons/device_sprite.png") no-repeat transparent;
}
- .systemmonitor-state.state-no_state-ve {
- float: left;
- width: 213px;
- border-top: 4px solid #95A19F;
- background-color: #f8f8ff;
+ .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;
+ padding: 5px;
}
- .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 {
- 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;
+ .systemmonitor-state .status {
margin: 5px;
}
- .systemmonitor-device {
- background-position: -6px 4px;
- background-repeat: no-repeat;
- min-height: 80px;
+ .status {
+ float: right;
+ width: 32px;
+ height: 32px;
+ background: url("../../icons/x32_sprite.png") no-repeat transparent;
}
- .systemmonitor-device.device-system { background-image: url("../../icons/x64/network.png"); }
- .systemmonitor-device.device-server {
- background-image: url("../../icons/x64/server.png");
+ div.status {
+ float: left !important;
}
- .systemmonitor-device.device-ve {
- background-image: url("../../icons/x64/server.png");
- width: 213px;
- float: left;
- border: 1px dashed #aaaaaa;
- border-top: none;
- }
+ .state-no_state .status,
+ .state-no_state-ve .status,
+ .state-unknown .status,
+ .state-unknown-ve .status { background-position: 0 -207px; }
- .systemmonitor-content.icons32 {
- padding:2px 10px 2px 56px;
- background-repeat: no-repeat;
- background-position: 12px 4px;
- }
- .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"); }
+ .state-ok .status,
+ .state-ok-ve .status { background-position: 0 -270px; }
+ .state-info .status,
+ .state-info-ve .status { background-position: 0 -336px; }
+
+ .state-warning .status,
+ .state-warning-ve .status { background-position: 0 -143px; }
+
+ .state-critical .status,
+ .state-critical-ve .status { background-position: 0 -463px; }
+
+ .state-error .status,
+ .state-error-ve .status { background-position: 0 -400px; }
+
+ /* Usage unknown
.systemmonitor-content table {
- border: none;
- margin-top: 10px;
+ border: none;
+ margin-top: 10px;
}
-
+
.systemmonitor-content * .online {
border: 1px solid #ffffff;
- background-color: #E3FFB8;
+ background-color: #E3FFB8;
color: #000000;
- padding:0px 5px;
+ padding:0px 5px;
}
.systemmonitor-content * .offline {
- border: 1px solid #ffffff;
- background-color: #d12f19;
- color:#ffffff;
- padding:0px 5px;
- }
+ border: 1px solid #ffffff;
+ background-color: #d12f19;
+ color:#ffffff;
+ padding:0px 5px;
+ }*/
/* Dashboard */
.dashboard-modules {
@@ -259,17 +240,17 @@
text-decoration: none;
}
- .dashboard-modules.admin { background-image: url('../../icons/x32/system.png') !important; }
- .dashboard-modules.vm { background-image: url('../../icons/x32/drawer.png') !important; }
- .dashboard-modules.client { background-image: url('../../icons/x32/client.png') !important; }
- .dashboard-modules.mail { background-image: url('../../icons/x32/email.png') !important; }
- .dashboard-modules.monitor { background-image: url('../../icons/x32/monitor.png') !important; }
- .dashboard-modules.dns { background-image: url('../../icons/x32/dns.png') !important; }
- .dashboard-modules.tools { background-image: url('../../icons/x32/tools.png') !important; }
- .dashboard-modules.help { background-image: url('../../icons/x32/help.png') !important; }
- .dashboard-modules.domain { background-image: url('../../icons/x32/domain.png') !important; }
- .dashboard-modules.sites { background-image: url('../../icons/x32/sites.png') !important; }
- .dashboard-modules.billing { background-image: url('../../icons/x32/calculator.png') !important; }
+ .dashboard-modules.admin { background-image: url("../../icons/x32/system.png") !important; }
+ .dashboard-modules.vm { background-image: url("../../icons/x32/drawer.png") !important; }
+ .dashboard-modules.client { background-image: url("../../icons/x32/client.png") !important; }
+ .dashboard-modules.mail { background-image: url("../../icons/x32/email.png") !important; }
+ .dashboard-modules.monitor { background-image: url("../../icons/x32/monitor.png") !important; }
+ .dashboard-modules.dns { background-image: url("../../icons/x32/dns.png") !important; }
+ .dashboard-modules.tools { background-image: url("../../icons/x32/tools.png") !important; }
+ .dashboard-modules.help { background-image: url("../../icons/x32/help.png") !important; }
+ .dashboard-modules.domain { background-image: url("../../icons/x32/domain.png") !important; }
+ .dashboard-modules.sites { background-image: url("../../icons/x32/sites.png") !important; }
+ .dashboard-modules.billing { background-image: url("../../icons/x32/calculator.png") !important; }
.panel_dashboard h2 {
font-size:20px;
@@ -371,7 +352,7 @@
.iconstxt span { padding-left: 20px; }
.iconstxt.icoPositive { background-image: url("../../icons/x16/tick_circle_frame.png"); }
.iconstxt.icoNegative { background-image: url("../../icons/x16/cross_circle_frame.png"); }
- .iconstxt.icoAdd { background-image: url(../../icons/x16/plus_circle_frame.png); }
+ .iconstxt.icoAdd { background-image: url("../../icons/x16/plus_circle_frame.png"); }
.iconstxt.icoKey { background-image: url("../../icons/x16/key.png"); }
.iconstxt.icoDelete { background-image: url("../../icons/x16/minus_circle_frame.png"); }
.iconstxt.icoDownload { background-image: url("../../icons/x16/arrow_270.png"); }
@@ -383,7 +364,7 @@
button.icons16 { height: 20px; width: 20px; padding: 0; background-repeat: no-repeat; background-position: 1px 1px;}
.icons16.icoDelete { background-image: url("../../icons/x16/minus_circle_frame.png"); }
- .icons16.icoFilter { background-image: url(../../icons/x16/funnel.png); }
+ .icons16.icoFilter { background-image: url("../../icons/x16/funnel.png"); }
.icons16.icoEdit { background-image: url("../../icons/x16/wrench.png"); }
.icons16.icoDbAdmin { background-image: url("../../icons/x16/database.png"); }
.icons16.icoLoginAs { background-image: url("../../icons/x16/user_go.png"); }
@@ -709,10 +690,10 @@
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{
display:block;
@@ -722,7 +703,7 @@
margin-bottom:-3px;
width:13px;
height:13px;
- background:url(../../images/chevron.png) top left no-repeat;
+ background:url("../../images/chevron.png") top left no-repeat;
-webkit-transform:none;
-moz-transform:none;
-khtml-transform:none;
@@ -747,7 +728,7 @@
position:relative;
left:425px;
top:-13px;
- background:url(../../images/chevron.png) top left no-repeat;
+ background:url("../../images/chevron.png") top left no-repeat;
width:13px;
height:13px;
-webkit-transform:rotate(90deg);
@@ -790,7 +771,7 @@
border-radius:5px;
}
input.gs-loading{
- background-image: url(../../icons/x16/loading.gif);
+ background-image: url("../../icons/x16/loading.gif");
background-repeat: no-repeat;
background-position: center right;
}
@@ -815,6 +796,8 @@
-o-border-radius:5px;
-ms-border-radius:5px;
border-radius:5px;
+ max-height:500px;
+ overflow:auto;
}
ul.gs-resultbox li{
float: left;
@@ -912,7 +895,7 @@
div.df-container input{
}
input.df-loading{
- background-image: url(../../icons/x16/loading.gif);
+ background-image: url("../../icons/x16/loading.gif");
background-repeat: no-repeat;
background-position: center right;
}
@@ -1035,7 +1018,7 @@
width:16px;
height:16px;
cursor:pointer;
- background: url(../../icons/x16/question_frame.png) no-repeat center center;
+ background: url("../../icons/x16/question_frame.png") no-repeat center center;
float:right;
display:inline;
position:relative;
--
Gitblit v1.9.1