Merge branch '3.8'

Conflicts: composer.lock templates/mobile/common/index.html.twig
2025-10-15 05:53:13 +00:00 · 2013-09-05 13:57:42 +02:00
parent c53017b1ab a5b58730fd
commit 6c29fc88e9
20 changed files with 382 additions and 285 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -1028,12 +1028,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/avalanche123/Imagine.git",
-                "reference": "45aba323391fc079e25382b83561919db117ff51"
+                "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/45aba323391fc079e25382b83561919db117ff51",
-                "reference": "45aba323391fc079e25382b83561919db117ff51",
+                "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/64ed228095ec1f99e1124debf87b4b8ebd83070b",
+                "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b",
                "shasum": ""
            },
            "require": {
@@ -1077,20 +1077,20 @@
                "image manipulation",
                "image processing"
            ],
-            "time": "2013-08-15 23:32:14"
+            "time": "2013-09-02 21:53:44"
        },
        {
            "name": "jms/metadata",
-            "version": "1.4.0",
+            "version": "1.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/schmittjoh/metadata.git",
-                "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668"
+                "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/2b95de3ff995996cf068314bd4299dbfca2ca668",
-                "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0af8423dc23dfeed1592426106d2ffbc69f68057",
+                "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057",
                "shasum": ""
            },
            "require": {
@@ -1129,7 +1129,7 @@
                "xml",
                "yaml"
            ],
-            "time": "2013-08-25 08:44:36"
+            "time": "2013-08-27 18:10:33"
        },
        {
            "name": "jms/parser-lib",
@@ -1302,16 +1302,16 @@
        },
        {
            "name": "media-alchemyst/media-alchemyst",
-            "version": "0.3.4",
+            "version": "0.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
-                "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b"
+                "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/3d10c9d3fde4c6e77434b883ed14f08e60b0734b",
-                "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b",
+                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/da4dc484cff946a5a2bb1966c538e7132b542b8c",
+                "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c",
                "shasum": ""
            },
            "require": {
@@ -1321,7 +1321,7 @@
                "monolog/monolog": "~1.0",
                "neutron/temporary-filesystem": "~2.1",
                "php": ">=5.3.3",
-                "php-ffmpeg/php-ffmpeg": "~0.3.1",
+                "php-ffmpeg/php-ffmpeg": "~0.3.4",
                "php-mp4box/php-mp4box": "~0.3.0",
                "php-unoconv/php-unoconv": "~0.3.0",
                "pimple/pimple": "~1.0",
@@ -1371,7 +1371,7 @@
                "video",
                "video processing"
            ],
-            "time": "2013-08-08 10:18:56"
+            "time": "2013-09-05 10:26:38"
        },
        {
            "name": "mediavorus/mediavorus",
@@ -1755,16 +1755,16 @@
        },
        {
            "name": "php-ffmpeg/php-ffmpeg",
-            "version": "0.3.2",
+            "version": "0.3.4",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/PHP-FFmpeg.git",
-                "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b"
+                "reference": "c7226654828600e0c44ac6689a07e741b32147dd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/9fcb485d497872e674cb14eb3df1386dbda9169b",
-                "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b",
+                "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/c7226654828600e0c44ac6689a07e741b32147dd",
+                "reference": "c7226654828600e0c44ac6689a07e741b32147dd",
                "shasum": ""
            },
            "require": {
@@ -1819,7 +1819,7 @@
                "video",
                "video processing"
            ],
-            "time": "2013-08-08 10:15:15"
+            "time": "2013-09-05 10:09:39"
        },
        {
            "name": "php-mp4box/php-mp4box",
@@ -2264,12 +2264,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/fabpot/Silex.git",
-                "reference": "d6fe48eaf37e511eef606446012ebf50c68735d2"
+                "reference": "466beac0e4e05392a1a26e62649347a848a23d08"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Silex/zipball/d6fe48eaf37e511eef606446012ebf50c68735d2",
-                "reference": "d6fe48eaf37e511eef606446012ebf50c68735d2",
+                "url": "https://api.github.com/repos/fabpot/Silex/zipball/466beac0e4e05392a1a26e62649347a848a23d08",
+                "reference": "466beac0e4e05392a1a26e62649347a848a23d08",
                "shasum": ""
            },
            "require": {
@@ -2339,7 +2339,7 @@
            "keywords": [
                "microframework"
            ],
-            "time": "2013-08-23 16:12:49"
+            "time": "2013-09-04 08:28:12"
        },
        {
            "name": "silex/web-profiler",
@@ -2543,12 +2543,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/symfony.git",
-                "reference": "32947b2fc8c199b7aab4475473136ed651c097a0"
+                "reference": "d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/32947b2fc8c199b7aab4475473136ed651c097a0",
-                "reference": "32947b2fc8c199b7aab4475473136ed651c097a0",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265",
+                "reference": "d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265",
                "shasum": ""
            },
            "require": {
@@ -2643,15 +2643,15 @@
            "keywords": [
                "framework"
            ],
-            "time": "2013-08-25 08:03:30"
+            "time": "2013-09-05 08:35:20"
        },
        {
            "name": "tecnick.com/tcpdf",
-            "version": "6.0.023",
+            "version": "6.0.025",
            "source": {
                "type": "git",
                "url": "http://git.code.sf.net/p/tcpdf/code",
-                "reference": "3ebcb4d8d952ffdcb0fb95db8855da46a8590a26"
+                "reference": "a8ec5fe7efc5a18d64ad95a760e2626a52674d43"
            },
            "require": {
                "php": ">=5.3.0"
@@ -2700,7 +2700,7 @@
                "pdf417",
                "qrcode"
            ],
-            "time": "2013-08-05 19:34:06"
+            "time": "2013-09-04 18:32:13"
        },
        {
            "name": "themattharris/tmhoauth",
@@ -2708,12 +2708,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/themattharris/tmhOAuth.git",
-                "reference": "0.8.3"
+                "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/0.8.3",
-                "reference": "0.8.3",
+                "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/47dcee2ac74f8c032d2a1afb836e65108bf582b7",
+                "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7",
                "shasum": ""
            },
            "require": {
--- a/lib/Alchemy/Phrasea/Controller/Prod/Language.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Language.php
@@ -104,6 +104,12 @@ class Language implements ControllerProviderInterface
            $out['forceSendDocument'] = _('Force sending of the document ?');
            $out['export'] = _('Export');
            $out['share'] = _('Share');
+            $out['move'] = _('Move');
+            $out['push'] = _('Push');
+            $out['feedback'] = _('Feedback');
+            $out['toolbox'] = _('Tool box');
+            $out['print'] = _('Print');
+            $out['attention'] = _('Attention !');

            return $app->json($out);
        });
--- a/lib/Alchemy/Phrasea/Controller/Root/Account.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php
@@ -414,7 +414,7 @@ class Account implements ControllerProviderInterface
        foreach ($app['events-manager']->list_notifications_available() as $notifications) {
            foreach ($notifications as $notification) {
                $notifId = $notification['id'];
-                $notifName = sprintf('notification_%d', $notifId);
+                $notifName = sprintf('notification_%s', $notifId);

                if (isset($requestedNotifications[$notifId])) {
                    $app['authentication']->getUser()->setPrefs($notifName, '1');
--- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php
@@ -34,6 +34,8 @@ class FilesystemRequirements extends RequirementCollection implements Requiremen
            $baseDir . '/www/custom',
            $baseDir . '/tmp/locks',
            $baseDir . '/tmp/cache_twig',
+            $baseDir . '/tmp/serializer',
+            $baseDir . '/tmp/doctrine',
            $baseDir . '/tmp/cache_minify',
            $baseDir . '/tmp/lazaret',
            $baseDir . '/tmp/desc_tmp',
--- a/lib/classes/appbox.php
+++ b/lib/classes/appbox.php
@@ -322,6 +322,9 @@ class appbox extends base
        $finder->in(array(
            $this->app['root.path'] . '/tmp/cache_minify/',
            $this->app['root.path'] . '/tmp/cache_twig/',
+            $this->app['root.path'] . '/tmp/cache/profiler/',
+            $this->app['root.path'] . '/tmp/doctrine/',
+            $this->app['root.path'] . '/tmp/serializer/',
        ))
            ->depth(0)
            ->ignoreVCS(true)
--- a/lib/classes/module/console/systemClearCache.php
+++ b/lib/classes/module/console/systemClearCache.php
@@ -41,7 +41,10 @@ class module_console_systemClearCache extends Command
            ->exclude('.svn')
            ->in(array(
                $this->container['root.path'] . '/tmp/cache_minify/',
-                $this->container['root.path'] . '/tmp/cache_twig/'
+                $this->container['root.path'] . '/tmp/cache_twig/',
+                $this->container['root.path'] . '/tmp/cache/profiler/',
+                $this->container['root.path'] . '/tmp/doctrine/',
+                $this->container['root.path'] . '/tmp/serializer/',
            ));

        $filesystem = new Filesystem();
--- a/templates/mobile/common/index.html.twig
+++ b/templates/mobile/common/index.html.twig
@@ -8,6 +8,31 @@
        <link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.css' }) }}" />
        <script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
        <script src="{{ path('minifier', { 'f' : 'assets/jquery-mobile/jquery.mobile.js' }) }}"></script>
+        <style type="text/css">
+            html,body, div[data-role ="page"] {
+                height: 100%;
+                width: 100%;
+                margin: 0px;
+                padding: 0px;
+            }
+
+             .ui-content{
+                height: 85%;
+                width: 100%;
+                margin: 0px;
+                padding: 0px;
+                display:table;
+            }
+
+            #map {
+                height: 100%;
+                width: 100%;
+                padding: 0px;
+                display:table-cell;
+                vertical-align: middle;
+                text-align: center
+            }
+        </style>
        {% block stylesheet %}{% endblock %}
        {% block icon %}{% endblock %}
        {% block javascript %}{% endblock %}
--- a/templates/mobile/common/thumbnail.html.twig
+++ b/templates/mobile/common/thumbnail.html.twig
@@ -72,11 +72,11 @@

 {% macro format100percent(thumbnail, extraclass)%}
    {% set record_type = thumbnail.get_type() %}
-        <div style="width:100%" class="thumb_wrapper {{extraclass|default('')}}">
+    <div id="map">
        {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
          {% set random = thumbnail.get_random() %}
-          <div class="record record_video imgTips" style="100%;">
-            <video type="video/mp4" controls="controls" style="width:100%;" autoplay="autoplay">
+          <div class="record record_video imgTips">
+            <video type="video/mp4" controls="controls" style="height:100%;" autoplay="autoplay">
              <source src="{{thumbnail.get_url()}}" type="video/mp4"></source>
            </video>
          </div>
@@ -84,8 +84,6 @@
          {% set random = thumbnail.get_random() %}
          <div class="record record_document imgTips" style="width:100%;">
              <div id="preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}" class="PNB" style=""></div>
-            <input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
-            <input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
          </div>
          <script type="text/javascript">
            swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
@@ -97,8 +95,6 @@
          {% set random = thumbnail.get_random() %}
          <div class="record record_audio audioTips" style="width:100%;">
            <div id="preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}" class="PNB" style=""></div>
-            <input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
-            <input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
          </div>
          <script type="text/javascript">
            swfobject.embedSWF("/include/jslibs/audio-player/player.swf",
@@ -106,12 +102,8 @@
            "{{thumbnail.get_width()}}", "{{thumbnail.get_height()}}", "9.0.0", false, false,
            {menu: "false",flashvars: "playerID=2&autostart=yes&noinfo=yes&animation=no&remaining=yes&soundFile={{thumbnail.get_url()}}", movie: "/include/jslibs/audio-player/player.swf",  allowFullScreen :"true",wmode: "transparent"}, false);</script>
        {% else %}
-          <img class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
+          <img style="height:100%;" class="record record_image imgTips zoomable thumb" oncontextMenu="return(false);"
               src="{{thumbnail.get_url()}}" ondragstart="return false;">
-          <input type="hidden" name="width" value="{{thumbnail.get_width()}}"/>
-          <input type="hidden" name="height" value="{{thumbnail.get_height()}}"/>
        {% endif %}
    </div>
-
-
 {% endmacro %}
--- a/templates/mobile/lightbox/basket_element.html.twig
+++ b/templates/mobile/lightbox/basket_element.html.twig
@@ -19,13 +19,12 @@
    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
  </div>
  <div data-role="content">
-    {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }}
+    {{ thumbnail.format100percent(record.get_preview()) }}
    {% if basket_element.getBasket().getValidation() %}
      {% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
        <fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
          <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes"  />
            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label>
-
          <input {% if basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() == false and basket_element.getUserValidationDatas(app['authentication'].getUser(), app).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no"  />
            <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label>
        </fieldset>
@@ -45,5 +44,11 @@
  <div data-role="footer">

  </div>
+    <script type="text/javascript">
+        $( window ).on( "orientationchange", function( event ) {
+            $("#map").height($(window).height() - 50);
+        });
+        $( window ).orientationchange();
+    </script>
 </div>
 {% endblock %}
--- a/templates/mobile/lightbox/feed_element.html.twig
+++ b/templates/mobile/lightbox/feed_element.html.twig
@@ -19,10 +19,16 @@
    <a rel="external" href="{{ path('lightbox') }}" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
  </div>
  <div data-role="content">
-    {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }}
+    {{ thumbnail.format100percent(record.get_preview()) }}
  </div>
  <div data-role="footer">

  </div>
+    <script type="text/javascript">
+        $( window ).on( "orientationchange", function( event ) {
+            $("#map").height($(window).height() - 50);
+        });
+        $( window ).orientationchange();
+    </script>
 </div>
 {% endblock %}
--- a/templates/mobile/lightbox/index.html.twig
+++ b/templates/mobile/lightbox/index.html.twig
@@ -39,7 +39,7 @@
    <a href="#about" class="ui-btn-right">{% trans 'a propos'%}</a>
  </div>
    <div data-role="content">
-    <ul data-role="listview">
+    <ul data-role="listview" style="width:100%;margin: 0;">
      <li>
        <a href="#validation">{% trans 'Validations'%}</a>
        <span class="ui-li-count">{{_self.valid_baskets_length(baskets_collection)}}</span>
@@ -86,7 +86,7 @@
    <p>
      {% trans 'Voici vos validations en cours' %}
    </p>
-    <ul data-role="listview">
+    <ul data-role="listview"  style="width:100%;margin: 0;">
            {% for basket in baskets_collection %}
              {% if basket.getValidation() %}
                {% set basket_length = basket.getElements().count() %}
@@ -115,7 +115,7 @@
    <p>
      {% trans 'Voici vos paniers' %}
    </p>
-    <ul data-role="listview">
+    <ul data-role="listview"  style="width:100%;margin: 0;">
            {% for basket in baskets_collection %}
              {% if basket.getValidation() is empty %}
                {% set basket_length = basket.getElements().count() %}
--- a/templates/web/admin/collection/reorder.html.twig
+++ b/templates/web/admin/collection/reorder.html.twig
@@ -80,7 +80,7 @@
                    var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), {
                        content:datas.msg
                    });
-                    $('#table-order').before(html);
+                    $('#table-order').insertBefore(html);
                },
                complete : function() {
                    $this.attr('disabled', false);
@@ -91,13 +91,13 @@

    function moveUpItem(select){
        select.find('option:selected').each(function(){
-            $(this).before($(this).prev());
+            $(this).insertBefore($(this).prev());
        });
    }

    function moveDownItem(select){
        select.find('option:selected').each(function(){
-            $(this).after($(this).next());
+            $(this).insertAfter($(this).next());
        });
    }

--- a/templates/web/admin/tasks/list.html.twig
+++ b/templates/web/admin/tasks/list.html.twig
@@ -54,11 +54,11 @@
                        <span class="caret"></span>
                    </a>
                    <ul class="dropdown-menu">
-                        <li class="taskMenuItem" id="taskEdit_{{ task.getID() }}"><a href="#">edit</a></li>
-                        <li class="taskMenuItem" id="taskStart_{{ task.getID() }}"><a href="#">start</a></li>
-                        <li class="taskMenuItem" id="taskStop_{{ task.getID() }}"><a href="#">stop</a></li>
-                        <li class="taskMenuItem" id="taskDelete_{{ task.getID() }}"><a href="#">delete</a></li>
-                        <li class="taskMenuItem" id="taskLog_{{ task.getID() }}"><a href="#">log</a></li>
+                        <li class="taskMenuItem" id="taskEdit_{{ task.getID() }}"><a href="#">{% trans 'Edit' %}</a></li>
+                        <li class="taskMenuItem" id="taskStart_{{ task.getID() }}"><a href="#">{% trans 'Start' %}</a></li>
+                        <li class="taskMenuItem" id="taskStop_{{ task.getID() }}"><a href="#">{% trans 'Stop' %}</a></li>
+                        <li class="taskMenuItem" id="taskDelete_{{ task.getID() }}"><a href="#">{% trans 'Delete' %}</a></li>
+                        <li class="taskMenuItem" id="taskLog_{{ task.getID() }}"><a href="#">{% trans 'Logs' %}</a></li>
                    </ul>
                </div>
            </td>
@@ -262,6 +262,10 @@


        $(".taskMenuItem").bind("click", function() {
+            if ($(this).hasClass('disabled')) {
+                return false;
+            }
+
            var action = $(this).attr("id").split('_');

            switch(action[0])
--- a/templates/web/admin/user/demand.html.twig
+++ b/templates/web/admin/user/demand.html.twig
@@ -19,92 +19,163 @@
    $(document).ready(function(){

        resize();
+
        $(window).resize(function(){
            resize();
        });

+        var $form = $("form#accept-demand");
+        var $mainBtnAction = $(".btn-all-action", $form);
+        var $basesBtnAction = $(".btn-single-action", $form);
+
+        $(".btn-all-action, .btn-single-action").on("uncheck-all", function(event) {
+            $("button", $(event.currentTarget)).removeClass("active");
+        }).on("uncheck-deny", function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $denyButton = $(".deny-checker", $btnGroup);
+            
+            if ($denyButton.hasClass("active")) {
+                $denyButton.removeClass("active");
+                $(".deny-checker", $mainBtnAction).removeClass("active");
+            }
+        }).on("check-deny", function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $denyButton = $(".deny-checker", $btnGroup);
+
+            if (false === $denyButton.hasClass("active")) {
+                $btnGroup.trigger("uncheck-all");
+                $denyButton.addClass("active");
+
+                var nbActiveButton = $(".deny-checker.active", $basesBtnAction).length;
+                var totalBtn = $(".deny-checker", $basesBtnAction).length;
+                
+                if (nbActiveButton === totalBtn) {
+                    $(".deny-checker", $mainBtnAction).addClass("active");
+                }
+            }
+        }).on("check-accept", function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $acceptBtn = $(".accept-checker", $btnGroup);
+
+            if (false === $acceptBtn.hasClass("active"))  {
+                $btnGroup.trigger('uncheck-deny');
+                $acceptBtn.addClass("active");
+
+                var nbActiveButton = $(".accept-checker.active", $basesBtnAction).length;
+                var totalBtn = $(".accept-checker", $basesBtnAction).length;
+
+                if (nbActiveButton === totalBtn) {
+                    $(".accept-checker", $mainBtnAction).addClass("active");
+                }
+            }
+        }).on("uncheck-accept", function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $acceptBtn = $(".accept-checker", $btnGroup);
+
+            if ($acceptBtn.hasClass("active")) {
+                $acceptBtn.removeClass("active");
+                $(".accept-checker", $mainBtnAction).removeClass("active");
+                
+                $btnGroup.trigger("uncheck-hd");
+                $btnGroup.trigger("uncheck-watermark");
+            }
+        }).on('check-hd', function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $hdBtn = $(".accept-hd-checker", $btnGroup);
+
+            if (false === $hdBtn.hasClass("active")) {
+                $hdBtn.addClass('active');
+
+                var nbActiveButton = $(".accept-hd-checker.active", $basesBtnAction).length;
+                var totalBtn = $(".accept-hd-checker", $basesBtnAction).length;
+
+                if (nbActiveButton === totalBtn) {
+                    $(".accept-hd-checker", $mainBtnAction).addClass("active");
+                }
+                
+                $btnGroup.trigger('uncheck-deny').trigger('check-accept');
+            }
+        }).on('uncheck-hd', function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $hdBtn = $(".accept-hd-checker", $btnGroup);
+
+            if ($hdBtn.hasClass("active")) {
+                $hdBtn.removeClass("active");
+                $(".accept-hd-checker", $mainBtnAction).removeClass("active");
+            }
+        }).on('check-watermark', function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $watermarkBtn = $(".accept-watermark-checker", $btnGroup);
+
+            if (false === $watermarkBtn.hasClass("active")) {
+                $watermarkBtn.addClass('active');
+
+                var nbActiveButton = $(".accept-watermark-checker.active", $basesBtnAction).length;
+                var totalBtn = $(".accept-watermark-checker", $basesBtnAction).length;
+
+                if (nbActiveButton === totalBtn) {
+                    $(".accept-watermark-checker", $mainBtnAction).addClass("active");
+                }
+                
+                $btnGroup.trigger('uncheck-deny').trigger('check-accept');
+            }
+        }).on('uncheck-watermark', function(event) {
+            var $btnGroup = $(event.currentTarget);
+            var $watermarkBtn = $(".accept-watermark-checker", $btnGroup);
+
+            if ($watermarkBtn.hasClass("active")) {
+                $watermarkBtn.removeClass('active');
+                $(".accept-watermark-checker", $mainBtnAction).removeClass("active");
+            }
        });
        
-    function checkDeny(el)
-    {
-        if(!$(el).hasClass('active'))
-        {
-            $('.disabler_'+$(el).attr('id').substring(5)).removeClass('active');
-        }
-        else
-        {
-        }
-    }
+        $.each([
+            $('.deny-checker', $basesBtnAction),
+            $('.accept-checker', $basesBtnAction),
+            $('.accept-hd-checker', $basesBtnAction),
+            $('.accept-watermark-checker', $basesBtnAction)
+        ], function(i, buttons) {
+            buttons.bind("click", function(event) {
+                var $this = $(this);
+                var $btnGroup = $this.closest('.btn-group');
+                var event = $this.data('event');

-    function checkAdd(el)
-    {
-        if(!$(el).hasClass('active'))
-        {
-            $('#accept_'+$(el).attr('id').substring(10)).addClass('active');
-            $('#deny_'+$(el).attr('id').substring(10)).removeClass('active');
+                if ($this.hasClass("active")) {
+                    $btnGroup.trigger("uncheck-"+ event);
+                } else {
+                    $btnGroup.trigger('check-' + event);
                }
-    }
-
-    function checkRemove(el)
-    {
-        if($(el).hasClass('active'))
-        {
-            $('.disabler_'+$(el).attr('id').substring(7)).each(function(){
-                $(this).removeClass('active');
            });
-            $(el).addClass('active');
-        }
-        else
-        {
-            $('#deny_'+$(el).attr('id').substring(7)).removeClass('active');
-        }
-    }
-
-    function modelChecker(usr)
-    {
-        var val = $('#model_'+usr)[0].value;
-
-        var bool = false;
-        if(!isNaN(val) && val!== '')
-            bool = true;
-
-        if(bool)
-            $('#sub_usr_'+usr).slideToggle('slow');
-        else
-            $('#sub_usr_'+usr).slideToggle('slow');
-
-        if(bool)
-            $('.checker_'+usr).attr('disabled','disabled');
-        else
-            $('.checker_'+usr).removeAttr('disabled');
-
-    }
-
-    function checkAll(that)
-    {
-        var bool = true;
-        var first = true;
-        $('.'+that+'_checker:not(.active)').each(function(){
-            //        if(!$(this)[0].disabled)
-            //        {
-            if(first && !$(this).hasClass('active'))
-                bool = false;
-            if (bool === false)
-                $(this).removeClass('active');
-            else
-                $(this).addClass('active');
-            first = false;
-            if(that === 'deny')
-                checkDeny($(this));
-            if(that === 'accept_hd')
-                checkAdd(this);
-            if(that === 'watermark')
-                checkAdd(this);
-            if(that === 'accept')
-                checkRemove(this);
-            //        }
        });
+
+        $.each([
+            $('.deny-checker', $mainBtnAction),
+            $('.accept-checker', $mainBtnAction),
+            $('.accept-hd-checker', $mainBtnAction),
+            $('.accept-watermark-checker', $mainBtnAction)
+        ], function(i, buttons) {
+            buttons.bind("click", function(event) {
+                var $this = $(this);
+                var event = $this.data('event');
+
+                if ($this.hasClass("active")) {
+                    $mainBtnAction.trigger("uncheck-"+ event);
+                    $basesBtnAction.trigger("uncheck-"+ event);
+                } else {
+                    $mainBtnAction.trigger('check-' + event);
+                    $basesBtnAction.trigger('check-' + event);
                }
+            });
+        });
+        
+        $(".submit", $form).bind("click", function (event) {
+            $(".btn.active", $basesBtnAction).each(function() {
+                $("<input>").attr("type", "hidden").attr("name", this.name).val(this.value).appendTo($form);
+            });
+
+            $form.submit();
+        });
+    });
 </script>

 <div class="page-header">
@@ -119,19 +190,19 @@
 {% endif %}

 {% if table['user'] | length > 0 %}
-    <form action="{{ path('users_submit_demands') }}" method="post">
-        <div class="btn-group">
-            <button class="btn" type="button" onclick="checkAll('deny')" style="height:30px;">
-                <img class="tipInfoUsr" title="{% trans 'admin:: refuser l\'acces' %}" src="/skins/icons/delete.gif"/>
+    <form id="accept-demand" action="{{ path('users_submit_demands') }}" method="post">
+        <div class="btn-group btn-all-action">
+            <button data-event="deny" class="btn deny-checker" type="button">
+                <img title="{% trans 'admin:: refuser l\'acces' %}" src="/skins/icons/delete.gif"/>
            </button>
-            <button class="btn" type="button" onclick="checkAll('accept')" style="height:30px;">
-                <img class="tipInfoUsr" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src="/skins/icons/cmdok.gif"/>
+            <button data-event="accept" class="btn accept-checker" type="button">
+                <img title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src="/skins/icons/cmdok.gif"/>
            </button>
-            <button class="btn" type="button" onclick="checkAll('accept_hd')" style="height:30px;">
-                <span class="tipInfoUsr" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
+            <button data-event="hd" class="btn accept-hd-checker" type="button">
+                <span title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
            </button>
-            <button class="btn" type="button" onclick="checkAll('watermark')" style="height:30px;">
-                <span class="tipInfoUsr" title="{% trans 'admin:: watermarquer les documents' %}">W</span>
+            <button data-event="watermark" class="btn accept-watermark-checker" type="button">
+                <span title="{% trans 'admin:: watermarquer les documents' %}">W</span>
            </button></td>
        </div>

@@ -139,7 +210,6 @@
            <thead>
                <tr>
                    <th>{% trans 'Informations' %}</th>
-                    <th>{% trans 'admin::compte-utilisateur date d\'inscription' %}</th>
                    <th>{% trans 'admin::collection' %}</th>
                    <th>{% trans 'Models' %}</th>
                </tr>
@@ -152,7 +222,9 @@
                <div class="well well-small">
                    <table class="table" style="table-layout: fixed;">
                        <tr>
-                            <span class="badge badge-warning">{{ loop.index }} </span>
+                            <span>
+                                {{ app['date-formatter'].getPrettyString(row["date_modif"]) }}
+                            </span>
                        </tr>
                        <tr>
                            <td>
@@ -180,50 +252,25 @@
                                </dl>
                            </td>
                            <td>
-                                {{ app['date-formatter'].getPrettyString(row["date_modif"]) }}
-                            </td>
-                            <td>
-                                {# Delete this when the JS 'll be updated --
-                                <table class='table-bordered' cellspacing="0" cellpading="0" >
                                {% for basId in colls %}
-                                        <tr>
-                                            <td>
-                                                <input name="deny[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkDeny(this)" id="{{ 'deny_' ~ row['usr_id']  ~ '_' ~ basId }}" class="deny_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: refuser l\'acces' %}" type="checkbox"/>
-                                            </td>
-                                            <td>
-                                                <input name="accept[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkRemove(this)" id="{{ 'accept_' ~ row['usr_id'] ~ '_' ~ basId }}" class="{{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} accept_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" type="checkbox"/>
-                                            </td>
-                                            <td>
-                                                <input name="accept_hd[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{ 'accept_hd_' ~ row['usr_id'] ~ '_' ~ basId }}" class="{{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} accept_hd_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}" type="checkbox"/>
-                                            </td>
-                                            <td>
-                                                <input name="watermark[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{  'watermark_' ~ row['usr_id'] ~ '_' ~ basId }}" class="{{ 'disabler_' ~  row['usr_id'] ~ '_' ~ basId }} watermark_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: watermarquer les documents' %}" type="checkbox"/>
-                                            </td>
-                                            <td>
-                                                {{ basId| bas_labels(app) }}
-                                            </td>
-                                        </tr>
-                                    {% endfor %}
-                                </table>
-                                {#-- End of delete #}
-                                {% for basId in colls %}
-                                    <div class="btn-group" data-toggle="buttons-checkbox" style="margin:auto auto 5px 0;">
-                                        <button type="button" name="deny[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkDeny(this)" id="{{ 'deny_' ~ row['usr_id']  ~ '_' ~ basId }}" class="btn deny_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: refuser l\'acces' %}" style="height:30px;">
-                                            <img class="tipInfoUsr" title="{% trans 'admin:: refuser l\'acces' %}" src='/skins/icons/delete.gif' />
-                                        </button>
-                                        <button type="button" name="accept[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkRemove(this)" id="{{ 'accept_' ~ row['usr_id'] ~ '_' ~ basId }}" class="btn {{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} accept_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" style="height:30px;">
-                                            <img class="tipInfoUsr" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src='/skins/icons/cmdok.gif' />
-                                        </button>
-                                        <button type="button" name="accept_hd[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{ 'accept_hd_' ~ row['usr_id'] ~ '_' ~ basId }}" class="btn {{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} accept_hd_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}" style="height:30px;">
-                                            <span class="tipInfoUsr" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
-                                        </button>
-                                        <button type="button" name="watermark[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{  'watermark_' ~ row['usr_id'] ~ '_' ~ basId }}" class="btn {{ 'disabler_' ~  row['usr_id'] ~ '_' ~ basId }} watermark_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: watermarquer les documents' %}" style="height:30px;">
-                                            <span class="tipInfoUsr" title="{% trans 'admin:: watermarquer les documents' %}">W</span>
-                                        </button>
-                                    </div>
                                    <h1 style="word-wrap: break-word;">
                                        {{ basId| bas_labels(app) }}
                                    </h1>
+                                    {% set btn_value = row['usr_id'] ~ "_" ~  basId %}
+                                    <div class="btn-group btn-single-action" style="margin:auto auto 5px 0;">
+                                        <button data-event="deny" value="{{ btn_value }}" type="button" name="deny[]" class="btn deny-checker" title="{% trans 'admin:: refuser l\'acces' %}">
+                                            <img title="{% trans 'admin:: refuser l\'acces' %}" src='/skins/icons/delete.gif' />
+                                        </button>
+                                        <button data-event="accept" value="{{ btn_value }}" type="button" name="accept[]" class="btn accept-checker" title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}">
+                                            <img title="{% trans 'admin:: donner les droits de telechargement et consultation de previews' %}" src='/skins/icons/cmdok.gif' />
+                                        </button>
+                                        <button data-event="hd" value="{{ btn_value }}" type="button" name="accept_hd[]" class="btn accept-hd-checker" title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">
+                                            <span title="{% trans 'admin:: donner les droits de telechargements de preview et hd' %}">HD</span>
+                                        </button>
+                                        <button data-event="watermark" value="{{ btn_value }}" type="button" name="watermark[]" class="btn accept-watermark-checker" title="{% trans 'admin:: watermarquer les documents' %}">
+                                            <span title="{% trans 'admin:: watermarquer les documents' %}">W</span>
+                                        </button>
+                                    </div>
                                {% endfor %}
                            </td>
                            <td>
@@ -242,7 +289,7 @@
        </div>

        <div class="form-actions">
-            <button class="btn btn-primary">{% trans 'boutton::valider' %}</button>
+            <button type="button" class="btn btn-primary submit">{% trans 'boutton::valider' %}</button>
        </div>
    </form>
 {% else %}
--- a/templates/web/prod/actions/Property/type.html.twig
+++ b/templates/web/prod/actions/Property/type.html.twig
@@ -11,7 +11,7 @@

 <form style="padding:15px;" name="change-records-type" action="{{ path('change_type') }}" method="POST">
    <div class="well-small" style="text-align:center;">
-        <select name="force_types" style="width:250px">
+        <select name="force_types" class="input-xxlarge">
            <option value="">{% trans "Apply to all selected documents" %}</option>
            {% for option in typesEnum %}
                <option value="{{ option }}">{{ option }}</option>
--- a/templates/web/prod/actions/collection_default.html.twig
+++ b/templates/web/prod/actions/collection_default.html.twig
@@ -1,55 +1,55 @@
-    <div style="text-align:center;margin:30px 0px;">
+{% set canValid = false %}
+<div class="well-small text-center">
    <form onsubmit="return false" action="{{ path('prod_move_collection_apply') }}" method="post">
-        {% if records.databoxes() | length > 1 %}1
+        {% if records.databoxes() | length > 1 %}
+            <div class="well-small">
                {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %}
-            <div style="text-align:center;">
-                <button class="move_cancel">{% trans 'boutton::annuler' %}</button>
            </div>
-        {% elseif records | length == 0 %}2
+        {% elseif records | length == 0 %}
+            <div class="well-small">
                {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %}
-            <div style="text-align:center;">
-                <button class="move_cancel">{% trans 'boutton::annuler' %}</button>
            </div>
-        {% elseif collections | length == 0 %}3
+        {% elseif collections | length == 0 %}
+            <div class="well-small">
                {% trans 'erreur : Vous n\'avez pas les droits' %}
-            <div style="text-align:center;">
-                <button class="move_cancel">{% trans 'boutton::annuler' %}</button>
            </div>
        {% else %}
+            {% set canValid = true %}

-            <div>
            {% if records | length != records.received() | length %}
+                <div class="well-small">
                    {% set countable = records.received().count() - records.count() %}
                    {% trans %}
-                    prod::collection {{countable}} documents ne pouvant etres mofiies
+                        One document can not be modified.
+                    {% plural countable %}
+                        {{countable}} documents can not be modified.
                    {% endtrans %}
-                {% endif %}
                </div>
+            {% endif %}

+            <div class="well-small">
                {% set countable = records | length %}
                {% trans %}
-                prod::collection {{countable}} documents a deplacer
+                    Move one record to the chose collection in the list.
+                {% plural countable %}
+                    Move {{ countable }} records to the chosen collection in the list.
                {% endtrans %}
-            <br/>
-            <br/>
+            </div>
+
+            <div class="well-small">
                <select name="base_id">
                    {% for collection in collections %}
                        <option value="{{ collection.get_base_id() }}">{{ collection.get_label(app['locale.I18n']) }}</option>
                    {% endfor %}
                </select>
-            <br/>
-            <br/>
-            <br/>
+            </div>
+
            {% if records.stories() | length > 0 %}
-                <table style="border:#ff0000 1px solid;">
-                    <tr>
-                    <td style="width:25px;"><input type="checkbox" value="1" name="chg_coll_son"/>
-                    </td>
-                    <td style="width:250px; text-align:left">
-                        {% trans 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' %}
-                    </td>
-                    </tr>
-                </table>
+                <div class="well-small">
+                    <label class="checkbox text-info">
+                        <input type="checkbox" value="1" name="chg_coll_son"> {% trans 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' %}
+                    </label>
+                </div>
            {% endif %}

            <input type="hidden" name="act" value="WORK">
@@ -58,18 +58,15 @@
    </form>
 </div>

-<script type="text/javascript">
-
-$(document).ready(function(){
-
+{% if canValid %}
+    <script type="text/javascript">
+        $(document).ready(function(){
            $dialog = p4.Dialog.get(1);

            var $form = $dialog.getDomElement();
-
            var buttons = {};

            buttons[language.valider] = function(){
-
                var coll_son = $('input[name="chg_coll_son"]:checked', $form).length > 0 ? '1' : '0';
                var datas = {
                    lst: $('input[name="lst"]', $form).val(),
@@ -108,5 +105,6 @@ $(document).ready(function(){
            };

            $dialog.setOption('buttons', buttons);
-});
-</script>
+        });
+    </script>
+{% endif %}
--- a/tmp/cache/profiler/.gitignore
+++ b/tmp/cache/profiler/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/tmp/doctrine/.gitignore
+++ b/tmp/doctrine/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/tmp/serializer/.gitignore
+++ b/tmp/serializer/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/www/skins/prod/jquery.main-prod.js
+++ b/www/skins/prod/jquery.main-prod.js
@@ -1617,7 +1617,7 @@ function toggleRemoveReg(el)
 function deleteThis(lst)
 {
    if(lst.split(';').length === 0 ) {
-        alert(langage.nodocselected);
+        alert(language.nodocselected);
        return false;
    }

@@ -1643,7 +1643,7 @@ function chgCollThis(datas)
 {
    $dialog = p4.Dialog.Create({
        size:'Small',
-        title:'Move',
+        title: language.move,
        closeButton:true
    });
    $.ajax({
@@ -1660,7 +1660,7 @@ function pushThis(sstt_id, lst, story)
 {
    $dialog = p4.Dialog.Create({
        size:'Full',
-        title:'Push'
+        title:language.push
    });

    $.post("../prod/push/sendform/", {
@@ -1678,7 +1678,7 @@ function feedbackThis(sstt_id, lst, story)
    /* disable push closeonescape as an over dialog may exist (add user) */
    $dialog = p4.Dialog.Create({
        size:'Full',
-        title:'Feedback'
+        title:language.feedback
    });

    $.post("../prod/push/validateform/", {
@@ -1695,7 +1695,7 @@ function toolREFACTOR(datas){

    var dialog = p4.Dialog.Create({
        size:'Medium',
-        title:'Tool box',
+        title:language.toolbox,
        loading: true
    });

@@ -2345,7 +2345,7 @@ function checkDeleteThis(type, el)
                deleteBasket(el);
            };

-            $('#DIALOG').empty().append(language.confirmDel).attr('title','Attention !').dialog({
+            $('#DIALOG').empty().append(language.confirmDel).attr('title', language.attention).dialog({
                autoOpen:false,
                resizable:false,
                modal:true,
@@ -2376,7 +2376,7 @@ function printThis(value)
    if ($("#DIALOG").data("ui-dialog")) {
        $("#DIALOG").dialog('destroy');
    }
-    $('#DIALOG').attr('title', 'Print')
+    $('#DIALOG').attr('title', language.print)
    .empty().addClass('loading')
    .dialog({
        resizable:false,