diff --git a/dev/test/testdiv.php b/dev/test/testdiv.php new file mode 100644 index 00000000000..2d6a42ebc14 --- /dev/null +++ b/dev/test/testdiv.php @@ -0,0 +1,71 @@ + + + + + + + + + +Login Dolibarr 3.4.0-alpha + + + + + + + + + + + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + +
  fds fs df sdf gdsfgsdf r   + +
    + +
+ +
+
+ + +
+ + + +
+
+ + + +
+ +
+ + + + diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index afc427b5d7e..b8864ea80f3 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -31,12 +31,12 @@ class MenuManager var $type_user; // Put 0 for internal users, 1 for external users var $atarget=""; // Valeur du target a utiliser dans les liens var $name="eldy"; - + var $menu_array; var $menu_array_after; var $tabMenu; - + /** * Constructor @@ -52,7 +52,7 @@ class MenuManager // On sauve en session le menu principal choisi if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"]; if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; - + // Read mainmenu and leftmenu that define which menu to show if (isset($_GET["mainmenu"])) { @@ -62,11 +62,11 @@ class MenuManager $_SESSION["leftmenuopened"]=""; } else - { + { // On va le chercher en session si non defini par le lien $mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:''; } - + if (isset($_GET["leftmenu"])) { // On sauve en session le menu principal choisi @@ -86,7 +86,7 @@ class MenuManager // On va le chercher en session si non defini par le lien $leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:''; } - + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $tabMenu=array(); $menuArbo = new Menubase($db,'eldy'); @@ -112,11 +112,11 @@ class MenuManager $conf->global->MAIN_SEARCHFORM_SOCIETE=0; $conf->global->MAIN_SEARCHFORM_CONTACT=0; } - + $res='ErrorBadParameterForMode'; if ($mode == 'top') $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu); if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu); - + return $res; } diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php index 1a6ef81a58e..21975a1aef4 100755 --- a/htdocs/core/tools.php +++ b/htdocs/core/tools.php @@ -51,7 +51,8 @@ print $langs->trans("ToolsDesc").'

'; -$db->close(); llxFooter(); + +$db->close(); ?> diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 3452fbe9e86..9bdd8369f70 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2012 Laurent Destailleur + * Copyright (C) 2011-2013 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -75,7 +75,10 @@ $(document).ready(function () { }); +
+
+ @@ -94,11 +97,14 @@ $(document).ready(function () {
- + - - + + + +
-
+
'; + echo ''; } ?> - + + +
@@ -233,6 +241,8 @@ if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?> +
+ diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index d7efa19804d..db971ab0799 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -80,12 +80,6 @@ $img_button=dol_buildpath($path.'/theme/amarok/img/button_bg.png',1); font-size:100%; } -/*.fiche ul { - margin:0.5em; - padding:0.5em; - padding-left: 2em; -}*/ - body { background-color:#f5f5f5; @@ -178,11 +172,29 @@ form { margin:0px; } +.valignmiddle { + vertical-align: middle; +} +.centpercent { + width: 100%; +} +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} + /* ============================================================================== */ /* Login */ /* ============================================================================== */ +body.body center{color:white;} + form#login { display:block; border:solid 1px rgba(0,0,0,.4); @@ -240,7 +252,12 @@ form#login table.login_table { background:none !important; } -body.body center{color:white;} +div#login_left, div#login_right { + display: inline-block; + min-width: 220px; + text-align: center; + vertical-align: middle; +} table.login_table { background-color: red !important;} table.login_table tr td {vertical-align:middle;} diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 3360cb07f69..745fa89d7d9 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -161,12 +161,22 @@ div.float { float:; } + .valignmiddle { vertical-align: middle; } .centpercent { width: 100%; } +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} /* ============================================================================== */ @@ -488,7 +498,9 @@ form#login { } .login_table { padding:12px; - width: 540px; + margin-left: 10px; + margin-right: 10px; + max-width: 540px; border: 1px solid #C0C0C0; background-color: #E0E0E0; @@ -527,6 +539,13 @@ div.login_block table { display: inline; } +div#login_left, div#login_right { + display: inline-block; + min-width: 220px; + text-align: center; + vertical-align: middle; +} + div.login { white-space:nowrap; padding: browser->phone?'0':'8')?>px 0px 0px 0px; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 97527a537cd..1a2cd4fdcff 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -183,12 +183,22 @@ form { padding: 0em 0em 0em 0em; margin: 0em 0em 0em 0em; } + .valignmiddle { vertical-align: middle; } .centpercent { width: 100%; } +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} /* ============================================================================== */ @@ -521,7 +531,9 @@ form#login { font-size: 13px; } .login_table_title { - width: 540px; + margin-left: 10px; + margin-right: 10px; + max-width: 540px; color: #888888; text-shadow: 1px 1px 1px #FFF; } @@ -529,8 +541,10 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { + margin-left: 10px; + margin-right: 10px; padding:12px; - width: 540px; + max-width: 540px; border: 1px solid #C0C0C0; background-color: #E0E0E0; @@ -570,6 +584,13 @@ div.login_block table { display: inline; } +div#login_left, div#login_right { + display: inline-block; + min-width: 220px; + text-align: center; + vertical-align: middle; +} + div.login { white-space:nowrap; padding: browser->phone?'0':'8')?>px 0px 0px 0px; @@ -2138,13 +2159,9 @@ div.table-val-border-col { /* ============================================================================== */ #login { - position: relative; display: block; - width: 480px; height: auto; top: 20px; - left: 50%; - margin-left: -240px; margin-bottom: 30px; } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 2dd4bfc3a2f..2e2f03920c5 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -166,12 +166,22 @@ div.float { float:; } + .valignmiddle { vertical-align: middle; } .centpercent { width: 100%; } +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} /* ============================================================================== */ @@ -535,7 +545,7 @@ form#login { font-size: 13px; } .login_table_title { - width: 540px; + max-width: 540px; color: #888888; text-shadow: 1px 1px 1px #FFF; } @@ -543,8 +553,10 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { + margin-left: 10px; + margin-right: 10px; padding:12px; - width: 540px; + max-width: 540px; border: 1px solid #C0C0C0; background-color: #E0E0E0; @@ -583,6 +595,13 @@ div.login_block table { display: inline; } +div#login_left, div#login_right { + display: inline-block; + min-width: 220px; + text-align: center; + vertical-align: middle; +} + div.login { white-space:nowrap; padding: browser->phone?'0':'8')?>px 0px 0px 0px; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index cbeccbebadc..a3c1837548e 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -303,12 +303,22 @@ th .button { -webkit-border-radius:0px !important; border-radius:0px !important; } + .valignmiddle { vertical-align: middle; } .centpercent { width: 100%; } +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} /* ============================================================================== */ @@ -712,12 +722,13 @@ foreach($mainmenuusedarray as $val) /* Login */ form#login { - margin-top: 70px; + margin-top: 60px; margin-bottom: 30px; font-size: 13px; + vertical-align: middle; } .login_table_title { - width: 540px; + max-width: 540px; color: #888888; text-shadow: 1px 1px 1px #FFF; } @@ -725,11 +736,13 @@ form#login { text-shadow: 1px 1px 1px #FFF; } .login_table { + margin-left: 10px; + margin-right: 10px; padding-left:6px; padding-right:6px; - padding-top:14px; + padding-top:12px; padding-bottom:12px; - width: 540px; + max-width: 540px; border: 1px solid #C0C0C0; background-color: #E0E0E0; @@ -747,6 +760,13 @@ form#login { background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); } +div#login_left, div#login_right { + display: inline-block; + min-width: 250px; + padding-top: 10px; + text-align: center; + vertical-align: middle; +} table.login_table tr td table.none tr td { padding: 2px; } @@ -2058,7 +2078,7 @@ table.cal_month { border-spacing: 0px; } .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; } .cal_other_month { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; } .cal_current_month_right { border-right: solid 1px #E0E0E0; } -.cal_other_month_right { border-right: solid 1px #C0C0C0; } +.cal_other_month_right { border-right: solid 1px #C0C0C0; } .cal_other_month { opacity: 0.6; background: #DDDDDD; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_past_month { opacity: 0.6; background: #EEEEEE; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }