Qual: Move embeded style into css files. Add more styles.

htdocs/compta/prelevement/index.php

@@ -74,7 +74,7 @@ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</
 $var=!$var;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
 print '<td align="right">';
-print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&mainmenu=bank">';
+print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
 print $bprev->NbFactureAPrelever();
 print '</a>';
 print '</td></tr>';

htdocs/core/lib/security2.lib.php

@@ -163,7 +163,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 {
 	global $dolibarr_main_demo,$db;
 	global $smartphone,$hookmanager;
-	
+
 	// Instantiate hooks of thirdparty module only if not already define
 	if (! is_object($hookmanager))
 	{
@@ -209,7 +209,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		}
 	}
 
-	$conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
+	$conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php?lang=".$langs->defaultlang;
 	$conf_css = DOL_URL_ROOT.$conf->css;
 
 	// Set cookie for timeout management
@@ -237,7 +237,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		$demologin=$tab[0];
 		$demopassword=$tab[1];
 	}
-	
+
 	// Execute hook getLoginPageOptions
 	// Should be an array with differents options in $hookmanager->resArray
 	$parameters=array('entity' => $_POST['entity']);

htdocs/core/tpl/login.tpl.php

@@ -41,20 +41,7 @@ print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/dst.js"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
-<style type="text/css">
-<!--
-#login {
-	margin-top: 70px;
-	margin-bottom: 30px;
-}
-.login_table {
-	width: 512px;
-	border: 1px solid #C0C0C0;
-	background: #F0F0F0 url('.$login_background.') repeat-x;
-}
--->
-</style>'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -82,7 +69,7 @@ $(document).ready(function () {
 <input type="hidden" name="screenwidth" id="screenwidth" value="" />
 <input type="hidden" name="screenheight" id="screenheight" value="" />
 
-<table class="login_table" summary="<?php echo $title; ?>" cellpadding="0" cellspacing="0" border="0" align="center">
+<table class="login_table_title" summary="<?php echo $title; ?>" cellpadding="0" cellspacing="0" border="0" align="center">
 <tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
 </table>
 <br>
@@ -134,7 +121,7 @@ if (! empty($hookmanager->resArray['options'])) {
 </td>
 
 <td align="center" valign="top">
-<img alt="Logo" title="" src="<?php echo $urllogo; ?>" />
+<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
 </td>
 
 </tr>

htdocs/core/tpl/passwordforgotten.tpl.php

@@ -38,20 +38,7 @@ else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includ
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />
+print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
-<style type="text/css">
-<!--
-#login {
-	margin-top: 70px;
-	margin-bottom: 30px;
-}
-.login_table {
-	width: 512px;
-	border: 1px solid #C0C0C0;
-	background: #F0F0F0 url('.$login_background.') repeat-x;
-}
--->
-</style>'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -64,7 +51,7 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
 <input type="hidden" name="action" value="buildnewpassword">
 
-<table class="login_table" summary="<?php echo $title; ?>" cellpadding="0" cellspacing="0" border="0" align="center">
+<table class="login_table_title" summary="<?php echo $title; ?>" cellpadding="0" cellspacing="0" border="0" align="center">
 <tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
 </table>
 <br>
@@ -92,9 +79,9 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 	<tr><td valign="middle" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('SecurityCode'); ?></b></td>
 	<td valign="middle" nowrap="nowrap" align="left" class="none">
 
-	<table class="login_table" style="width: 100px;"><tr>
+	<table class="login_table_securitycode" style="width: 100px;"><tr>
 	<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="3"></td>
-	<td><img src="<?php echo $dol_url_root.'/core/antispamimage.php'; ?>" border="0" width="80" height="32"></td>
+	<td><img src="<?php echo $dol_url_root.'/core/antispamimage.php'; ?>" border="0" width="80" height="32" id="img_securitycode"></td>
 	<td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
@@ -105,7 +92,7 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </td>
 
 <td align="center" valign="top">
-<img alt="Logo" title="" src="<?php echo $urllogo; ?>" />
+<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
 </td>
 
 </tr>

htdocs/theme/amarok/style.css.php

@@ -69,12 +69,12 @@ body {
     font-family: <?php print $fontlist ?>;
      <?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
 	}
-	
+
 a {
 	text-decoration: none;
 	color:#333;
 	}
-	
+
 a:hover, a:sel{
 	color:black;
 	}
@@ -109,7 +109,7 @@ border-left: solid 1px rgba(0,0,0,.3);
 	border-top:solid 1px rgba(0,0,0,.1);
 */
 	border-radius:.6em;
-    
+
     background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -123,7 +123,7 @@ border-left: solid 1px rgba(0,0,0,.3);
 		color-stop(1, rgba(0,0,0,.3))
 	);
 	}
-	
+
 .button,  a.butAction{color:white;}
 
 .butActionDelete{color:white;}
@@ -150,6 +150,8 @@ td.formdocbutton {padding-top:6px;}
 
 /* LOGIN : */
 form#login {
+	margin-top: 70px;
+	margin-bottom: 30px;
 	display:block;
 	border:solid 1px rgba(0,0,0,.4);
 	border-top:solid 1px white;
@@ -187,19 +189,19 @@ form#login img {
 	border-bottom:solid 1px rgba(0,0,0,.3);
 	box-shadow: 1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6);
 	}
-	
+
 form#login input{
 	padding:8px;
 	font-size:120%;
 	}
-	
+
 form#login label {
 	vertical-align:middle;
 	line-height:46px;
 	color:rgba(0,0,0,.4);
 	text-shadow: 1px 1px 1px rgba(255,255,255,.6);
 	}
-	
+
 form#login table.login{margin:0;border:none;background:none !important;}
 table.login tr td a {color:#333 !important;}
 table.login tr td a:hover {color:#000 !important;}
@@ -213,7 +215,7 @@ table.login .button {
 	border:solid 1px #2e7992;
 	box-shadow: 1px 1px 3px rgba(0,0,0,.4);
 	}
-	
+
 table.login .vmenu{
 	color:rgba(0,0,0,.3);
 	text-shadow: 1px 1px 1px rgba(255,255,255,.6);
@@ -235,12 +237,12 @@ div.tmenu {
     white-space: nowrap;
 	height:36px;
 	line-height:36px;
-	
+
 	background: #168ac2; /* bleu */
 	background: #b7e0e7; /* bleu_clair */
 	background: #6d6887; /* violet */
 	background: #333; /* obsidienne */
-    
+
     background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -253,7 +255,7 @@ div.tmenu {
 		color-stop(0, rgba(255,255,255,.3)),
 		color-stop(1, rgba(0,0,0,.3))
 	);
-	
+
 	border-bottom:solid 1px rgba(0,0,0,.8);
 	box-shadow: 0 0 6px rgba(0,0,0,.4) !important;
 	z-index:100;
@@ -319,7 +321,7 @@ div.vmenu {
 	padding-left:3px;
 	border-top: solid 1px rgba(255,255,255,.5);
 	border-bottom: solid 1px rgba(0,0,0,.5);
-	
+
 	}
 
 .menu_contenu {
@@ -339,7 +341,7 @@ div.vmenu {
 .blockvmenusearch .menu_titre {
 	margin-top:6px;
 	}
-	
+
 
 /* AIDE EN LIGNE : */
 #blockvmenuhelp {
@@ -355,13 +357,13 @@ div.vmenu {
 	margin-bottom:-2px;
 	padding-bottom:0;
 	}
-	
+
-.tabTitle {	
+.tabTitle {
 	color:rgba(0,0,0,.5);
 	margin-right:12px;
 	text-shadow: 1px 1px 1px white;
 	}
-	
+
 .tab {
 	margin-left:2px;
 	margin-right:2px;
@@ -395,7 +397,7 @@ table {
 	}
 
 table.liste{border:solid 0px #aaa; padding:.6em;}
-	
+
 table.liste tbody tr.liste_titre>td, table.liste .liste_total, table.liste .liste_titre {
 	padding:4px;
 	background-color:white;
@@ -417,7 +419,7 @@ tr.liste_titre td.liste_titre_sel {
 	background-color: rgba(0,0,0,.2);
 	color:black;
 	}
-	
+
 table.liste a img{padding: 1px;}
 
 table#undertopmenu { /* tableau contenant tous les autres : */
@@ -439,7 +441,7 @@ tr.liste_titre td {
 	border-top:solid 1px rgba(0,0,0,.08);
 	color:rgba(0,0,0,.6);
 	}
-	
+
 table.noborder, table.border, div.tabBar, table.liste {
 	background-color:white;
 	border:solid 1px #aaa;
@@ -447,7 +449,7 @@ table.noborder, table.border, div.tabBar, table.liste {
 	width:99% !important;
 	border-bottom:solid 2px #aaa;
 	}
-	
+
 table.liste tr td img {padding-right:2px;}
 table.noborder tr td{padding-right:2px;}
 table.noborder tr.liste_total td{ /* total en bas d'un tableau */
@@ -474,7 +476,7 @@ table.noborder tbody tr.liste_titre td { /* titre des tableaux : */
 	);
 	border-bottom:solid 1px rgba(0,0,0,.2);
 	}
-	
+
 table.noborder tbody{
 	border:solid 1px rgba(0,0,0,.3);
 	border-bottom:solid 1px rgba(0,0,0,.08);

htdocs/theme/auguria/style.css.php

@@ -449,10 +449,44 @@ foreach($mainmenuusedarray as $key => $val)
 
 /* Login */
 
-table.login {
+form#login {
+	margin-top: 70px;
+	margin-bottom: 30px;
+	font-size: 13px;
+}
+.login_table_title {
+	width: 540px;
+	color: #888888;
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table label {
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table {
+	padding:12px;
+	width: 540px;
+	border: 1px solid #C0C0C0;
+	background-color: #E0E0E0;
+
     -moz-box-shadow: 4px 4px 4px #CCC;
     -webkit-box-shadow: 4px 4px 4px #CCC;
     box-shadow: 4px 4px 4px #CCC;
+
+	border-radius: 12px;
+	border:solid 1px rgba(168,168,168,.4);
+	border-top:solid 1px f8f8f8;
+	background-color: #f8f8f8;
+	background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+}
+#img_securitycode {
+	border: 1px solid #DDDDDD;
+}
+#img_logo {
+	max-width: 200px;
 }
 
 div.login_block {

htdocs/theme/bureau2crea/style.css.php

@@ -524,6 +524,46 @@ li.tmenu a.tmenudisabled {
 
 /* Login */
 
+form#login {
+	margin-top: 70px;
+	margin-bottom: 30px;
+	font-size: 13px;
+}
+.login_table_title {
+	width: 540px;
+	color: #888888;
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table label {
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table {
+	padding:12px;
+	width: 540px;
+	border: 1px solid #C0C0C0;
+	background-color: #E0E0E0;
+
+    -moz-box-shadow: 4px 4px 4px #CCC;
+    -webkit-box-shadow: 4px 4px 4px #CCC;
+    box-shadow: 4px 4px 4px #CCC;
+
+	border-radius: 12px;
+	border:solid 1px rgba(168,168,168,.4);
+	border-top:solid 1px f8f8f8;
+	background-color: #f8f8f8;
+	background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+}
+#img_securitycode {
+	border: 1px solid #DDDDDD;
+}
+#img_logo {
+	max-width: 200px;
+}
+
 div.login_block {
 	position: absolute;
 	<?php print $right; ?>: 5px;

htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php

@@ -38,20 +38,7 @@ else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includ
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />
+print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />'."\n";
-<style type="text/css">
-<!--
-#login {
-	margin-top: 70px;
-	margin-bottom: 30px;
-}
-.login_table {
-	width: 512px;
-	border: 1px solid #C0C0C0;
-	background: #F0F0F0 url('.$login_background.') repeat-x;
-}
--->
-</style>'."\n";
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';

htdocs/theme/cameleo/style.css.php

@@ -522,6 +522,46 @@ foreach($mainmenuusedarray as $key => $val)
 
 /* Login */
 
+form#login {
+	margin-top: 70px;
+	margin-bottom: 30px;
+	font-size: 13px;
+}
+.login_table_title {
+	width: 540px;
+	color: #888888;
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table label {
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table {
+	padding:12px;
+	width: 540px;
+	border: 1px solid #C0C0C0;
+	background-color: #E0E0E0;
+
+    -moz-box-shadow: 4px 4px 4px #CCC;
+    -webkit-box-shadow: 4px 4px 4px #CCC;
+    box-shadow: 4px 4px 4px #CCC;
+
+	border-radius: 12px;
+	border:solid 1px rgba(168,168,168,.4);
+	border-top:solid 1px f8f8f8;
+	background-color: #f8f8f8;
+	background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+}
+#img_securitycode {
+	border: 1px solid #DDDDDD;
+}
+#img_logo {
+	max-width: 200px;
+}
+
 div.login_block {
 	position: absolute;
 	<?php print $right; ?>: 5px;

htdocs/theme/eldy/style.css.php

@@ -628,10 +628,44 @@ foreach($mainmenuusedarray as $key => $val)
 
 /* Login */
 
+form#login {
+	margin-top: 70px;
+	margin-bottom: 30px;
+	font-size: 13px;
+}
+.login_table_title {
+	width: 540px;
+	color: #888888;
+	text-shadow: 1px 1px 1px #FFF;
+}
+.login_table label {
+	text-shadow: 1px 1px 1px #FFF;
+}
 .login_table {
+	padding:12px;
+	width: 540px;
+	border: 1px solid #C0C0C0;
+	background-color: #E0E0E0;
+
     -moz-box-shadow: 4px 4px 4px #CCC;
     -webkit-box-shadow: 4px 4px 4px #CCC;
     box-shadow: 4px 4px 4px #CCC;
+
+	border-radius: 12px;
+	border:solid 1px rgba(168,168,168,.4);
+	border-top:solid 1px f8f8f8;
+	background-color: #f8f8f8;
+	background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+	background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%);
+}
+#img_securitycode {
+	border: 1px solid #DDDDDD;
+}
+#img_logo {
+	max-width: 200px;
 }
 
 div.login_block {
@@ -749,7 +783,7 @@ div.blockvmenusearch
     padding-right: 1px;
     padding-top: 3px;
     padding-bottom: 3px;
-    margin: 6px 0px 8px 2px;
+    margin: 12px 0px 8px 2px;
 	background: #E3E6E8;
 
 <?php if ($usecss3) { ?>