diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c8c0f9e6430..848a86e427d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -228,12 +228,12 @@ div.fichecenter { div.fichethirdleft { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 35%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px;\n"; } ?> + browser->phone)) { print "padding-bottom: 4px;\n"; } ?> } div.fichetwothirdright { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 65%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px\n"; } ?> + browser->phone)) { print "padding-bottom: 4px\n"; } ?> } div.fichehalfleft { 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 */ background: #E1A4A4; /* red */ } -.ui-layout-resizer-closed { - background-color: #DDDDDD; -} .ui-layout-resizer-closed:hover { background-color: #EEDDDD; } @@ -794,35 +791,30 @@ td.photo { } /* sliding resizer - add 'outside-border' to resizer on-hover */ /* 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-west-sliding-hover { border-right-width: 1px; } .ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } -*/ /* * TOGGLER-BUTTONS */ .ui-layout-toggler { - browser->phone)) { ?> border-top: 1px solid #AAA; /* match pane-border */ border-right: 1px solid #AAA; /* match pane-border */ border-bottom: 1px solid #AAA; /* match pane-border */ background-color: #DDD; top: 5px !important; - - diplay: none; - -} + } .ui-layout-toggler-open { - height: 54px !important; + height: 48px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px; border-radius:0px 10px 10px 0px; } .ui-layout-toggler-closed { - height: browser->phone)?'54':'1'); ?>px !important; + height: 48px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index ca6dba6d87d..c3347cce4e8 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -821,10 +821,9 @@ if (($action == 'create') || ($action == 'adduserldap')) print "".''.$langs->trans("PassPenix").''; print ''; } - print "\n"; - - print '

'; - + + print "".''; + print "\n"; print ""; } else diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 395224478e8..c7a1e8fea53 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -185,8 +185,9 @@ if ($_GET["action"] == 'edit') print '
'; + // Theme - show_theme($fuser,(($user->admin || empty($dolibarr_main_demo))?1:0),true); + show_theme($fuser,empty($dolibarr_main_demo)?1:0,true); print ''; @@ -234,7 +235,7 @@ else print ''; print '
'; - if (empty($user->admin) && ! empty($dolibarr_main_demo)) + if (! empty($dolibarr_main_demo)) { print "trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify").""; }