| '.$langs->trans("ActionAffectedTo").' | ';
$listofuserid = array();
+ $listofcontactid = array();
+ $listofotherid = array();
if (empty($donotclearsession))
{
$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
@@ -1090,12 +1092,6 @@ if ($action == 'create')
print ' ';
print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
print ' ';
- /*if (in_array($user->id,array_keys($listofuserid)))
- {
- print '';
- print $langs->trans("MyAvailability").': '.$langs->trans("Busy");
- print ' ';
- }*/
print ' |
';
// Done by
@@ -1108,9 +1104,9 @@ if ($action == 'create')
if ($conf->categorie->enabled) {
// Categories
- print '| '.$langs->trans("Categories").' | ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
- print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+ print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent', 0, 0);
print " |
";
}
@@ -1148,7 +1144,8 @@ if ($action == 'create')
print '| '.$langs->trans("ActionOnContact").' | ';
$preselectedids = GETPOST('socpeopleassigned', 'array');
if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
- print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+ print img_picto('', 'contact', 'class="paddingrightonly"');
+ print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
print ' |
';
}
@@ -1161,7 +1158,7 @@ if ($action == 'create')
print '| '.$langs->trans("Project").' | ';
print img_picto('', 'project', 'class="paddingrightonly"');
- $numproject = $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+ $numproject = $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
print ' ';
$urloption = '?action=create&donotclearsession=1';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index a48dc03aea2..7a52183b195 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -360,7 +360,9 @@ if (empty($action) || $action == 'show_month')
$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
$nav .= " \n";
$nav .= " \n";
- $nav .= " ".$langs->trans("Today")." ";
+ if (empty($conf->dol_optimize_smallscreen)) {
+ $nav .= " ".$langs->trans("Today")." ";
+ }
$picto = 'calendar';
}
if ($action == 'show_week')
@@ -369,7 +371,9 @@ if ($action == 'show_week')
$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
$nav .= " \n";
$nav .= " trans("Next"))."\">\n";
- $nav .= " ".$langs->trans("Today")." ";
+ if (empty($conf->dol_optimize_smallscreen)) {
+ $nav .= " ".$langs->trans("Today")." ";
+ }
$picto = 'calendarweek';
}
if ($action == 'show_day')
@@ -378,7 +382,9 @@ if ($action == 'show_day')
$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
$nav .= " \n";
$nav .= " \n";
- $nav .= " ".$langs->trans("Today")." ";
+ if (empty($conf->dol_optimize_smallscreen)) {
+ $nav .= " ".$langs->trans("Today")." ";
+ }
$picto = 'calendarday';
}
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 72b25c9d731..f0c1a0d1951 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -274,34 +274,17 @@ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
$tmpday = $first_day;
-$picto = 'calendartype';
+$picto = 'calendarweek';
$nav = "".img_previous($langs->trans("Previous"))."\n";
$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")." \n";
$nav .= "".img_next($langs->trans("Next"))."\n";
-$nav .= " (".$langs->trans("Today").")";
-$picto = 'calendarweek';
+if (empty($conf->dol_optimize_smallscreen)) {
+ $nav .= " (".$langs->trans("Today").")";
+}
-/*$nav .= ' ';
// Must be after the nav definition
$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f99cc3cbd16..899925b16f6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -285,28 +285,11 @@ $nav = "".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
$nav .= " \n";
$nav .= " trans("Next"))."\">\n";
-$nav .= " ".$langs->trans("Today")." ";
-
-/*$nav.=' ';
// Must be after the nav definition
$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index feddd6e4f24..e82d59ae3f4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1848,7 +1848,7 @@ class Form
if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
{
$out .= ' ';
- $out .= ' - '.$langs->trans("Availability").': '.$langs->trans("Busy");
+ $out .= ' - '.$langs->trans("Availability").': ';
$out .= ' ';
}
}
@@ -5578,7 +5578,6 @@ class Form
}
// Show date with combo selects
else {
- //$retstring.='';
// Day
$retstring .= '';
@@ -5622,11 +5621,13 @@ class Form
}
$retstring .= "\n";
}
- //$retstring.=' ';
}
}
- if ($d && $h) $retstring .= ($h == 2 ? '
' : ' ');
+ if ($d && $h) {
+ $retstring .= ($h == 2 ? '
' : ' ');
+ $retstring.='';
+ }
if ($h)
{
@@ -5644,10 +5645,13 @@ class Form
for ($hour = $hourstart; $hour < $hourend; $hour++)
{
if (strlen($hour) < 2) $hour = "0".$hour;
- $retstring .= '';
+ $retstring .= '';
}
$retstring .= '';
- if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+ //if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+ if ($m) $retstring .= ":";
}
if ($m)
@@ -5665,6 +5669,10 @@ class Form
$retstring .= '';
}
+ if ($d && $h) {
+ $retstring .= '';
+ }
+
// Add a "Now" link
if ($conf->use_javascript_ajax && $addnowlink)
{
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 9586adeaed4..eac04cfefc1 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -353,7 +353,7 @@ class FormProjets
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
$out .= $comboenhancement;
- $morecss = 'minwidth200imp maxwidth500';
+ $morecss = 'minwidth200 maxwidth500';
}
if (empty($option_only)) {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d6c5434ce94..5574056468d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1275,6 +1275,10 @@ table[summary="list_of_modules"] .fa-cog {
width: calc(100% - 50px) !important;
display: inline-block;
}
+.widthcentpercentminusxx {
+ width: calc(100% - 70px) !important;
+ display: inline-block;
+}
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
@@ -1298,8 +1302,8 @@ table[summary="list_of_modules"] .fa-cog {
margin-bottom: 15px !important;
}
- select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300 {
- width: calc(100% - 50px) !important;
+ select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
+ width: calc(100% - 40px) !important;
display: inline-block;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 65afa0e017f..1a315169cc8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1269,6 +1269,15 @@ table[summary="list_of_modules"] .fa-cog {
.minwidth500imp { min-width: 250px !important; }
}
+.widthcentpercentminusx {
+ width: calc(100% - 50px) !important;
+ display: inline-block;
+}
+.widthcentpercentminusxx {
+ width: calc(100% - 70px) !important;
+ display: inline-block;
+}
+
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
{
|