Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix selection in combo

Browse Source
This commit is contained in:
Laurent Destailleur
2021-02-18 13:56:13 +01:00
parent 56d2ac274a
commit 2904cc803f
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/pdf.php
View File

@@ -326,7 +326,8 @@ print '</td></tr>';
print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>'; print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
//if (! empty($conf->global->MAIN_MULTILANGS)) //if (! empty($conf->global->MAIN_MULTILANGS))
//{ //{
print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0), 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1); $selected = GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0);
print $formadmin->select_language($selected, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
//} else { //} else {
// print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>'; // print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>';
//} //}

43
htdocs/comm/action/index.php
View File

@@ -834,8 +834,8 @@ if ($showbirthday)
} }
// HOLIDAYS CALENDAR // HOLIDAYS CALENDAR
if ($conf->global->AGENDA_SHOW_HOLIDAYS) //if ($conf->global->AGENDA_SHOW_HOLIDAYS)
{ //{
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status"; $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.rowid = x.fk_user"; $sql .= " WHERE u.rowid = x.fk_user";
@@ -920,7 +920,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
$i++; $i++;
} }
} }
} //}
// EXTERNAL CALENDAR // EXTERNAL CALENDAR
// Complete $eventarray with external import Ical // Complete $eventarray with external import Ical
@@ -1514,6 +1514,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
global $theme_datacolor; global $theme_datacolor;
global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused; global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
if ($conf->use_javascript_ajax) { // Enable the "Show more button..."
$conf->global->MAIN_JS_SWITCH_AGENDA = 1;
}
$dateint = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day); $dateint = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
print "\n"; print "\n";
@@ -1645,7 +1649,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
// Define color // Define color
$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]); $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
} }
$cssclass = $cssclass.' '.$cssclass.'_day_'.$ymd; $cssclass = $cssclass.' eventday_'.$ymd;
// Defined style to disable drag and drop feature // Defined style to disable drag and drop feature
if ($event->type_code == 'AC_OTH_AUTO') if ($event->type_code == 'AC_OTH_AUTO')
@@ -1676,10 +1680,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; } if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; }
if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; } if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; }
// Show rect of event // Show event box
print "\n"; print "\n";
print '<!-- start event '.$i.' -->'."\n"; print '<!-- start event '.$i.' -->'."\n";
print '<div id="event_'.$ymd.'_'.$i.'" class="event family_'.$event->type.' '.$cssclass.'"'; $morecss = '';
if ($i >= $maxprint) {
$morecss = 'showifmore';
}
if ($event->type == 'holiday' && !GETPOST('check_birthday')) {
$morecss = 'hidden';
}
print '<div id="event_'.$ymd.'_'.$i.'" class="event family_'.$event->type.' '.$cssclass.($morecss ? ' '.$morecss : '').'"';
//print ' style="height: 100px;'; //print ' style="height: 100px;';
//print ' position: absolute; top: 40px; width: 50%;'; //print ' position: absolute; top: 40px; width: 50%;';
//print '"'; //print '"';
@@ -1887,17 +1898,21 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint) if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint)
{ {
print '<div id="more_'.$ymd.'">'.img_picto("all", "1downarrow_selected.png").' +'.$langs->trans("More").'...</div>'; print '<div class="center" id="more_'.$ymd.'">'.img_picto("All", "angle-double-down", 'class="warning"').' +'.($i - $maxprint).'</div>';
//print ' +'.(count($eventarray[$daykey])-$maxprint); //print ' +'.(count($eventarray[$daykey])-$maxprint);
print '<script type="text/javascript">'."\n"; print '<script type="text/javascript">'."\n";
print 'jQuery(document).ready(function () {'."\n"; print 'jQuery(document).ready(function () {'."\n";
print 'jQuery("#more_'.$ymd.'").click(function() { reinit_day_'.$ymd.'(); });'."\n"; print ' var open=0;'."\n";
print ' jQuery("#more_'.$ymd.'").click(function() { console.log("Click on showmore for '.$ymd.'"); reinit_day_'.$ymd.'(); event.stopImmediatePropagation(); });'."\n";
print 'function reinit_day_'.$ymd.'() {'."\n"; print ' function reinit_day_'.$ymd.'() {'."\n";
print 'var nb=0;'."\n"; print ' jQuery(".eventday_'.$ymd.'.showifmore").toggle();'."\n";
// TODO Loop on each element of day $ymd and start to toggle once $maxprint has been reached print ' open = open + 1; if (open > 1) { open = 0; }'."\n";
print 'jQuery(".family_mytasks_day_'.$ymd.'").toggle();'; print ' if (open) { ';
print '}'."\n"; print ' jQuery("#more_'.$ymd.'").html(\''.img_picto("All", "angle-double-up", 'class="warning"').'\');'."\n";
print ' } else { ';
print ' jQuery("#more_'.$ymd.'").html(\''.img_picto("All", "angle-double-down", 'class="warning"').' +'.($i - $maxprint).'\');'."\n";
print ' }'."\n";
print ' }'."\n";
print '});'."\n"; print '});'."\n";

6
htdocs/core/class/html.formadmin.class.php
View File

@@ -77,7 +77,7 @@ class FormAdmin
if ($showempty && !$multiselect) if ($showempty && !$multiselect)
{ {
$out .= '<option value="0"'; $out .= '<option value="0"';
if ($selected == '') $out .= ' selected'; if ($selected === '') $out .= ' selected';
$out .= '>'; $out .= '>';
if ($showempty != '1') $out .= $showempty; if ($showempty != '1') $out .= $showempty;
else $out .= '&nbsp;'; else $out .= '&nbsp;';
@@ -86,7 +86,7 @@ class FormAdmin
if ($showauto) if ($showauto)
{ {
$out .= '<option value="auto"'; $out .= '<option value="auto"';
if ($selected == 'auto') $out .= ' selected'; if ($selected === 'auto') $out .= ' selected';
$out .= '>'.$langs->trans("AutoDetectLang").'</option>'; $out .= '>'.$langs->trans("AutoDetectLang").'</option>';
} }
@@ -115,7 +115,7 @@ class FormAdmin
} }
$valuetoshow .= ' '.picto_from_langcode($key, 'class="saturatemedium"'); $valuetoshow .= ' '.picto_from_langcode($key, 'class="saturatemedium"');
if ($selected == $keytouse) { if ((string) $selected == (string) $keytouse) {
$out .= '<option value="'.$keytouse.'" selected data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>'; $out .= '<option value="'.$keytouse.'" selected data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';
} else { } else {
$out .= '<option value="'.$keytouse.'" data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>'; $out .= '<option value="'.$keytouse.'" data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';

2
htdocs/core/lib/functions.lib.php
View File

@@ -3265,7 +3265,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
if (empty($srconly) && in_array($pictowithouttext, array( if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building', 'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building',
'cash-register', 'category', 'check', 'clock', 'close_title', 'cog', 'company', 'contact', 'contract', 'cron', 'cubes', 'cash-register', 'category', 'check', 'clock', 'close_title', 'cog', 'company', 'contact', 'contract', 'cron', 'cubes',
'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt', 'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group', 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',

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

@@ -4531,7 +4531,7 @@ div.visible {
display: block; display: block;
} }
div.hidden, td.hidden, img.hidden, span.hidden { div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
display: none; display: none;
} }

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

@@ -4402,7 +4402,7 @@ div.visible {
display: block; display: block;
} }
div.hidden, td.hidden, img.hidden, span.hidden { div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
display: none; display: none;
} }