Evolution #673: Modération plus rapide/facile

src/Muzich/AdminBundle/Controller/Moderate_comment/EditController.php

@@ -5,6 +5,7 @@ namespace Muzich\AdminBundle\Controller\Moderate_comment;
 use Muzich\CoreBundle\lib\Controller as BaseController;
 use Muzich\CoreBundle\Managers\CommentsManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 class EditController extends BaseController
 {
@@ -49,8 +50,19 @@ class EditController extends BaseController
     
     $this->getDoctrine()->getEntityManager()->flush();
     
-    $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
-    return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    }
+    return $this->getJsonEmptyResponse();
+  }
+  
+  protected function getJsonEmptyResponse()
+  {
+    $response = new Response(json_encode(array()));
+    $response->headers->set('Content-Type', 'application/json; charset=utf-8');
+    return $response;
   }
   
   public function refuseAction($element_id, $date)
@@ -76,8 +88,12 @@ class EditController extends BaseController
     $this->getDoctrine()->getEntityManager()->persist($element);
     $this->getDoctrine()->getEntityManager()->flush();
     
-    $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
-    return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    }
+    return $this->getJsonEmptyResponse();
   }
   
 }

src/Muzich/AdminBundle/Controller/Moderate_tag/EditController.php

@@ -5,6 +5,7 @@ namespace Muzich\AdminBundle\Controller\Moderate_tag;
 use Admingenerated\MuzichAdminBundle\BaseModerate_tagController\EditController as BaseEditController;
 use Muzich\CoreBundle\Managers\TagManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 class EditController extends BaseEditController
 {
@@ -28,8 +29,19 @@ class EditController extends BaseEditController
     $tagManager = new TagManager();
     $tagManager->moderateTag($this->getDoctrine(), $tag, true);
     
-    $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
-    return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_tag_list" ));
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_tag_list" ));
+    }
+    return $this->getJsonEmptyResponse();
+  }
+  
+  protected function getJsonEmptyResponse()
+  {
+    $response = new Response(json_encode(array()));
+    $response->headers->set('Content-Type', 'application/json; charset=utf-8');
+    return $response;
   }
   
   public function refuseAction($pk)
@@ -57,8 +69,12 @@ class EditController extends BaseEditController
     
     $this->getDoctrine()->getEntityManager()->flush();
     
-    $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
-    return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_tag_list" ));
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_tag_list" ));
+    }
+    return $this->getJsonEmptyResponse();
   }
   
 }

src/Muzich/AdminBundle/Resources/config/Moderate_element-generator.yml

@@ -35,9 +35,11 @@ builders:
           params:
             pk: "{{ Element.id }}"
           confirm: Sure to ACCEPT and CLEAN ?
-        refuse:
+          icon: icon-ok-sign
+        reject:
           route: Muzich_AdminBundle_Moderate_element_refuse
           params:
             pk: "{{ Element.id }}"
           confirm: Sure to REFUSE and REMOVE ?
+          icon: icon-trash
         list: ~

src/Muzich/AdminBundle/Resources/config/Moderate_tag-generator.yml

@@ -14,10 +14,12 @@ builders:
       object_actions:
         accept:
           route: Muzich_AdminBundle_Moderate_tag_accept
-          confirm: Sure to ACCEPT ?
+          icon: icon-ok-sign
+          class: moderate_accept
         refuse:
           route: Muzich_AdminBundle_Moderate_tag_refuse
-          confirm: Sure to REFUSE ?
+          icon: icon-trash
+          class: moderate_refuse
       sort: [ tomoderate, DESC ]
       scopes:
         moderation: 

src/Muzich/AdminBundle/Resources/views/Dashboard/dashboard.html.twig~HEAD

@@ -1,19 +0,0 @@
-{% extends base_admin_template %}
-
-{% block body %}    
-    <div class="row-fluid">
-      <div class="span3">
-        <div class="well well-small sidebar-nav">
-          {{ knp_menu_render('dashboard') }}
-        </div><!--/.well -->
-      </div><!--/span-->
-      <div class="span9">
-          {% block content %}
-          {% endblock %}
-      </div><!--/span-->
-    </div><!--/row-->
-{% endblock %}
-    
-{% block javascripts %}
-    {{ parent() }}
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Dashboard/welcome.html.twig~HEAD

@@ -1,17 +0,0 @@
-{% extends 'MuzichAdminBundle:Dashboard:dashboard.html.twig' %}
-
-{% block title %}Admingenerator{% endblock %}
-
-{% block content %}
-    <div class="hero-unit">          
-      {% block page_title %}
-          <header>
-              <h1>Muzi.ch Admin</h1>
-          </header>
-      {% endblock %}
-      <p>Administration interface of muzi.ch.</p>
-    </div>
-    <div class="row-fluid">
-      Ici prendron place les données statistiques
-    </div><!--/row-->
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Moderate_commentList/list.html.twig

@@ -66,17 +66,14 @@
               {% block list_object_actions %}
                 <td class="actions">
                   
-                  <a class="" href="{{ path("Muzich_AdminBundle_Moderate_comment_accept", { 'element_id': Comment.element_id, 'date' : Comment.date }) }}"
-                     data-confirm="{% trans from "Admingenerator" %}Sure to ACCEPT ?{% endtrans %}"
+                  <a class="moderate_accept" href="{{ path("Muzich_AdminBundle_Moderate_comment_accept", { 'element_id': Comment.element_id, 'date' : Comment.date }) }}"
                      rel="tooltip" data-original-title="{% trans from "Admingenerator" %}Accept{% endtrans %}">
-                    <i class="icon-asterisk"></i>
+                    <i class="icon-ok-sign"></i>
                   </a>
                   
-                                              
-                  <a class="" href="{{ path("Muzich_AdminBundle_Moderate_comment_refuse", { 'element_id': Comment.element_id, 'date' : Comment.date }) }}"
-                     data-confirm="{% trans from "Admingenerator" %}Sure to REFUSE ?{% endtrans %}"
+                  <a class="moderate_refuse" href="{{ path("Muzich_AdminBundle_Moderate_comment_refuse", { 'element_id': Comment.element_id, 'date' : Comment.date }) }}"
                      rel="tooltip" data-original-title="{% trans from "Admingenerator" %}Refuse{% endtrans %}">
-                    <i class="icon-asterisk"></i>
+                    <i class="icon-trash"></i>
                   </a>
                 
                 </td>

src/Muzich/AdminBundle/Resources/views/base_admin_assetic_less.html.twig

@@ -48,6 +48,8 @@
     <link rel="stylesheet" href="{{ asset('css/jquery-ui-1.10.1.autocomplete.min.css') }}" type="text/css" media="all" />
     <script type="text/javascript" src="{{ asset('js/jquery-ui-1.10.1.autocomplete.min.js') }}"></script>
     
+    <script type="text/javascript" src="{{ asset('js/admin.js') }}"></script>
+    
   </head>
 
   <body>

src/Muzich/AdminBundle/Resources/views/base_admin_assetic_less.html.twig~HEAD

@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>{% block title %}Admin{% endblock %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    {% block scripts_head %}
-        <!-- jquery.min.js -->
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-1.8.3.min.js') }}"></script>
-        
-        <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-        <!--[if lt IE 9]>
-            <script src="{{ asset('bundles/admingeneratorgenerator/js/html5shiv/html5.js') }}"></script>
-        <![endif]-->
-    {% endblock %}
-
-    {% block stylesheets %}
-        <!-- bootstrap.min.css -->
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/bootstrap/bootstrap.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/bootstrap/bootstrap-extended.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/bootstrap/bootstrap-datepicker.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/google/prettify.css') }}" type="text/css" media="all" />
-                    
-        <!-- bootstrap-responsive.min.css -->
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/bootstrap/bootstrap-responsive.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/bootstrap/bootstrap-responsive-extended.css') }}" type="text/css" media="all" />
-        
-        <!-- admingenerator.min.css -->
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/general.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/nested-list.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/collection.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/upload.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/filetypeicons.css') }}" type="text/css" media="all" />
-        <link rel="stylesheet" href="{{ asset('bundles/admingeneratorgenerator/css/admingenerator/form/single-upload.css') }}" type="text/css" media="all" />
-    {% endblock %}
-
-    {% block icons %}
-        <!-- Favicon and touch icons -->
-        <link rel="shortcut icon" href="{{ asset('bundles/admingeneratorgenerator/ico/favicon.ico') }}">
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ asset('bundles/admingeneratorgenerator/ico/apple-touch-icon-144-precomposed.png') }}">
-        <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ asset('bundles/admingeneratorgenerator/ico/apple-touch-icon-114-precomposed.png') }}">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ asset('bundles/admingeneratorgenerator/ico/apple-touch-icon-72-precomposed.png') }}">
-        <link rel="apple-touch-icon-precomposed" href="{{ asset('bundles/admingeneratorgenerator/ico/apple-touch-icon-57-precomposed.png') }}">
-    {% endblock %}
-    
-    
-    <link rel="stylesheet" href="{{ asset('css/jquery-ui-1.10.1.autocomplete.min.css') }}" type="text/css" media="all" />
-    <script type="text/javascript" src="{{ asset('js/jquery-ui-1.10.1.autocomplete.min.js') }}"></script>
-    
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          {% block logo %}
-            <a class="brand" href="{{ path('AdmingeneratorDashboard_welcome') }}">Admin</a>
-          {% endblock %}
-          <div class="nav-collapse collapse">
-            {% block profile %}
-              <ul class="nav pull-right">
-                <li><p class="navbar-text" style="padding-right: 10px;">{{ 'profile.welcome'|trans({'%username%': app.user ? app.user : 'anonymous'}, 'Admingenerator')|raw }}</li>
-                {% if app.user %}
-                  <li><button onclick="document.location='{{ path('fos_user_security_logout') }}'" class="btn " title="{{ 'profile.logout'|trans({}, 'Admingenerator') }}"><i class="icon-off"></i> {{ 'profile.logout'|trans({}, 'Admingenerator') }}</button></li>
-                {% else %}
-                  <li><button onclick="document.location='{{ path('fos_user_security_login') }}'" class="btn " title="{{ 'profile.login'|trans({}, 'Admingenerator') }}">{{ 'profile.login'|trans({}, 'Admingenerator') }}</button></li>
-                {% endif %}
-              </ul>
-            {% endblock %}
-            {% block menu %}
-              {{ knp_menu_render('admin') }}
-              {{ knp_menu_render('moderation') }}
-            {% endblock %}
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="container-fluid">
-        {% block flashes %}
-            <div id="flashes" class="row-fluid">
-                {% if app.session.hasFlash('success') %}
-                  <div class="alert alert-success">
-                    <button type="button" class="close" data-dismiss="alert">×</button>
-                    {{ app.session.flash('success')|raw }}
-                  </div>
-                {% endif %}
-                {% if app.session.hasFlash('error') %}
-                  <div class="alert alert-error">
-                    <button type="button" class="close" data-dismiss="alert">×</button>
-                    {{ app.session.flash('error')|raw }}
-                  </div>
-                {% endif %}
-            </div><!--/row-->
-        {% endblock %}
-
-        {% block body %}
-            <div class="row-fluid">
-            </div><!--/row-->
-        {% endblock %}
-
-      <hr>
-
-      <footer>
-        <p>
-          {% block footer %}
-              &copy; Symfony2Admingenerator {{ ("now"|date('Y') > 2012) ? '2012 - ' ~ "now"|date('Y') : '2012' }}
-          {% endblock %}
-        </p>
-      </footer>
-
-    </div> <!-- /container -->
-
-    {% block javascripts %}
-        <!-- bootstrap.min.js -->
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-transition.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-alert.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-modal.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-dropdown.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-scrollspy.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-tab.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-tooltip.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-popover.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-button.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-collapse.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-carousel.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-typeahead-extended.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-affix.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/bootstrap-datepicker.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/bootstrap/locales/bootstrap-datepicker.' ~ app.request.locale ~ '.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/google/prettify.js') }}"></script>
-        
-        <!-- jquery-ui.min.js  -->
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.core.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.widget.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.mouse.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.draggable.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.droppable.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.sortable.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.effect.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/jquery-ui/jquery.ui.effect-slide.js') }}"></script>
-       
-        <!-- blueimp.jquery-file-upload.min.js  -->
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/blueimp.javascript-templates.min.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/blueimp.javascript-load-image.min.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/blueimp.canvas-to-blob.min.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/jquery.iframe-transport.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/jquery.fileupload.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/jquery.fileupload-fp.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/blueimp/jquery.fileupload-ui.js') }}"></script>
-        
-        <!-- jquery.spin.min.js  -->
-        <script type="text/javascript" src="{{ asset('bundles/admingeneratorgenerator/js/spin/jquery.spin.js') }}"></script>
-    {% endblock %}
-
-  </body>
-</html>

web/js/admin.js

@@ -0,0 +1,12 @@
+$(document).ready(function(){
+  
+  $('a.moderate_accept, a.moderate_refuse').click(function(){
+    $.getJSON($(this).attr('href'), function(response) {
+      // Do query ...
+    });
+    $(this).parents('tr.list_trow').remove();
+    $('div.tooltip').remove();
+    return false;
+  });
+  
+});