From 14fd690533d8c847c1a51dcb950818587297919d Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 13 May 2009 17:00:58 +0000 Subject: [PATCH] 2009-05-13 Sancho Lerena * include/styles/pandora_blackmetal.css: New style with custom headers image (used for custom logo). * include/styles/menu.css, include/styles/pandora_red.css include/styles/pandora_black.css include/styles/pandora_width.css include/styles/pandora.css: Improved old themes. * include/functions_ui.php: Custom style CSS loads last, to allow rewrite some CSS menu styles. * install.php: Ask if want to DROP database if this exists. Show better message about the created password. Don't drop database if not marked in step #3. * images/black_header.png: Image for blackmetal style. * images/MiniLogoArtica.jpg: Image for blackmetal style. * general/header.php: Some changes for style. Now displays OpenSource version or Enterprise version depending of version. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 25 + pandora_console/general/header.php | 23 +- pandora_console/images/MiniLogoArtica.jpg | Bin 0 -> 5615 bytes pandora_console/images/black_header.png | Bin 0 -> 184 bytes pandora_console/include/functions_ui.php | 7 +- pandora_console/include/styles/menu.css | 48 +- pandora_console/include/styles/pandora.css | 40 +- .../include/styles/pandora_black.css | 49 +- .../include/styles/pandora_blackmetal.css | 927 ++++++++++++++++++ .../include/styles/pandora_red.css | 39 +- .../include/styles/pandora_width.css | 20 + pandora_console/install.php | 24 +- 12 files changed, 1142 insertions(+), 60 deletions(-) create mode 100644 pandora_console/images/MiniLogoArtica.jpg create mode 100644 pandora_console/images/black_header.png create mode 100644 pandora_console/include/styles/pandora_blackmetal.css diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 69a5073592..67582be59b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,28 @@ +2009-05-13 Sancho Lerena + + * include/styles/pandora_blackmetal.css: New style with custom headers + image (used for custom logo). + + * include/styles/menu.css, + include/styles/pandora_red.css + include/styles/pandora_black.css + include/styles/pandora_width.css + include/styles/pandora.css: Improved old themes. + + * include/functions_ui.php: Custom style CSS loads last, to allow rewrite + some CSS menu styles. + + * install.php: Ask if want to DROP database if this exists. Show better + message about the created password. Don't drop database if not marked in + step #3. + + * images/black_header.png: Image for blackmetal style. + + * images/MiniLogoArtica.jpg: Image for blackmetal style. + + * general/header.php: Some changes for style. Now displays OpenSource version + or Enterprise version depending of version. + 2009-05-13 Esteban Sánchez * images/clean.png, images/fullscreen.png, images/local_component.png, diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index cedb5861bb..50e400d2a8 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -20,18 +20,7 @@ require_once ("include/functions_messages.php"); //First column (logo) echo ''; +echo '
'; // First column (identifier) echo '
'; -/* CUSTOM BRANDING STARTS HERE */ -/* TODO: Put the branding in it's own file, variables or database - Yes, put here your corporate logo instead pandora_logo_head.png - The style specifies width and height so that oversized images get resized. - Optimally your logo would be this size. -*/ -echo 'logo'; -/* CUSTOM BRANDING ENDS HERE */ - - -// Margin to logo -echo ' user '.''.__('You are').' ['.$config["id_user"].'] '; @@ -111,7 +100,15 @@ echo '

'; echo 'lightning_go '.__('Events').''; // Styled text -echo '
Pandora FMS
'; +echo '
Pandora FMS
'; + +/* Enterprise support */ +if (file_exists (ENTERPRISE_DIR."/load_enterprise.php")) + echo '
Enterprise
'; +else + echo '
OpenSource
'; + +echo ''; require_jquery_file ('countdown'); ?> diff --git a/pandora_console/images/MiniLogoArtica.jpg b/pandora_console/images/MiniLogoArtica.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c548bf7caddf747bdca1ecae09bf4da4ec53afdd GIT binary patch literal 5615 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 "include/styles/common.css", - $config['style'] => "include/styles/".$config['style'].".css", "menu" => "include/styles/menu.css", - "tip", "include/styles/tip.css" - ), $config['css']); + "tip", "include/styles/tip.css", + $config['style'] => "include/styles/".$config['style'].".css"), $config['css']); //We can't load empty and we loaded (conditionally) ie $loaded = array ('', 'ie'); diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index e518a977d4..db7c921364 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -81,7 +81,7 @@ font-weight: bold; } .menu li.links { - background: #E9F3D2 url(../../images/link.png) no-repeat 4px 8px; + background: url(../../images/link.png) no-repeat 4px 8px; border-width: 1px 0 0 1px; border-style: solid; border-color: #dadbdc; @@ -89,76 +89,76 @@ /* Icons specified here */ #icon_oper-dashboard { - background: #E9F3D2 url(../../images/house.png) no-repeat 4px 4px; + background: url(../../images/house.png) no-repeat 4px 4px; } #icon_oper-agents { - background: #E9F3D2 url(../../images/bricks.png) no-repeat 4px 4px; + background: url(../../images/bricks.png) no-repeat 4px 4px; } #icon_oper-servers { - background: #E9F3D2 url(../../images/server_database.png) no-repeat 4px 4px; + background: url(../../images/server_database.png) no-repeat 4px 4px; } #icon_oper-incidents { - background: #E9F3D2 url(../../images/book_edit.png) no-repeat 4px 4px; + background: url(../../images/book_edit.png) no-repeat 4px 4px; } #icon_oper-events { - background: #E9F3D2 url(../../images/lightning_go.png) no-repeat 4px 4px; + background: url(../../images/lightning_go.png) no-repeat 4px 4px; } /* users */ #icon_oper-users { - background: #E9F3D2 url(../../images/group.png) no-repeat 4px 4px; + background: url(../../images/group.png) no-repeat 4px 4px; } /* trap console */ #icon_oper-snmpc, #icon_god-snmpc { - background: #E9F3D2 url(../../images/computer_error.png) no-repeat 4px 4px; + background: url(../../images/computer_error.png) no-repeat 4px 4px; } #icon_oper-messages { - background: #E9F3D2 url(../../images/email.png) no-repeat 4px 4px; + background: url(../../images/email.png) no-repeat 4px 4px; } #icon_oper-reporting { - background: #E9F3D2 url(../../images/reporting.png) no-repeat 4px 4px; + background: url(../../images/reporting.png) no-repeat 4px 4px; } #icon_oper-visualc { - background: #E9F3D2 url(../../images/monitor.png) no-repeat 4px 4px; + background: url(../../images/monitor.png) no-repeat 4px 4px; } #icon_oper-extensions, #icon_god-extensions { - background: #E9F3D2 url(../../images/extensions.png) no-repeat 4px 4px; + background: url(../../images/extensions.png) no-repeat 4px 4px; } /* Godmode images */ #icon_god-agents { - background: #E9F3D2 url(../../images/god1.png) no-repeat 4px 4px; + background: url(../../images/god1.png) no-repeat 4px 4px; } #icon_god-modules { - background: #E9F3D2 url(../../images/brick.png) no-repeat 4px 4px; + background: url(../../images/brick.png) no-repeat 4px 4px; } #icon_god-alerts { - background: #E9F3D2 url(../../images/god2.png) no-repeat 4px 4px; + background: url(../../images/god2.png) no-repeat 4px 4px; } #icon_god-dbmaint { - background: #E9F3D2 url(../../images/god8.png) no-repeat 4px 4px; + background: url(../../images/god8.png) no-repeat 4px 4px; } #icon_god-users { - background: #E9F3D2 url(../../images/god3.png) no-repeat 4px 4px; + background: url(../../images/god3.png) no-repeat 4px 4px; } #icon_god-reporting { - background: #E9F3D2 url(../../images/reporting_edit.png) no-repeat 4px 4px; + background: url(../../images/reporting_edit.png) no-repeat 4px 4px; } #icon_god-profiles { - background: #E9F3D2 url(../../images/god4.png) no-repeat 4px 4px; + background: url(../../images/god4.png) no-repeat 4px 4px; } #icon_god-servers { - background: #E9F3D2 url(../../images/god5.png) no-repeat 4px 4px; + background: url(../../images/god5.png) no-repeat 4px 4px; } #icon_god-audit { - background: #E9F3D2 url(../../images/god6.png) no-repeat 4px 4px; + background: url(../../images/god6.png) no-repeat 4px 4px; } #icon_god-setup { - background: #E9F3D2 url(../../images/god7.png) no-repeat 4px 4px; + background: url(../../images/god7.png) no-repeat 4px 4px; } #icon_god-policies { - background: #E9F3D2 url(../../images/policies.png) no-repeat 4px 4px; + background: url(../../images/policies.png) no-repeat 4px 4px; } #icon_oper-inventory { - background: #E9F3D2 url(../../images/page_white_text.png) no-repeat 4px 4px; + background: url(../../images/page_white_text.png) no-repeat 4px 4px; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index c1cd496861..4d9ab183a7 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -201,6 +201,7 @@ div#menu { width: 165px; float: left; } + div#head { font-size: 8pt; width: 960px; @@ -208,6 +209,21 @@ div#head { background: url(../../images/header.jpg); border-bottom: solid 2px #555; } +/* + +div#head { + font-size: 8pt; + width: 960px; + height: 60px; + background: url(../../images/enterprise_header.png); + background-color: #020202; + background-repeat: repeat-x; + background-attachment: scroll; + background-position: 0% 0%; + border-bottom: solid 2px #000; +} +*/ + div#foot { font-size: 7pt; border-top: solid 2px #000; @@ -616,7 +632,7 @@ span.rmess, span.nrmess { float: right; text-align: right; margin-right: 10px; - padding-top: 10px; + padding-top: 0px; } #head_m { position: absolute; @@ -633,6 +649,18 @@ span#logo_text2 { letter-spacing: -2px; color: #aaa; } + +div#logo_text3 { + text-align: right; + font: 2em Arial, Sans-serif; + letter-spacing: 6px; + color: #aaa; + font-weight: bold; + margin-top: 0px; + margin-left: 4px; + padding-top: 0px: +} + .bb0 { border-bottom: 0px; } @@ -912,3 +940,13 @@ div#steps_clean { div#event_control { clear:right; } + +div#pandora_logo_header { +/* Put here your company logo (139x60 pixels) like this: */ +/* background: url(../../images/MiniLogoArtica.jpg); */ + background: url(../../images/pandora_logo_head.png); + background-position: 0% 0%; + width: 139px; + height: 60px; + float: left; +} diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 06e747bd63..5a85cd805d 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -93,7 +93,6 @@ h3 { } a { color: #ddd; - font-weight: bold; text-decoration: none; } a:hover { @@ -608,7 +607,7 @@ span.rmess, span.nrmess { float: right; text-align: right; margin-right: 10px; - padding-top: 10px; + padding-top: 0px; } #head_m { position: absolute; @@ -625,6 +624,18 @@ span#logo_text2 { letter-spacing: -2px; color: #aaa; } + +div#logo_text3 { + text-align: right; + font: 2em Arial, Sans-serif; + letter-spacing: 6px; + color: #aaa; + font-weight: bold; + margin-top: 0px; + margin-left: 4px; + padding-top: 0px: +} + .bb0 { border-bottom: 0px; } @@ -708,3 +719,37 @@ a.big_data { float: right; } +div#pandora_logo_header { + background: url(../../images/pandora_logo_head.png); + background-position: 0% 0%; + width: 139px; + height: 60px; + float: left; +} + +.menu li a { + background-color: #000; + color: #CCC; +} + +.submenu li a { + background-color: #000; + color: #CCC; +} + +.menu li.selected { + background-color: #333 !important; +} + +} +.menu li.links { + border-color: #333; +} + +.submenu li a { + border-color: #333; +} + +.menu { + border-color: #333; +} diff --git a/pandora_console/include/styles/pandora_blackmetal.css b/pandora_console/include/styles/pandora_blackmetal.css new file mode 100644 index 0000000000..ee0420aafc --- /dev/null +++ b/pandora_console/include/styles/pandora_blackmetal.css @@ -0,0 +1,927 @@ +/* + +Author: The Pandora FMS team +Name: Black Metal theme +Description: Default theme used in Enterprise version +*/ + +* { + font-family: verdana, sans-serif; + font-size: 8pt; +} +body { + text-align: center; +} +input, textarea { + border: 1px solid #ddd; +} + +textarea { + padding: 5px; + min-height: 100px; + width: 99%; +} +textarea.conf_editor { + padding: 5px; + width: 650px; + height: 350px; +} +textarea.conf_error { + background-image: url(../../images/err.png); + background-repeat: no-repeat; + background-position: top right; +} +input { + padding: 2px 3px 4px 3px; +} +input.button { + font-family: Arial,Sans-serif; + border: 1px solid #ccc; + background: #fff; + padding: 2px 3px; + margin: 10px 15px; +} +select { + padding: 0px; + border:1px solid #ddd; +} +checkbox { + padding: 4px; + border:1px solid #eee; +} +h1, h2, h3, h4 { + font-weight: bold; + font-size: 1em; + font-family: Arial, Sans-serif; + text-transform: uppercase; + color: #000; + padding-bottom: 4px; + padding-top: 7px; +} +h1 { + font-size: 16px; +} +h2 { + font-size: 15px; +} +h3 { + font-size: 14px; +} +h4 { + margin-bottom: 2px; + padding-bottom: 0px; + padding-top: 5px; + font-size: 13px; + color: #000; +} +a { + color: #486787; + text-decoration: none; +} +a:hover { + color: #003a3a; + text-decoration: underline; +} +a.white_bold { + color: #eee; + text-decoration: none; + font-weight: bold; +} +a.white_grey_bold { + color: #999; + text-decoration: none; + font-weight: bold; +} +a.white { + color: #eee; + text-decoration: none; +} +p.center { + text-align: center; +} +h1#log { + font-size: 18px; + margin-bottom: 0px; + color: #000; +} +h1#log_f { + color: #f00; + border-bottom: 1px solid #f00; + padding-bottom: 3px; +} +div#login { + margin: 0 auto; + margin-top: 200px; + width: 460px; + border-left: solid 1px #000; + border-top: solid 1px #000; + border-bottom: solid 2px #000; + border-right: solid 2px #000; +} +div#login_in, #login_f { + margin: 0 auto; + width: 400px; +} +div#login_f { + margin-top: 10px; + margin-bottom: 25px; +} +div#noaccess { + width: 350px; + padding-left: 40px; +} +div#activity{ + padding-top: 18px; + padding-bottom: 18px; +} +div#noa { + float: right; + padding-right: 50px; + margin-top: 25px; +} +div#db_f { + text-align: justify; + margin: auto; + padding: 0.5em; + width: 55em; + margin-top: 3em; +} +div#db_ftxt { + float: right; + padding-top: 10px; +} +div#container { + margin: 0 auto; + width: 960px; + text-align: left; + border-left: solid 2px #000; + border-right: solid 2px #000; + border-top: solid 2px #000; + margin-top: 5px; + background: #fff; +} +div#page { + width: 960px; + background: #fff; + clear: both; + border-bottom: solid 5px #000; + border-top: solid 5px #000; +} +div#main { + width: 785px; + min-height: 500px; + float: right; + padding-left: 0px; + padding-top: 0px; + padding-bottom: 20px; + margin-bottom: 25px; + background-color: #fefefe; + background-image: url(../../images/backgrounds/background4.jpg); + margin-top: 0px; + margin-left: 0px; + margin-right: 0px; +} +div#menu { + width: 165px; + float: left; +} + +div#pandora_logo_header { +/* Put here your company logo (139x60 pixels) like this: */ +/* background: url(../../images/xxxxx.png); */ + + background: url(../../images/MiniLogoArtica.jpg); + background-position: 0% 0%; + width: 83px; + height: 31px; + float: left; +} + +div#head { + font-size: 8pt; + width: 960px; + height: 60px; + background: url(../../images/black_header.png); + background-color: #000; + background-repeat: repeat-x; + background-position: 0% 0%; + border-bottom: solid 2px #000; +} +div#foot { + font-size: 7pt; + border-top: solid 2px #000; + padding-top: 5px; + padding-bottom: 5px; + text-align: center; + background: #000; + width: 960px; + clear: both; +} +#ver { + margin-bottom: 25px; +} +#ip { + margin-top: 10px; + margin-bottom: 5px; +} +label { + display: block; + padding-top: 4px; + font-weight: bold; + text-align: left; +} +th > label { + padding-top: 7px; +} +input.chk {margin-right: 0px; + border: 0px none; + height: 14px; +} +input.datos { + background-color: #f5f5f5; +} +input.datos_readonly { + background-color: #050505; +} +input.login { + border-color: #000; + background-color: #f5f5f5; + margin: 2px 0 8px; + width: 90px; +} +input.sub { + font-weight: bold; + border-bottom-color: #708090; + border-right-color: #708090; + /* These borders haven't made it yet in a valid standard + First one is for Mozilla, second for Webkit (Safari, Konqueror), third one for IE7+ and valid CSS3. + Percentage values are invalid here but .4em seems big enough */ + -moz-border-radius: .4em; + -webkit-border-radius: .4em; + border-radius: .4em; + font-size: 8pt; + background-color: #e5e5e5; + color: #000; +} +input.next, input.upd, input.ok, input.wand, input.delete, input.search, +input.copy, input.add { + padding-right: 21px; +} +input.next { + background: #e5e5e5 url(../../images/go.png) no-repeat right 2px; +} +input.upd { + background: #e5e5e5 url(../../images/upd.png) no-repeat right 3px; +} +input.wand { + background: #e5e5e5 url(../../images/wand.png) no-repeat right 3px; +} +input.delete { + background: #e5e5e5 url(../../images/cross.png) no-repeat right 3px; +} +input.search { + background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px; +} +input.copy { + background: #e5e5e5 url(../../images/copy.png) no-repeat right 3px; +} +input.ok { + background: #e5e5e5 url(../../images/ok.png) no-repeat right 3px; +} +input.add { + background: #e5e5e5 url(../../images/add.png) no-repeat right 3px; +} +table, img { + border: 0px; +} +th { + color: #fff; + background-color: #555; + text-align:center; +} +tr.datos, tr.datost, tr.datosb , tr.datos_id, +tr.datosf9, tr.datos2, tr.datos2t, +tr.datos2b, tr.datos2_id , tr.datos2f9 { + background-color: #f9f9f9; +} +tr.datos:hover, tr.datost:hover, tr.datosb:hover, tr.datos_id:hover, +tr.datosf9:hover, tr.datos2:hover, tr.datos2t:hover, +tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover { + background-color: #efefef; +} +td.datos3 { + background-color: #d4ddc6; +} +td.datos_id { + color: #1a313a; +} +.bg { /* op menu */ + background-color: #555; +} +.bg2 { /* main page */ + background-color: #d84437; +} +.bg3 { /* godmode */ + background-color: #d84437; +} +.bg4 { /* links */ + background-color: #5385bf; +} +.bg, .bg2, .bg3, .bg4 { + position: relative; + width: 100%; +} +.bg { + height: 20px; +} +.bg2, .bg3, .bg4 { + height: 17px; +} +.f10, #ip { + font-size: 7pt; + text-align: center; +} +.f9, .f9i, .f9b, .datos_greyf9, .datos_bluef9, .datos_greenf9, .datos_redf9, .datos_yellowf9, td.f9, td.f9i, td.datosf9, td.datos2f9 { + font-size: 6.5pt; +} +.f9i, .redi { + font-style: italic; +} +.tit { + padding: 3px 1px; +} +.tit, .titb { + font-weight: bold; + color: #fff; + text-align: center; +} +.suc, .error, .help { + padding: 4px 1px 6px 30px; +} +.suc { + color: #5a8629; + background: url(../../images/suc.png) no-repeat 1px; +} +.error { + background: url(../../images/err.png) no-repeat; +} +.help { + background: url(../../images/help.png) no-repeat; +} +.red, .redb, .redi, .error { + color: #f00; +} + +.sep { + margin-left: 30px; + border-bottom: 1px solid #708090; + width: 100%; +} +.green { + color: #5a8629; +} +.yellow { + color: #F3C500; +} +.greenb { + color: #00aa00; +} +.grey { + color: #808080; + font-weight: bold; +} +.redb, .greenb, td.datos_id, td.datos2_id, f9b { + font-weight: bold; +} +.p10 { + padding-top: 1px; + padding-bottom: 0px; +} +.p21 { + padding-top: 2px; + padding-bottom: 1px; +} +.w120 { + width: 120px; +} +.w130, #table-agent-configuration select { + width: 130px; +} +.w135 { + width: 135px; +} +.w155, #table_layout_data select { + width: 155px; +} +.top, .top_red, .bgt, td.datost, td.datos2t { + vertical-align: top; +} +.top_red { + background: #ff0000; +} +.bot, .titb, td.datosb { + vertical-align: bottom; +} +.msg { + margin-top: 15px; + text-align: justify; +} +ul.mn { + list-style: none; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; + line-height: 24px; +} +.gr { + font-size: 10pt; + font-weight: bold; +} +a.mn, .gr { + font-family: Arial, Verdana, sans-serif, Helvetica; +} +div.nf { + background: url(../../images/info.png) no-repeat; + color: #ac4444; + margin-left: 7px; + padding: 2px 1px 6px 25px; +} +div.title_line { + background-color: #4e682c; + height: 5px; + width: 762px; +} +#menu_tab_frame, #menu_tab_frame_view { + background:#D84437 none repeat scroll 0 0; + border-bottom:1px solid #000; + float:left; + margin-left:-8px; + min-height:25px; + padding-right:8px; + width:100%; +} +#menu_tab_frame_view { + background: #66AA44; +} +#menu_tab .mn, #menu_tab ul, #menu_tab .mn ul { + padding: 0px; + list-style: none; + margin: 0px; +} +#menu_tab .mn li { + float: right; + position: relative; +} +#menu_tab li a, #menu_tab a { + background: #d4ddc6; + padding: 3px 5px; + color: #333; + border-left: 2px solid #000; + font-weight: bold; + line-height: 19px; +} +#menu_tab li.nomn_high a { + background: #799E48; + color: #fff; +} +#menu_tab .mn li a { + display: block; + text-decoration: none; +} +#menu_tab li.nomn:hover a, #menu_tab li:hover ul a:hover { + background: #799E48; + color: #fff; +} +#menu_tab li:hover a { + background: #b2b08a url("../images/arrow.png") no-repeat right 3px; +} +#menu_tab li:hover ul a, #menu_tab .mn ul { + background: #db6351; + border-top: none; +} +/* TAB TITLE */ +#menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul { + color: #fff; + font-weight: bold; + padding: 0px 0px 0px 0px; + list-style: none; + margin: 0px 0px 0px 2px; +} +#menu_tab_left .mn li { + float: left; + position: relative; +} +#menu_tab_left li a, #menu_tab_left li span { + text-transform: uppercase; + background: #d84437; + padding: 2px 5px 2px 5px; + color: #fff; + font-weight: bold; + line-height: 18px; +} +#menu_tab_left .mn li a { + display: block; + text-decoration: none; +} +#menu_tab_left li.view a { + background: #6a4; + padding: 2px 10px 2px 10px; + color: #fff; + font-weight: bold; + line-height: 18px; +} +span.users { + background: url(../../images/group.png) no-repeat; +} +span.agents { + background: url(../../images/bricks.png) no-repeat; +} +span.data { + background: url(../../images/data.png) no-repeat; +} +span.alerts { + background: url(../../images/bell.png) no-repeat; +} +span.time { + background: url(../../images/hourglass.png) no-repeat; +} +span.net { + background: url(../../images/network.png) no-repeat; +} +span.master { + background: url(../../images/master.png) no-repeat; +} +span.wmi { + background: url(../../images/wmi.png) no-repeat; +} +span.prediction { + background: url(../../images/chart_bar.png) no-repeat; +} +span.plugin { + background: url(../../images/plugin.png) no-repeat; +} +span.export { + background: url(../../images/database_refresh.png) no-repeat; +} +span.snmp { + background: url(../../images/snmp.png) no-repeat; +} +span.binary { + background: url(../../images/binary.png) no-repeat; +} +span.recon { + background: url(../../images/recon.png) no-repeat; +} +span.rmess { + background: url(../../images/email_open.png) no-repeat; +} +span.nrmess { + background: url(../../images/email.png) no-repeat; +} +/* This kind of span do not have any sense, should be replaced on PHP code +by a real img in code. They are not useful because insert too much margin around +(for example, not valid to use in the table of server view */ +span.users, span.agents, span.data, span.alerts, span.time, span.net, +span.master, span.snmp, span.binary, span.recon, span.wmi, span.prediction, +span.plugin, span.plugin, span.export { + margin-left: 4px; + margin-top: 10px; + padding: 4px 8px 12px 30px; + display: block; +} +span.rmess, span.nrmess { + margin-left: 14px; + padding: 1px 0px 10px 30px; + display: block; +} +/* New styles for data box */ +.databox, .databox_color, .databox_frame { + margin-bottom: 15px; + margin-top: 5px; + margin-left: 0px; + border: 1px solid #f2f2f2; +} +.databox { + background-color: #fafafa; +} + +.databox_color { +} + +#head_l { + float: left; + margin: 0; + padding: 0; +} +#head_r { + float: right; + text-align: right; + margin-right: 10px; + padding-top: 5px; +} +#head_m { + position: absolute; + padding-top: 6px; + padding-left: 12em; +} +span#logo_text1 { + font: bolder 2.5em Arial, Sans-serif; + letter-spacing: -2px; + color: #eee; + text-align: right; +} +span#logo_text2 { + font: 2.5em Arial, Sans-serif; + letter-spacing: -2px; + color: #aaa; + text-align: right; +} +div#logo_text3 { + text-align: right; + font: 2em Arial, Sans-serif; + letter-spacing: 6px; + color: #aaa; + font-weight: bold; + margin-top: 0px; + margin-left: 4px; + padding-top: 0px: +} + +.bb0 { + border-bottom: 0px; +} +.bt0 { + border-top: 0px; +} +.action-buttons { + text-align: right; +} +#table-add-item select, #table-add-sla select { + width: 180px; +} +/* classes for event priorities. Sits now in functions.php */ +.datos_green, .datos_greenf9 { + background-color: #BBFFA4; +} +.datos_red, .datos_redf9 { + background-color: #FFC0B5; +} +.datos_yellow, .datos_yellowf9 { + background-color: #F4FFBF; +} +.datos_blue, .datos_bluef9 { + background-color: #CDE2EA; +} +.datos_grey, .datos_greyf9 { + background-color: #E4E4E4; +} +td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yellowf9 { + padding: 5px 5px 5px 5px; +} +/* end of classes for event priorities */ +div#main_pure { + background-color: #fefefe; + text-align: left; + margin-bottom: 25px; + margin-top: 10px; + margin-left: 10px; + margin-right: 10px; +} +#table-agent-configuration radio { + margin-right: 40px; +} +.ui-draggable { + cursor:move; +} +#layout_trash_drop { + float: right; + width: 300px; + height: 180px; + background: #fff url("../../images/trash.png") no-repeat bottom left; +} +#layout_trash_drop div { + display: block; +} +#layout_editor_drop { + float: left; + width: 300px; +} +.agent_reporting { + margin: 5px; + padding: 5px; +} +.report_table, .agent_reporting { + border: #CCC outset 3px; +} +.img_help { + cursor: help; +} +#loading { + position:fixed; + width: 200px; + margin-left: 250px; + text-align:center; + top:300px; + background-color: #999999; + padding: 20px; +} +/* big_data is used in tactical and logon_ok */ +a.big_data { + text-decoration: none; font: bold 2em Arial, Sans-serif; +} +.notify { + background-color: #f7ffa5; + text-align: center; + font-weight: bold; + padding: 8px; +} +.listing { + border-collapse: collapse; +} +.listing td { + border-bottom: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; +} +ul { + list-style-type: none; + padding-left: 0; + margin-left: 0; +} +span.actions { + margin-left: 30px; +} +code, pre { + font-family: courier, serif; +} +select#template, select#action { + width: 250px; +} +#label-checkbox-matches_value, +#label-checkbox-copy_modules, +#label-checkbox-copy_alerts { + display: inline; + font-weight: normal; +} +input[type=image] { + border:0px; +} +table#simple select#id_module_type, +table#alert_search select#id_agent, +table#alert_search select#id_group { + width: 200px; +} +table#simple select#select_snmp_oid, +table#simple select#id_plugin { + width: 270px; +} +table#simple input#text-plugin_parameter, +table#simple input#text-snmp_oid, +table#simple select#prediction_module, +table#source_table select, +table#destiny_table select, +table#target_table select, +table#filter_compound_table select, +table#filter_compound_table #text-search, +table#delete_table select { + width: 100%; +} +table#simple select#network_component_group, +table#simple select#network_component { + width: 90%; +} +table#simple span#component_group, +table#simple span#component { + width: 45%; + font-style: italic; +} +.clickable { + cursor: pointer; +} +table#agent_list tr, table.alert_list tr { + vertical-align: top; +} +ul.actions_list { + list-style-image: url(../../images/arrow.png); + list-style-position: inside; + margin-top: 0; +} +div.loading { + background-color: #FFF1A8; + margin-left: auto; + margin-right: auto; + padding: 5px; + text-align: center; + font-style: italic; + width: 95%; +} +div.loading img { + float: right; +} +/* Tablesorter jQuery pager */ +div.pager { + margin-left: 10px; + margin-top: 5px; +} +div.pager img{ + position: relative; + top: 4px; + padding-left: 5px; +} +div.pager input { + padding-left: 5px; +} +.pagedisplay { + border: 0; + width: 35px; +} +/* Steps style */ +ol.steps { + margin-bottom: 15px; + padding: 0; + list-style-type: none; + list-style-position: outline; +} +ol.steps li { + float: left; + background-color: #efefef; + padding: 5px; + margin-left: 5px; + width: 150px; +} +ol.steps li a { + color: #000; +} +ol.steps li.visited a { + color: #999; +} +ol.steps li span { + font-weight: normal; + display: block; +} +ol.steps li span { + color: #777; +} +ol.steps li.visited span { + color: #999; +} +ol.steps li.current { + border-left: 5px solid #000; + margin-left: 0; + font-weight: bold; + background-color: #E9F3D2; +} +ol.steps li.visited { + color: #999 !important; +} + +fieldset { + border: 2px solid #E9F3D2; + padding: 0 0 0 10px; + width: 90%; + margin-bottom: 15px; +} +fieldset legend span, +span#latest_value { + font-style:italic; +} +span#latest_value span#value { + font-style:normal; +} +form#filter_form { + margin-bottom: 15px; +} +ul.action_list { + margin: 0; + list-style: none inside url(../../images/arrow.png); +} +ul.action_list li div { + margin-left: 15px; +} +span.action_name { + float: left; +} +div.actions_container { + overflow:auto; + width: 100%; + max-height: 200px; +} +div.actions_container label { + display: inline; + font-weight: normal; + font-style: italic; +} +a.add_action { + clear: both; + display: block; +} + +/* timeEntry styles */ +.timeEntry_control { + vertical-align: middle; + margin-left: 2px; +} +div#steps_clean { + clear:both; +} +div#event_control { + clear:right; +} diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css index e7989b0e84..3a52e6eef2 100644 --- a/pandora_console/include/styles/pandora_red.css +++ b/pandora_console/include/styles/pandora_red.css @@ -81,7 +81,7 @@ checkbox { h1, h2, h3 { font: bold 1em Arial, Sans-serif; text-transform: uppercase; - color: #786; + color: #A00; padding-bottom: 5px; padding-top: 7px; } @@ -102,7 +102,6 @@ h4 { } a { color: #d81616; - font-weight: bold; text-decoration: none; } a:hover { @@ -191,8 +190,8 @@ div#page { width: 960px; background: #fff; clear: both; - border-bottom: solid 5px #786; - border-top: solid 5px #786; + border-bottom: solid 5px #D44; + border-top: solid 5px #D44; } div#main { width: 780px; @@ -262,7 +261,7 @@ input.datos_readonly { background-color: #050505; } input.login { - border-color: #786; + border-color: #D44; background-color: #f5f5f5; margin: 2px 0 8px; width: 90px; @@ -307,7 +306,7 @@ table, img { } th, td.lb, td.lb_view { color: #fff; - background-color: #786; + background-color: #D44; } td.datos, td.datost, td.datosb , td.datos_id, td.datosf9 { background-color: #fff0f0; @@ -325,7 +324,7 @@ td.datos_jus, td.datos2_jus { text-align: justify; } .bg { /* op menu */ - background-color: #786; + background-color: #D44; } .bg2 { /* main page */ background-color: #d84437; @@ -500,7 +499,7 @@ div.title_line { color: #fff; padding: 2px 10px 2px 10px; border-left: 2px solid #778866; - font-weight: bold; + /* font-weight: bold; */ line-height: 18px; } @@ -533,7 +532,7 @@ div.title_line { background: #d84437; padding: 2px 10px 2px 10px; color: #fff; - font-weight: bold; +/* font-weight: bold; */ line-height: 18px; } #menu_tab_left .mn li a { @@ -623,7 +622,7 @@ span.rmess, span.nrmess { background-color: #fafafa; } .databox_color { - border-left: 4px solid #FF7863; + border-left: 4px solid #D44; } #head_l { float: left; @@ -634,7 +633,7 @@ span.rmess, span.nrmess { float: right; text-align: right; margin-right: 10px; - padding-top: 10px; + padding-top: 0px; } #head_m { position: absolute; @@ -652,6 +651,16 @@ span#logo_text2 { letter-spacing: -2px; color: #aaa; } +div#logo_text3 { + text-align: right; + font: 2em Arial, Sans-serif; + letter-spacing: 6px; + color: #aaa; + font-weight: bold; + margin-top: 0px; + margin-left: 4px; + padding-top: 0px: +} .bb0 { border-bottom: 0px; } @@ -705,3 +714,11 @@ div#main_pure { margin-left: 10px; margin-right: 10px; } + +div#pandora_logo_header { + background: url(../../images/pandora_logo_head.png); + background-position: 0% 0%; + width: 139px; + height: 60px; + float: left; +} diff --git a/pandora_console/include/styles/pandora_width.css b/pandora_console/include/styles/pandora_width.css index 2f029737eb..241afc04db 100644 --- a/pandora_console/include/styles/pandora_width.css +++ b/pandora_console/include/styles/pandora_width.css @@ -66,3 +66,23 @@ div#events_list { float: left; width: 100%; } +span#logo_text1 { + font: bolder 3em Arial, Sans-serif; + letter-spacing: -2px; + color: #eee; +} +span#logo_text2 { + font: 3em Arial, Sans-serif; + letter-spacing: -2px; + color: #aaa; +} +div#logo_text3 { + text-align: right; + font: 2em Arial, Sans-serif; + letter-spacing: 6px; + color: #aaa; + font-weight: bold; + margin-top: 0px; + margin-left: 4px; + padding-top: 0px: +} diff --git a/pandora_console/install.php b/pandora_console/install.php index 5209b57b1e..c8212ee5d0 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -312,6 +312,9 @@ function install_step3() {
DB Name (pandora by default)
+ + Drop Database if exists +
Full path to HTTP publication directory
For example /var/www/pandora_console/. Needed for graphs and attachments. @@ -357,6 +360,11 @@ function install_step4() { $dbpassword = $_POST["pass"]; $dbuser = $_POST["user"]; $dbhost = $_POST["host"]; + if (isset($_POST["drop"])) + $dbdrop = $_POST["drop"]; + else + $dbdrop = 0; + $dbname = $_POST["dbname"]; if (isset($_POST["url"])) $url = $_POST["url"]; @@ -375,7 +383,7 @@ function install_step4() { echo "

Pandora FMS Console installation wizard. Step #4 of 4

-
+

Creating database and default configuration file

"; @@ -383,6 +391,11 @@ function install_step4() { check_generic ( 0, "Connection with Database"); } else { check_generic ( 1, "Connection with Database"); + + // Drop database if needed + if ($dbdrop == 1) + mysql_query ("DROP DATABASE IF EXISTS $dbname"); + // Create schema $step1 = mysql_query ("CREATE DATABASE $dbname"); check_generic ($step1, "Creating database '$dbname'"); @@ -400,8 +413,7 @@ function install_step4() { $step5 = mysql_query ("GRANT ALL PRIVILEGES ON $dbname.* to pandora@localhost IDENTIFIED BY '".$random_password."'"); mysql_query ("FLUSH PRIVILEGES"); - check_generic ($step5, "Established privileges for user pandora
-       password '$random_password'"); + check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); $step6 = is_writable("include"); check_generic ($step6, "Write permissions to save config file in './include'"); @@ -452,13 +464,15 @@ $config["homeurl"]="'.$url.'"; // Base URL if (mysql_error() != "") echo "
ERROR: ". mysql_error().".
"; - mysql_query ("DROP DATABASE $dbname"); + + if ($step1 == 1) + mysql_query ("DROP DATABASE $dbname"); } echo "
- Pandora FMS is an OpenSource Software project registered at + Pandora FMS is an Open Source Software project registered at SourceForge
";