Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor look enhancement

Browse Source
This commit is contained in:
Laurent Destailleur
2017-03-16 17:02:30 +01:00
parent 4c0ff38020
commit dba6d99686
7 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/class/html.form.class.php
View File

@@ -4740,7 +4740,7 @@ class Form
// Year // Year
if ($emptydate || $set_time == -1) if ($emptydate || $set_time == -1)
{ {
$retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">'; $retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
} }
else else
{ {
@@ -4885,7 +4885,7 @@ class Form
* @param string $prefix Prefix for input fields * @param string $prefix Prefix for input fields
* @param int $iSecond Default preselected duration (number of seconds or '') * @param int $iSecond Default preselected duration (number of seconds or '')
* @param int $disabled Disable the combo box * @param int $disabled Disable the combo box
* @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text
* @param integer $minunderhours If 1, show minutes selection under the hours * @param integer $minunderhours If 1, show minutes selection under the hours
* @param int $nooutput Do not output html string but return it * @param int $nooutput Do not output html string but return it
* @return string|null * @return string|null
@@ -4923,11 +4923,12 @@ class Form
} }
elseif ($typehour=='text') elseif ($typehour=='text')
{ {
$retstring.='<input type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">'; $retstring.='<input placeholder="'.$langs->trans('HourShort').'" type="text" size="1" name="'.$prefix.'hour"'.($disabled?' disabled':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
} }
else return 'BadValueForParameterTypeHour'; else return 'BadValueForParameterTypeHour';
$retstring.=' '.$langs->trans('HourShort'); if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
else $retstring.=':';
// Minutes // Minutes
if ($minunderhours) $retstring.='<br>'; if ($minunderhours) $retstring.='<br>';
@@ -4946,10 +4947,12 @@ class Form
} }
elseif ($typehour=='text') elseif ($typehour=='text')
{ {
$retstring.='<input type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">'; $retstring.='<input placeholder="'.$langs->trans('MinuteShort').'" type="text" size="1" name="'.$prefix.'min"'.($disabled?' disabled':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
} }
$retstring.=' '.$langs->trans('MinuteShort');
$retstring.="&nbsp;"; if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
//$retstring.="&nbsp;";
if (! empty($nooutput)) return $retstring; if (! empty($nooutput)) return $retstring;

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

@@ -352,7 +352,7 @@ class FormProjets
} }
if (empty($option_only)) { if (empty($option_only)) {
$out.= '<select class="flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>'; $out.= '<select class="valignmiddle flat'.($minmax?' '.$minmax:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
} }
if (!empty($show_empty)) { if (!empty($show_empty)) {
$out.= '<option value="0">&nbsp;</option>'; $out.= '<option value="0">&nbsp;</option>';

1
htdocs/core/lib/project.lib.php
View File

@@ -919,7 +919,6 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
$tableCell.='</td>'; $tableCell.='</td>';
print $tableCell; print $tableCell;
} }
dol_syslog("yyy");
print '<td align="right">'; print '<td align="right">';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject")); if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));

8
htdocs/projet/activity/perday.php
View File

@@ -323,7 +323,7 @@ $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$y
$nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n"; $nav.='<a class="inline-block valignmiddle" href="?year='.$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)"; $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
$nav.='<br>'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' '; $nav.='<br>'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' ';
$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">'; $nav.=' <input type="submit" name="submitdateselect" class="button valignmiddle" value="'.$langs->trans("Refresh").'">';
$picto='calendarweek'; $picto='calendarweek';
@@ -338,9 +338,10 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">'; print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
$head=project_timesheet_prepare_head($mode); $head=project_timesheet_prepare_head($mode);
dol_fiche_head($head, 'inputperday', '', 0, 'task'); dol_fiche_head($head, 'inputperday', '', -1, 'task');
// Show description of content // Show description of content
print '<div class="hideonsmartphone">';
if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>'; if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
else else
{ {
@@ -355,6 +356,7 @@ else
{ {
print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>'; print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
} }
print '</div>';
dol_fiche_end(); dol_fiche_end();
@@ -389,7 +391,7 @@ dol_fiche_end();
//print '<input type="hidden" name="month" value="'.$month.'">'; //print '<input type="hidden" name="month" value="'.$month.'">';
//print '<input type="hidden" name="day" value="'.$day.'">'; //print '<input type="hidden" name="day" value="'.$day.'">';
print '<div class="floatright">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to. print '<div class="floatright right">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
print '<div class="float valignmiddle">'; print '<div class="float valignmiddle">';
print $langs->trans("AssignTaskToMe").'<br>'; print $langs->trans("AssignTaskToMe").'<br>';

6
htdocs/projet/activity/perweek.php
View File

@@ -334,9 +334,10 @@ print '<input type="hidden" name="month" value="'.$month.'">';
print '<input type="hidden" name="year" value="'.$year.'">'; print '<input type="hidden" name="year" value="'.$year.'">';
$head=project_timesheet_prepare_head($mode); $head=project_timesheet_prepare_head($mode);
dol_fiche_head($head, 'inputperweek', '', 0, 'task'); dol_fiche_head($head, 'inputperweek', '', -1, 'task');
// Show description of content // Show description of content
print '<div class="hideonsmartphone">';
if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>'; if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
else else
{ {
@@ -351,6 +352,7 @@ else
{ {
print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>'; print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
} }
print '</div>';
dol_fiche_end(); dol_fiche_end();
@@ -384,7 +386,7 @@ dol_fiche_end();
//print '<input type="hidden" name="month" value="'.$month.'">'; //print '<input type="hidden" name="month" value="'.$month.'">';
//print '<input type="hidden" name="day" value="'.$day.'">'; //print '<input type="hidden" name="day" value="'.$day.'">';
print '<div class="floatright">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to. print '<div class="floatright right">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
print '<div class="float valignmiddle">'; print '<div class="float valignmiddle">';
print $langs->trans("AssignTaskToMe").'<br>'; print $langs->trans("AssignTaskToMe").'<br>';

4
htdocs/theme/eldy/style.css.php
View File

@@ -761,8 +761,8 @@ div.fiche>form>div.div-table-responsive {
min-width: 20px; min-width: 20px;
min-height: 1.4em; min-height: 1.4em;
line-height: 1.4em; line-height: 1.4em;
padding: .4em .1em; /* padding: .4em .1em; */
border: 1px solid #BBB; /* border-bottom: 1px solid #BBB; */
/* max-width: inherit; why this ? */ /* max-width: inherit; why this ? */
} }

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

@@ -771,8 +771,8 @@ div.fiche>form>div.div-table-responsive {
min-width: 20px; min-width: 20px;
min-height: 1.4em; min-height: 1.4em;
line-height: 1.4em; line-height: 1.4em;
padding: .4em .1em; /* padding: .4em .1em; */
border: 1px solid #BBB; /* border-bottom: 1px solid #BBB; */
/* max-width: inherit; why this */ /* max-width: inherit; why this */
} }