diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 7820de113b7..91e5dd9f1d2 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -339,7 +339,7 @@ dol_fiche_end(); $showextcals=$listofextcals; // Legend -if ($conf->use_javascript_ajax) +if (! empty($conf->use_javascript_ajax)) { $s=''; $s.='' . "\n"; - if (! empty($conf->use_javascript_ajax)) + + $s.='
' . $langs->trans("LocalAgenda").'  
'; + if (is_array($showextcals) && count($showextcals) > 0) { - $s.='
' . $langs->trans("LocalAgenda").'  
'; - if (is_array($showextcals) && count($showextcals) > 0) + foreach ($showextcals as $val) { - foreach ($showextcals as $val) - { - $htmlname = dol_string_nospecial($val['name']); - $s.='' . "\n"; - $s.='
' . $val ['name'] . '  
'; - } + $htmlname = dol_string_nospecial($val['name']); + $s.='' . "\n"; + $s.='
' . $val ['name'] . '  
'; } } $s.='
'.$langs->trans("AgendaShowBirthdayEvents").'  
'; @@ -1092,11 +1090,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa global $theme_datacolor; global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused; - print '
'."\n"; + print "\n".'
'; // Line with title of day $curtime = dol_mktime(0, 0, 0, $month, $day, $year); - print ''; + print '
'."\n"; + print ''; + print ''."\n"; // Line with td contains all div of each events print '
'; print ''; } - print '
'; @@ -1171,11 +1170,11 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa $numicals[dol_string_nospecial($event->icalname)]++; } $color=$event->icalcolor; - $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable'); + $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unmovable'); } else if ($event->type_code == 'BIRTHDAY') { - $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); + $numbirthday++; $colorindex=2; $cssclass='family_birthday unmovable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); } else { @@ -1213,32 +1212,35 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa $cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd; // Defined style to disable drag and drop feature - if ($event->date_end_in_calendar && date('Ymd',$event->date_start_in_calendar) != date('Ymd',$event->date_end_in_calendar)) + if ($event->type_code =='AC_OTH_AUTO') + { + $cssclass.= " unmovable"; + } + else if ($event->date_end_in_calendar && date('Ymd',$event->date_start_in_calendar) != date('Ymd',$event->date_end_in_calendar)) { $tmpyearend = date('Y',$event->date_end_in_calendar); $tmpmonthend = date('m',$event->date_end_in_calendar); $tmpdayend = date('d',$event->date_end_in_calendar); if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) { - $cssclass.= " unsortable"; + $cssclass.= " unmovable"; } } - if ($event->type_code =='AC_OTH_AUTO') - { - $cssclass.= " unsortable"; - } + else $cssclass.= " movable"; $h=''; $nowrapontd=1; if ($action == 'show_day') { $h='height: 100%; '; $nowrapontd=0; } if ($action == 'show_week') { $h='height: 100%; '; $nowrapontd=0; } // Show rect of event - print '
'; - print '
  • '; + print '
      '; // always 1 li per ul, 1 ul per event + print '
    • '; print ''; print ''; - print '
      '; - print '
'."\n"; + + print '
'."\n"; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 2fe1a3201f5..62532b004bb 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -424,6 +424,9 @@ th .button { background-color: #777; border-radius: 10px; } +.movable { + cursor: move; +} .borderrightlight {