From 7cbe4fdf7544522d1f948e656cd10d0234dd3daf Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 23 Apr 2013 14:57:29 +0000 Subject: [PATCH] 2013-04-23 Sergio Martin * include/styles/dialog.css include/styles/images/dialog-titlebar-close.png include/styles/pandora.css include/ajax/events.php include/functions_events.php images/event_responses_col.png images/interrogant.png general/pandora_help.php general/footer.php general/login_page.php general/logon_ok.php: Change the help screens and the modal windows visual style to new design. Little fixes to support metaconsole login and some visual changes git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8035 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 17 + pandora_console/general/footer.php | 4 +- pandora_console/general/login_page.php | 7 +- pandora_console/general/logon_ok.php | 6 +- pandora_console/general/pandora_help.php | 26 +- .../images/event_responses_col.png | Bin 0 -> 1576 bytes pandora_console/images/interrogant.png | Bin 0 -> 1167 bytes pandora_console/include/ajax/events.php | 2 +- pandora_console/include/functions_events.php | 10 +- pandora_console/include/styles/dialog.css | 79 +++- .../styles/images/dialog-titlebar-close.png | Bin 2850 -> 1344 bytes pandora_console/include/styles/pandora.css | 390 ++++++++++-------- 12 files changed, 334 insertions(+), 207 deletions(-) create mode 100644 pandora_console/images/event_responses_col.png create mode 100644 pandora_console/images/interrogant.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 54c61eb331..711674780d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-04-23 Sergio Martin + + * include/styles/dialog.css + include/styles/images/dialog-titlebar-close.png + include/styles/pandora.css + include/ajax/events.php + include/functions_events.php + images/event_responses_col.png + images/interrogant.png + general/pandora_help.php + general/footer.php + general/login_page.php + general/logon_ok.php: Change the help screens and + the modal windows visual style to new design. + Little fixes to support metaconsole login and + some visual changes + 2013-04-23 Miguel de Dios * include/functions_ui.php, include/javascript/pandora_modules.js: diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index c72ded3702..2383e4b468 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -26,10 +26,10 @@ if (! file_exists ($config["homedir"] . $license_file)) { $license_file = 'general/license/pandora_info_en.html'; } -echo ''; +echo ''; echo sprintf(__('Pandora FMS %s - Build %s', $pandora_version, $build_version)); echo '
'; -echo ''. __('Page generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")); //Always use timestamp here +echo ''. __('Page generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")); //Always use timestamp here echo ''; if (isset ($config['debug'])) { echo ' - Saved '.format_numeric ($sql_cache["saved"]).' Queries'; diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index d56af3209c..8268ded7cc 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -69,7 +69,10 @@ echo ' // Replace the following with your own URL and logo. // A mashup of the Pandora FMS logo and your companies highly preferred echo ''; - if (defined ('PANDORA_ENTERPRISE')) { + if (defined ('METACONSOLE')) { + html_print_image ("enterprise/meta/images/pandora_login_enterprise.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); + } + else if (defined ('PANDORA_ENTERPRISE')) { html_print_image ($config['homeurl'] . "/images/pandora_login_enterprise.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true); } else { @@ -101,7 +104,7 @@ echo ' html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login login_password"', false, true); echo ''; echo ''; break; case 'logout': diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 969c93a3cd..7f57913fe8 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -54,7 +54,7 @@ echo '
' $news = db_get_all_rows_sql ($sql); if ($news !== false) { echo ''; - echo ''; + echo ''; if ($config["prominent_time"] == "timestamp") { $comparation_suffix = ""; } @@ -97,7 +97,7 @@ echo '
' $table->head[3] = __('Date'); $table->head[4] = __('Source IP'); $table->head[5] = __('Comments'); - $table->title = '' . __('This is your last activity in Pandora FMS console') . ''; + $table->title = '' . __('This is your last activity in Pandora FMS console') . ''; switch ($config["dbtype"]) { case "mysql": @@ -178,7 +178,7 @@ $table->head = array (); $table->data = array (); $table->style[0] = 'text-align:center;'; $table->width = "100%"; -$table->head[0] = '' . __('Pandora FMS Overview') . ''; +$table->head[0] = '' . __('Pandora FMS Overview') . ''; $table->head_colspan[0] = 4; // Indicators diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index d017ac050f..e2042cbf3a 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -72,21 +72,25 @@ if (! $id || ! file_exists ($help_file)) { /* Show help */ echo '
'; -echo '
'; -echo ''; -echo html_print_image('images/pandora_textlogo.png', true, array("border" => '0')); +echo ''; +echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0')); echo ""; -echo '

'.__('Pandora FMS help system').'

'; -echo '

'; -echo '
'; +echo '

'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '

'; +echo '
'; echo '
'; -echo '
'; +echo '
'; +ob_start(); require_once ($help_file); -echo '
'; -echo '

'; -echo '
'; +$help = ob_get_contents(); +ob_end_clean(); + +// Add a line after H1 tags +$help = str_replace('', '
', $help); +$help = str_replace('', '
', $help); +echo $help; +echo '

'; +echo '
'; include ('footer.php'); -echo '
'; ?> diff --git a/pandora_console/images/event_responses_col.png b/pandora_console/images/event_responses_col.png new file mode 100644 index 0000000000000000000000000000000000000000..6c33514e11f4e77a298864b87ae11d07039139f2 GIT binary patch literal 1576 zcmbVMZA=q)82`7G0tJ*TzSNh^+aZiO>D~2(wigP$_KI|&P)jpQHWRMb15RkKTu*5U zV%4crSr(icW{g8;9C3-6GcIIqTBdH2?SqRik-exs+BpaMJfP5j^}-gwaHUVUZ0$Nm(>Z(M^m1`I!bbWPwLdpM@bd zV1ZW~T&OE-XBydxHlC?ztMbxqO|&@xmz6>#QCu_-WCRL|2Ae|>JZgcb?c(BDQX?=l z4H23w@YA4tE;nT7cm^_P&>|Ww#-L)o2GgTvy?F(sMKKh?vOd;@}+&1MAEB3f;ch$xE0LIM>n3Pti#7Dy&S z^K4jPxez2-r2O1E!2*ksK20GQcDbGz4n<}PC6)|{Qegzsphz$%sLxB0#oE2tkpvW@!K-;zYzoy(a`d_&6B3-H1s4Bk0&D;$i%FeU zN0=~Dix!(O%tREEf*{KYvkgN@RA;mk zM2hPSMFc8DGbz8U=y!(ecp(?J^9&_$yqDveQxo8B~mMK)$`QSvYwbS`w zK_+-TwGQs!C9>`Aru{=31Fkx{p!#6@ z(u=FDU({em<3pJhPH{Z*919#JLH&qpq!6-o5cJ zljJFGiT3~~e(R;q&dw2;8XUQ%I6-}Kc`EB-Y2pumuTt54YP@}mEdFJ?bpcJ>1sk$? zPg&vhoARRD9aI90J(5EQGqT`NWm>?5t;@Z>;OcA2 z#>pLl-+lfqs*zop-jlQT5377O=uid9Dmadb(?J3RB1_6=yReFXm;k!?#_M;S+lz{v+Y7AjGKk7)X5f6SGg5XU>EAj0%n|g2^80P)| z{C>ax=bKm5=~ILK5BCEA1}mqfD)}BJ?}O2U08o#f{r(+dj0AE$m~rNUmgZqlG@J&8 z6-#U4D%OnU=f1!b07M=)YxSV6ObNPUFG05)*bwDa_@Ti0l4 z8hQE*uOP)0@w|C@#ltfz(=~l%LC+cV#3M|`dwU}0tal9tW<#IU|CD=qFP7rZ_*$%WYZu_HM1qu7QXS#vu*s!gr zHJqg&Pm@gVm0-F1vbMk1CekoA)LfQhP`jiqP*MILYFYbeKd9pS`TnP{Ut4xDTgAS! z$V7Vl+ zggx_lY?M96f}NrTvv)3hPrW^^(L0xPPcBQ6VcVnq*QmQLvOn$P{^Am2fAz6V_T3|k z{nw52N6FoyDpIi)e$%+SyE_?)qI2ti{(X3NM56)K*F@C$r(|$oox1Vvx6R!XYsJOm z>nJihw6!`6s5P~}Z(NNO=u1nUnKO!F~fKB%nHL!j4W??6`{mh3u<&>9C0L_Z*u5PVsDZ?!hIksZBNbT9qB8uHs5oQ>T+)OSohmsH=pEPv!5 zdn0}QXZXa%v#;L145$ldHfDzlpHMf)UvAWgu03!Cj2)DZUpV{v=FzXIpH7NbVeOYm z@5RR!);>)~2a4j4vA6HOP}+?2|L~pq$Zv(g)!d}#Gx&f7cLHe-Um)b Uo*t3(k2}AJiaag7Uz&aCAMMX`K>z>% literal 0 HcmV?d00001 diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 58ae1fef3d..4af7d3dd58 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -286,7 +286,7 @@ if ($get_extended_event) { $tabs .= "
  • ".html_print_image('images/pencil.png',true).__('Comments')."
    • "; if (!$readonly && (tags_check_acl ($config['id_user'], $event['id_grupo'], "EW", $event['clean_tags']) || tags_check_acl ($config['id_user'], $event['id_grupo'], "EM", $event['clean_tags']))) { - $tabs .= "
  • ".html_print_image('images/cog.png',true).__('Responses')."
    • "; + $tabs .= "
  • ".html_print_image('images/event_responses_col.png',true).__('Responses')."
    • "; } $tabs .= ""; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 61947c8d7a..bcee7cc595 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1546,7 +1546,7 @@ function events_page_responses ($event) { $table_responses->head = array (); $table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table_responses->style[1] = 'text-align: left;'; - $table_responses->class = "databox alternate"; + $table_responses->class = "alternate rounded_cells"; if (tags_check_acl ($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'])) { // Owner @@ -1748,7 +1748,7 @@ function events_page_custom_fields ($event) { $table->head = array (); $table->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table->style[1] = 'text-align: left;'; - $table->class = "databox alternate"; + $table->class = "alternate rounded_cells"; $all_customs_fields = (bool)check_acl($config["id_user"], $event["id_grupo"], "AW"); @@ -1816,7 +1816,7 @@ function events_page_details ($event, $server = "") { $table_details->head = array (); $table_details->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table_details->style[1] = 'text-align: left;'; - $table_details->class = "databox alternate"; + $table_details->class = "alternate rounded_cells"; switch ($event['event_type']) { case 'going_unknown': @@ -2059,7 +2059,7 @@ function events_page_general ($event) { $table_general->head = array (); $table_general->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table_general->style[1] = 'text-align: left;'; - $table_general->class = "databox alternate"; + $table_general->class = "alternate rounded_cells"; $data = array(); $data[0] = __('Event ID'); @@ -2200,7 +2200,7 @@ function events_page_comments ($event) { $table_comments->head = array (); $table_comments->style[0] = 'width:35%; vertical-align: top; text-align: left;'; $table_comments->style[1] = 'text-align: left;'; - $table_comments->class = "databox alternate"; + $table_comments->class = "alternate rounded_cells"; $comments_array = explode('
    ',io_safe_output($event["user_comment"])); diff --git a/pandora_console/include/styles/dialog.css b/pandora_console/include/styles/dialog.css index d90adc9478..7e09460143 100644 --- a/pandora_console/include/styles/dialog.css +++ b/pandora_console/include/styles/dialog.css @@ -2,7 +2,7 @@ /* This file skins dialog */ .ui-dialog { - background: none repeat scroll 0 0 #b0d68d !important; + background: none repeat scroll 0 0 #3f3f3f !important; border: 1px solid #DDDDDD !important; color: #333333 !important; padding: 0.2em !important; @@ -17,9 +17,12 @@ box-shadow: 0px 5px 5px #010E1B !important; } +.ui-widget-header { + background: #3f3f3f !important; +} .ui-dialog .ui-dialog-titlebar { - background: url(../../images/ui_title.png) repeat-x scroll !important; + background-color: #f3f3f3; height: 14px !important; #_height: 16px !important; padding: 0.3em 1em !important; @@ -43,7 +46,8 @@ color: white !important; font-weight: bold !important; position: relative !important; - #top: 7px !important; + top: 3px; + font-size: 10pt; left: 4px !important; float: none !important; } @@ -59,17 +63,13 @@ position: absolute !important; top: 2px; right: 5px !important; - cursor: default !important; + cursor: pointer !important; } .ui-dialog .ui-dialog-titlebar-close span { display: none !important; } - .ui-dialog .ui-dialog-titlebar-close-hover { - background: url(images/dialog-titlebar-close-hover.png) no-repeat !important; - } - .ui-dialog .ui-dialog-titlebar-close-hover { color: #000000 !important; } @@ -78,10 +78,6 @@ display: none !important; } - .ui-dialog .ui-dialog-titlebar-close:hover { - background: url(images/dialog-titlebar-close-hover.png) no-repeat !important; - } - .ui-dialog .ui-dialog-titlebar-close:hover { color: #000000 !important; } @@ -89,20 +85,67 @@ .ui-dialog .ui-dialog-content { - margin: 1.2em !important; + margin: 12px !important; #padding: 0.5em 1em !important; overflow: auto !important; + -moz-border-left: 1px solid #A9A9A9 !important; + -moz-border-right: 1px solid #A9A9A9 !important; + -moz-border-bottom: 1px solid #A9A9A9 !important; + -moz-border-radius: 8px 8px 8px 8px !important; + + -webkit-border-left: 1px solid #A9A9A9 !important; + -webkit-border-right: 1px solid #A9A9A9 !important; + -webkit-border-bottom: 1px solid #A9A9A9 !important; + -webkit-border-radius: 8px 8px 8px 8px !important; + border-left: 1px solid #A9A9A9 !important; border-right: 1px solid #A9A9A9 !important; border-bottom: 1px solid #A9A9A9 !important; - border-radius: 0px 0px 4px 4px !important; - #height: 80% !important; - #width: 98% !important; - margin: 0 auto !important; + border-radius: 8px 8px 8px 8px !important; + background: #FFFFFF !important; position: relative !important; - +} + +.ui-tabs .ui-tabs-nav { + background-color: white !important; +} + +.ui-tabs-panel { + background: #F3F3F3 !important; + -moz-border-radius: 8px !important; + -webkit-border-radius: 8px !important; + border-radius: 8px !important; + -moz-border-top-left-radius: 0px !important; + -webkit-border-top-left-radius: 0px !important; + border-top-left-radius: 0px !important; + -moz-box-shadow: -1px 1px 6px #aaa; + -webkit-box-shadow: -1px 1px 6px #aaa; + box-shadow: 1px 1px 6px #aaa; +} + +.ui-widget .ui-widget { + border: 0px !important; +} + +.ui-state-default:first-child { + margin-left: -3px !important; +} + +.ui-state-default { + background: #fff !important; + border: 2px solid #f3f3f3 !important; + -moz-border-top-left-radius: 10px !important; + -webkit-top-left-border-radius: 10px !important; + border-top-left-radius: 10px !important; + -moz-border-top-right-radius: 10px !important; + -webkit-top-right-border-radius: 10px !important; + border-top-right-radius: 10px !important; + margin-left: 2px !important; +} +.ui-state-active { + background: #f3f3f3 !important; } .ui-dialog-content { diff --git a/pandora_console/include/styles/images/dialog-titlebar-close.png b/pandora_console/include/styles/images/dialog-titlebar-close.png index cb836bdc7c6ed68ab6125dfa77c1b59ac7fc174f..dacaf9b2f4275e6c5c01de888c4bb0a6ff5bfba5 100644 GIT binary patch literal 1344 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc#=yY%t50_}kRw^*8c`CQpH@+tIX_n~5u`@1BDVmjn}NZ`zM>#8IXksP zAt^OIGtXA({qFrr3YjUkO5vuy2EGN(sTr9bRYj@6RemAKRoTgwDN6Qs3N{s1Km&49 zOA-|-a&z*EttxDlz~)*3*&tzkB?YjOl5ATgh@&EW0~DO|i&7O#^$c{A4a^J`%uMtQ zO$;neEOiu&3=9qQ4UO~-%ykV7tW3?V3=9>ZKnZADQA(Oskc%7CE+EfVDWjyMz)D}g zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~ zr2NtnTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=? zsVqp<4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPCa{IvN;nWLC47mkBn_W_iGRsm^+=}vZ6~Lah%Eav! z3!LUb^`_u3tA zxj=0myLKwW>VNzK4m~Hz4!%uENnz1$c=X%g>G!*L?)+0%RsCyU@j>B6gc@7S1AC@B z>?>I~6xN6(G8-tfI<$$1i2V8g?d|P)lW)~CL{D7%!*0pfvarwjhwQ2Vh9jrXpa1{= z>+9?PGv0hx*(s>d;PH*8kZa+=I(f|(i8mOu*uS5to^aSvj)5`7?8@Q~FT^a0pYa?9 zYLJ{Xd9vg@o64q~*OdxkE}ZTGHx3>Wv%u9s@D_5SpaP1mfT6k#a!Vdo#28_$L3$Bts>M-R%&5sX? z&Y78-hmZHm2OjE}KY#wh-MeQy#>L4g+j*Q~RdMIKa+AkEfBDj-jj`;XZvFcD`k=%S zw$8>U4p|#sF0ER!K%yf|PmSSYrOrxOm1zyGwwaa<5ey7p1hq^;q-XVl$}~?`KbLh* G2~7Y2n%LL? literal 2850 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 AGynhq diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5e44d158bd..e9857df784 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -39,35 +39,6 @@ div#page { background-image: none; } -#login_body { - /* Set rules to fill background */ - min-height: 100%; - min-width: 960px; - - /* Set up proportionate scaling */ - width: 100%; - height: auto; - - /* Set up positioning */ - position: fixed; - top: 0; - left: 0; - z-index: -999; - - background-image: url('../../images/login_background.jpg'); - background-size: cover; - -moz-background-size: cover; - -webkit-background-size: cover; - -o-background-size: cover; -} - -@media screen and (max-width: 1024px) { /* Specific to this particular image */ - #login_body { - left: 50%; - margin-left: -512px; /* 50% */ - } -} - body.pure { background-color: #fff; } @@ -172,80 +143,7 @@ div#error_buttons { div#error_buttons a{ margin: 14px; } -p.log_in { - color: #CCC; - padding: 0px 10px; -} -h1#log_f { - color: #c00; - border-bottom: 1px solid #c00; - padding-bottom: 3px; -} -div#login { - border-left: solid 1px #000; - border-top: solid 1px #000; - border-bottom: solid 2px #000; - border-right: solid 2px #000; - font-size: 12px !important; -} -div#login_in, #login_f { - /*margin: 0 auto 0 140px; - width: 400px;*/ -} -/* Style for login form */ -.databox_login, .databox_logout { - border: none !important; - background-color: #888888; - padding: 8px; - border-radius: 11px; - height: 300px; -} - -#login_inner { - background: url('../../images/splash_bg.png') #111; - width: 100%; - height: 100%; - border-radius: 11px; - overflow: hidden; -} -#login_outer { - -moz-box-shadow: 0px 0px 8px #ffffff; - -webkit-box-shadow: 0px 0px 18px #ffffff; - box-shadow: 0px 0px 18px rgba(200, 200, 200, 0.2); - padding: 3px; - border-radius: 11px; - width: 250px !important; - height: 300px; - margin: 50px auto; - background: transparent; -} -div#error_login { - #margin: 0 auto; - #margin-top: -10px; - text-align: center; - margin-top: 5px; - margin-left: 5px; - width: 75%; - float: right; - text-align: left; - top: 100px; -} - -div#error_login_icon { - #margin: 0 auto; - margin-top: 10px; - margin-right: 7px; - text-align: center; - #margin-left: 20px; - width: 20%; - float: right; -} - -div#login_f { - margin-top: 10px; - margin-bottom: 25px; -} div#noaccess { width: 350px; padding-left: 40px; @@ -283,8 +181,6 @@ div#container { div#page { width: 960px; clear: both; - border-bottom: solid 5px #567953; - /*border-top: solid 5px #567953;*/ } div#main { background: #fafafa; @@ -310,6 +206,54 @@ div#main_help { margin-right: 0px; border-radius: 10px; } +div#main_help div.databox { + background: F3F3F3; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + border: 0px; + padding-left: 25px; + padding-right: 25px; + margin-top: 10px; + -moz-box-shadow: -1px 1px 6px #aaa; + -webkit-box-shadow: -1px 1px 6px #aaa; + box-shadow: -1px 1px 6px #aaa; + +} + +div#main_help div.databox h1{ + padding-bottom: 0px; + margin-bottom: 0px; + font-weight: bold; + font-family: sans-serif, verdana; +} + +div#main_help div.databox h3, div#main_help div.databox h2 { + color: #6EB432; + font-family: sans-serif, verdana; +} + +div#main_help a.footer { + color: #999; +} + +a.footer{ + font-size: 9px; +} + +div#main_help div.databox hr{ + width:100%; + border: 0px; + height: 1px; + background-color: #222; + margin: 0px; +} + +div#main_help div.databox p{ + line-height: 15px; + text-align: justify; +} + div#menu { width: 165px; float: left; @@ -325,27 +269,125 @@ div#head { } div#foot { - font-size: 7pt; - border-top: solid 2px #000; - padding-top: 5px; + font-size: 6pt !important; + border-top: solid 2px #222; + padding-top: 8px; padding-bottom: 5px; text-align: center; - background: #000; + background: #111; width: 960px; height: 38px; clear: both; + width: auto; } #ver { margin-bottom: 25px; } -#bottom_logo { - bottom: 0; - height: 70px; - margin: 0 auto 0 44%; - overflow: hidden; +/****************/ +/* LOGIN STYLES */ +/****************/ + +#login_body { + /* Set rules to fill background */ + min-height: 100%; + min-width: 960px; + + /* Set up proportionate scaling */ + width: 100%; + height: auto; + + /* Set up positioning */ position: fixed; - display: none; + top: 0; + left: 0; + z-index: -999; + + background-image: url('../../images/login_background.jpg'); + background-size: cover; + -moz-background-size: cover; + -webkit-background-size: cover; + -o-background-size: cover; +} + +@media screen and (max-width: 1024px) { /* Specific to this particular image */ + #login_body { + left: 50%; + margin-left: -512px; /* 50% */ + } +} + +p.log_in { + color: #CCC; + padding: 0px 10px; +} +h1#log_f { + color: #c00; + border-bottom: 1px solid #c00; + padding-bottom: 3px; +} +div#login { + border-left: solid 1px #000; + border-top: solid 1px #000; + border-bottom: solid 2px #000; + border-right: solid 2px #000; + font-size: 12px !important; +} +div#login_in, #login_f { + /*margin: 0 auto 0 140px; + width: 400px;*/ +} + +.databox_login, .databox_logout { + border: none !important; + background-color: #888888; + padding: 8px; + border-radius: 11px; + height: 300px; +} + +#login_inner { + background: url('../../images/splash_bg.png') #111; + width: 100%; + height: 100%; + border-radius: 11px; + overflow: hidden; +} +#login_outer { + -moz-box-shadow: 0px 0px 18px #ffffff; + -webkit-box-shadow: 0px 0px 18px #ffffff; + box-shadow: 0px 0px 18px rgba(200, 200, 200, 0.2); + padding: 3px; + border-radius: 11px; + width: 250px !important; + margin: 50px auto; + background: transparent; +} +div#error_login { + #margin: 0 auto; + #margin-top: -10px; + text-align: center; + margin-top: 5px; + margin-left: 5px; + width: 75%; + float: right; + text-align: left; + top: 100px; +} + +div#error_login_icon { + #margin: 0 auto; + margin-top: 10px; + margin-right: 7px; + text-align: center; + #margin-left: 20px; + width: 20%; + float: right; +} + +div#login_f { + margin-top: 10px; + margin-bottom: 25px; } IMG.login_logo { @@ -376,12 +418,55 @@ DIV.login_pass { margin-top: 21px; } +input.login { + border: 0px none; + background-color: #ebebeb !important; + margin: 0px auto; + width: 135px; + height: 18px; + font-weight: bold; +} +/* FF hack for login inputs */ +@-moz-document url-prefix() { + input.login{ + margin: -2px 0 8px 20px !important; + } +} + +input.login_user { + /* Browser without multibackground support */ + background: #efefef url(../../images/input_user.png) no-repeat 7px 1px !important; + padding-left: 32px; + width: 106px; + color: #222; +} + +input.login_password { + /* Browser without multibackground support */ + background: #efefef url(../../images/input_lock.png) no-repeat 7px 1px !important; + padding-left: 32px; + width: 106px; + color: #222; +} +.databox_error { + width: 657px !important; + height: 400px; + border: none !important; + background-color: #fafafa; + background: url(../../images/splash_error.png) no-repeat; +} + #ver_num { position: relative; color: #696969; font-size: xx-small; margin-top: 32px; } + +/***********************/ +/* END OF LOGIN STYLES */ +/***********************/ + label { display: block; padding-top: 4px; @@ -402,22 +487,6 @@ input.datos { input.datos_readonly { background-color: #050505; } -input.login { - border: 0px none; - background-color: #ebebeb !important; - margin: 0px auto; - width: 135px; - height: 18px; -} - - - -/* FF hack for login inputs */ -@-moz-document url-prefix() { - input.login{ - margin: -2px 0 8px 20px !important; - } -} input.sub { font-weight: bold; @@ -468,7 +537,7 @@ input.sub[disabled] { color: #aaa; } -input.next, input.upd, input.ok, input.wand, input.delete, input.cog, +input.next, input.next_login, input.upd, input.ok, input.wand, input.delete, input.cog, input.target, input.search, input.copy, input.add, input.graph, input.percentile, input.binary, input.camera, input.config, input.cancel, input.default, input.filter, input.pdf { @@ -476,22 +545,6 @@ input.cancel, input.default, input.filter, input.pdf { } -input.login_user { - /* Browser without multibackground support */ - background: #efefef url(../../images/input_user.png) no-repeat 7px 1px !important; - padding-left: 32px; - width: 106px; - color: #222; -} - -input.login_password { - /* Browser without multibackground support */ - background: #efefef url(../../images/input_lock.png) no-repeat 7px 1px !important; - padding-left: 32px; - width: 106px; - color: #222; -} - input.next { /* Browser without multibackground support */ background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important; @@ -508,6 +561,22 @@ input.next { /* estándar */ background: url(../../images/input_go.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } +input.next_login { + /* Browser without multibackground support */ + background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_go.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; +} input.upd { /* Browser without multibackground support */ background: #efefef url(../../images/input_update.png) no-repeat 90% 3px !important; @@ -1480,25 +1549,19 @@ table.databox_grid td { border-right: 1px solid #acacac; } + table.alternate tr:nth-child(odd) td{ + background-color: #ffffff; +} +table.alternate tr:nth-child(even) td{ background-color: #e4e5e4; } -/* Style for login form -.databox_logout { - width: 657px !important; - height: 400px; - border: none !important; - background-color: #fafafa; - background: url(../../images/splash_logout.png) no-repeat; -}*/ - -.databox_error { - width: 657px !important; - height: 400px; - border: none !important; - background-color: #fafafa; - background: url(../../images/splash_error.png) no-repeat; +table.rounded_cells td { + padding: 4px 4px 4px 10px; + -moz-border-radius: 6px !important; + -webkit-border-radius: 6px !important; + border-radius: 6px !important; } .databox_color { @@ -1979,9 +2042,6 @@ div#head { color: white; } -div#foot { - width: auto; -} ol.steps { margin-bottom: 70px; }
    ' . __('News board') . '
    ' . __('News board') . '