[icinga-checkins] icinga.org: icinga-web/master: * Fixed css typo that killed the layout on non-WebKit browser

git at icinga.org git at icinga.org
Thu Aug 11 14:04:54 CEST 2011


Module: icinga-web
Branch: master
Commit: 87ccfbbd675e3531e001e8bf9851838490c89f98
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=87ccfbbd675e3531e001e8bf9851838490c89f98

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 10:52:30 2011 +0200

* Fixed css typo that killed the layout on non-WebKit browser

---

 app/modules/Web/config/icinga-io.xml.in |  100 -------------------------------
 pub/styles/icinga.css                   |   40 ++++++++++++-
 2 files changed, 39 insertions(+), 101 deletions(-)

diff --git a/app/modules/Web/config/icinga-io.xml.in b/app/modules/Web/config/icinga-io.xml.in
deleted file mode 100644
index 9acbf09..0000000
--- a/app/modules/Web/config/icinga-io.xml.in
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
-
-
-				<!--
-					Path to icinga api
-				-->
-				<setting name="api.file">@icinga_api@/IcingaApi.php</setting>
-
-				<!--
-					IcingaApi classname
-				-->
-				<setting name="api.class">IcingaApi</setting>
-
-				<!--
-					See doc/icinga-api-types.txt for options
-				-->
-				<setting name="api.interfaces.data">
-					<!-- IcingaApi connection interface -->
-					<ae:parameter name="api_type">IcingaApi::@api_type@</ae:parameter>
-
-					<!-- Suits for all interfaes -->
-					<ae:parameter name="config_type">@api_subtype@</ae:parameter>
-					<ae:parameter name="config_host">@api_host@</ae:parameter>
-					<ae:parameter name="config_port">@api_port@</ae:parameter>
-
-					<!-- ###BEGIN_CONNECTION_IDO### -->
-					<!-- Database specific (IcingaApi::CONNECTION_IDO) -->
-					<ae:parameter name="config_database">@api_db_name@</ae:parameter>
-					<ae:parameter name="config_user">@api_db_user@</ae:parameter>
-					<ae:parameter name="config_password">@api_db_pass@</ae:parameter>
-					<ae:parameter name="config_table_prefix">@api_db_prefix@</ae:parameter>
-					<ae:parameter name="config_config_type">1</ae:parameter>
-					<!-- ###END_CONNECTION_IDO### -->
-
-					<!-- ###BEGIN_CONNECTION_LIFESTATUS### -->
-					<!-- MK Lifestatus options (IcingaApi::CONNECTION_LIFESTATUS) -->
-					<ae:parameter name="config_database">@api_path@</ae:parameter>
-					<!-- ###END_CONNECTION_LIFESTATUS### -->
-
-				</setting>
-				
-				<setting name="api.interfaces.command">
-				
-					<!-- Default pipe interface, single maschine installation -->
-					<ae:parameter name="pipe1">
-						<ae:parameter name="type">IcingaApi::COMMAND_PIPE</ae:parameter>
-						<ae:parameter name="enabled">true</ae:parameter>
-						
-						<ae:parameter name="pipe">@api_cmd_file@</ae:parameter>
-
-						<ae:parameter name="instance">@api_cmd_instance@</ae:parameter>
-						<ae:parameter name="broadcast">false</ae:parameter>
-					</ae:parameter>
-
-					<!--
-
-						* This examples show how to send commands to specific instances
-						* Use 'instance' to send commands to this instance only
-						* Use 'brodcast' to send all commands to this instances!
-
-					<ae:parameter name="pipe1-instance-test">
-						<ae:parameter name="type">IcingaApi::COMMAND_PIPE</ae:parameter>
-						<ae:parameter name="enabled">true</ae:parameter>
-						
-						<ae:parameter name="pipe">@api_cmd_file@</ae:parameter>
-
-						<ae:parameter name="instance">test</ae:parameter>
-						<ae:parameter name="broadcast">false</ae:parameter>
-					</ae:parameter>
-					
-					<ae:parameter name="pipe1-broadcast">
-						<ae:parameter name="type">IcingaApi::COMMAND_PIPE</ae:parameter>
-						<ae:parameter name="enabled">false</ae:parameter>
-						
-						<ae:parameter name="pipe">@api_cmd_file@</ae:parameter>
-
-						<ae:parameter name="instance"></ae:parameter>
-						<ae:parameter name="broadcast">true</ae:parameter>
-					</ae:parameter>
-
-					-->
-
-					<ae:parameter name="ssh1">
-						<ae:parameter name="type">IcingaApi::COMMAND_SSH</ae:parameter>
-						<ae:parameter name="enabled">false</ae:parameter>
-						
-						<ae:parameter name="ssh_bin">/usr/bin/ssh</ae:parameter>
-						<ae:parameter name="ssh_user">icinga</ae:parameter>
-						<ae:parameter name="ssh_host">127.0.0.15</ae:parameter>
-						<ae:parameter name="ssh_port">22</ae:parameter>
-						<ae:parameter name="ssh_timeout">20</ae:parameter>
-						<ae:parameter name="ssh_pipe">@api_cmd_file@</ae:parameter>
-
-						<ae:parameter name="instance">default</ae:parameter>
-						<ae:parameter name="broadcast">false</ae:parameter>
-					</ae:parameter>
-				</setting>
-
-</settings>
diff --git a/pub/styles/icinga.css b/pub/styles/icinga.css
index 360ca32..5829deb 100644
--- a/pub/styles/icinga.css
+++ b/pub/styles/icinga.css
@@ -61,6 +61,8 @@ dd {
 	margin: 10px 0 10px 0;
 	padding: 5px;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	border: 1px #c0c0c0 solid;
@@ -82,11 +84,13 @@ dd {
 	width: 400px;
 	border: 1px #c0c0c0 solid;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 }
 
 .menu-logo-icon {
-    background-image: url('../images/icinga/idot-small.png);
+    background-image: url('../images/icinga/idot-small.png');
     background-repeat:no-repeat;
     width: 27px;
     text-align:center; 
@@ -140,6 +144,8 @@ div.logEntry {
     background: transparent url("../images/icons/book.png") left;
     background-repeat: no-repeat;
     -moz-box-shadow:2px 2px 2px #acacac;
+	box-shadow:2px 2px 2px #acacac;
+
     -webkit-box-shadow:2px 2px 2px #acacac;
     background-color:#ededed;
 	cursor:pointer;
@@ -163,6 +169,8 @@ div.icinga-osearch-frame div.icinga-osearch-wrap {
 	padding: 5px;
 	border: 1px #c0c0c0 solid;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 	cursor: pointer;
 }
@@ -194,6 +202,8 @@ div.cronk-data-view div.cronk-preview {
 	padding: 5px;
 	border: 1px #c0c0c0 solid;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 	cursor: pointer;
 	width: 70px;
@@ -218,8 +228,12 @@ div.cronk-data-view div.cronk-preview {
 div.cronk-data-view div.cronk-preview:hover {
 	-o-transform: scale(1.1);
 	-moz-transform: scale(1.1);
+	transform: scale(1.1);
+
 	-webkit-transform: scale(1.1);
 	-moz-transition: 0.2s linear;
+	transition: 0.2s linear;
+
 	-webkit-transition: 0.2s linear;
 	-o-transition: 0.2s linear;
 }
@@ -303,6 +317,8 @@ div#growl-msg-stack {
 div.icinga-box-container {
 	border: 1px #a0a0a0 solid;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 }
 
@@ -310,6 +326,8 @@ div.icinga-status-container {
 	border: 1px #a0a0a0 solid;
 	width: 180px;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	box-shadow: 8px 8px 5px #888;
@@ -330,6 +348,8 @@ div.icinga-status {
 	margin-top: auto;
 	margin-bottom: auto;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	-webkit-border-radius: 5px;
 }
 
@@ -600,11 +620,15 @@ div#menu {
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 	border-radius: 10px;
+
+	border-radius: 10px;
 }
 
 
 div.role_user_wrap {
     -moz-border-radius:5px;
+	border-radius:5px;
+
     -webkit-border-radius:5px;
     border:1px solid grey;
     margin:2px;
@@ -648,6 +672,8 @@ div.icinga-overall-status-container {
 div.icinga-bugBox {
    -webkit-box-shadow:3px 3px 2px #dedede; 
    -moz-box-shadow:3px 3px 2px #dedede;
+	box-shadow:3px 3px 2px #dedede;
+
     padding: 2px;
     margin: 2px;
 	cursor:help;
@@ -680,6 +706,8 @@ div.icinga-comment {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
+
+	border-radius: 5px;
 	margin: 2px 0px 2px 0px;
 }
 
@@ -699,6 +727,8 @@ div.icinga-monitor-performance {
 	background-color: #f1f1f1;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	border-radius: 5px;	
 	padding: 1px 5px 0px 5px;
 }
@@ -738,6 +768,8 @@ div.icinga-monitor-performance-container-50 {
 .activeFilter {
 	background-color:#ffacac;
     -moz-box-shadow:1px -1px 50px red;
+	box-shadow:1px -1px 50px red;
+
     -webkit-box-shadow:1px -1px 50px red;
 	-o-box-shadow:1px -1px 50px red;
 }
@@ -749,8 +781,12 @@ div.bp_cfgPanel {
     height:75px;
     border:1px solid #ababab;
     -moz-border-radius:5px;
+	border-radius:5px;
+
     -webkit-border-radius:5px;
     -moz-box-shadow:2px 2px 5px #888;
+	box-shadow:2px 2px 5px #888;
+
     -webkit-box-shadow:2px 2px 5px #888;
     text-align:center;
     float:left;
@@ -820,6 +856,8 @@ tr.bp_serviceRow {
     background-position: 0 0;
     opacity:.5;
     -moz-opacity:.5;
+	opacity:.5;
+
     filter:alpha(opacity=50);
     cursor:default;
 }





More information about the icinga-checkins mailing list