diff --git a/application/modules/opac/views/scripts/head.phtml b/application/modules/opac/views/scripts/head.phtml
index e9c1cc50ec2ef0268f30f18ad9f8ad1794701f89..f04ea1841710a1aa8873154b8cf993dd6f8f4de7 100644
--- a/application/modules/opac/views/scripts/head.phtml
+++ b/application/modules/opac/views/scripts/head.phtml
@@ -38,7 +38,8 @@
initializeImgHover();
initializePopups();
initializeDivisionFive();
- initializeReseauxSociaux();')
+ initializeReseauxSociaux();
+ initializeReloadModule();')
->addJQueryBackEnd(sprintf('$("#select_clef_profil").parent().prepend(\'%s\')',
$this->tagImg(URL_ADMIN_IMG.'ico/lock.png',
['alt' => $this->_("Afficher les outils d\'administration"),
diff --git a/application/modules/opac/views/scripts/pagination.phtml b/application/modules/opac/views/scripts/pagination.phtml
index eae47faa233b27e5e091e9f319f3bcb5ca224f3c..83e9d7739a172b6529cf50cf2747af9a19f04d4c 100644
--- a/application/modules/opac/views/scripts/pagination.phtml
+++ b/application/modules/opac/views/scripts/pagination.phtml
@@ -1,31 +1,58 @@
<?php
-xdebug_break();
if(!isset($this->url_link))
$this->url_link = [];
+
+
+if(!isset($this->link_attribs))
+ $this->link_attribs = [];
+
+
if (1 >= $this->pageCount) return;?>
+
<?php if ($this->pageCount): ?>
-<div class="paginationControl">
-<!-- Previous page link -->
-<?php if (isset($this->previous)): ?>
- <a href="<?php echo $this->url(array_merge($this->url_link, ['page' => $this->previous])); ?>">< <?php echo $this->_('Précédent'); ?></a> |
-<?php else: ?>
- <span class="disabled">< <?php echo $this->_('Précédent'); ?></span> |
-<?php endif; ?>
-<!-- Numbered page links -->
-<?php foreach ($this->pagesInRange as $page): ?>
- <?php if ($page != $this->current): ?>
- <a href="<?php echo $this->url(array_merge($this->url_link, ['page' => $page])); ?>"><?php echo $page; ?></a> |
- <?php else: ?>
- <?= $page; ?> |
- <?php endif; ?>
-<?php endforeach; ?>
-
-<!-- Next page link -->
-<?php if (isset($this->next)): ?>
- <a href="<?php echo $this->url(array_merge($this->url_link, ['page' => $this->next])); ?>"><?php echo $this->_('Suivant'); ?> ></a>
-<?php else: ?>
- <span class="disabled"><?php echo $this->_('Suivant'); ?> ></span>
-<?php endif; ?>
-</div>
+ <div class="paginationControl">
+
+ <?php
+ if (isset($this->previous)) {
+ echo $this->tagAnchor(array_merge($this->url_link, ['page' => $this->previous]),
+ '< ' . $this->_('Précédent'),
+ $this->link_attribs);
+ } else {
+ echo $this->tag('span',
+ '< ' . $this->_('Précédent'),
+ ['class' => 'disabled']);
+ }
+ echo ' | ';
+ ?>
+
+
+ <?php
+ foreach ($this->pagesInRange as $page){
+ if ($page != $this->current) {
+ echo $this->tagAnchor(array_merge($this->url_link, ['page' => $page]),
+ $page,
+ $this->link_attribs);
+ }
+ else {
+ echo $page;
+ }
+
+ echo ' | ';
+ }
+ ?>
+
+ <?php
+ if (isset($this->next)) {
+ echo $this->tagAnchor(array_merge($this->url_link, ['page' => $this->next]),
+ $this->_('Suivant') . ' >',
+ $this->link_attribs);
+ } else {
+ echo $this->tag('span',
+ $this->_('Suivant') . ' >',
+ ['class' => 'disabled']);
+ }
+ ?>
+
+ </div>
<?php endif; ?>
diff --git a/library/ZendAfi/View/Helper/Accueil/Sito.php b/library/ZendAfi/View/Helper/Accueil/Sito.php
index 1903b35796116c5161f7424966acc55c8b01c712..8d9ff139c3a1d65927051627dbeaf1ca970aef2e 100644
--- a/library/ZendAfi/View/Helper/Accueil/Sito.php
+++ b/library/ZendAfi/View/Helper/Accueil/Sito.php
@@ -192,7 +192,7 @@ class SitoDisplayStrategy {
if (!$sites)
return '';
- $start = $this->page ? $this->page - 1 : 0;
+ $start = ($this->page ? $this->page - 1 : 0) * $nb_aff;
$sites = array_slice($sites, $start, $nb_aff);
return $this->_renderSites($sites);
@@ -253,7 +253,9 @@ class SelectedStrategy extends SitoDisplayStrategy {
'controller' => 'sito',
'action' => 'widget-page',
'id_module' => $this->id_module,
- 'id_division' => $this->division]]);
+ 'id_division' => $this->division],
+ 'link_attribs' => [ 'data-reload-module' => 'true' ]
+ ]);
}
}
diff --git a/public/opac/js/division-five.js b/public/opac/js/division-five.js
index 51737f70a7c4af8a0b9f0d3b01a629cfa7f6948f..0018484b131f12bc15122bea2ba85377317df196 100644
--- a/public/opac/js/division-five.js
+++ b/public/opac/js/division-five.js
@@ -4,7 +4,7 @@ var initializeDivisionFive = function () {
var default_position = division.find('.colFlottantInner .boite').position.left;
var boite_titre = division.find('.boite .titre');
var boite = division.find('.boite');
-
+
boite.addClass('collapsed');
@@ -25,6 +25,9 @@ var initializeDivisionFive = function () {
$.fn.boiteShowContent =
function() {
+ if ($(this).closest('.colFlottant').length == 0)
+ return $(this);
+
var contenu = $(this).find('.contenu');
contenu.slideToggle('400',initScroll(contenu));
return $(this);
diff --git a/public/opac/js/reload_module.js b/public/opac/js/reload_module.js
index 0b238ac6a100318b0a33a2da393c80b610d8f056..232f25edaeedd417367b682f260cbf1e9dfbd6be 100644
--- a/public/opac/js/reload_module.js
+++ b/public/opac/js/reload_module.js
@@ -6,6 +6,7 @@
boite.empty().append(new_content);
initializeDivisionFive();
initializePopups();
+ initializeReloadModule();
boite
.boiteSlideToRight()
.boiteShowContent();
@@ -13,3 +14,12 @@
return this;
}
})(jQuery);
+
+
+function initializeReloadModule() {
+ $('a[data-reload-module="true"]').click(function(event) {
+ event.preventDefault();
+
+ $(this).closest('.boite').reload($(this).attr('href'));
+ });
+}
diff --git a/public/opac/js/subModal.js b/public/opac/js/subModal.js
index 40265c12db3e38ef1304d2066d4fea38b2475955..b99c1996facc490080d0b1e9eb3a37de9795469f 100644
--- a/public/opac/js/subModal.js
+++ b/public/opac/js/subModal.js
@@ -7,10 +7,10 @@
window.initializePopups = function() {
$('[data-popup="true"]')
.unbind('click').click(function(event){
- event.preventDefault();
- current_anchor=$(this);
- addLoadingClass();
- opacDialogFromUrl(addPath($(this).attr('href'),'/render/popup'));
+ event.preventDefault();
+ current_anchor=$(this);
+ addLoadingClass();
+ opacDialogFromUrl(addPath($(this).attr('href'),'/render/popup'));
});
}
@@ -29,11 +29,11 @@
updateAndDestroyCKEditor();
event.preventDefault();
$.ajax({
- type: "POST",
- url: form.attr('action'),
- data: form.serialize(),
- dataType: 'json',
- success: function(data) {
+ type: "POST",
+ url: form.attr('action'),
+ data: form.serialize(),
+ dataType: 'json',
+ success: function(data) {
opacDialogClose();
opacDialogFromData(data);
}
@@ -42,19 +42,19 @@
}
- var updateAndDestroyCKEditor = function() {
- if (undefined == window.CKEDITOR)
- return;
+ var updateAndDestroyCKEditor = function() {
+ if (undefined == window.CKEDITOR)
+ return;
- for ( instance in CKEDITOR.instances )
- CKEDITOR.instances[instance].updateElement();
+ for ( instance in CKEDITOR.instances )
+ CKEDITOR.instances[instance].updateElement();
- for ( instance in CKEDITOR.instances ) {
- var i = CKEDITOR.instances[instance];
- i.destroy();
- }
- }
-
+ for ( instance in CKEDITOR.instances ) {
+ var i = CKEDITOR.instances[instance];
+ i.destroy();
+ }
+ }
+
function initModalSize(width, height) {
@@ -67,8 +67,8 @@
var onOpen = function() {
initializePopups();
- addLoadingClass();
- // setTimeout(initializeFormTabs, 1000);
+ addLoadingClass();
+ // setTimeout(initializeFormTabs, 1000);
}
@@ -95,10 +95,10 @@
var modal_size = initModalSize(width, height);
popupDialog = $('<iframe src="'+url+'" style="min-width:95%"></div>')
.dialog({width: modal_size['width'],
- height: modal_size['height'],
- close: returnFunc,
- modal:true,
- title: titleDialog});
+ height: modal_size['height'],
+ close: returnFunc,
+ modal:true,
+ title: titleDialog});
}
@@ -110,9 +110,9 @@
window.opacShowModalConnection = function(data, returnFunc ,width ,height ) {
var modal_size = initModalSize(width, height);
opacShowModal(data['redirect'],
- modal_size['width'] ,
- modal_size['height'],
- returnFunc);
+ modal_size['width'] ,
+ modal_size['height'],
+ returnFunc);
}
@@ -147,10 +147,10 @@
show_modal=true;
var position = (data['position'] != undefined) ?
- data['position'] :
- { my: "center bottom",
- at: "center center",
- of: window };
+ data['position'] :
+ { my: "center bottom",
+ at: "center center",
+ of: window };
//pour que le dialogue soit en dessous de la notification
if ($("#info_message").size())
@@ -163,7 +163,7 @@
width:modal_size['width'],
height:modal_size['height'],
modal:show_modal,
- dialogClass: dialogClass,
+ dialogClass: dialogClass,
close:onClose,
open:onOpen,
position: position
@@ -173,30 +173,30 @@
window.addLoadingClass = function () {
- if (current_anchor == undefined)
- return;
- current_anchor.addClass(loading);
- }
-
-
- window.initializeFormTabs = function() {
- var dialog_form = $('#opac-dialog form');
- if (!dialog_form.length)
- return;
-
- var tabs = $('<ul></ul>');
- $('fieldset').each(function(index, element) {
- var fieldset = $(element);
- fieldset.attr('id', 'tab'+index)
- var legend = fieldset.find('legend');
-
- tabs.append('<li><a href="#tab'+index+'">'
- +legend.text()
- +'</a></li>');
- legend.remove();
- });
- dialog_form.prepend(tabs).tabs();
- }
+ if (current_anchor == undefined)
+ return;
+ current_anchor.addClass(loading);
+ }
+
+
+ window.initializeFormTabs = function() {
+ var dialog_form = $('#opac-dialog form');
+ if (!dialog_form.length)
+ return;
+
+ var tabs = $('<ul></ul>');
+ $('fieldset').each(function(index, element) {
+ var fieldset = $(element);
+ fieldset.attr('id', 'tab'+index)
+ var legend = fieldset.find('legend');
+
+ tabs.append('<li><a href="#tab'+index+'">'
+ +legend.text()
+ +'</a></li>');
+ legend.remove();
+ });
+ dialog_form.prepend(tabs).tabs();
+ }
})()
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php b/tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php
index 2bde339cd9fa17072d07552f2f4d905ea373d7e6..36d15958a16d7a4a15e02e071b44ff3aaddb67d3 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php
@@ -127,6 +127,61 @@ class SitoViewHelperSelectItemsBySelectionOrderTest extends SitoViewHelperTestCa
+class SitoViewHelperSelectItemsBySelectionOrderPaginationTest extends SitoViewHelperTestCase {
+ protected $_preferences = ['titre' => 'Ma sito',
+ 'type_aff' => 1,
+ 'id_items' => '12-15',
+ 'id_categorie' => '',
+ 'nb_aff' => 1,
+ 'display_order' => 'Selection'];
+
+ /** @test */
+ public function firstPageShoulNotContainsRMLL() {
+ $this->assertNotXPathContentContains($this->html,
+ '//div/div[1]//h2//a',
+ 'RMLL');
+ }
+
+
+ /** @test */
+ public function firstSiteShouldBeFOSDEM() {
+ $this->assertXPathContentContains($this->html,
+ '//div/div[1]//h2//a',
+ 'FOSDEM');
+ }
+
+
+ /** @test */
+ public function onSecondPageSiteShouldBeRMLL() {
+ $this->_helper->setPage(2);
+ $this->html = $this->_helper->getBoite();
+ $this->assertXPathContentContains($this->html,
+ '//div/div[1]//h2//a',
+ 'RMLL');
+ }
+
+
+ /** @test */
+ public function paginatorShouldBePresent() {
+ $this->assertXPath($this->html, '//div[@class="paginationControl"]');
+ }
+
+
+ /** @test */
+ public function paginatorNextLinkShouldBeEnabled() {
+ $this->assertXPathContentContains($this->html, '//div[@class="paginationControl"]//a[contains(@href, "sito/widget-page/id_module/2/id_division/1/page/2")]', 'Suivant');
+ }
+
+
+ /** @test */
+ public function paginatorPreviousLinkShouldBeDisabled() {
+ $this->assertXPathContentContains($this->html, '//div[@class="paginationControl"]//span[@class="disabled"]', utf8_encode('Précédent'));
+ }
+}
+
+
+
+
class SitoViewHelperSelectItemsByRandomOrderTest extends SitoViewHelperTestCase {
protected $_preferences = ['titre' => 'Ma sito',
'type_aff' => 1,