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

New: Better usage when using with a smartphone

Browse Source
This commit is contained in:
Laurent Destailleur 2009-09-15 11:24:00 +00:00
parent 7036c67414
commit 3c3f211023
12 changed files with 98 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -45,6 +45,7 @@ For users:
- New: Add an admin page of PHP sessions with a way to lock new connections - New: Add an admin page of PHP sessions with a way to lock new connections
for other users than yourself. Can also purge existing sessions. for other users than yourself. Can also purge existing sessions.
- New: Add experimental point of sale module. - New: Add experimental point of sale module.
- New: Better usage when using with smartphones.
- Fix: "Now" link works when date popup is not used. - Fix: "Now" link works when date popup is not used.
- Fix: Debug seriously the email notification module. - Fix: Debug seriously the email notification module.
- Fix: Error Call to a member function trans when refusing a supplier order. - Fix: Error Call to a member function trans when refusing a supplier order.

2
htdocs/adherents/index.php
View File

@ -161,7 +161,7 @@ foreach ($AdherentType as $key => $adhtype)
{ {
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="type.php?rowid='.$adhtype->id.'">'.img_object($langs->trans("ShowType"),"group").' '.$adhtype->getNomUrl(0,20).'</a></td>'; print '<td><a href="type.php?rowid='.$adhtype->id.'">'.img_object($langs->trans("ShowType"),"group").' '.$adhtype->getNomUrl(0,dol_size(16)).'</a></td>';
print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>'; print '<td align="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).'</td>';
print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-$MemberUpToDate[$key] > 0) ? $MembersValidated[$key]-$MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>'; print '<td align="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-$MemberUpToDate[$key] > 0) ? $MembersValidated[$key]-$MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).'</td>';
print '<td align="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</td>'; print '<td align="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,gmmktime(),3).'</td>';

2
htdocs/html.form.class.php
View File

@ -108,7 +108,7 @@ class Form
$s.= $htmltext."\n"; $s.= $htmltext."\n";
$s.= '</div>'."\n"; $s.= '</div>'."\n";
$s.= '<script type=\'text/javascript\'>'."\n"; $s.= '<script type=\'text/javascript\'>'."\n";
$s.= 'TooltipManager.init("","",{width:'.$width.', shiftX:'.$shiftX.'});'."\n"; $s.= 'TooltipManager.init("","",{width:'.dol_size($width,'width').', shiftX:'.$shiftX.'});'."\n";
$s.= 'TooltipManager.addHTML("tip'.$i.'", "tooltip_content");'."\n"; $s.= 'TooltipManager.addHTML("tip'.$i.'", "tooltip_content");'."\n";
$s.= '</script>'."\n"; $s.= '</script>'."\n";
} }

14
htdocs/lib/functions.lib.php
View File

@ -55,6 +55,20 @@ function dol_clone($object)
return $myclone; return $myclone;
} }
/**
* \brief Optimize a size for some browsers (phone, smarphone, ...)
* \param size Size we want
* \param type Type of optimizing(''=Optimize for a truncate, 'width'=Optimize for screen width)
* \return int New size after optimizing
*/
function dol_size($size,$type='')
{
global $conf;
if (empty($conf->browser->phone)) return $size;
if ($type == 'width') return 250;
else return 10;
}
/** /**
* \brief Return date for now * \brief Return date for now

16
htdocs/lib/security.lib.php
View File

@ -70,12 +70,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '<style type="text/css">'."\n"; print '<style type="text/css">'."\n";
print '<!--'."\n"; print '<!--'."\n";
print '#login {'; print '#login {';
print ' margin-top: 70px;'; print ' margin-top: '.(empty($conf->browser->phone)?'70px;':'10px;');
print ' margin-bottom: 30px;'; print ' margin-bottom: '.(empty($conf->browser->phone)?'30px;':'5px;');
print ' text-align: center;'; print ' text-align: center;';
print ' font: 12px arial,helvetica;'; print ' font: 12px arial,helvetica;';
print '}'."\n"; print '}'."\n";
print '#login table {'; print '#login table {';
if (empty($conf->browser->phone)) print ' width: 498px;';
print ' border: 1px solid #C0C0C0;'; print ' border: 1px solid #C0C0C0;';
if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
{ {
@ -95,11 +96,11 @@ function dol_loginfunction($langs,$conf,$mysoc)
else print "document.getElementById('password').focus();\n"; else print "document.getElementById('password').focus();\n";
print "}\n"; print "}\n";
print '</script>'."\n"; print '</script>'."\n";
print '<!-- HTTP_USER_AGENT = '.$_SERVER["HTTP_USER_AGENT"].' -->'."\n";
print '</head>'."\n"; print '</head>'."\n";
// Body // Body
print '<body class="body" onload="donnefocus();">'."\n\n"; print '<body class="body" onload="donnefocus();">'."\n\n";
// Start Form // Start Form
print '<form id="login" name="login" method="post" action="'; print '<form id="login" name="login" method="post" action="';
print $_SERVER['PHP_SELF']; print $_SERVER['PHP_SELF'];
@ -112,13 +113,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
// Table 1 // Table 1
$title='Dolibarr '.DOL_VERSION; $title='Dolibarr '.DOL_VERSION;
if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE; if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
print '<table summary="'.$title.'" cellpadding="0" cellspacing="0" border="0" align="center" width="498">'."\n";; print '<table class="login" summary="'.$title.'" cellpadding="0" cellspacing="0" border="0" align="center">'."\n";;
print '<tr class="vmenu"><td align="center">'.$title.'</td></tr>'."\n"; print '<tr class="vmenu"><td align="center">'.$title.'</td></tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";
print '<br>'."\n\n"; print '<br>'."\n\n";
// Table 2 // Table 2
print '<table summary="Login area" cellpadding="2" align="center" width="498">'."\n"; print '<table class="login" summary="Login area" cellpadding="2" align="center">'."\n";
print '<tr><td colspan="3">&nbsp;</td></tr>'; print '<tr><td colspan="3">&nbsp;</td></tr>';
@ -126,7 +127,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
$demologin=''; $demologin='';
$demopassword=''; $demopassword='';
global $dolibarr_main_demo; global $dolibarr_main_demo;
if (! empty($dolibarr_main_demo)) if (! empty($dolibarr_main_demo))
{ {
@ -220,7 +220,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '<table><tr>'; print '<table><tr>';
print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4"></td>'; print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4"></td>';
print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="128" height="36"></td>'; $width=128;$height=36;
if (! empty($conf->browser->phone)) $width=64; $height=24;
print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="'.$width.'" height="'.$height.'"></td>';
print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>'; print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>';
print '</tr></table>'; print '</tr></table>';

3
htdocs/theme/auguria/auguria.css.php
View File

@ -33,6 +33,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -1228,7 +1229,7 @@ div.menuFleche
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border: 1px solid #444444; border: 1px solid #444444;
padding: 2px; padding: 2px;
background-color: #FFFFE0; background-color: #FFFFE0;

3
htdocs/theme/bluelagoon/bluelagoon.css.php
View File

@ -34,6 +34,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -855,7 +856,7 @@ td.small {
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border: 1px solid #444444; border: 1px solid #444444;
padding: 2px; padding: 2px;
background-color: #FFFFE0; background-color: #FFFFE0;

80
htdocs/theme/eldy/eldy.css.php
View File

@ -34,6 +34,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -60,7 +61,7 @@ body {
background: #f9f9f9 url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/headbg.jpg' ?>) 0 0 no-repeat; background: #f9f9f9 url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/headbg.jpg' ?>) 0 0 no-repeat;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: arial,tahoma,verdana,helvetica; font-family: arial,tahoma,verdana,helvetica;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -75,7 +76,7 @@ a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
input input
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -84,7 +85,7 @@ input
} }
input.flat input.flat
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -92,7 +93,7 @@ input.flat
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
textarea { textarea {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -101,7 +102,7 @@ textarea {
} }
textarea.flat textarea.flat
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -110,7 +111,7 @@ textarea.flat
} }
select.flat select.flat
{ {
font-size: <?php print (eregi('MSIE 6',$_SERVER['HTTP_USER_AGENT']) ? "11" : "12"); ?>px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: normal; font-weight: normal;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -401,22 +402,22 @@ img.printer
} }
<?php } ?> <?php } ?>
a.vmenu:link { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; } a.vmenu:link { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; }
a.vmenu:visited { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; } a.vmenu:visited { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; }
a.vmenu:active { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; } a.vmenu:active { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; }
a.vmenu:hover { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; } a.vmenu:hover { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; }
font.vmenudisabled { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; color: #93a5aa; } font.vmenudisabled { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: bold; color: #93a5aa; }
a.vsmenu:link { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:link { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:visited { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:visited { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:active { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:active { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:hover { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:hover { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
font.vsmenudisabled { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 6px; } font.vsmenudisabled { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 6px; }
a.help:link { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; } a.help:link { font-size:<?php print empty($conf->browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; }
a.help:visited { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; } a.help:visited { font-size:<?php print empty($conf->browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; }
a.help:active { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; } a.help:active { font-size:<?php print empty($conf->browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; }
a.help:hover { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; } a.help:hover { font-size:<?php print empty($conf->browser->phone)?'11':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align: <?php print $left; ?>; font-weight: normal; }
div.blockvmenupair div.blockvmenupair
@ -806,30 +807,18 @@ width: 100%;
tr.liste_titre { tr.liste_titre {
height: 16px; height: 16px;
<?php if (eregi('xfirefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE ?>
background: #91ABB3;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre_2.png' ?>);
background-repeat: repeat-y;
<?php } else { ?>
background: #7699A9; background: #7699A9;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?>
color: #334444; color: #334444;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
} }
td.liste_titre { td.liste_titre {
<?php if (eregi('xfirefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE ?>
background: #91ABB3;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } else { ?>
background: #7699A9; background: #7699A9;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?>
color: #334444; color: #334444;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
@ -838,15 +827,9 @@ white-space: nowrap;
} }
td.liste_titre_sel td.liste_titre_sel
{ {
<?php if (eregi('xfirefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE ?>
background: #91ABB3;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } else { ?>
background: #7699A9; background: #7699A9;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?>
color: #F5FFFF; color: #F5FFFF;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
@ -854,15 +837,9 @@ border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
} }
input.liste_titre { input.liste_titre {
<?php if (eregi('xfirefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE ?>
background: #91ABB3;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } else { ?>
background: #7699A9; background: #7699A9;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?>
border: 0px; border: 0px;
} }
@ -925,17 +902,10 @@ margin: 2px;
} }
tr.box_titre { tr.box_titre {
<?php if (eregi('xfirefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE ?>
background: #91ABB3;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre_2.png' ?>);
background-repeat: repeat-y;
<?php } else { ?>
background: #7699A9; background: #7699A9;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x; background-repeat: repeat-x;
<?php } ?>
color: #334444; color: #334444;
font-size: 12px;
font-family: arial, helvetica, verdana, sans-serif; font-family: arial, helvetica, verdana, sans-serif;
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
@ -946,13 +916,11 @@ white-space: nowrap;
tr.box_impair { tr.box_impair {
background: #e6ebed; background: #e6ebed;
font-size: 12px;
font-family: arial, helvetica, verdana, sans-serif; font-family: arial, helvetica, verdana, sans-serif;
} }
tr.box_pair { tr.box_pair {
background: #d0d4d7; background: #d0d4d7;
font-size: 12px;
font-family: arial, helvetica, verdana, sans-serif; font-family: arial, helvetica, verdana, sans-serif;
} }
@ -1014,8 +982,8 @@ a.impayee:hover { font-weight: bold; color: #550000; }
td.small { td.small {
font-size: 10px; font-size: <?php print empty($conf->browser->phone)?'10':'9'; ?>px;
} }
/* /*
@ -1206,7 +1174,7 @@ table.valid {
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border-top: solid 1px #BBBBBB; border-top: solid 1px #BBBBBB;
border-<?php print $left; ?>: solid 1px #BBBBBB; border-<?php print $left; ?>: solid 1px #BBBBBB;
border-<?php print $right; ?>: solid 1px #444444; border-<?php print $right; ?>: solid 1px #444444;

61
htdocs/theme/freelug/freelug.css.php
View File

@ -33,6 +33,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -59,7 +60,7 @@ body {
<?php } ?> <?php } ?>
text-decoration: none ; text-decoration: none ;
color: #101010; color: #101010;
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -73,7 +74,7 @@ a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; } a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
input input
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
@ -82,7 +83,7 @@ input
} }
input.flat input.flat
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
@ -90,7 +91,7 @@ input.flat
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
textarea { textarea {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
@ -99,7 +100,7 @@ textarea {
} }
textarea.flat textarea.flat
{ {
font-size: 12px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
@ -108,7 +109,7 @@ textarea.flat
} }
select.flat select.flat
{ {
font-size: <?php print (eregi('MSIE 6',$_SERVER['HTTP_USER_AGENT']) ? "11" : "12"); ?>px; font-size: <?php print empty($conf->browser->phone)?'12':'9'; ?>px;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: normal; font-weight: normal;
border: 1px solid #ACBCBB; border: 1px solid #ACBCBB;
@ -116,7 +117,6 @@ select.flat
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
.button { .button {
font-size: 11px;
font-family: arial,verdana,heletica, sans-serif; font-family: arial,verdana,heletica, sans-serif;
padding: 0px 2px 0px 2px; padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
@ -129,7 +129,6 @@ select.flat
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.buttonajax { .buttonajax {
font-size: 11px;
font-family: arial,verdana,heletica, sans-serif; font-family: arial,verdana,heletica, sans-serif;
padding: 0px 2px 0px 2px; padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
@ -176,7 +175,6 @@ div.tmenu
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 2px 0px; margin: 0px 0px 2px 0px;
font-weight: bold; font-weight: bold;
font-size: 12px;
height: 20px; height: 20px;
background: #dddddd; background: #dddddd;
color: #000000; color: #000000;
@ -187,7 +185,6 @@ div.tmenu
a.tmenudisabled a.tmenudisabled
{ {
color: #757575; color: #757575;
font-size: 12px;
padding: 0px 8px; padding: 0px 8px;
margin: 0px 0px 6px 0px; margin: 0px 0px 6px 0px;
cursor: not-allowed; cursor: not-allowed;
@ -220,7 +217,6 @@ a.tmenu:link
margin: 0px 0px 6px 0px; margin: 0px 0px 6px 0px;
border: 1px solid #dddddd; border: 1px solid #dddddd;
font-weight: bold; font-weight: bold;
font-size:12px;
} }
a.tmenu:visited a.tmenu:visited
{ {
@ -229,7 +225,6 @@ a.tmenu:visited
margin: 0px 0px 6px 0px; margin: 0px 0px 6px 0px;
border: 1px solid #dddddd; border: 1px solid #dddddd;
font-weight: bold; font-weight: bold;
font-size:12px;
} }
a.tmenu:hover a.tmenu:hover
{ {
@ -342,7 +337,6 @@ a.login
margin: 0px 0px 6px 0px; margin: 0px 0px 6px 0px;
border: 1px solid #dcdcd0; border: 1px solid #dcdcd0;
font-weight:bold; font-weight:bold;
font-size:12px;
} }
a.login:hover a.login:hover
{ {
@ -393,19 +387,20 @@ a.vmenu:link { font-family: helvetica, verdana, arial, sans-serif; text-align
a.vmenu:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } a.vmenu:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; }
a.vmenu:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } a.vmenu:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; }
a.vmenu:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } a.vmenu:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; }
font.vmenudisabled { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #a3a590; } font.vmenudisabled { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #a3a590; }
a.vsmenu:link { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:link { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
a.vsmenu:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } a.vsmenu:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
font.vsmenudisabled { font-size:12px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #a3a590; margin: 1px 1px 1px 6px; } font.vsmenudisabled { font-size:<?php print empty($conf->browser->phone)?'12':'9'; ?>px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #a3a590; margin: 1px 1px 1px 6px; }
a.help:link { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } a.help:link { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
a.help:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } a.help:visited { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
a.help:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } a.help:active { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
a.help:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } a.help:hover { font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
div.blockvmenupair div.blockvmenupair
{ {
border-right: 1px solid #555555; border-right: 1px solid #555555;
@ -446,14 +441,13 @@ div.help
} }
td.barre { td.barre {
border-right: 1px solid #000000; border-right: 1px solid #000000;
border-bottom: 1px solid #000000; border-bottom: 1px solid #000000;
background: #DDDDDD; background: #DDDDDD;
font-size: 12px; font-family: helvetica, verdana;
font-family: helvetica, verdana; color: #000000;
color: #000000; text-align:left;
text-align:left; text-decoration: none
text-decoration: none
} }
td.barre_select { td.barre_select {
@ -732,9 +726,6 @@ div.titre {
} }
/*
* Widgets standard
*/
input.liste_titre { input.liste_titre {
background: #777799; background: #777799;
border: 0px; border: 0px;
@ -790,18 +781,15 @@ th {
border-top: 1px solid #FFFFFF; border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF;
white-space: nowrap; white-space: nowrap;
font-size: 1.0em;
} }
.pair { .pair {
background: #dcdcd0; background: #dcdcd0;
font-size: 12px;
} }
.impair { .impair {
background: #eeeedd; background: #eeeedd;
font-size: 12px;
} }
/* /*
@ -811,30 +799,29 @@ tr.box_titre {
color: #FFFFFF; color: #FFFFFF;
background: #777799; background: #777799;
font-family: Helvetica, Verdana; font-family: Helvetica, Verdana;
font-size: 1.0em;
font-weight: bold; } font-weight: bold; }
tr.box_pair { tr.box_pair {
background: #dcdcd0; background: #dcdcd0;
font-size: 0.95em; } }
tr.box_impair { tr.box_impair {
background: #eeeedd; background: #eeeedd;
font-family: Helvetica, Verdana; font-family: Helvetica, Verdana;
font-size: 0.95em; } }
tr.fiche { tr.fiche {
font-family: Helvetica, Verdana; font-family: Helvetica, Verdana;
font-size: 0.6em; } }
td.delete { td.delete {
background: red; background: red;
font-weight: bold; font-weight: bold;
} }
td.small { td.small {
font-size: 10px; font-size: <?php print empty($conf->browser->phone)?'10':'9'; ?>px;
} }
/* ============================================================================== */ /* ============================================================================== */
@ -1017,7 +1004,7 @@ table.valid {
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border-top: solid 1px #BBBBBB; border-top: solid 1px #BBBBBB;
border-left: solid 1px #BBBBBB; border-left: solid 1px #BBBBBB;
border-right: solid 1px #444444; border-right: solid 1px #444444;

3
htdocs/theme/rodolphe/rodolphe.css.php
View File

@ -34,6 +34,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -950,7 +951,7 @@ table.valid {
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border: 1px solid #444444; border: 1px solid #444444;
padding: 2px; padding: 2px;
background-color: lightyellow; background-color: lightyellow;

3
htdocs/theme/yellow/yellow.css.php
View File

@ -33,6 +33,7 @@ if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
//require_once("../../conf/conf.php"); //require_once("../../conf/conf.php");
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: text/css'); header('Content-type: text/css');
@ -993,7 +994,7 @@ table.valid {
#dhtmltooltip #dhtmltooltip
{ {
position: absolute; position: absolute;
width: 450px; width: <?php print dol_size(450,'width'); ?>px;
border: 1px solid #444444; border: 1px solid #444444;
padding: 2px; padding: 2px;
background-color: lightyellow; background-color: lightyellow;

24
htdocs/user/passwordforgotten.php
View File

@ -167,12 +167,13 @@ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->cs
print '<style type="text/css">'."\n"; print '<style type="text/css">'."\n";
print '<!--'."\n"; print '<!--'."\n";
print '#login {'; print '#login {';
print ' margin-top: 70px;'; print ' margin-top: '.(empty($conf->browser->phone)?'70px;':'10px;');
print ' margin-bottom: 30px;'; print ' margin-bottom: '.(empty($conf->browser->phone)?'30px;':'5px;');
print ' text-align: center;'; print ' text-align: center;';
print ' font: 10px arial,helvetica;'; print ' font: 10px arial,helvetica;';
print '}'."\n"; print '}'."\n";
print '#login table {'; print '#login table {';
if (empty($conf->browser->phone)) print ' width: 498px;';
print ' border: 1px solid #C0C0C0;'; print ' border: 1px solid #C0C0C0;';
if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
{ {
@ -203,7 +204,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="buildnewpassword">'."\n"; print '<input type="hidden" name="action" value="buildnewpassword">'."\n";
// Table 1 // Table 1
print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="498">'."\n"; print '<table class="login" cellpadding="0" cellspacing="0" border="0" align="center">'."\n";
if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
{ {
print '<tr><td colspan="3" style="text-align:center;">'; print '<tr><td colspan="3" style="text-align:center;">';
@ -222,7 +223,7 @@ if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled='';
if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled
// Table 2 // Table 2
print '<table cellpadding="2" align="center" width="498">'."\n"; print '<table class="login" cellpadding="2" align="center">'."\n";
print '<tr><td colspan="3">&nbsp;</td></tr>'."\n"; print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
@ -248,9 +249,14 @@ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_logo.pn
{ {
$urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png'; $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png';
} }
print '<td rowspan="2" align="center"><img title="'.$title.'" src="'.$urllogo.'"'; print '<td rowspan="2" align="center">';
if ($width) print ' width="'.$width.'"'; if (empty($conf->browser->phone))
print '></td>'; {
print '<img title="'.$title.'" src="'.$urllogo.'"';
if ($width) print ' width="'.$width.'"';
print '>';
}
print '</td>';
print '</tr>'."\n"; print '</tr>'."\n";
@ -262,7 +268,9 @@ if (function_exists("imagecreatefrompng") && ! $disabled)
print '<table><tr>'; print '<table><tr>';
print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2"></td>'; print '<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="2"></td>';
print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="128" height="36"></td>'; $width=128;$height=36;
if (! empty($conf->browser->phone)) $width=64; $height=24;
print '<td><img src="'.DOL_URL_ROOT.'/lib/antispamimage.php" border="0" width="'.$width.'" height="'.$height.'"></td>';
print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>'; print '<td><a href="'.$_SERVER["PHP_SELF"].'">'.img_refresh().'</a></td>';
print '</tr></table>'; print '</tr></table>';