Experiment flip-flap left menu with theme eldy when using smartphone. Need to setup MAIN_SMARTPHONE_OPTIM
This commit is contained in:
parent
3f8ceacbdb
commit
fab0db92d2
@ -640,8 +640,10 @@ 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 ($conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced';
|
// If theme support optim like flip-hide left menu and we use a smartphone, we force it
|
||||||
|
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
|
||||||
{
|
{
|
||||||
|
|||||||
@ -54,7 +54,7 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on
|
|||||||
$langs->load("main",0,1);
|
$langs->load("main",0,1);
|
||||||
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
|
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
|
||||||
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
|
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
|
||||||
$fontsize=empty($conf->browser->phone)?'12':'14';
|
$fontsize=empty($conf->browser->phone)?'12':'15';
|
||||||
$fontsizesmaller=empty($conf->browser->phone)?'11':'14';
|
$fontsizesmaller=empty($conf->browser->phone)?'11':'14';
|
||||||
|
|
||||||
$path=''; // This value may be used in future for external module to overwrite theme
|
$path=''; // This value may be used in future for external module to overwrite theme
|
||||||
@ -217,8 +217,8 @@ td.showDragHandle {
|
|||||||
/* ============================================================================== */
|
/* ============================================================================== */
|
||||||
|
|
||||||
div.fiche {
|
div.fiche {
|
||||||
margin-<?php print $left; ?>: <?php print empty($conf->browser->phone)?'10':'24'; ?>px;
|
margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone) || empty($conf->global->MAIN_SMARTPHONE_OPTIM))?'10':'24'; ?>px;
|
||||||
margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'8':''; ?>px;
|
margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'8':'6'; ?>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: 4px;\n"; } ?>
|
<?php if (! empty($conf->browser->phone)) { print "padding-bottom: 6px;\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: 4px\n"; } ?>
|
<?php if (! empty($conf->browser->phone)) { print "padding-bottom: 6px\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,6 +778,9 @@ 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;
|
||||||
}
|
}
|
||||||
@ -791,30 +794,35 @@ 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: 48px !important;
|
height: 54px !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: 48px !important;
|
height: <?php echo (empty($conf->browser->phone)?'54':'2'); ?>px !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;
|
||||||
|
|||||||
@ -821,9 +821,10 @@ if (($action == 'create') || ($action == 'adduserldap'))
|
|||||||
print "<tr>".'<td valign="top">'.$langs->trans("PassPenix").'</td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("PassPenix").'</td>';
|
||||||
print '<td><input size="30" type="text" name="phenix_pass" value="'.$_POST["phenix_pass"].'"></td></tr>';
|
print '<td><input size="30" type="text" name="phenix_pass" value="'.$_POST["phenix_pass"].'"></td></tr>';
|
||||||
}
|
}
|
||||||
|
print "</table>\n";
|
||||||
|
|
||||||
|
print '<center><br><input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit"></center>';
|
||||||
|
|
||||||
print "<tr>".'<td align="center" colspan="2"><input class="button" value="'.$langs->trans("CreateUser").'" type="submit"></td></tr>';
|
|
||||||
print "</table>\n";
|
|
||||||
print "</form>";
|
print "</form>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -185,9 +185,8 @@ if ($_GET["action"] == 'edit')
|
|||||||
|
|
||||||
print '</table><br>';
|
print '</table><br>';
|
||||||
|
|
||||||
|
|
||||||
// Theme
|
// Theme
|
||||||
show_theme($fuser,empty($dolibarr_main_demo)?1:0,true);
|
show_theme($fuser,(($user->admin || empty($dolibarr_main_demo))?1:0),true);
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user