[TikiWiki-commits] [Git][tikiwiki/tiki][26.x] [FIX] Fix Module calendar displayement in 26.x

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


Commits:
3a1e7cca by franck franck kalunga at 2025-10-23T13:12:50+00:00
[FIX] Fix Module calendar displayement in 26.x
---
* [FIX] Fix Module calendar displayement in 26.x

See merge request tikiwiki/tiki!8847

- - - - -


3 changed files:

- lib/wiki-plugins/wikiplugin_calendar.php
- themes/base_files/scss/_tiki-calendar.scss
- tiki-setup.php


Changes:

=====================================
lib/wiki-plugins/wikiplugin_calendar.php
=====================================
@@ -103,15 +103,7 @@ function wikiplugin_calendar($data, $params)
     $pluginCalendarIds = implode(',', $params['calIds']);
 
     $rawcals = $calendarlib->list_calendars();
-    TikiLib::lib('header')
-        ->add_cssfile('themes/base_files/feature_css/calendar.css', 20)
-        ->add_jsfile('lib/jquery_tiki/tiki-calendar_edit_item.js')
-        ->add_cssfile('vendor_bundled/vendor/npm-asset/fullcalendar/main.css')
-        ->add_jsfile('vendor_bundled/vendor/moment/moment/min/moment.min.js', true)
-        ->add_css('.fc-day-grid-event > .fc-content { white-space: normal; }')
-        ->add_cssfile('vendor_bundled/vendor/twbs/bootstrap-icons/font/bootstrap-icons.css')
-        ->add_jsfile('vendor_bundled/vendor/npm-asset/fullcalendar/main.js', true)
-        ->add_jsfile('lib/jquery_tiki/tiki-calendar.js');
+
     $rawcals['data'] = Perms::filter(
         ['type' => 'calendar'],
         'object',


=====================================
themes/base_files/scss/_tiki-calendar.scss
=====================================
@@ -122,7 +122,7 @@
 .fc-timegrid-event .fc-event-title {
     font-weight: normal;
 }
-.fc-button-group {
+.btn-group {
     flex-wrap: wrap;
 }
 


=====================================
tiki-setup.php
=====================================
@@ -874,6 +874,13 @@ $("#top").on("annotationCreated", function (e, annotation) {
 }
 
 $headerlib->add_jsfile('lib/jquery_tiki/pluginedit.js');
+$headerlib->add_cssfile('vendor_bundled/vendor/npm-asset/fullcalendar/main.css');
+$headerlib->add_cssfile('vendor_bundled/vendor/twbs/bootstrap-icons/font/bootstrap-icons.css');
+// Disable fullcalendar's force events to be one-line tall
+$headerlib->add_css('.fc-day-grid-event > .fc-content { white-space: normal; }');
+$headerlib->add_jsfile('vendor_bundled/vendor/moment/moment/min/moment.min.js', true);
+$headerlib->add_jsfile('vendor_bundled/vendor/npm-asset/fullcalendar/main.js', true);
+$headerlib->add_jsfile('lib/jquery_tiki/tiki-calendar.js');
 
 if ($prefs['feature_machine_learning'] == 'y') {
     $headerlib->add_jsfile('lib/jquery_tiki/tiki-machine_learning.js');



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3a1e7cca273e86346e095e76c02e33796465e288

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3a1e7cca273e86346e095e76c02e33796465e288
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