Fix css
This commit is contained in:
parent
bb8d5cec1b
commit
ab2e50ef49
@ -363,9 +363,9 @@ if ($action == 'show_day') {
|
|||||||
//print dol_print_date($firstdaytoshow,'dayhour').' '.dol_print_date($lastdaytoshow,'dayhour');
|
//print dol_print_date($firstdaytoshow,'dayhour').' '.dol_print_date($lastdaytoshow,'dayhour');
|
||||||
|
|
||||||
/*$title = $langs->trans("DoneAndToDoActions");
|
/*$title = $langs->trans("DoneAndToDoActions");
|
||||||
if ($status == 'done') $title = $langs->trans("DoneActions");
|
if ($status == 'done') $title = $langs->trans("DoneActions");
|
||||||
if ($status == 'todo') $title = $langs->trans("ToDoActions");
|
if ($status == 'todo') $title = $langs->trans("ToDoActions");
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$param = '';
|
$param = '';
|
||||||
if ($actioncode || GETPOSTISSET('search_actioncode')) {
|
if ($actioncode || GETPOSTISSET('search_actioncode')) {
|
||||||
@ -454,13 +454,13 @@ $param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
|
|||||||
|
|
||||||
|
|
||||||
/*$tabactive = '';
|
/*$tabactive = '';
|
||||||
if ($action == 'show_month') $tabactive = 'cardmonth';
|
if ($action == 'show_month') $tabactive = 'cardmonth';
|
||||||
if ($action == 'show_week') $tabactive = 'cardweek';
|
if ($action == 'show_week') $tabactive = 'cardweek';
|
||||||
if ($action == 'show_day') $tabactive = 'cardday';
|
if ($action == 'show_day') $tabactive = 'cardday';
|
||||||
if ($action == 'show_list') $tabactive = 'cardlist';
|
if ($action == 'show_list') $tabactive = 'cardlist';
|
||||||
if ($action == 'show_pertuser') $tabactive = 'cardperuser';
|
if ($action == 'show_pertuser') $tabactive = 'cardperuser';
|
||||||
if ($action == 'show_pertype') $tabactive = 'cardpertype';
|
if ($action == 'show_pertype') $tabactive = 'cardpertype';
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
|
$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
|
||||||
$paramnoactionodate = preg_replace('/action=[a-z_]+/', '', $paramnodate);
|
$paramnoactionodate = preg_replace('/action=[a-z_]+/', '', $paramnodate);
|
||||||
@ -502,14 +502,12 @@ $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="p
|
|||||||
//$viewmode .= '</span>';
|
//$viewmode .= '</span>';
|
||||||
$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
|
$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
|
||||||
|
|
||||||
$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
|
$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
|
||||||
//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
|
//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
|
||||||
$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
|
$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
|
||||||
//$viewmode .= '</span>';
|
//$viewmode .= '</span>';
|
||||||
$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
|
$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
|
||||||
|
|
||||||
$viewmode .= '<span class="marginrightonly"></span>';
|
|
||||||
|
|
||||||
// Add more views from hooks
|
// Add more views from hooks
|
||||||
$parameters = array(); $object = null;
|
$parameters = array(); $object = null;
|
||||||
$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
|
$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
|
||||||
@ -519,6 +517,8 @@ if (empty($reshook)) {
|
|||||||
$viewmode = $hookmanager->resPrint;
|
$viewmode = $hookmanager->resPrint;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$viewmode .= '<span class="marginrightonly"></span>'; // To add a space before the navigation tools
|
||||||
|
|
||||||
|
|
||||||
$newcardbutton = '';
|
$newcardbutton = '';
|
||||||
if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
|
if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user