From 39ef973ffe352e0810e84aab050ddb718e40ece2 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Tue, 2 May 2017 15:08:33 +0200
Subject: [PATCH] fix merge
---
.../modules/admin/views/scripts/catalogue/tester.phtml | 2 +-
.../modules/admin/views/scripts/cms/delete.phtml | 2 +-
.../views/scripts/custom-fields-report/edit.phtml | 2 +-
.../admin/views/scripts/custom-fields/index.phtml | 2 +-
.../modules/admin/views/scripts/frbr-link/index.phtml | 2 +-
.../modules/admin/views/scripts/lieu/index.phtml | 2 +-
.../views/scripts/newsletter/edit-subscribers.phtml | 2 +-
.../modules/admin/views/scripts/print/index.phtml | 2 +-
.../admin/views/scripts/systeme/cacheimages.phtml | 6 +++---
.../Controller/Action/Helper/AbstractListViewMode.php | 2 +-
library/ZendAfi/View/Helper/Admin/Button/Back.php | 2 +-
library/ZendAfi/View/Helper/Admin/Button/Cancel.php | 4 ++--
library/ZendAfi/View/Helper/Admin/Button/Continue.php | 2 +-
library/ZendAfi/View/Helper/Admin/Button/New.php | 2 +-
library/ZendAfi/View/Helper/Admin/Button/Submit.php | 4 ++--
library/ZendAfi/View/Helper/Admin/Menus.php | 4 ++--
.../ZendAfi/View/Helper/Admin/RenderVersionForm.php | 10 +++++-----
library/ZendAfi/View/Helper/Admin/SearchUsers.php | 2 +-
library/ZendAfi/View/Helper/Admin/UpdateSkins.php | 2 +-
19 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/application/modules/admin/views/scripts/catalogue/tester.phtml b/application/modules/admin/views/scripts/catalogue/tester.phtml
index eb4830e5ee1..3ae8ee9066a 100644
--- a/application/modules/admin/views/scripts/catalogue/tester.phtml
+++ b/application/modules/admin/views/scripts/catalogue/tester.phtml
@@ -49,6 +49,6 @@ if($this->notices)
->setUrl($this->url(['action' => 'edit',
'id_catalogue' => $this->catalogue->getId()]))
->setImage($this->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'configuration'))));
?>
diff --git a/application/modules/admin/views/scripts/cms/delete.phtml b/application/modules/admin/views/scripts/cms/delete.phtml
index 26c27c3c32e..43b2ec9291a 100644
--- a/application/modules/admin/views/scripts/cms/delete.phtml
+++ b/application/modules/admin/views/scripts/cms/delete.phtml
@@ -24,7 +24,7 @@ echo $this->Button((new Class_Entity())
->setUrl($this->url(['action' => 'force-delete']))
->setText($this->_('Supprimer'))
->setImage($this->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons', 'remove'))));
+ ->getIconUrl('buttons', 'remove'))));
echo $this->Button_Back((new Class_Entity())
->setUrl($this->url(['module' => 'admin',
diff --git a/application/modules/admin/views/scripts/custom-fields-report/edit.phtml b/application/modules/admin/views/scripts/custom-fields-report/edit.phtml
index ae45eb76542..92ba235c820 100644
--- a/application/modules/admin/views/scripts/custom-fields-report/edit.phtml
+++ b/application/modules/admin/views/scripts/custom-fields-report/edit.phtml
@@ -3,7 +3,7 @@ echo $this->renderForm($this->form,
['prepend' => [$this->button(
(new Class_Entity())->setText($this->_('Générer'))
->setAttribs(['id' => 'generate'])
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('actions',
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('actions',
'test'),
['style' => 'filter: invert();'])))]]);
diff --git a/application/modules/admin/views/scripts/custom-fields/index.phtml b/application/modules/admin/views/scripts/custom-fields/index.phtml
index 0375c7adf30..16df233e50a 100644
--- a/application/modules/admin/views/scripts/custom-fields/index.phtml
+++ b/application/modules/admin/views/scripts/custom-fields/index.phtml
@@ -2,7 +2,7 @@
echo $this->button((new Class_Entity())
->setText($this->_('Types de champs personnalisés'))
->setUrl($this->url(['controller' => 'custom-fields-meta']))
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('buttons', 'configuration'))));
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('buttons', 'configuration'))));
echo $this->customFieldsCategories($this->model);
?>
diff --git a/application/modules/admin/views/scripts/frbr-link/index.phtml b/application/modules/admin/views/scripts/frbr-link/index.phtml
index fb17a6471a6..946e1288a0b 100644
--- a/application/modules/admin/views/scripts/frbr-link/index.phtml
+++ b/application/modules/admin/views/scripts/frbr-link/index.phtml
@@ -2,7 +2,7 @@
echo $this->button((new Class_Entity())
->setText($this->_('Gérer les types de relation'))
->setUrl($this->url(['controller' => 'frbr-linktype']))
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('buttons',
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('buttons',
'configuration'))));
echo $this->Button_New((new Class_Entity())
diff --git a/application/modules/admin/views/scripts/lieu/index.phtml b/application/modules/admin/views/scripts/lieu/index.phtml
index e65b8ddafd0..8403cfa75cb 100644
--- a/application/modules/admin/views/scripts/lieu/index.phtml
+++ b/application/modules/admin/views/scripts/lieu/index.phtml
@@ -5,7 +5,7 @@ echo $this->Button_New((new Class_Entity())
echo $this->button((new Class_Entity())
->setText($this->_('Mettre à jour les coordonnées des lieux'))
->setUrl($this->url(['action' => 'update-coordinates']))
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('buttons',
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('buttons',
'generate'))));
diff --git a/application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml b/application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml
index f03b7395614..c1f138dbf63 100644
--- a/application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml
+++ b/application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml
@@ -11,7 +11,7 @@ echo $this->button((new Class_Entity())
->setAttribs(['data-popup' => 'true',
'onclick' => ''])
->setImage($this->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'add_user'),
['style' => 'filter: invert();'])));
diff --git a/application/modules/admin/views/scripts/print/index.phtml b/application/modules/admin/views/scripts/print/index.phtml
index 92f46406828..2e5e11bcbb5 100644
--- a/application/modules/admin/views/scripts/print/index.phtml
+++ b/application/modules/admin/views/scripts/print/index.phtml
@@ -3,7 +3,7 @@ echo $this->Button_New((new Class_Entity())->setText($this->_('Créer')));
echo $this->button((new Class_Entity())
->setImage($this->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'generate')))
->setText($this->_('Générer'))
->setUrl($this->url(['controller' => 'print',
diff --git a/application/modules/admin/views/scripts/systeme/cacheimages.phtml b/application/modules/admin/views/scripts/systeme/cacheimages.phtml
index 25134595fab..e29579cd306 100644
--- a/application/modules/admin/views/scripts/systeme/cacheimages.phtml
+++ b/application/modules/admin/views/scripts/systeme/cacheimages.phtml
@@ -15,17 +15,17 @@ echo'<h2>Actions</h2>';
echo $this->button(
(new Class_Entity())->setText($this->_('Vider la totalité du cache'))
->setUrl($this->url(['mode' => 'reset_all']))
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('actions', 'delete'),
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('actions', 'delete'),
['style' => 'filter: invert();'])));
echo $this->button(
(new Class_Entity())->setText($this->_('Réinitialiser les vignettes non reconnues'))
->setUrl($this->url(['mode' => 'reset_no']))
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('buttons', 'generate'))));
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('buttons', 'generate'))));
echo $this->button(
(new Class_Entity())->setText($this->_('Constitution du cache'))
->setAttribs(['onclick' => 'makeCacheImages(); return false;'])
- ->setImage($this->tagImg(Class_Admin_Skin::current()->renderIconUrlOn('actions', 'down'),
+ ->setImage($this->tagImg(Class_Admin_Skin::current()->getIconUrl('actions', 'down'),
['style' => 'filter: invert();'])));
// Constitution du cache des images
diff --git a/library/ZendAfi/Controller/Action/Helper/AbstractListViewMode.php b/library/ZendAfi/Controller/Action/Helper/AbstractListViewMode.php
index 1c81fb68e2c..8d5fae1198a 100644
--- a/library/ZendAfi/Controller/Action/Helper/AbstractListViewMode.php
+++ b/library/ZendAfi/Controller/Action/Helper/AbstractListViewMode.php
@@ -293,7 +293,7 @@ abstract class ZendAfi_Controller_Action_Helper_AbstractListViewMode extends Zen
[$view->button((new Class_Entity())
->setText($this->_form_settings->getSearchText())
->setImage($view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'loupe'),
['style' => 'filter: invert();']))
->setAttribs(['onclick' => "var form=$(this).parents('form'); if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').prevAll('form');if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').nextAll('form');form.submit(); return false;",
diff --git a/library/ZendAfi/View/Helper/Admin/Button/Back.php b/library/ZendAfi/View/Helper/Admin/Button/Back.php
index 7657df4f1ee..e5af79cd628 100644
--- a/library/ZendAfi/View/Helper/Admin/Button/Back.php
+++ b/library/ZendAfi/View/Helper/Admin/Button/Back.php
@@ -30,7 +30,7 @@ class ZendAfi_View_Helper_Admin_Button_Back extends ZendAfi_View_Helper_Button_B
protected function _getDefaultButton($attribs) {
return parent::_getDefaultButton($attribs)
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'back')));
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/Button/Cancel.php b/library/ZendAfi/View/Helper/Admin/Button/Cancel.php
index 728c6329cea..75e20fd554d 100644
--- a/library/ZendAfi/View/Helper/Admin/Button/Cancel.php
+++ b/library/ZendAfi/View/Helper/Admin/Button/Cancel.php
@@ -33,8 +33,8 @@ class ZendAfi_View_Helper_Admin_Button_Cancel extends ZendAfi_View_Helper_Button
protected function _getDefaultButton($attribs) {
return parent::_getDefaultButton($attribs)
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
- 'remove')))
+ ->getIconUrl('buttons',
+ 'remove')))
->setOnFormChange('$(\'button.undo\').removeAttr(\'disabled\');');
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/Button/Continue.php b/library/ZendAfi/View/Helper/Admin/Button/Continue.php
index df5b8f92eaa..8ed2d5ddac3 100644
--- a/library/ZendAfi/View/Helper/Admin/Button/Continue.php
+++ b/library/ZendAfi/View/Helper/Admin/Button/Continue.php
@@ -33,7 +33,7 @@ class ZendAfi_View_Helper_Admin_Button_Continue extends ZendAfi_View_Helper_Butt
protected function _getDefaultButton($attribs) {
return parent::_getDefaultButton($attribs)
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'validate')))
->setOnFormChange('$(\'button.continue\').removeAttr(\'disabled\');');
}
diff --git a/library/ZendAfi/View/Helper/Admin/Button/New.php b/library/ZendAfi/View/Helper/Admin/Button/New.php
index 5e522c19096..425cbe258da 100644
--- a/library/ZendAfi/View/Helper/Admin/Button/New.php
+++ b/library/ZendAfi/View/Helper/Admin/Button/New.php
@@ -31,7 +31,7 @@ class ZendAfi_View_Helper_Admin_Button_New extends ZendAfi_View_Helper_Button_Ne
protected function _getDefaultButton($attribs) {
return parent::_getDefaultButton($attribs)
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'add')));
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/Button/Submit.php b/library/ZendAfi/View/Helper/Admin/Button/Submit.php
index 5306454cef2..875a052ffc2 100644
--- a/library/ZendAfi/View/Helper/Admin/Button/Submit.php
+++ b/library/ZendAfi/View/Helper/Admin/Button/Submit.php
@@ -33,8 +33,8 @@ class ZendAfi_View_Helper_Admin_Button_Submit extends ZendAfi_View_Helper_Button
protected function _getDefaultButton($attribs) {
return parent::_getDefaultButton($attribs)
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
- 'validate')))
+ ->getIconUrl('buttons',
+ 'validate')))
->setOnFormChange('$(\'button.validate\').removeAttr(\'disabled\');');
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/Menus.php b/library/ZendAfi/View/Helper/Admin/Menus.php
index 6b2a7545b05..5c05d6c2a54 100644
--- a/library/ZendAfi/View/Helper/Admin/Menus.php
+++ b/library/ZendAfi/View/Helper/Admin/Menus.php
@@ -51,7 +51,7 @@ class ZendAfi_View_Helper_Admin_Menus extends Zendafi_View_Helper_Basehelper {
protected function _tagDuplicateNav() {
return $this->view->tagAnchor($this->view->url(['action' => 'duplicate-horizontal-menu']),
$this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'copy_module')),
['onclick' => sprintf('if(!confirm(\'%s\'))return false;',
$this->_('Êtes vous sûr de vouloir dupliquer la configuration du menu horizontal à tous les autres profils ? Cela supprimera la configuration existante pour les autres profils')),
@@ -65,7 +65,7 @@ class ZendAfi_View_Helper_Admin_Menus extends Zendafi_View_Helper_Basehelper {
'id' => $id,
'id_profil' => $this->_profil->getId()]),
$this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'delete')),
['onclick' => sprintf('if(!confirm(\'%s\'))return false;',
$this->_('Êtes vous sûr de vouloir supprimer le menu ?')),
diff --git a/library/ZendAfi/View/Helper/Admin/RenderVersionForm.php b/library/ZendAfi/View/Helper/Admin/RenderVersionForm.php
index 51bdb201c31..698d455853f 100644
--- a/library/ZendAfi/View/Helper/Admin/RenderVersionForm.php
+++ b/library/ZendAfi/View/Helper/Admin/RenderVersionForm.php
@@ -82,7 +82,7 @@ $('#" . $form->getId() . "').find('fieldset').each(function(i, elem) {
$back = (new Class_Entity())
->setText($this->_('Précédente'))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons', 'left')))
+ ->getIconUrl('buttons', 'left')))
->setAttribs(['disabled' => 'disabled',
'title' => $this->_('Pas de version précédente')]);
@@ -99,7 +99,7 @@ $('#" . $form->getId() . "').find('fieldset').each(function(i, elem) {
$forward = (new Class_Entity())
->setText($this->_('Suivante'))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons', 'right')))
+ ->getIconUrl('buttons', 'right')))
->setAttribs(['disabled' => 'disabled',
'title' => $this->_('Pas de version suivante')]);
@@ -118,7 +118,7 @@ $('#" . $form->getId() . "').find('fieldset').each(function(i, elem) {
->setUrl($this->view->url(['key' => null, 'action' => 'versions']))
->setText($this->_('Liste complète'))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'liste'),
['style' => 'filter: invert();'])));
}
@@ -131,7 +131,7 @@ $('#" . $form->getId() . "').find('fieldset').each(function(i, elem) {
$apply = (new Class_Entity())
->setText($this->_('Rétablir'))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions', 'rollback'),
+ ->getIconUrl('actions', 'rollback'),
['style' => 'filter: invert();']))
->setAttribs(['disabled' => 'disabled',
'title' => $this->_('Aucune différence avec les donnnées actuelles')]);
@@ -154,7 +154,7 @@ $('#" . $form->getId() . "').find('fieldset').each(function(i, elem) {
->setUrl($url)
->setAttribs(['onclick' => "if (confirm('" . htmlspecialchars($this->_('Êtes-vous sur de vouloir supprimer cette version de l\\\'historique ?')) . "')) { window.location.href='" . $url ."'}; return false;"])
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons', 'remove')));
+ ->getIconUrl('buttons', 'remove')));
return $this->view->Button($delete);
}
diff --git a/library/ZendAfi/View/Helper/Admin/SearchUsers.php b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
index 6d9cf809481..3bcc022348a 100644
--- a/library/ZendAfi/View/Helper/Admin/SearchUsers.php
+++ b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
@@ -40,7 +40,7 @@ class ZendAfi_View_Helper_Admin_SearchUsers extends ZendAfi_View_Helper_BaseHelp
[$this->view->button((new Class_Entity())
->setText($this->_('Rechercher'))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('actions',
+ ->getIconUrl('actions',
'loupe'),
['style' => 'filter: invert();']))
->setAttribs(['onclick' => "var form=$(this).parents('form'); if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').prevAll('form');if (!form.size()) form=$(this).parents('.boutons, .admin-buttons').nextAll('form');form.submit(); return false;",
diff --git a/library/ZendAfi/View/Helper/Admin/UpdateSkins.php b/library/ZendAfi/View/Helper/Admin/UpdateSkins.php
index 978585251c4..74f60e610d5 100644
--- a/library/ZendAfi/View/Helper/Admin/UpdateSkins.php
+++ b/library/ZendAfi/View/Helper/Admin/UpdateSkins.php
@@ -34,7 +34,7 @@ class ZendAfi_View_Helper_Admin_UpdateSkins extends ZendAfi_View_Helper_BaseHelp
->setText($this->_('Demander la mise à jour'))
->setUrl($this->view->url(['git' => 'pull']))
->setImage($this->view->tagImg(Class_Admin_Skin::current()
- ->renderIconUrlOn('buttons',
+ ->getIconUrl('buttons',
'generate'))));
$lis = '';
--
GitLab