From d53654e64f46ff71aa5f4b87f62557371471b614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
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 '<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 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"),'','').'<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 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 '</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 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 '<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 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 '</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 d9c5fdf43c0..f91616d0b9a 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 c50cbd014f7..c1aa8aaa469 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 989424afd67..905b93393dd 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
GIT binary patch
literal 0
HcmV?d00001
literal 16587
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
Bxhenv
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 658b63c1370..4b42a47f1cf 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 6513210a1a9..52fb9d3ab1a 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 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';
--
GitLab