[TikiWiki-commits] [Git][tikiwiki/tiki][26.x] [FIX] Fix : The calendar module was not displayed when it was deployed

franck franck kalunga pushed to branch 26.x at Tiki Wiki CMS Groupware / Tiki


Commits:
41e605db by franck franck kalunga at 2025-10-23T10:33:28+00:00
[FIX] Fix : The calendar module was not displayed when it was deployed
---
* [FIX] Fix : The calendar module was not displayed when it was deployed
---
* [FIX] Fix : The calendar module was not displayed when it was deployed
---
* [FIX] Fix : The calendar module was not displayed when it was deployed

See merge request tikiwiki/tiki!8840

See merge request tikiwiki/tiki!8842

See merge request tikiwiki/tiki!8844

- - - - -


4 changed files:

- modules/mod-func-calendar_new.php
- templates/modules/mod-calendar_new.tpl
- templates/wiki-plugins/wikiplugin_calendar.tpl
- themes/base_files/scss/_tiki-calendar.scss


Changes:

=====================================
modules/mod-func-calendar_new.php
=====================================
@@ -152,16 +152,13 @@ function module_calendar_new($mod_reference, $module_params)
     $calendarInitialParams['initialView'] = $initialView;
     $calendars = $calendarInitialParams['calendars'];
     $smarty->assign(
-        'eventCalendarParams',
+        'fullCalendarParams',
         $calendarInitialParams
     );
     $smarty->assign('moduleCalendarFocusdate', $moduleCalendarFocusdate);
     $smarty->assign('moduleCalendarIds', $moduleCalendarIds);
-    if ($calendarInitialParams['canEditAnything']) {
-        TikiLib::lib('header')
-            ->add_cssfile('themes/base_files/feature_css/calendar.css', 20)
-            ->add_jsfile('lib/jquery_tiki/tiki-calendar_edit_item.js');
-    }
+    $canEditAnything = $calendarInitialParams['canEditAnything'] ? 'y' : 'n';
+    $smarty->assign('canEditAnything', $canEditAnything);
 
     foreach ($calIds as $i => $cal_id) {
         if ($tiki_p_admin_calendars != 'y' && ! $userlib->user_has_perm_on_object($user, $cal_id, 'calendar', 'tiki_p_view_calendar')) {


=====================================
templates/modules/mod-calendar_new.tpl
=====================================
@@ -1,12 +1,9 @@
 {if isset($show_calendar_module) and $show_calendar_module eq 'y'}
     {tikimodule error=$module_params.error title=$tpl_module_title name=$name flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
-        {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) || $module_params.showaction ne 'n')}
+        {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) && $canEditAnything eq 'y' || $module_params.showaction ne 'n')}
             <br>
             <p>
-                <a class="btn btn-link" href="{bootstrap_modal controller='calendar' action=$prefs.calendar_event_click_action size='modal-lg'}">
-                    {icon name="add"}
-                    {tr}Add Event{/tr}
-                </a>
+                <a href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId}" class="btn btn-primary">{icon name='create'} {tr}Add Event{/tr}</a>
             </p>
         {/if}
         {if $viewlist eq 'list'}
@@ -32,7 +29,7 @@
                             paramOfModuleCalendar['initialDate'] = $('#date-module-calendar').val();
                             $("#module-calendar").setupFullCalendar(paramOfModuleCalendar, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}');
                         })
-                        {{if $prefs.print_pdf_from_url neq 'none'}$("#module-calendar").addEventCalendarPrint('#module-calendar-pdf-btn', calendarContainer[0]);{/if}}
+                        {{if $prefs.print_pdf_from_url neq 'none'}$("#module-calendar").addFullCalendarPrint('#module-calendar-pdf-btn', calendarContainer[0]);{/if}}
                     {/jq}
                 {/if}
                 {if $pdf_export eq 'y' and $pdf_warning eq 'n'}


=====================================
templates/wiki-plugins/wikiplugin_calendar.tpl
=====================================
@@ -18,7 +18,7 @@
                 content['initialDate'] = $('#date-plugin-calendar').val();
                 $("#plugin-calendar").setupFullCalendar(content,  wikipluginCalendar, 'plugin-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$pluginCalendarIds}}');
             })
-            {{if $prefs.print_pdf_from_url neq 'none'}$("#plugin-calendar").addEventCalendarPrint('#calendar-pdf-btn', wikipluginCalendar[0]);{/if}}
+            {{if $prefs.print_pdf_from_url neq 'none'}$("#plugin-calendar").addFullCalendarPrint('#calendar-pdf-btn', wikipluginCalendar[0]);{/if}}
         {/jq}
     {/if}
     {if $pdf_export eq 'y' and $pdf_warning eq 'n'}


=====================================
themes/base_files/scss/_tiki-calendar.scss
=====================================
@@ -122,6 +122,10 @@
 .fc-timegrid-event .fc-event-title {
     font-weight: normal;
 }
+.fc-button-group {
+    flex-wrap: wrap;
+}
+
 @media only screen and (max-width: 767px) {
     .fc-header-toolbar {
         display: block !important;



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/41e605db29410b41a3679f2c3841c741e2c46308

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/41e605db29410b41a3679f2c3841c741e2c46308
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs