Skip to content
Snippets Groups Projects
Commit 95e57a20 authored by llaffont's avatar llaffont
Browse files

Refacto déplacement des boîtes sur page d'accueil. On peut poser des boîtes dans la bannière

parent 02c4efdc
No related merge requests found
......@@ -39,7 +39,7 @@ class ZendAfi_View_Helper_Division extends ZendAfi_View_Helper_BaseHelper {
if (null === $content)
$content = $this->view->boitesDivision($profil, $division);
return sprintf('<div class="%1$s layout-division" id="layout-division-%6$s" style="%2$s">
return sprintf('<div class="%1$s layout-division" data-division="%6$s" style="%2$s">
<div id="%1$sInner" style="%3$s">%4$s %5$s</div>
</div>',
$html_id, $style, $style_inner, $barre_nav, $content, $division);
......
......@@ -25,7 +25,7 @@ function opacBlocksSorting(moduleSortUrl, currentProfilId) {
cursor: 'move',
connectWith: 'div.layout-division>div',
stop: function(event, ui){
var newDivision = $(ui.item).parents('div.layout-division').attr('id').split('-').pop();
var newDivision = $(ui.item).parents('div.layout-division').attr("data-division");
var newPosition = $(ui.item).prevAll('div[data-position]').length;
if (newDivision == $(ui.item).attr('data-division')
&& newPosition == $(ui.item).attr('data-position'))
......@@ -49,9 +49,9 @@ function opacBlocksSortingInitPositions() {
$("div.layout-division>div>div").each(function(k, item) {
if ("barre_nav" == $(item).attr("class"))
return;
var division = $(item).parents("div.layout-division").attr("id").split("-").pop();
var division = $(item).parents("div.layout-division").attr("data-division");
$(item).attr("data-position", currentPositions[division-1]);
currentPositions[division-1]++;
$(item).attr("data-division", division);
});
}
\ No newline at end of file
}
......@@ -46,6 +46,9 @@ class AgendaSQYImportTest extends Storm_Test_ModelTestCase {
static::$_lieu_loader = Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Lieu')
->whenCalled('save')->answers(true)
->whenCalled('findFirstBy')->answers(null)
->whenCalled('findFirstBy')
->with(['libelle' => 'Médiathèque Anatole-France'])
->answers(Class_Lieu::newInstanceWithId(44, ['libelle' => 'Médiathèque Anatole-France',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment