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

Look: Optimize for small screen

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-14 16:11:55 +02:00
parent a5d996de4c
commit e4c4cced70
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/dolgraph.class.php
View File

@ -905,7 +905,7 @@ class DolGraph
{ {
global $conf; global $conf;
if ($direction == 'width') return ($conf->dol_optimize_smallscreen?'400':($defaultsize?$defaultsize:'500')); if ($direction == 'width') return ($conf->dol_optimize_smallscreen?(empty($_SESSION['dol_screen_width'])?'280':$_SESSION['dol_screen_width']-40):($defaultsize?$defaultsize:'500'));
if ($direction == 'height') return ($conf->dol_optimize_smallscreen?'160':($defaultsize?$defaultsize:'200')); if ($direction == 'height') return ($conf->dol_optimize_smallscreen?'160':($defaultsize?$defaultsize:'200'));
return 0; return 0;
} }

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

@ -3476,7 +3476,7 @@ class Form
if ($fullday) $reset_scripts .= ' } '; if ($fullday) $reset_scripts .= ' } ';
} }
// If reset_scripts is not empty, print the button with the reset_scripts in OnClick // If reset_scripts is not empty, print the button with the reset_scripts in OnClick
if ($reset_scripts) if ($reset_scripts && empty($conf->dol_optimize_smallscreen))
{ {
$retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="Now" onClick="'.$reset_scripts.'">'; $retstring.=' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="Now" onClick="'.$reset_scripts.'">';
$retstring.=$langs->trans("Now"); $retstring.=$langs->trans("Now");

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

@ -379,7 +379,7 @@ td.showDragHandle {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'4')); ?>px;
} }
div.fichecenter { div.fichecenter {
@ -405,7 +405,7 @@ div.fichehalfright {
<?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?>
} }
div.ficheaddleft { div.ficheaddleft {
<?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
else print "margin-top: 10px;\n"; ?> else print "margin-top: 10px;\n"; ?>
} }
@ -1280,8 +1280,8 @@ div.tabs {
div.tabBar { div.tabBar {
color: #<?php echo $colortextmain; ?>; color: #<?php echo $colortextmain; ?>;
padding-top: 9px; padding-top: 9px;
padding-left: 8px; padding-left: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
padding-right: 8px; padding-right: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
padding-bottom: 8px; padding-bottom: 8px;
margin: 0px 0px 14px 0px; margin: 0px 0px 14px 0px;
-moz-border-radius:6px; -moz-border-radius:6px;
@ -1301,9 +1301,11 @@ div.tabBar {
<?php } else { ?> <?php } else { ?>
background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x; background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
<?php } ?> <?php } ?>
<?php if (empty($dol_optimize_smallscreen)) { ?>
-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;
<?php } ?>
} }
div.tabsAction { div.tabsAction {
@ -2546,6 +2548,16 @@ div.dolEventError h1, div.dolEventError h2 {
li.ui-li-divider .ui-link { li.ui-li-divider .ui-link {
color: #FFF !important; color: #FFF !important;
} }
.ui-btn-inner {
padding-left: 12px;
}
.ui-select .ui-btn-icon-right .ui-btn-inner {
padding-right: 36px;
}
/* Warning: setting this make screen not beeing refreshed after a combo selection */
/*.ui-body-c {
background: #fff;
}*/
/* /*
.ui-li-divider { .ui-li-divider {
background: #eee !important; background: #eee !important;