lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v15

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-01 18:15:22 +01:00
parent ee5ea123ed
commit 49dae0aed2
10 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.formprojet.class.php
View File

@ -502,9 +502,10 @@ class FormProjets
* @param string $morecss More CSS * @param string $morecss More CSS
* @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement * @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
* @param string $projectkey Equivalent key to fk_projet for actual table_element * @param string $projectkey Equivalent key to fk_projet for actual table_element
* @param string $placeholder Placeholder
* @return int|string The HTML select list of element or '' if nothing or -1 if KO * @return int|string The HTML select list of element or '' if nothing or -1 if KO
*/ */
public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet") public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet", $placeholder = '')
{ {
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
@ -612,7 +613,7 @@ class FormProjets
$i = 0; $i = 0;
if ($num > 0) { if ($num > 0) {
$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">'; $sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
$sellist .= '<option value="-1"></option>'; $sellist .= '<option value="-1"'.($placeholder ? ' class="optiongrey"' : '').'>'.$placeholder.'</option>';
while ($i < $num) { while ($i < $num) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$ref = $obj->ref ? $obj->ref : $obj->rowid; $ref = $obj->ref ? $obj->ref : $obj->rowid;

8
htdocs/projet/card.php
View File

@ -658,7 +658,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Opportunity status // Opportunity status
print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>'; print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
print '<td class="maxwidthonsmartphone">'; print '<td class="maxwidthonsmartphone">';
print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1); print $formproject->selectOpportunityStatus('opp_status', GETPOSTISSET('opp_status') ? GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
print '</tr>'; print '</tr>';
// Opportunity probability // Opportunity probability
@ -1090,14 +1090,14 @@ if ($action == 'create' && $user->rights->projet->creer) {
print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency); print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
}*/ }*/
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency); print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
// Opportunity Weighted Amount // Opportunity Weighted Amount
print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>'; print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) { if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency); print '<span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -1117,7 +1117,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Budget // Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>'; print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($object->budget_amount, '')) { if (strcmp($object->budget_amount, '')) {
print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency); print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';

4
htdocs/projet/contact.php
View File

@ -374,7 +374,7 @@ if ($id > 0 || !empty($ref)) {
// Opportunity Amount // Opportunity Amount
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency); print '<span class="amount">'.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -394,7 +394,7 @@ if ($id > 0 || !empty($ref)) {
// Budget // Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>'; print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($object->budget_amount, '')) { if (strcmp($object->budget_amount, '')) {
print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency); print '<span class="amount">'.price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';

31
htdocs/projet/element.php
View File

@ -296,7 +296,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
// Opportunity Amount // Opportunity Amount
print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>'; print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
if (strcmp($object->opp_amount, '')) { if (strcmp($object->opp_amount, '')) {
print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency); print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -316,7 +316,7 @@ print '</td></tr>';
// Budget // Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>'; print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($object->budget_amount, '')) { if (strcmp($object->budget_amount, '')) {
print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency); print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';
@ -1020,7 +1020,7 @@ foreach ($listofreferent as $key => $value) {
if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) { if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet'); $selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, empty($project_field) ? 'fk_projet' : $project_field, $langs->trans("SelectElement"));
if ($selectList < 0) { if ($selectList < 0) {
setEventMessages($formproject->error, $formproject->errors, 'errors'); setEventMessages($formproject->error, $formproject->errors, 'errors');
} elseif ($selectList) { } elseif ($selectList) {
@ -1032,9 +1032,10 @@ foreach ($listofreferent as $key => $value) {
$addform .= '<input type="hidden" name="action" value="addelement">'; $addform .= '<input type="hidden" name="action" value="addelement">';
$addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">'; $addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">'; $addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
$addform .= '<table><tr><td><span class="hideonsmartphone opacitymedium">'.$langs->trans("SelectElement").'</span></td>'; $addform .= '<table><tr>';
//$addform .= '<td><span class="hideonsmartphone opacitymedium">'.$langs->trans("SelectElement").'</span></td>';
$addform .= '<td>'.$selectList.'</td>'; $addform .= '<td>'.$selectList.'</td>';
$addform .= '<td><input type="submit" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>'; $addform .= '<td><input type="submit" class="button button-linkto smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>';
$addform .= '</tr></table>'; $addform .= '</tr></table>';
$addform .= '</form>'; $addform .= '</form>';
$addform .= '</div>'; $addform .= '</div>';
@ -1043,9 +1044,9 @@ foreach ($listofreferent as $key => $value) {
if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) { if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
$addform .= '<div class="inline-block valignmiddle">'; $addform .= '<div class="inline-block valignmiddle">';
if ($testnew) { if ($testnew) {
$addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>'; $addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'" title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { } elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>'; $addform .= '<span title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><a class="buttonxxx marginleftonly buttonRefused" disabled="disabled" href="#"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a></span>';
} }
$addform .= '<div>'; $addform .= '<div>';
} }
@ -1389,7 +1390,7 @@ foreach ($listofreferent as $key => $value) {
if (!$qualifiedfortotal) { if (!$qualifiedfortotal) {
print '<strike>'; print '<strike>';
} }
print price($total_ht_by_line); print '<span class="amount">'.price($total_ht_by_line).'</span>';
if (!$qualifiedfortotal) { if (!$qualifiedfortotal) {
print '</strike>'; print '</strike>';
} }
@ -1440,7 +1441,7 @@ foreach ($listofreferent as $key => $value) {
if (!$qualifiedfortotal) { if (!$qualifiedfortotal) {
print '<strike>'; print '<strike>';
} }
print price($total_ttc_by_line); print '<span class="amount">'.price($total_ttc_by_line).'</span>';
if (!$qualifiedfortotal) { if (!$qualifiedfortotal) {
print '</strike>'; print '</strike>';
} }
@ -1513,6 +1514,7 @@ foreach ($listofreferent as $key => $value) {
if (in_array($tablename, array('projet_task'))) { if (in_array($tablename, array('projet_task'))) {
$colspan = 2; $colspan = 2;
} }
print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>'; print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
if (in_array($tablename, array('projet_task'))) { if (in_array($tablename, array('projet_task'))) {
print '<td class="center">'; print '<td class="center">';
@ -1551,7 +1553,16 @@ foreach ($listofreferent as $key => $value) {
print '</tr>'; print '</tr>';
} else { } else {
if (!is_array($elementarray)) { // error if (!is_array($elementarray)) { // error
print $elementarray; print '<tr><td>'.$elementarray.'</td></tr>';
} else {
$colspan = 7;
if (in_array($tablename, array('projet_task'))) {
$colspan = 5;
}
if ($tablename == 'fichinter') {
$colspan++;
}
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
} }
print "</table>"; print "</table>";

2
htdocs/projet/tasks.php
View File

@ -626,7 +626,7 @@ if ($id > 0 || !empty($ref)) {
// Budget // Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>'; print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($object->budget_amount, '')) { if (strcmp($object->budget_amount, '')) {
print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency); print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';

2
htdocs/projet/tasks/time.php
View File

@ -826,7 +826,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
// Budget // Budget
print '<tr><td>'.$langs->trans("Budget").'</td><td>'; print '<tr><td>'.$langs->trans("Budget").'</td><td>';
if (strcmp($projectstatic->budget_amount, '')) { if (strcmp($projectstatic->budget_amount, '')) {
print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency); print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
} }
print '</td></tr>'; print '</td></tr>';

4
htdocs/salaries/card.php
View File

@ -25,6 +25,7 @@
* \ingroup salaries * \ingroup salaries
* \brief Page of salaries payments * \brief Page of salaries payments
*/ */
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php'; require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
@ -555,7 +556,8 @@ if ($action == 'create') {
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
print '<tr><td>'.$langs->trans("Project").'</td><td>'; print '<tr><td>'.$langs->trans("Project").'</td><td>';
$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1); print img_picto('', 'project', 'class="pictofixedwidth"');
print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
print '</td></tr>'; print '</td></tr>';
} }

1
htdocs/theme/eldy/global.inc.php
View File

@ -6115,6 +6115,7 @@ span#select2-boxbookmark-container {
box-shadow: none; box-shadow: none;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
margin-bottom: 0 !important;
} }
span.noborderoncategories a, li.noborderoncategories a { span.noborderoncategories a, li.noborderoncategories a {
line-height: normal; line-height: normal;

7
htdocs/theme/md/btn.inc.php
View File

@ -320,7 +320,7 @@ div.pagination li:first-child a.btnTitle {
border: none; border: none;
font-size: 12px; font-size: 12px;
font-weight: 300; font-weight: 300;
background-color: #fbfbfb; /* background-color: #fbfbfb; */
} }
a.btnTitle.btnTitleSelected { a.btnTitle.btnTitleSelected {
@ -371,6 +371,11 @@ div.pagination .btnTitle:hover .btnTitle-label{
display: block; display: block;
} }
.paginationafterarrows a.btnTitlePlus, .titre_right a.btnTitlePlus {
border: 1px solid var(--colorbackbody);
}
/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */ /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ @media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */
{ {

3
htdocs/theme/md/style.css.php
View File

@ -5943,7 +5943,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
/* To emulate select 2 style */ /* To emulate select 2 style */
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr { .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
padding: 2px 5px 1px 5px; padding: 3px 5px 2px 5px;
margin: 0 0 2px 3px; margin: 0 0 2px 3px;
position: relative; position: relative;
line-height: 13px; line-height: 13px;
@ -5993,6 +5993,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
box-shadow: none; box-shadow: none;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
margin-bottom: 0 !important;
} }
span.noborderoncategories a, li.noborderoncategories a { span.noborderoncategories a, li.noborderoncategories a {
line-height: normal; line-height: normal;