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

Fix look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-08 11:58:47 +01:00
parent e7d24796f1
commit 8491be2572
2 changed files with 130 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/core/class/html.formother.class.php
View File

@ -620,15 +620,17 @@ class FormOther
if ($i > 0) print '<option value="0" disabled>----------</option>'; if ($i > 0) print '<option value="0" disabled>----------</option>';
print '<option value="'.$lines[$i]->fk_project.'_0"'; print '<option value="'.$lines[$i]->fk_project.'_0"';
if ($selectedproject == $lines[$i]->fk_project) print ' selected'; if ($selectedproject == $lines[$i]->fk_project) print ' selected';
print '>'; // Project -> Task
print $langs->trans("Project").' '.$lines[$i]->projectref; $labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public)) {
{ $labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
} else { } else {
print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')'; $labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
} }
//print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
print '>'; // Project -> Task
print $labeltoshow;
print "</option>\n"; print "</option>\n";
$lastprojectid = $lines[$i]->fk_project; $lastprojectid = $lines[$i]->fk_project;
@ -652,21 +654,26 @@ class FormOther
print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"'; print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected'; if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
if ($disabled) print ' disabled'; if ($disabled) print ' disabled';
print '>';
print $langs->trans("Project").' '.$lines[$i]->projectref; $labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
print ' '.$lines[$i]->projectlabel; $labeltoshow .= ' '.$lines[$i]->projectlabel;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public))
{ {
print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')'; $labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
} else { } else {
print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')'; $labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
} }
if ($lines[$i]->id) print ' > '; if ($lines[$i]->id) $labeltoshow .= ' > ';
for ($k = 0; $k < $level; $k++) for ($k = 0; $k < $level; $k++)
{ {
print "&nbsp;&nbsp;&nbsp;"; $labeltoshow .= "&nbsp;&nbsp;&nbsp;";
} }
print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n"; $labeltoshow .= $lines[$i]->ref.' '.$lines[$i]->label;
print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
print '>';
print $labeltoshow;
print "</option>\n";
$inc++; $inc++;
} }

12
htdocs/projet/tasks.php
View File

@ -492,14 +492,14 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask'); print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask');
if ($object->statut == Project::STATUS_CLOSED) { if ($object->id > 0 && $object->statut == Project::STATUS_CLOSED) {
print '<div class="warning">'; print '<div class="warning">';
$langs->load("errors"); $langs->load("errors");
print $langs->trans("WarningProjectClosed"); print $langs->trans("WarningProjectClosed");
print '</div>'; print '</div>';
} else { }
if ($object->statut == Project::STATUS_DRAFT)
{ if ($object->id > 0 && $object->statut == Project::STATUS_DRAFT) {
print '<div class="warning">'; print '<div class="warning">';
$langs->load("errors"); $langs->load("errors");
print $langs->trans("WarningProjectDraft"); print $langs->trans("WarningProjectDraft");
@ -604,9 +604,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print '</div>'; print '</div>';
print '</form>'; print '</form>';
} } elseif ($id > 0 || !empty($ref)) {
} elseif ($id > 0 || !empty($ref))
{
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
/* /*