From 36112d30f3603d6b8f910d42e50e334dbcdbc386 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Thu, 12 Jan 2017 16:02:43 +0100
Subject: [PATCH] dev #45275 fix feedback
---
library/Class/MultiSelection/Album.php | 6 +--
.../Helper/Plugin/MultiSelection/Widget.php | 27 ++++++----
.../View/Helper/RenderModelActions.php | 3 +-
public/admin/css/global.css | 21 ++++----
public/admin/skins/bokeh74/global.css | 51 ++++++++++++++-----
public/admin/skins/retro/global.css | 36 +++++++++----
6 files changed, 95 insertions(+), 49 deletions(-)
diff --git a/library/Class/MultiSelection/Album.php b/library/Class/MultiSelection/Album.php
index d69bd94af52..d4d63a92271 100644
--- a/library/Class/MultiSelection/Album.php
+++ b/library/Class/MultiSelection/Album.php
@@ -46,12 +46,12 @@ class Class_MultiSelection_Album extends Class_MultiSelection_Abstract {
$count = $models->count();
$visitor
- ->visitTitle($this->_('Sélection multiple d\'albums'))
+ ->visitTitle($this->_('Sélection d\'albums'))
->visitCount($this->_plural($count,
'',
- 'Vous avez sélectionné 1 album',
- 'Vous avez sélectionné %d albums',
+ 'Nombre d\'album sélectionné : 1',
+ 'Nombre d\'albums sélectionnés : %d',
$count))
->visitEditSelection($this->_plural($count,
diff --git a/library/ZendAfi/View/Helper/Plugin/MultiSelection/Widget.php b/library/ZendAfi/View/Helper/Plugin/MultiSelection/Widget.php
index 8e0ab82c494..912821784bb 100644
--- a/library/ZendAfi/View/Helper/Plugin/MultiSelection/Widget.php
+++ b/library/ZendAfi/View/Helper/Plugin/MultiSelection/Widget.php
@@ -47,7 +47,7 @@ class ZendAfi_View_Helper_Plugin_MultiSelection_Widget extends ZendAfi_View_Help
protected function _getTitle() {
- return $this->_tag('h3', $this->_title);
+ return $this->_tag('h4', $this->_title);
}
@@ -57,16 +57,21 @@ class ZendAfi_View_Helper_Plugin_MultiSelection_Widget extends ZendAfi_View_Help
protected function _getActions() {
- return implode([$this->view->tagAnchor($this->view->url(['action' => 'edit-multiple']),
- $this->_edit_selection,
- ['class' => 'multiple_widget_action']),
- $this->view->tagAnchor('#',
- $this->_show_selection,
- ['onclick' => "\$('.select_items_content').toggle();",
- 'class' => 'multiple_widget_action']),
- $this->view->tagAnchor($this->view->url(['action' => 'clear-models-selection']),
- $this->_clear_selection,
- ['class' => 'multiple_widget_action'])]);
+ $actions = implode([$this->view->tagAnchor($this->view->url(['action' => 'edit-multiple']),
+ $this->_('Modifier'),
+ ['class' => 'multiple_widget_action',
+ 'title' => $this->_edit_selection]),
+ $this->view->tagAnchor($this->view->url(['action' => 'clear-models-selection']),
+ $this->_('Vider'),
+ ['class' => 'multiple_widget_action',
+ 'title' => $this->_clear_selection]),
+ $this->view->tagAnchor('#',
+ $this->_('Afficher'),
+ ['class' => 'multiple_widget_action',
+ 'onclick' => "\$('.selected_items_widget').toggleClass('list');",
+ 'title' => $this->_show_selection])]);
+
+ return $this->_tag('div', $actions, ['class' => 'multiple_widget_actions']);
}
diff --git a/library/ZendAfi/View/Helper/RenderModelActions.php b/library/ZendAfi/View/Helper/RenderModelActions.php
index 6a8d74861b4..f830401aa5c 100644
--- a/library/ZendAfi/View/Helper/RenderModelActions.php
+++ b/library/ZendAfi/View/Helper/RenderModelActions.php
@@ -72,7 +72,8 @@ class ZendAfi_View_Helper_RenderModelAction {
$title = $this->_initTitle($model);
- $content = $this->_current_skin->renderActionIconOn($icon, $this->_view,
+ $content = $this->_current_skin->renderActionIconOn($icon,
+ $this->_view,
['alt' => $title,
'title' => $title,
'class' => 'ico'])
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index f947384a792..b7b977b96e5 100644
--- a/public/admin/css/global.css
+++ b/public/admin/css/global.css
@@ -1313,10 +1313,16 @@ div#reader {
background: #5F5F5F;
}
+.selected_items_widget.list .select_items_content {
+ max-height: 19em;
+ overflow: auto;
+}
+
.select_items_content {
- display: none;
- margin: auto;
- width: 90%;
+ max-height: 0;
+ overflow: hidden;
+ width: 100%;
+ transition: all 0.4s ease-out;
}
.multiple_widget_action {
@@ -1326,11 +1332,6 @@ div#reader {
vertical-align: middle;
}
-.selected_items_widget > div > h3,
-.selected_items_widget > div > p {
- display: none;
-}
-
.selected_items_widget > div {
margin: 1em 0;
padding: 1em 0;
@@ -1371,10 +1372,6 @@ div#reader {
background-color: rgba(0, 0 , 0 , 0.5);
}
-.album_index .selected_items_widget {
- display: none !important;
-}
-
.pager {
text-align: center;
margin-top: 5px;
diff --git a/public/admin/skins/bokeh74/global.css b/public/admin/skins/bokeh74/global.css
index 08bbd753ce7..c1144c8ac2e 100755
--- a/public/admin/skins/bokeh74/global.css
+++ b/public/admin/skins/bokeh74/global.css
@@ -291,7 +291,6 @@ table#suggestions td:last-child a {
border: 1px solid rgba(0, 0 , 0 , 0.8);
}
-
.main > .modules[style*="width:100%"] {
display: block;
float: none;
@@ -659,27 +658,55 @@ td[id*="menu_item"] {
display: none;
}
-.selected_items_widget > div > h3,
-.selected_items_widget > div > p {
- display: none;
-}
-
.selected_items_widget > div {
- margin: 1em 0;
- padding: 1em 0;
+ margin: 0.5em;
+ padding: 0.5em;
}
.multiple_widget_action {
display: inline-block;
text-align: center;
- width: 33%;
vertical-align: middle;
+ margin-left: 0.8em;
+}
+
+.multiple_widget_action[onclick*="list"] {
+ background-image: url('icons/actions/ouvrir_24.png');
+ background-repeat: no-repeat;
+ background-size: 0.8em;
+ background-position: right center;
+ padding-right: 1em;
+}
+
+.selected_items_widget.list .multiple_widget_action[onclick*="list"] {
+ background-image: url('icons/actions/fermer_24.png');
+}
+
+.selected_items_widget.list .select_items_content {
+ max-height: 19em;
+ overflow: auto;
}
.select_items_content {
- display: none;
- margin: auto;
- width: 80%;
+ max-height: 0;
+ overflow: hidden;
+ width: 100%;
+ transition: all 0.4s ease-out;
+}
+
+.selected_items_widget.show h4 ,
+.selected_items_widget.show p {
+ margin: 0;
+ padding: 0;
+}
+
+.selected_items_widget.show div.multiple_widget_actions,
+.selected_items_widget.show p {
+ display: inline-block;
+}
+
+.selected_items_widget.show div.multiple_widget_actions {
+ float: right;
}
.modules .form .multiple-selection-checkbox {
diff --git a/public/admin/skins/retro/global.css b/public/admin/skins/retro/global.css
index 1aeebbdd521..4d7259df16d 100755
--- a/public/admin/skins/retro/global.css
+++ b/public/admin/skins/retro/global.css
@@ -625,24 +625,40 @@ fieldset {
.multiple_widget_action {
display: inline-block;
text-align: center;
- width: 33%;
vertical-align: middle;
+ margin-left: 0.8em;
}
-.select_items_content {
- display: none;
- margin: auto;
- width: 80%;
+.selected_items_widget.list .select_items_content {
+ max-height: 19em;
+ overflow: auto;
}
-.selected_items_widget > div > h3,
-.selected_items_widget > div > p {
- display: none;
+.select_items_content {
+ max-height: 0;
+ overflow: hidden;
+ width: 100%;
+ transition: all 0.4s ease-out;
}
.selected_items_widget > div {
- margin: 1em 0;
- padding: 1em 0;
+ margin: 0.5em;
+ padding: 0.5em;
+}
+
+.selected_items_widget.show div.multiple_widget_actions,
+.selected_items_widget.show p {
+ display: inline-block;
+}
+
+.selected_items_widget.show h4 ,
+.selected_items_widget.show p {
+ margin: 0;
+ padding: 0;
+}
+
+.selected_items_widget.show div.multiple_widget_actions {
+ float: right;
}
.modules .form .multiple-selection-checkbox {
--
GitLab