on theme store

application/modules/opac/controllers/CmsController.php

@@ -57,6 +57,15 @@ class CmsController extends ZendAfi_Controller_Action {
     $preferences['id_bib']        = $this->_getParam('b');
     $preferences['events_only']   = true;
 
+    if ( ! Class_Template::current()->isLegacy()) {
+      $this->view->titre = $this->_('%s - %s',
+                                    $preferences [ 'titre' ],
+                                    Class_Date::humanDate(strtotime($this->_getParam('d')), 'MMMM yyyy'));
+      $this->view->articles = $this->_getArticlesByPreferences($preferences);
+      $this->renderScript('cms/articlesview.phtml');
+    }
+
+
     if(!isset($preferences['display_mode']))
        $preferences['display_mode']='Title';
 
@@ -290,7 +299,7 @@ class CmsController extends ZendAfi_Controller_Action {
   protected function _initCalendarAndPreferences() {
     $id_module = $this->_getParam('id_module');
 
-    if (false !== strpos($id_module, 'library'))
+    if (0 === strpos($id_module, 'library_'))
       return $this->_loadLibraryAgenda((int) filter_var($id_module, FILTER_SANITIZE_NUMBER_INT));
 
     $module = Class_Profil::getCurrentProfil()->getModuleAccueilPreferences($id_module, 'CALENDAR');
@@ -319,7 +328,8 @@ class CmsController extends ZendAfi_Controller_Action {
       ->setView($this->view);
 
     $this->view->preferences = $wrapper->getPreferences();
-    $this->view->calendar = $wrapper->getCalendar($this->_request->getParams());
+    $this->view->calendar = $wrapper->getCalendar($this->_request->getParams(),
+                                                  $this->_helper->selectedFilters());
   }