lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-18 14:27:31 +02:00
parent 2670f356f1
commit 658911b8c9
10 changed files with 186 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/prelevement/index.php
View File

@ -74,7 +74,7 @@ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
print '<td align="right">'; 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 $bprev->NbFactureAPrelever();
print '</a>'; print '</a>';
print '</td></tr>'; print '</td></tr>';

2
htdocs/core/lib/security2.lib.php
View File

@ -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; $conf_css = DOL_URL_ROOT.$conf->css;
// Set cookie for timeout management // Set cookie for timeout management

19
htdocs/core/tpl/login.tpl.php
View File

@ -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"; 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"; 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 '<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; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' --> print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
</head>'; </head>';
@ -82,7 +69,7 @@ $(document).ready(function () {
<input type="hidden" name="screenwidth" id="screenwidth" value="" /> <input type="hidden" name="screenwidth" id="screenwidth" value="" />
<input type="hidden" name="screenheight" id="screenheight" 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> <tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
</table> </table>
<br> <br>
@ -134,7 +121,7 @@ if (! empty($hookmanager->resArray['options'])) {
</td> </td>
<td align="center" valign="top"> <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> </td>
</tr> </tr>

23
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -38,20 +38,7 @@ else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includ
print '<!-- Includes JS for JQuery -->'."\n"; print '<!-- Includes JS for JQuery -->'."\n";
if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\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"; 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; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' --> print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
</head>'; </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="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="action" value="buildnewpassword"> <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> <tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
</table> </table>
<br> <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> <tr><td valign="middle" nowrap="nowrap"> &nbsp; <b><?php echo $langs->trans('SecurityCode'); ?></b></td>
<td valign="middle" nowrap="nowrap" align="left" class="none"> <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><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> <td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
</tr></table> </tr></table>
@ -105,7 +92,7 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
</td> </td>
<td align="center" valign="top"> <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> </td>
</tr> </tr>

2
htdocs/theme/amarok/style.css.php
View File

@ -150,6 +150,8 @@ td.formdocbutton {padding-top:6px;}
/* LOGIN : */ /* LOGIN : */
form#login { form#login {
margin-top: 70px;
margin-bottom: 30px;
display:block; display:block;
border:solid 1px rgba(0,0,0,.4); border:solid 1px rgba(0,0,0,.4);
border-top:solid 1px white; border-top:solid 1px white;

36
htdocs/theme/auguria/style.css.php
View File

@ -449,10 +449,44 @@ foreach($mainmenuusedarray as $key => $val)
/* Login */ /* 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; -moz-box-shadow: 4px 4px 4px #CCC;
-webkit-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC;
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 { div.login_block {

40
htdocs/theme/bureau2crea/style.css.php
View File

@ -524,6 +524,46 @@ li.tmenu a.tmenudisabled {
/* Login */ /* 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 { div.login_block {
position: absolute; position: absolute;
<?php print $right; ?>: 5px; <?php print $right; ?>: 5px;

15
htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
View File

@ -38,20 +38,7 @@ else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includ
print '<!-- Includes JS for JQuery -->'."\n"; print '<!-- Includes JS for JQuery -->'."\n";
if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\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"; 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; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' --> print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
</head>'; </head>';

40
htdocs/theme/cameleo/style.css.php
View File

@ -522,6 +522,46 @@ foreach($mainmenuusedarray as $key => $val)
/* Login */ /* 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 { div.login_block {
position: absolute; position: absolute;
<?php print $right; ?>: 5px; <?php print $right; ?>: 5px;

36
htdocs/theme/eldy/style.css.php
View File

@ -628,10 +628,44 @@ foreach($mainmenuusedarray as $key => $val)
/* Login */ /* 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 { .login_table {
padding:12px;
width: 540px;
border: 1px solid #C0C0C0;
background-color: #E0E0E0;
-moz-box-shadow: 4px 4px 4px #CCC; -moz-box-shadow: 4px 4px 4px #CCC;
-webkit-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC;
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 { div.login_block {
@ -749,7 +783,7 @@ div.blockvmenusearch
padding-right: 1px; padding-right: 1px;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
margin: 6px 0px 8px 2px; margin: 12px 0px 8px 2px;
background: #E3E6E8; background: #E3E6E8;
<?php if ($usecss3) { ?> <?php if ($usecss3) { ?>