dev #48349 : article delete screen cosmetics

application/modules/admin/views/scripts/cms/delete.phtml

@@ -9,24 +9,28 @@
     <li><?php echo $this->_('Nombre de formulaires : %s',
                             $this->model->numberOfFormulaires());?></li>
   <?php } ?>
+  <?php
+  if ($count = Class_Versions::forArticle($this->model)->count()) {
+    echo $this->tag('li', $this->_('Nombre de versions : %s', $count));
+  }
+  ?>
 </ul>
 
 <p class="error"><?php echo $this->_('Toutes les données de l\'article seront effacées !');?></p>
 
 <div class="boutons">
 <?php
-echo $this->bouton('url=' . $this->url(['action' => 'force-delete']),
-                   'picto=remove',
-                   'texte=' . $this->_('Supprimer'),
-                   'largeur=200px');
+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'))));
 
-echo $this->bouton('url=' . $this->url(['module' => 'admin',
+echo $this->Button_Back((new Class_Entity())
+                   ->setUrl($this->url(['module' => 'admin',
                                         'controller' => 'cms',
                                         'action' => 'index',
                                         'id_cat' => $this->model->getIdCat()],
-                                       null, true),
-                   'picto=remove',
-                   'texte=' . $this->_('Retour'),
-                   'largeur=200px');
+                                       null, true)));
 ?>
 </div>

library/Class/Version/FilePersistence.php

@@ -165,6 +165,15 @@ class Class_Version_FilePersistence extends Class_Entity {
   }
 
 
+  public function count($versions) {
+    if (!$versions->getName() || !$versions->getKey())
+      return 0;
+
+    $path = $this->_getFolderPath($versions);
+    return count($this->_filesIn($path));
+  }
+
+
   public function encode($version) {
     return json_encode($version->getData());
   }

library/Class/Versions.php

@@ -38,6 +38,11 @@ class Class_Versions {
   }
 
 
+  public static function forArticle($article) {
+    return new static('article', $article->getId());
+  }
+
+
   public function __construct($name, $key) {
     $this->_name = $name;
     $this->_key = $key;
@@ -79,6 +84,11 @@ class Class_Versions {
   }
 
 
+  public function count() {
+    return static::getPersistence()->count($this);
+  }
+
+
   public function findLastKey() {
     return static::getPersistence()->findLastKeyOf($this);
   }

library/ZendAfi/Controller/Plugin/Manager/Article.php

@@ -99,6 +99,7 @@ class ZendAfi_Controller_Plugin_Manager_Article extends ZendAfi_Controller_Plugi
                               {
                                 $plugin->notifyAfterDelete($article);
                               });
+    $this->_helper->notify($this->_view->_('Article supprimé'));
     $this->_redirect($this->_backDeleteUrl($article));
   }
 

library/ZendAfi/Controller/Plugin/Versionning/Article.php

@@ -164,6 +164,6 @@ class ZendAfi_Controller_Plugin_Versionning_Article
 
 
   protected function _versionsFor($model) {
-    return new Class_Versions('article', $model->getId());
+    return Class_Versions::forArticle($model);
   }
 }