From d53654e64f46ff71aa5f4b87f62557371471b614 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 May 2017 20:41:44 +0200 Subject: [PATCH] Look and feel v6 --- htdocs/admin/ihm.php | 44 ------------------- htdocs/admin/pdf.php | 9 ++-- htdocs/comm/action/card.php | 8 ++-- htdocs/core/class/html.formactions.class.php | 5 ++- htdocs/core/lib/functions.lib.php | 4 +- htdocs/core/lib/security2.lib.php | 6 --- htdocs/core/lib/usergroups.lib.php | 13 ++++-- htdocs/holiday/list.php | 1 + htdocs/projet/activity/perday.php | 38 ++++++++-------- htdocs/projet/activity/perweek.php | 40 ++++++++--------- htdocs/theme/doliforge_logo.png | Bin 16587 -> 0 bytes htdocs/theme/eldy/style.css.php | 22 +++++----- htdocs/theme/md/style.css.php | 7 ++- htdocs/user/note.php | 1 + htdocs/user/passwordforgotten.php | 9 ---- 15 files changed, 80 insertions(+), 127 deletions(-) delete mode 100644 htdocs/theme/doliforge_logo.png diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 193ee35a80f..739a6fa4c88 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -50,18 +50,6 @@ $action = GETPOST('action'); if (! defined("MAIN_MOTD")) define("MAIN_MOTD",""); -// List of supported permanent search area -$searchform=array(); -/* deprecated -if (empty($conf->use_javascript_ajax)) -{ - $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE"); - $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE); - $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users")); - $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module310Name','Module400Name'); -} -*/ - /* * Action @@ -275,21 +263,6 @@ if ($action == 'edit') // Edit show_theme(null,1); print '
'; - // List of permanent supported search box - if (! empty($searchform)) - { - print ''; - print ''; - foreach ($searchform as $key => $value) - { - print ''; - } - print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").'
'.$searchformtitle[$key].''; - print $form->selectyesno($searchform[$key],$searchformconst[$key],1); - print '
'; - print '
'; - } - // Other print ''; print ''; @@ -476,23 +449,6 @@ else // Show print '
'; - // List of search forms to show - if (! empty($searchform)) - { - print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; - print ''; - foreach ($searchform as $key => $value) - { - - print ''; - print ''; - } - print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").' 
'.$searchformtitle[$key].''.yn($searchformconst[$key]).''; - if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); - print '
'; - print '
'; - } - // Other print ''; print ''; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 2e650c75696..6698be8b01f 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -306,8 +306,9 @@ else // Show $var=true; // Misc options - print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'
'; - $var=true; + print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'',''); + + print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; print ''; @@ -357,7 +358,7 @@ else // Show print '
'; - print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'
'; + print load_fiche_titre($langs->trans("PDFAddressForging"),'',''); print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; @@ -444,7 +445,7 @@ else // Show print '
'; // Other - print load_fiche_titre($langs->trans("Other"),'','').'
'; + print load_fiche_titre($langs->trans("Other"),'',''); $var=true; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print ''; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 73d015d7db9..30b13bc3007 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -706,7 +706,7 @@ if ($action == 'create') if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent='0'; else if (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent=100; } - $formactions->form_select_status_action('formaction',$percent,1,'complete'); + $formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200'); print ''; // Location @@ -1428,7 +1428,7 @@ if ($id > 0) } else { $value = $object->array_options["options_" . $key]; } - print '\n"; } @@ -1491,7 +1491,7 @@ if ($id > 0) { if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) { - print '
 

'; + print '
'; print ''; // ancre /* @@ -1512,8 +1512,6 @@ if ($id > 0) print '
'; - - print '
 
'; } } } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index b799e0e2359..452ff89d914 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -54,9 +54,10 @@ class FormActions * @param string $htmlname Name of html prefix for html fields (selectX and valX) * @param integer $showempty Show an empty line if select is used * @param integer $onlyselect 0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running) + * @param string $morecss More css on select field * @return void */ - function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete',$showempty=0,$onlyselect=0) + function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100') { global $langs,$conf; @@ -120,7 +121,7 @@ class FormActions { //var_dump($selected); if ($selected == 'done') $selected='100'; - print ''; if ($showempty) print ''; foreach($listofstatus as $key => $val) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 31f29ff611c..262204b9f72 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -257,8 +257,10 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL) if (empty($method) || $method == 3 || $method == 4) { + global $conf; + // Management of default values - if (! isset($_GET['sortfield'])) // If we did a click on a field to sort, we do no apply default values + if (! isset($_GET['sortfield']) && empty($conf->global->MAIN_DISABLE_DEFAULT_VALUES)) // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_DISABLE_DEFAULT_VALUES is on { if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) { diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index 5139128a5d8..a14645a3152 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -197,12 +197,6 @@ function dol_loginfunction($langs,$conf,$mysoc) if (! GETPOST("username")) $focus_element='username'; else $focus_element='password'; - $login_background=DOL_URL_ROOT.'/theme/login_background.png'; - if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) - { - $login_background=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'; - } - $demologin=''; $demopassword=''; if (! empty($dolibarr_main_demo)) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 4350edc3797..8936cf98623 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -426,7 +426,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; - // BackgroundColor + // Background color THEME_ELDY_BACKBODY if ($foruserprofile) { /* @@ -609,7 +609,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) { print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default")); } - print '   ('.$langs->trans("Default").': 3c3c14) '; + print '   ('.$langs->trans("Default").': 3c3c14) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; @@ -654,9 +654,14 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) { $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''); if ($color) print ''; - else print $langs->trans("Default"); + else + { + //print ''; + //print ''.$langs->trans("Default").''; + print $langs->trans("Default"); + } } - print '   ('.$langs->trans("Default").': 000078) '; + print '   ('.$langs->trans("Default").': 000078) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; } diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index d9c5fdf43c0..f91616d0b9a 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -282,6 +282,7 @@ print ''; print ''; print ''; print ''; +if ($id > 0) print ''; if ($sall) { diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index c50cbd014f7..c1aa8aaa469 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -407,25 +407,7 @@ print '
'; print '
'; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$label.''; + print '
'.$label.''; print $extrafields->showOutputField($key,$value); print "
'."\n"; -print ''; -print ''; -print ''; -print ''; -if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) -{ - print ''; -} -print ''; -print ''; -print ''; -if ($usertoprocess->id == $user->id) print ''; -else print ''; -print ''; -print ''; -print ''; -print "\n"; - -print ''; +print ''; print ''; print ''; print ''; @@ -444,6 +426,24 @@ print $searchpitco; print ''; print "\n"; +print ''; +print ''; +print ''; +print ''; +if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) +{ + print ''; +} +print ''; +print ''; +print ''; +if ($usertoprocess->id == $user->id) print ''; +else print ''; +print ''; +print ''; +print ''; +print "\n"; + // By default, we can edit only tasks we are assigned to $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 989424afd67..905b93393dd 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -402,6 +402,26 @@ print '
'; print '
'; print '
'.$langs->trans("RefTask").''.$langs->trans("LabelTask").''.$langs->trans("ProjectRef").''.$langs->trans("ThirdParty").''.$langs->trans("PlannedWorkload").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("HourStart").''.$langs->trans("Duration").''.$langs->trans("Note").'
'.$langs->trans("RefTask").''.$langs->trans("LabelTask").''.$langs->trans("ProjectRef").''.$langs->trans("ThirdParty").''.$langs->trans("PlannedWorkload").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("HourStart").''.$langs->trans("Duration").''.$langs->trans("Note").'
'."\n"; +print ''; +print ''; +print ''; +print ''; +if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print ''; +print ''; +print ''; +print ''; +print ''; +for($i=0;$i<7;$i++) +{ + print ''; +} +// Action column +print ''; +print "\n"; + print ''; print ''; print ''; @@ -425,26 +445,6 @@ for($i=0;$i<7;$i++) print ''; print "\n"; -print ''; -print ''; -print ''; -print ''; -if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print ''; -print ''; -print ''; -print ''; -print ''; -for($i=0;$i<7;$i++) -{ - print ''; -} -// Action column -print ''; -print "\n"; - // By default, we can edit only tasks we are assigned to $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0); diff --git a/htdocs/theme/doliforge_logo.png b/htdocs/theme/doliforge_logo.png deleted file mode 100644 index c9de1b5012c45670d346b4f699a01ab8d257d415..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16587 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 O0000dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?> } div.fichecenter { + /* margin-top: 10px; */ width: 100%; clear: both; /* This is to have div fichecenter that are true rectangles */ } @@ -1737,7 +1738,7 @@ div.vmenu, td.vmenu { .vmenu { width: 190px; - margin-left: 4px; + margin-left: 6px; display: none; @@ -1953,10 +1954,11 @@ img.toolbarbutton { /* ============================================================================== */ div.tabs { text-align: ; - margin-left: 6px !important; - margin-right: 6px !important; + padding-left: 6px !important; + padding-right: 6px !important; clear:both; height:100%; + /* background-image: linear-gradient(to top,#f6f6f6 0,#fff 8px); */ } div.tabsElem { margin-top: 1px; @@ -2018,7 +2020,7 @@ a.tabTitle { a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 8px 9px 8px; + padding: 12px 9px 12px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; @@ -2027,11 +2029,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { border-left: 1px solid transparent; border-top: 1px solid transparent; border-bottom: 0px !important; - /* - -moz-border-radius:4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - */ background-image: none !important; } @@ -3036,9 +3033,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; } div.titre { font-family: ; - font-weight: bold; + font-size: 14px; + /* font-weight: bold; */ color: rgb(); text-decoration: none; + padding-top: 5px; + padding-bottom: 5px; /* text-shadow: 1px 1px 2px #FFFFFF; */ } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 6513210a1a9..52fb9d3ab1a 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -241,7 +241,7 @@ body { color: rgb(); font-size: px; - line-height: 130%; + line-height: 1.3; font-family: ; margin-top: 0; margin-bottom: 0; @@ -3146,9 +3146,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; } div.titre { font-family: ; - font-weight: bold; + font-size: 14px; + /* font-weight: bold; */ color: rgb(); text-decoration: none; + padding-top: 5px; + padding-bottom: 5px; /* text-shadow: 1px 1px 2px #FFFFFF; */ dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?> } diff --git a/htdocs/user/note.php b/htdocs/user/note.php index ae685391299..ca9f821d14c 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -52,6 +52,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('usercard','globalcard')); + /******************************************************************************/ /* Actions */ /******************************************************************************/ diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index f7acc3609c7..e59e26efd0b 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -191,15 +191,6 @@ $conf_css = $themepath."?lang=".$langs->defaultlang; $jquerytheme = 'smoothness'; if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; -if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) -{ - $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'; -} -else -{ - $login_background = DOL_URL_ROOT.'/theme/login_background.png'; -} - if (! $username) $focus_element = 'username'; else $focus_element = 'password';
'; +$searchpitco=$form->showFilterAndCheckAddButtons(0); +print $searchpitco; +print '
'.$langs->trans("RefTask").''.$langs->trans("LabelTask").'
'; -$searchpitco=$form->showFilterAndCheckAddButtons(0); -print $searchpitco; -print '