Skip to content
Snippets Groups Projects
Commit 8bc57e38 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Uniformize, support, install and login page with a more neutral

background (nearest bootstrap). Remove image background.
parent bbf07641
Branches
Tags
No related merge requests found
......@@ -47,6 +47,8 @@ $(document).ready(function () {
<?php } ?>
<center>
<div class="login_vertical_align">
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
......@@ -197,7 +199,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php if (! empty($_SESSION['dol_loginmesg']))
{
?>
<div class="center" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
<div class="center login_main_message" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
<?php echo $_SESSION['dol_loginmesg']; ?>
</div></div>
<?php
......@@ -268,8 +270,11 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
}
?>
</div>
</center> <!-- end of center -->
</body>
</html>
<!-- END PHP TEMPLATE -->
......@@ -43,7 +43,10 @@ $(document).ready(function () {
</script>
<?php } ?>
<center>
<div class="login_vertical_align">
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
......@@ -132,7 +135,7 @@ if (! empty($hookmanager->resArray['options'])) {
</form>
<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<div class="center login_main_home" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php if ($mode == 'dolibarr' || ! $disabled) { ?>
<font style="font-size: 12px;">
<?php echo $langs->trans('SendNewPasswordDesc'); ?>
......@@ -148,16 +151,16 @@ if (! empty($hookmanager->resArray['options'])) {
<br>
<?php if ($message) { ?>
<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<div class="center login_main_message" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php echo dol_htmloutput_mesg($message,'','',1); ?>
</div>
<?php } ?>
</div>
</center> <!-- end of center -->
<br>
</body>
</html>
<!-- END PHP TEMPLATE -->
......@@ -180,7 +180,7 @@ margin-top: 10px;
font-size:16px;
font-weight: normal;
color: #4965B3;
text-shadow: 2px 1px 2px #c0c0c0;
text-shadow: 1px 1px 1px #c0c0c0;
}
tr.bg1 {
......
......@@ -18,7 +18,7 @@
body {
font-size:12px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
background: #f9f9f9;
/* background-color: #F4F4F4; */
margin: 5px 10px;
}
......
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
......@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files and other constants
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
$img_head='';
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
$dol_hide_topmenu=$conf->dol_hide_topmenu;
$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
......@@ -108,7 +108,7 @@ body {
<?php if (GETPOST("optioncss") == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
background-color: #FCFCFC;
<?php } ?>
color: #101010;
font-size: <?php print $fontsize ?>px;
......
......@@ -85,7 +85,7 @@ body {
<?php if (GETPOST("optioncss") == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
background-color: #FCFCFC;
<?php } ?>
color: #101010;
font-size: <?php print $fontsize ?>px;
......
......@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files and other constants
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
$img_head='';
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
$dol_hide_topmenu=$conf->dol_hide_topmenu;
$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
......@@ -812,7 +812,10 @@ foreach($mainmenuusedarray as $val)
.bodylogin
{
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
background: #f9f9f9;
}
.login_vertical_align {
padding: 10px;
}
form#login {
margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
......@@ -836,22 +839,18 @@ form#login {
padding-top:12px;
padding-bottom:12px;
max-width: 540px;
border: 1px solid #C0C0C0;
background-color: #E0E0E0;
border: 1px solid #A0A0A0;
-moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD;
border-radius: 8px;
border:solid 1px rgba(168,168,168,.4);
border-top:solid 1px f8f8f8;
background-color: #f8f8f8;
background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
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%);
border:solid 1px rgba(90,90,90,.4);
-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
background-color: #FFFFFF;
}
div#login_left, div#login_right {
display: inline-block;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment