diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 193ee35a80fe344e1bf9d8c3ec945f708643b7c7..739a6fa4c884b00c9022811a92538bc0962acb8a 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 '<br>'; - // List of permanent supported search box - if (! empty($searchform)) - { - print '<table summary="search" class="noborder" width="100%">'; - print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td colspan="2">'.$langs->trans("Activated").'</td></tr>'; - foreach ($searchform as $key => $value) - { - print '<tr><td class="titlefield">'.$searchformtitle[$key].'</td><td colspan="2">'; - print $form->selectyesno($searchform[$key],$searchformconst[$key],1); - print '</td></tr>'; - } - print '</table>'; - print '<br>'; - } - // Other print '<table summary="edit" class="noborder" width="100%">'; print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>'; @@ -476,23 +449,6 @@ else // Show print '<br>'; - // List of search forms to show - if (! empty($searchform)) - { - print '<table class="noborder" width="100%">'; - print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("PermanentLeftSearchForm").'</td><td>'.$langs->trans("Activated").'</td><td> </td></tr>'; - foreach ($searchform as $key => $value) - { - - print '<tr class="oddeven"><td class="titlefield">'.$searchformtitle[$key].'</td><td>'.yn($searchformconst[$key]).'</td>'; - print '<td align="left">'; - if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); - print '</td></tr>'; - } - print '</table>'; - print '<br>'; - } - // Other print '<table class="noborder" width="100%">'; print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 2e650c7569675ce59f5f2e09cb5e713526e76e74..6698be8b01f099334e72fbd923d8dbe5166944cd 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"),'','').'<br>'; - $var=true; + print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'',''); + + print '<table summary="more" class="noborder" width="100%">'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>'; @@ -357,7 +358,7 @@ else // Show print '<br>'; - print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>'; + print load_fiche_titre($langs->trans("PDFAddressForging"),'',''); print '<table class="noborder" width="100%">'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>'; @@ -444,7 +445,7 @@ else // Show print '<br>'; // Other - print load_fiche_titre($langs->trans("Other"),'','').'<br>'; + print load_fiche_titre($langs->trans("Other"),'',''); $var=true; print '<table summary="more" class="noborder" width="100%">'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>'; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 73d015d7db94973a689d87b7f786cd4c583ad206..30b13bc30070aca77fa335bd282b43954cca0332 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 '</td></tr>'; // Location @@ -1428,7 +1428,7 @@ if ($id > 0) } else { $value = $object->array_options["options_" . $key]; } - print '<tr><td width="30%">'.$label.'</td><td>'; + print '<tr><td class="titlefield">'.$label.'</td><td>'; print $extrafields->showOutputField($key,$value); print "</td></tr>\n"; } @@ -1491,7 +1491,7 @@ if ($id > 0) { if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) { - print '<div style="clear:both;"> <br><br></div><div class="fichecenter"><div class="fichehalfleft">'; + print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">'; print '<a name="builddoc"></a>'; // ancre /* @@ -1512,8 +1512,6 @@ if ($id > 0) print '</div></div></div>'; - - print '<div style="clear:both;"> </div>'; } } } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index b799e0e23593e4e5f27bdee0ecce355c09256f3e..452ff89d9146c2f4f40a81257dd6f68924b40d69 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 '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat maxwidth100">'; + print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">'; if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>'; foreach($listofstatus as $key => $val) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 31f29ff611cb9825384bdfb9dfb864b7479c8c05..262204b9f7277f322f726597fa77c9fb65308263 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 5139128a5d85fe010c572c0f03bb0f2095e71512..a14645a3152e1fd8f6c69447770b84fbeb2602fe 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 4350edc37972778dc3626788ffbd7c0dd29e78ea..8936cf98623259536144a5c18492e821f64af126 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 '</td></tr>'; - // 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").': <strong>3c3c14</strong>) '; + print ' ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print '</td>'; @@ -654,9 +654,14 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) { $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''); if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">'; - else print $langs->trans("Default"); + else + { + //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">'; + //print '<span style="color: #000078">'.$langs->trans("Default").'</span>'; + print $langs->trans("Default"); + } } - print ' ('.$langs->trans("Default").': <strong>000078</strong>) '; + print ' ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print '</td>'; } diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index d9c5fdf43c080ddd2957b9760e90f77735676d58..f91616d0b9ab86b91fbb14fb1edc053a97023192 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -282,6 +282,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; +if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">'; if ($sall) { diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index c50cbd014f7e520d77f71fceff1355f5de44b78d..c1aa8aaa469d12b92d9d021e239456e964a24cad 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -407,25 +407,7 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>'; print '<div class="div-table-responsive">'; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; -print '<tr class="liste_titre">'; -print '<td>'.$langs->trans("RefTask").'</td>'; -print '<td>'.$langs->trans("LabelTask").'</td>'; -print '<td>'.$langs->trans("ProjectRef").'</td>'; -if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) -{ - print '<td>'.$langs->trans("ThirdParty").'</td>'; -} -print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>'; -print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>'; -print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>'; -if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>'; -else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>'; -print '<td align="center">'.$langs->trans("HourStart").'</td>'; -print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>'; -print '<td align="right">'.$langs->trans("Note").'</td>'; -print "</tr>\n"; - -print '<tr class="liste_titre">'; +print '<tr class="liste_titre_filter">'; print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; @@ -444,6 +426,24 @@ print $searchpitco; print '</td>'; print "</tr>\n"; +print '<tr class="liste_titre">'; +print '<td>'.$langs->trans("RefTask").'</td>'; +print '<td>'.$langs->trans("LabelTask").'</td>'; +print '<td>'.$langs->trans("ProjectRef").'</td>'; +if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) +{ + print '<td>'.$langs->trans("ThirdParty").'</td>'; +} +print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>'; +print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>'; +print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>'; +if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>'; +else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>'; +print '<td align="center">'.$langs->trans("HourStart").'</td>'; +print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>'; +print '<td align="right">'.$langs->trans("Note").'</td>'; +print "</tr>\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 989424afd671f7682b11191bb2f404dcf3dbdbec..905b93393dd2f4108bcb120037671fec044a34ec 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -402,6 +402,26 @@ print '<div class="clearboth" style="padding-bottom: 8px;"></div>'; print '<div class="div-table-responsive">'; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; +print '<tr class="liste_titre_filter">'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; +if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +for($i=0;$i<7;$i++) +{ + print '<td class="liste_titre"></td>'; +} +// Action column +print '<td class="liste_titre nowrap" align="right">'; +$searchpitco=$form->showFilterAndCheckAddButtons(0); +print $searchpitco; +print '</td>'; +print "</tr>\n"; + print '<tr class="liste_titre">'; print '<td>'.$langs->trans("RefTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>'; @@ -425,26 +445,6 @@ for($i=0;$i<7;$i++) print '<td></td>'; print "</tr>\n"; -print '<tr class="liste_titre">'; -print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; -print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; -print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; -if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>'; -print '<td class="liste_titre"></td>'; -print '<td class="liste_titre"></td>'; -print '<td class="liste_titre"></td>'; -print '<td class="liste_titre"></td>'; -for($i=0;$i<7;$i++) -{ - print '<td class="liste_titre"></td>'; -} -// Action column -print '<td class="liste_titre nowrap" align="right">'; -$searchpitco=$form->showFilterAndCheckAddButtons(0); -print $searchpitco; -print '</td>'; -print "</tr>\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 Binary files a/htdocs/theme/doliforge_logo.png and /dev/null differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 658b63c13700b2f7545ae9f35e2e365a7c875ff4..4b42a47f1cfc61a2013425307e5672a8f75ca710 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -935,7 +935,7 @@ div.blockvmenuend, div.blockvmenubookmarks { padding-left: 0 !important; } div.vmenu, td.vmenu { - padding-right: 6px !important; + padding-right: 10px !important; } @@ -989,6 +989,7 @@ div.fiche { <?php if (! empty($conf->dol_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; <?php if (GETPOST("optioncss") == 'print') { ?> display: none; <?php } ?> @@ -1953,10 +1954,11 @@ img.toolbarbutton { /* ============================================================================== */ div.tabs { text-align: <?php print $left; ?>; - 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: <?php print $fontlist ?>; - 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: <?php print $fontlist ?>; - font-weight: bold; + font-size: 14px; + /* font-weight: bold; */ color: rgb(<?php print $colortexttitlenotab; ?>); 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 6513210a1a9a08d4c00d454ef226ed92c05d4ae6..52fb9d3ab1adc2a756be3456b5cc62560e4a6770 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -241,7 +241,7 @@ body { <?php } ?> color: rgb(<?php echo $colortext; ?>); font-size: <?php print $fontsize ?>px; - line-height: 130%; + line-height: 1.3; font-family: <?php print $fontlist ?>; margin-top: 0; margin-bottom: 0; @@ -3146,9 +3146,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; } div.titre { font-family: <?php print $fontlist ?>; - font-weight: bold; + font-size: 14px; + /* font-weight: bold; */ color: rgb(<?php print $colortexttitlenotab; ?>); text-decoration: none; + padding-top: 5px; + padding-bottom: 5px; /* text-shadow: 1px 1px 2px #FFFFFF; */ <?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?> } diff --git a/htdocs/user/note.php b/htdocs/user/note.php index ae685391299bf968927140a7966cfafaeba575be..ca9f821d14c933d61d26a702dcb4d68e7aae0fa6 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 f7acc3609c7c610d94b851a3fcea092e7a526f95..e59e26efd0b6b7c0fe730b448ba64878beb8d88e 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';