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

Experiment flip-flap left menu with theme eldy when using iphone

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-31 22:23:46 +00:00
parent 2fc239d8f8
commit c314ac5c4a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/main.inc.php
View File

@ -640,10 +640,8 @@ if (! defined('NOLOGIN'))
$conf->theme=$user->conf->MAIN_THEME; $conf->theme=$user->conf->MAIN_THEME;
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
// If theme support flip-hide left menu and we use a smartphone, we force it
// If theme support optim like flip-hide left menu and we use a smartphone, we force it if ($conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
// Set javascript option // Set javascript option
if (! GETPOST('nojs')) // If javascript was not disabled on URL if (! GETPOST('nojs')) // If javascript was not disabled on URL
{ {

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

@ -217,8 +217,8 @@ td.showDragHandle {
/* ============================================================================== */ /* ============================================================================== */
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone) || empty($conf->global->MAIN_SMARTPHONE_OPTIM))?'10':'24'; ?>px; margin-<?php print $left; ?>: <?php print empty($conf->browser->phone)?'10':'24'; ?>px;
margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'8':'6'; ?>px; margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'8':''; ?>px;
} }
div.fichecenter { div.fichecenter {
@ -228,12 +228,12 @@ div.fichecenter {
div.fichethirdleft { div.fichethirdleft {
<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?> <?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
<?php if (empty($conf->browser->phone)) { print "width: 35%;\n"; } ?> <?php if (empty($conf->browser->phone)) { print "width: 35%;\n"; } ?>
<?php if (! empty($conf->browser->phone)) { print "padding-bottom: 6px;\n"; } ?> <?php if (! empty($conf->browser->phone)) { print "padding-bottom: 4px;\n"; } ?>
} }
div.fichetwothirdright { div.fichetwothirdright {
<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?> <?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
<?php if (empty($conf->browser->phone)) { print "width: 65%;\n"; } ?> <?php if (empty($conf->browser->phone)) { print "width: 65%;\n"; } ?>
<?php if (! empty($conf->browser->phone)) { print "padding-bottom: 6px\n"; } ?> <?php if (! empty($conf->browser->phone)) { print "padding-bottom: 4px\n"; } ?>
} }
div.fichehalfleft { div.fichehalfleft {
<?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?> <?php if (empty($conf->browser->phone)) { print "float: ".$left.";\n"; } ?>
@ -778,9 +778,6 @@ td.photo {
.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */ .ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */
background: #E1A4A4; /* red */ background: #E1A4A4; /* red */
} }
.ui-layout-resizer-closed {
background-color: #DDDDDD;
}
.ui-layout-resizer-closed:hover { .ui-layout-resizer-closed:hover {
background-color: #EEDDDD; background-color: #EEDDDD;
} }
@ -794,35 +791,30 @@ td.photo {
} }
/* sliding resizer - add 'outside-border' to resizer on-hover */ /* sliding resizer - add 'outside-border' to resizer on-hover */
/* this sample illustrates how to target specific panes and states */ /* this sample illustrates how to target specific panes and states */
/*.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } .ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; }
.ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } .ui-layout-resizer-south-sliding-hover { border-top-width: 1px; }
.ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } .ui-layout-resizer-west-sliding-hover { border-right-width: 1px; }
.ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } .ui-layout-resizer-east-sliding-hover { border-left-width: 1px; }
*/
/* /*
* TOGGLER-BUTTONS * TOGGLER-BUTTONS
*/ */
.ui-layout-toggler { .ui-layout-toggler {
<?php if (empty($conf->browser->phone)) { ?>
border-top: 1px solid #AAA; /* match pane-border */ border-top: 1px solid #AAA; /* match pane-border */
border-right: 1px solid #AAA; /* match pane-border */ border-right: 1px solid #AAA; /* match pane-border */
border-bottom: 1px solid #AAA; /* match pane-border */ border-bottom: 1px solid #AAA; /* match pane-border */
background-color: #DDD; background-color: #DDD;
top: 5px !important; top: 5px !important;
<?php } else { ?> }
diplay: none;
<?php } ?>
}
.ui-layout-toggler-open { .ui-layout-toggler-open {
height: 54px !important; height: 48px !important;
width: <?php echo (empty($conf->browser->phone)?'7':'22'); ?>px !important; width: <?php echo (empty($conf->browser->phone)?'7':'22'); ?>px !important;
-moz-border-radius:0px 10px 10px 0px; -moz-border-radius:0px 10px 10px 0px;
-webkit-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px;
border-radius:0px 10px 10px 0px; border-radius:0px 10px 10px 0px;
} }
.ui-layout-toggler-closed { .ui-layout-toggler-closed {
height: <?php echo (empty($conf->browser->phone)?'54':'2'); ?>px !important; height: 48px !important;
width: <?php echo (empty($conf->browser->phone)?'7':'22'); ?>px !important; width: <?php echo (empty($conf->browser->phone)?'7':'22'); ?>px !important;
-moz-border-radius:0px 10px 10px 0px; -moz-border-radius:0px 10px 10px 0px;
-webkit-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px;