remove prod js modules dependencies - remove useless gulp tasks - add phraseanet production client npm module

lib/Alchemy/Phrasea/Controller/Prod/QueryController.php

@@ -152,7 +152,7 @@ class QueryController extends Controller
 
             $infoResult = '<div id="docInfo">'
                 . $this->app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>'])
-                . '</div><a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">'
+                . '</div><a href="#" class="infoDialog search-display-info" data-infos="' . str_replace('"', '&quot;', $explain) . '">'
                 . $this->app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>';
 
             $json['infos'] = $infoResult;

package.json

@@ -33,6 +33,6 @@
     "postinstall": "./node_modules/.bin/gulp install;"
   },
   "dependencies": {
-    "phraseanet-production-client": "git+https://github.com/lostdalek/Phraseanet-production-client.git#notification"
+    "phraseanet-production-client": "~0.2.0"
   }
 }

resources/gulp/components/prod.js

@@ -63,62 +63,18 @@ gulp.task('build-prod-css', ['build-prod-skin-black', 'build-prod-skin-grey', 'b
         config.paths.src + 'prod/styles/main.scss'
     ], 'prod', 'prod/css/', debugMode);
 });
-gulp.task('build-prod-js', function(){
-    var prodGroup = [
-        // config.paths.vendors +  'underscore-amd/underscore.js',
-        //config.paths.src + 'vendors/colorpicker/js/colorpicker.js',
-        //config.paths.vendors +  'jquery.lazyload/jquery.lazyload.js',
-        // config.paths.vendors + 'humane-js/humane.js', // @TODO > extra files
-        //config.paths.vendors + 'blueimp-load-image/js/load-image.js', // @TODO > extra files
-        //config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
-        //config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
-        config.paths.vendors + 'geonames-server-jquery-plugin/jquery.geonames.js',
-        //config.paths.src + 'prod/js/core/lists.js',
-        //config.paths.src + 'prod/js/core/selectable.js',
-        //config.paths.src + 'prod/js/core/alert.js',
-
-        //config.paths.src + 'prod/js/components/search/search.js',
-        //config.paths.src + 'prod/js/components/search/search-result.js',
-        // config.paths.src + 'prod/js/components/publication.js',
-        // config.paths.src + 'prod/js/components/workzone/workzone.js',
-        // config.paths.src + 'prod/js/components/workzone/workzone-basket.js',
-        // config.paths.src + 'prod/js/components/workzone/workzone-facets.js',
-        // config.paths.src + 'prod/js/components/workzone/workzone-thesaurus.js',
-        // config.paths.src + 'prod/js/components/cgu.js',
-        // config.paths.src + 'prod/js/components/preferences.js',
-        //config.paths.src + 'prod/js/components/record/editable-record.js',
-        //config.paths.src + 'prod/js/components/push/push.js',
-        // config.paths.src + 'prod/js/prod.js',
-        //config.paths.src + 'prod/js/components/upload/upload.js',
-        // config.paths.src + 'prod/js/components/video-editor.js',
-        //config.paths.src + 'vendors/jquery-sprintf/js/jquery.sprintf.1.0.3.js',
-        //config.paths.src + 'prod/js/components/preview/preview.js',
-        //config.paths.src + 'prod/js/components/editor/record-editor.js',
-        // config.paths.src + 'prod/js/jquery.color.animation.js',
-        //config.paths.src + 'vendors/jquery-image-enhancer/js/jquery.image_enhancer.js',
-        // config.paths.vendors + 'jquery-treeview/jquery.treeview.js',
-        // config.paths.vendors + 'jquery-treeview/jquery.treeview.async.js',
-        //config.paths.vendors + 'fancytree/dist/jquery.fancytree-all.min.js'
-    ];
-    return utils.buildJsGroup(prodGroup, 'prod', 'prod/js', debugMode);
-});
 
 gulp.task('test-prod', function () {
     return gulp.src(config.paths.src + 'prod/js/tests/*.html')
         .pipe(qunit());
 });
 
-gulp.task('watch-prod-js', function() {
-    debugMode = true;
-    return gulp.watch(config.paths.src + 'prod/**/*.js', ['build-prod-js']);
-});
-
 gulp.task('watch-prod-css', function() {
     debugMode = true;
     return gulp.watch(config.paths.src + 'prod/**/*.scss', ['build-prod-css']);
 });
 
-gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){
+gulp.task('build-prod', ['copy-prod-images'], function(){
     debugMode = false;
-    return gulp.start('build-prod-js');
+    return gulp.start('build-prod-css');
 });

resources/gulp/watch.js

@@ -23,7 +23,6 @@ gulp.task('watch-css', function(){
 gulp.task('watch-js', function(){
     gulp.start('watch-common-js');
     // gulp.start('watch-oauth-js');
-    gulp.start('watch-prod-js');
     gulp.start('watch-thesaurus-js');
     //gulp.start('watch-uploadFlash');
     gulp.start('watch-lightbox-js');

resources/www/common/js/components/common.js

@@ -22,10 +22,6 @@ var commonModule = (function ($, p4) {
         $.datepicker.setDefaults({showMonthAfterYear: false});
         $.datepicker.setDefaults($.datepicker.regional[jq_date]);
 
-        $('body').on('click', '.infoDialog', function (event) {
-            _infoDialog($(this));
-        });
-
         var cache = $('#mainMenu .helpcontextmenu');
         $('.context-menu-item', cache).hover(function () {
             $(this).addClass('context-menu-item-hover');
@@ -33,35 +29,13 @@ var commonModule = (function ($, p4) {
             $(this).removeClass('context-menu-item-hover');
         });
 
-        /*$('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
+        $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
             showTransition: 'slideDown',
             hideTransition: 'hide',
             shadow: false
-        });*/
+        });
     });
 
-
-
-
-    function _infoDialog(el) {
-        $("#DIALOG").attr('title', '')
-            .empty()
-            .append(el.attr('infos'))
-            .dialog({
-
-                autoOpen: false,
-                closeOnEscape: true,
-                resizable: false,
-                draggable: false,
-                width: 600,
-                height: 400,
-                modal: true,
-                overlay: {
-                    backgroundColor: '#000',
-                    opacity: 0.7
-                }
-            }).dialog('open').css({'overflow-x': 'auto', 'overflow-y': 'auto'});
-    }
     function showOverlay(n, appendto, callback, zIndex) {
 
         var div = "OVERLAY";

templates/web/common/dialog_export.html.twig

@@ -80,15 +80,14 @@
 
 {% if app['conf'].get(['registry', 'actions', 'auth-required-for-export']) and app.getAuthenticatedUser().isGuest() %}
     <script type="text/javascript">
-        dialogModule.dialog.get(1).close();
+        {% set max_download = app['conf'].get(['registry', 'actions', 'download-max-size'], 120) %}
-        var $dialog = dialogModule.dialog.create({
+        var exportConfig = {
-            size : '500x100',
+            isGuest: true,
-            closeOnEscape : true,
+            msg: {
-            closeButton:false,
+                modalTile: '{{ "Unauthorized action"|trans }}',
-            title : "{{ "Unauthorized action"|trans }}"
+                modalContent: '{{ "Guest, you must be authenticated to have the right to download."|trans }}'
-        }, 2);
+            }
-
+        };
-        $dialog.setContent("{{ "Guest, you must be authenticated to have the right to download."|trans }}");
     </script>
 {% else %}
     {% if download.get_total_download() <= 0 and download.get_total_order() <= 0 and download.get_total_ftp() <= 0%}
@@ -493,7 +492,7 @@
                         $('#ftp_form_selector').bind('change',function(){
                         $('#ftp .ftp_form').hide();
                         $('#ftp .ftp_form_'+$(this).val()).show();
-                            $('.ftp_folder_check', dialogModule.dialog.get(1).getDomElement()).unbind('change').bind('change', function(){
+                            $('.ftp_folder_check', dialog.get(1).getDomElement()).unbind('change').bind('change', function(){
                                 if($(this).prop('checked'))
                                     $(this).next().prop('disabled',false);
                                 else
@@ -507,332 +506,25 @@
     </div>
 
     <script type="text/javascript">
-
-        function check_TOU(container)
-        {
-            var checkbox = $('input[name="TOU_accept"]', $(container));
-            var go = checkbox.length === 0 || checkbox.prop('checked');
-
-            if(!go)
-            {
-                {% set alert_message %}
-                    {{ 'You must agree to the Terms of Use to continue.' | trans }}
-                {% endset %}
-
-                var alert = dialogModule.dialog.create({
-                    size : 'Alert',
-                    closeOnEscape : true,
-                    closeButton:true,
-                    title : '{{ "Warning !" | trans }}'
-                }, 2);
-
-                alert.setContent("{{ alert_message | e('js') }}");
-
-                return false;
-            }
-            return true;
-        }
-
-        function check_subdefs(container)
-        {
-            var go = required = false;
-
-            $('input[name="obj[]"]', $(container)).each(function(){
-                if($(this).prop('checked'))
-                {
-                    go = true;
-                }
-            });
-
-            $('input.required, textarea.required', container).each(function(i,n){
-                if($.trim($(n).val()) === '')
-                {
-                    required = true;
-                    $(n).addClass('error');
-                }
-                else
-                {
-                    $(n).removeClass('error');
-                }
-            });
-
-            if(required)
-            {
-                {% set alert_message %}
-                    {{ 'Certains champs sont obligatoires, veuillez les remplir' | trans }}
-                {% endset %}
-
-                var alert = dialogModule.dialog.create({
-                    size : 'Alert',
-                    closeOnEscape : true,
-                    closeButton:true,
-                    title : '{{ "Warning !" | trans | e('js') }}'
-                }, 2);
-
-                alert.setContent("{{ alert_message | e('js') }}");
-
-                return false;
-            }
-            if(!go)
-            {
-                {% set alert_message %}
-                    {{ 'Vous devez selectionner un type de sous definitions' | trans }}
-                {% endset %}
-
-                var alert = dialogModule.dialog.create({
-                    size : 'Alert',
-                    closeOnEscape : true,
-                    closeButton:true,
-                    title : '{{ "Warning !" | trans | e('js') }}'
-                }, 2);
-
-                alert.setContent("{{ alert_message | e('js') }}");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        {% set TOUTitle %}
-            {{ "Terms of Use" | trans }}
-        {% endset %}
-
-        $(document).ready(function(){
-            var dialog = dialogModule.dialog.get(1);
-            var tabs = $('.tabs', dialog.getDomElement());
-
-            $('a.TOUview').bind('click', function(){
-                var options = {
-                  size : 'Medium',
-                  closeButton: true,
-                  title :'{{ TOUTitle|e('js') }}'
-                };
-
-                $dialog = dialogModule.dialog.create(options, 2);
-
-                $.get($(this).attr('href'), function(content){$dialog.setContent(content);});
-            });
-
-            $('.close_button').bind('click',function(){
-                dialog.close();
-            });
-
-            /*define([
-                "common/geonames"
-            ], function (geonames) {
-                geonames.init($('#command_geoname_field'), {
-                    "server": "{{ app['geonames.server-uri'] }}",
-                    "limit": 40
-                });
-            });*/
-
-
-
-            $('#download .download_button').bind('click',function(){
-                if(!check_subdefs($('#download')))
-                    return false;
-
-                if (!check_TOU($('#download'))) {
-                    return false;
-                }
-
-                var total = 0;
-                var count = 0;
-
-                $('input[name="obj[]"]', $('#download')).each(function(){
-                    var total_el = $('#download input[name=download_'+$(this).val()+']');
-                    var count_el = $('#download input[name=count_'+$(this).val()+']');
-                    if($(this).prop('checked'))
-                    {
-                        total += parseInt($(total_el).val());
-                        count += parseInt($(count_el).val());
-                    }
-                });
-
         {% set max_download = app['conf'].get(['registry', 'actions', 'download-max-size'], 120) %}
-                {% set alert_too_big_one %}
+        var exportConfig = {
-                        {% trans with {'%max_download%' : max_download} %}You can not directly download more than %max_download% Mo ; time to package all documents is too long{% endtrans %}
+            isGuest: false,
-                {% endset %}
+            maxDownload: {{max_download}},
-                {% set alert_too_big_two %}
+            msg: {
-                        {{ 'You can alternatively receive an email when the download is ready.' | trans }}
+                termOfUseTitle: '{{ "Terms of Use" | trans }}',
-                {% endset %}
+                termOfUseAgree: '{{ 'You must agree to the Terms of Use to continue.' | trans }}',
-                {% set alert_too_big_three %}
+                requiredFields: '{{ 'Certains champs sont obligatoires, veuillez les remplir' | trans }}',
-                        {{ 'Would you like to receive an e-mail when your download is ready ?' | trans }}
+                missingSubdef: '{{ 'Vous devez selectionner un type de sous definitions' | trans }}',
-                {% endset %}
+                fileTooLarge: '{% trans with {'%max_download%' : max_download} %}You can not directly download more than %max_download% Mo ; time to package all documents is too long{% endtrans %}',
-
+                fileTooLargeAlt: '{{ 'You can alternatively receive an email when the download is ready.' | trans }}',
-                if(count>1 && total/1024/1024 > {{max_download}}) {
+                fileTooLargeEmail: '{{ 'Would you like to receive an e-mail when your download is ready ?' | trans }}',
-                    if(confirm("{{alert_too_big_one|e('js') ~ "\\n" ~ alert_too_big_two|e('js') ~ "\\n" ~ alert_too_big_three|e('js')}}")) {
+                success: '{{ "Success" | trans }}',
-                        $('input[name="obj[]"]:checked', $('#download')).each(function(i,n){
+                warning: '{{ "Warning !" | trans }}'
-                        $('input[name="obj[]"][value="'+$(n).val()+'"]', $('#sendmail')).prop('checked', true);
+            },
-                        });
+            user: {
-                        $('input[name="destmail"]', $('#sendmail')).val("{{app.getAuthenticatedUser().getEmail()}}");
+                email: '{{app.getAuthenticatedUser().getEmail()}}'
-
-                        var tabs = $('.tabs', dialog.getDomElement());
-                        tabs.tabs("option", "active", 1);
             }
-
-                    return;
-                }
-
-                $('#download form').submit();
-                dialog.close();
-            });
-
-            $('#order .order_button').bind('click',function(){
-                if (!check_TOU($('#order'))) {
-                    return false;
-                }
-
-                $('#order .order_button_loader').css('visibility','visible');
-
-                var options = $('#order form').serialize();
-
-                var $this = $(this);
-                $this.prop('disabled', true).addClass('disabled');
-                $.post("../prod/order/"
-                    , options
-                    , function(data){
-                        $this.prop('disabled', false).removeClass('disabled');
-
-                        $('#order .order_button_loader').css('visibility','hidden');
-
-                        if(!data.error) {
-                            var title = '{{ "Success" | trans | e('js') }}';
-                        } else {
-                            var title = '{{ "Warning !" | trans | e('js') }}';
-                        }
-
-                        var options = {
-                          size : 'Alert',
-                          closeButton: true,
-                          title : title
         };
-
-                        dialogModule.dialog.create(options, 2).setContent(data.msg);
-
-                        if(!data.error)
-                        {
-                            humane.info(data.msg);
-                            dialog.close();
-                        } else {
-                            humane.error(data.msg);
-                        }
-
-                        return;
-                    }
-                    ,'json'
-                );
-            });
-
-            $('#ftp .ftp_button').bind('click',function(){
-                if(!check_subdefs($('#ftp')))
-                    return false;
-
-                if (!check_TOU($('#ftp'))) {
-                    return false;
-                }
-
-                $('#ftp .ftp_button_loader').show();
-
-                    $('#ftp .ftp_form:hidden').remove();
-
-                var $this = $(this);
-
-                var options_addr = $('#ftp_form_stock form:visible').serialize();
-                var options_join = $('#ftp_joined').serialize();
-
-                $this.prop('disabled',true);
-                $.post("../prod/export/ftp/"
-                    , options_addr + '&' + options_join
-                    , function(data){
-                        $this.prop('disabled', false);
-                        $('#ftp .ftp_button_loader').hide();
-
-                        if(data.success) {
-                            humane.info(data.message);
-                            dialog.close();
-                        } else {
-                            var alert = dialogModule.dialog.create({
-                                size : 'Alert',
-                                closeOnEscape : true,
-                                closeButton:true,
-                                title : '{{ "Warning !" | trans | e('js') }}'
-                            }, 2);
-
-                            alert.setContent(data.message);
-                         }
-                        return;
-                    }
-                    , 'json'
-                );
-            });
-
-            $('#ftp .tryftp_button').bind('click',function(){
-                $('#ftp .tryftp_button_loader').css('visibility','visible');
-                var $this = $(this);
-                $this.prop('disabled',true)
-                var options_addr = $('#ftp_form_stock form:visible').serialize();
-
-                $.post("../prod/export/ftp/test/"
-                    , options_addr           // no need to include 'ftp_joined' checkboxes to test ftp
-                    , function(data){
-                        $('#ftp .tryftp_button_loader').css('visibility','hidden');
-
-                        var options = {
-                          size : 'Alert',
-                          closeButton: true,
-                          title : data.success ? '{{ "Success" | trans | e('js') }}' : '{{ "Warning !" | trans | e('js') }}'
-                        };
-
-                        dialogModule.dialog.create(options, 3).setContent(data.message);
-
-                        $this.prop('disabled', false);
-
-                        return;
-                    }
-                );
-            });
-
-            $('#sendmail .sendmail_button').bind('click',function(){
-                if(!check_subdefs($('#sendmail'))) {
-                    return false;
-                }
-
-                if (!check_TOU($('#sendmail'))) {
-                    return false;
-                }
-
-                if ($('iframe[name=""]').length === 0) {
-                    $('body').append('<iframe style="display:none;" name="sendmail_target"></iframe>');
-                }
-
-                $('#sendmail form').submit();
-                dialog.close();
-            });
-
-            $('.datepicker', dialog.getDomElement()).datepicker({
-                changeYear: true,
-                changeMonth:true,
-                dateFormat : 'yy-mm-dd'
-            });
-
-            $('a.undisposable_link', dialog.getDomElement()).bind('click',function(){
-                $(this).parent().parent().find('.undisposable').slideToggle();
-                return false;
-            });
-
-            $('input[name="obj[]"]', $('#download, #sendmail, #ftp')).bind('change', function(){
-
-                var $form = $(this).closest('form');
-
-                if($('input.caption[name="obj[]"]:checked', $form).length > 0) {
-                    $('div.businessfields', $form).show();
-                } else {
-                    $('div.businessfields', $form).hide();
-                }
-            });
-        });
     </script>
 {% endif %}
 

templates/web/common/index_bootstrap.html.twig

@@ -18,17 +18,7 @@
         <![endif]-->
 
         <script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script>
-        {% if app.debug %}
-        {#<script type="text/javascript" src="/assets/vendors/better/better.js"></script>
-        <script>
-          // instanciate the object
-          var globalDetector = new Better.GlobalDetector();
-          // start monitoring globals
-          globalDetector.start();
-        </script>#}
-        {% endif %}
         <script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
-        {#<script src="//code.jquery.com/jquery-migrate-1.2.1.js"></script>#}
         <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
         <script type="text/javascript">
             $.widget.bridge('uitooltip', $.ui.tooltip);

templates/web/prod/Share/record.html.twig

@@ -53,44 +53,7 @@
                 </form>
             </p>
         </div>
-
-        <script language="javascript">
-            $(document).ready(function(){
-                $('input.ui-state-default').hover(
-                    function(){$(this).addClass('ui-state-hover');},
-                    function(){$(this).removeClass('ui-state-hover');}
-                );
-
-                $('#permalinkUrlCopy').on('click', function(event) {
-                    event.preventDefault();
-                    return copyElContentClipboard('permalinkUrl');
-                });
-
-                $('#permaviewUrlCopy').on('click', function(event) {
-                    event.preventDefault();
-                    return copyElContentClipboard('permaviewUrl');
-                });
-
-                $('#embedCopy').on('click', function(event) {
-                    event.preventDefault();
-                    return copyElContentClipboard('embedRecordUrl');
-                });
-
-                var copyElContentClipboard = function(elId) {
-                    var copyEl = document.getElementById(elId);
-                    copyEl.select();
-                    try {
-                        var successful = document.execCommand('copy');
-                        var msg = successful ? 'successful' : 'unsuccessful';
-                        console.log('Copying text command was ' + msg);
-                    } catch (err) {
-                        console.log('unable to copy');
-                    }
-                }
-            });
-        </script>
     {% else %}
         <div>{{ 'No URL available' | trans }}</div>
     {% endif %}
 {% endif %}
-

templates/web/prod/User/Add.html.twig

@@ -47,7 +47,7 @@
                     <label for="">{{ 'City' | trans }}</label>
                 </td>
                 <td>
-                    <input name="city" type="text" value="" class="geoname_field"/>
+                    <input name="city" type="text" value="" class="geoname_field" autocomplete="false"/>
                 </td>
             </tr>
             <tr>
@@ -66,67 +66,8 @@
 </div>
 
 <script type="text/javascript">
-
+    var addUserConfig = {
-    $addUserForm = $('#quickAddUser');
+        geonameServerUrl: "{{ app['geonames.server-uri'] }}"
-    $addUserFormMessages = $addUserForm.find('.messages');
-
-    var closeModal = function() {
-        var dialog = $addUserForm.closest('.ui-dialog-content');
-        if (dialog.data("ui-dialog")) {
-            dialog.dialog('destroy').remove();
     }
-    };
 
-    var submitAddUser = function() {
+</script>
-        console.log('add user');
-        $addUserFormMessages.empty();
-        var method = $addUserForm.attr('method');
-
-        method = $.inArray(method.toLowerCase(), ['post', 'get']) ? method : 'POST';
-        $.ajax({
-            type : method,
-            url : $addUserForm.attr('action'),
-            data : $addUserForm.serializeArray(),
-            beforeSend : function(){
-                $addUserForm.addClass('loading');
-            },
-            success : function(datas){
-                if( datas.success === true ) {
-                    p4.Feedback.addUser($addUserForm, closeModal);
-                } else {
-                    if( datas.message !== undefined ) {
-                        $addUserFormMessages.empty().append('<div class="alert alert-error">' + datas.message + '</div>');
-                    }
-                }
-                $addUserForm.removeClass('loading');
-            },
-            error:function(){
-                $addUserForm.removeClass("loading");
-            },
-            timeout:function(){
-                $addUserForm.removeClass("loading");
-            }
-        });
-    };
-
-    $addUserForm.find('.geoname_field').geocompleter({
-        "server": "{{ app['geonames.server-uri'] }}",
-        "limit": 40
-    });
-
-    $addUserForm.on('submit', function(event) {
-        event.preventDefault();
-        submitAddUser();
-    });
-
-    $addUserForm.on('click', '.validate', function(event) {
-        event.preventDefault();
-        submitAddUser();
-    });
-
-    $addUserForm.on('click', '.cancel', function(event) {
-        event.preventDefault();
-        closeModal();
-        return false;
-    });
-    </script>

templates/web/prod/actions/Property/index.html.twig

@@ -16,12 +16,12 @@
         <input type="hidden" name='original_selection' value="{{ app.request.query.get('lst') }}">
 
         <ul>
-            <li><a href="#property-statut">{{ 'Records Statut' | trans }}</a></li>
+            <li><a href="#property-status">{{ 'Records Statut' | trans }}</a></li>
             {# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
             <li><a href="{{ path('display_type_property', { 'lst' : records.serializedList() } ) }}">{{ 'Records type' | trans }}&nbsp;<span>&nbsp;</span></a></li>
         </ul>
 
-        <div id='property-statut'>
+        <div id="property-status">
             <p class="header">
                 <h4 style='text-align:center;'>
                     {% if nbReceivedDocuments == 1 %}
@@ -119,64 +119,6 @@
                 </div>
             </form>
         </div>
-    </div>
+        <div id="type-status"></div>
-
+</div>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $("#tabs-records-property").tabs({
-               beforeLoad: function( event, ui ) {
-                   ui.ajaxSettings.data = {
-                       lst: $("input[name=original_selection]", $(this)).val()
-                   };
-
-                   // load template only once
-                   if ( ui.tab.data( "loaded" ) ) {
-                        event.preventDefault();
-                        return;
-                   }
-
-                   ui.jqXHR.success(function() {
-                        ui.tab.data( "loaded", true );
-                   });
-
-                   ui.tab.find('span').html("<i>{{ 'Loading'|trans }}...</i>");
-               },
-                load: function(event, ui)
-                {
-                    ui.tab.find('span').empty();
-                }
-            });
-
-            var $dialog = dialogModule.dialog.get(1);
-            var $dialogBox = $dialog.getDomElement();
-
-            $("button.cancel", $dialogBox).bind("click", function(){
-                $dialog.close();
-            });
-
-            $("button.submiter", $dialogBox).bind("click", function(){
-                var $this = $(this);
-                var form = $(this).closest("form");
-                var loader = form.find("form-action-loader");
-
-                $.ajax({
-                    type: form.attr("method"),
-                    url: form.attr("action"),
-                    data: form.serializeArray(),
-                    dataType: 'json',
-                    beforeSend:function(){
-                        $this.attr("disabled", true);
-                        loader.show();
-                    },
-                    success: function(data){
-                        $dialog.close();
-                    },
-                    complete: function(){
-                        $this.attr("disabled", false);
-                        loader.hide();
-                    }
-                });
-            });
-        });
-    </script>
 {% endif %}

templates/web/prod/actions/Property/type.html.twig

@@ -53,36 +53,3 @@
         </span>
     </div>
  </form>
-
-<script type="text/javascript">
-    var $dialog = dialogModule.dialog.get(1);
-    var $dialogBox = $dialog.getDomElement();
-
-    $("button.cancel", $dialogBox).bind("click", function(){
-        $dialog.close();
-    });
-
-    $("button.submiter", $dialogBox).bind("click", function(){
-        var $this = $(this);
-        var form = $(this).closest("form");
-        var loader = form.find("form-action-loader");
-
-        $.ajax({
-            type: form.attr("method"),
-            url: form.attr("action"),
-            data: form.serializeArray(),
-            dataType: "json",
-            beforeSend:function(){
-                $this.attr("disabled", true);
-                loader.show();
-            },
-            success: function(data){
-                $dialog.close();
-            },
-            complete: function(){
-                $this.attr("disabled", false);
-                loader.hide();
-            }
-        });
-    });
-</script>

templates/web/prod/actions/Push.html.twig

@@ -89,7 +89,7 @@
                                 {{ 'Select a user in the list' | trans }} <br/>
                                 {% if app.getAclForUser(app.getAuthenticatedUser()).has_right('manageusers') %}
                                     {{ 'or' | trans }}
-                                    <a href="{{ path('prod_push_add_user') }}" class="user_adder btn btn-mini">{{ 'Add user' | trans }}</a>
+                                    <a href="#" class="push-add-user btn btn-mini">{{ 'Add user' | trans }}</a>
                                 {% endif %}
                             </div>
                             <p id="recommanded-users">

templates/web/prod/index.html.twig

@@ -486,7 +486,7 @@
                     <div class="" style="float:left; width:100%;margin-top:20px;">
                         {% set mod = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'advanced_search_reload') %}
                         <label class="checkbox inline" for="user_settings_advanced_search_reload">
-                            <input onchange="userModule.setPref('advanced_search_reload',$(this).prop('checked')?'1' : '0');" name="advanced_search_reload" type="checkbox" style="margin: 3px 0 0 -18px;" class="checkbox" value="1" id="user_settings_advanced_search_reload" {% if mod == '1' %}checked="checked"{% endif %}/>
+                            <input name="advanced_search_reload" type="checkbox" style="margin: 3px 0 0 -18px;" class="checkbox preferences-options-search-reload" value="1" id="user_settings_advanced_search_reload" {% if mod == '1' %}checked="checked"{% endif %}/>
                             {{ 'Use latest search settings on Production loading' | trans }}
                         </label>
                     </div>
@@ -496,11 +496,11 @@
                         <h1>{{ 'Mode de presentation' | trans }}</h1>
                         {% set mod = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'view') %}
                         <label class="radio inline" for="thumbs_view">
-                            <input onchange="userModule.setPref('view',$(this).val());" name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio" value="thumbs" id="thumbs_view" {% if mod == 'thumbs' %}checked="checked"{% endif %}/>
+                            <input name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio preferences-options-presentation-thumbnail" value="thumbs" id="thumbs_view" {% if mod == 'thumbs' %}checked="checked"{% endif %}/>
                             {{ 'reponses:: mode vignettes' | trans }}
                         </label>
                         <label class="radio inline" for="list_view">
-                            <input onchange="userModule.setPref('view',$(this).val());" name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio" value="list" id="list_view" {% if mod == 'list' %}checked="checked"{% endif %}/>
+                            <input name="view_type" type="radio" style="margin: 3px 0 0 -18px;" class="radio preferences-options-presentation-list" value="list" id="list_view" {% if mod == 'list' %}checked="checked"{% endif %}/>
                             {{ 'reponses:: mode liste' | trans }}
                         </label>
                     </div>
@@ -516,11 +516,11 @@
                     {% set rollover_thumbnail = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'rollover_thumbnail') %}
                     <h1>{{ 'Presentation de vignettes'  | trans }}</h1>
                     <label class="radio" for="rollover_caption">
-                        <input onchange="userModule.setPref('rollover_thumbnail',$(this).val());" name="rollover_thumbnail" type="radio" class="radio" value="caption" id="rollover_caption" {% if rollover_thumbnail == 'caption' %}checked="checked" {% endif %}/>
+                        <input name="rollover_thumbnail" type="radio" class="radio preferences-options-rollover-caption" value="caption" id="rollover_caption" {% if rollover_thumbnail == 'caption' %}checked="checked" {% endif %}/>
                         {{ 'Iconographe (description au rollover)' | trans }}
                     </label>
                     <label class="radio" for="rollover_preview">
-                        <input onchange="userModule.setPref('rollover_thumbnail',$(this).val());" name="rollover_thumbnail" type="radio" class="radio" value="preview" id="rollover_preview" {% if rollover_thumbnail == 'preview' %}checked="checked" {% endif %}/>
+                        <input name="rollover_thumbnail" type="radio" class="radio preferences-options-rollover-preview" value="preview" id="rollover_preview" {% if rollover_thumbnail == 'preview' %}checked="checked" {% endif %}/>
                         {{ 'Graphiste (preview au rollover)' | trans }}
                     </label>
                 </div>
@@ -528,15 +528,15 @@
                     {% set technical_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'technical_display') %}
                     <h1>{{'Display technical data'  | trans }}</h1>
                     <label class="radio" for="technical_show">
-                        <input onchange="userModule.setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="1" id="technical_show" {% if technical_display == '1' %}checked="checked"{% endif %}/>
+                        <input name="technical_display" type="radio" class="radio preferences-options-technical-display" value="1" id="technical_show" {% if technical_display == '1' %}checked="checked"{% endif %}/>
                         {{ 'In the answer grid' | trans }}
                     </label>
                     <label class="radio" for="technical_group">
-                        <input onchange="userModule.setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="group" id="technical_group" {% if technical_display == 'group' %}checked="checked"{% endif %}/>
+                        <input name="technical_display" type="radio" class="radio preferences-options-technical-display" value="group" id="technical_group" {% if technical_display == 'group' %}checked="checked"{% endif %}/>
                         {{ 'After metadata' | trans }}
                     </label>
                     <label class="radio" for="technical_hide">
-                        <input onchange="userModule.setPref('technical_display',$(this).val());" name="technical_display" type="radio" class="radio" value="0" id="technical_hide" {% if technical_display == '0' %}checked="checked"{% endif %}/>
+                        <input name="technical_display" type="radio" class="radio preferences-options-technical-display" value="0" id="technical_hide" {% if technical_display == '0' %}checked="checked"{% endif %}/>
                         {{ 'Do not display' | trans }}
                     </label>
                 </div>
@@ -544,7 +544,7 @@
                     {% set doctype_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'doctype_display') %}
                     <h1>{{'Type de documents'  | trans }}</h1>
                     <label class="checkbox" for="doctype_display_show">
-                        <input onchange="userModule.setPref('doctype_display',($(this).prop('checked') ? '1' :'0'));" name="doctype_display" type="checkbox" class="checkbox" value="1" id="doctype_display_show" {% if doctype_display != '0' %}checked="checked"{% endif %}/>
+                        <input name="doctype_display" type="checkbox" class="checkbox preferences-options-doctype-display" value="1" id="doctype_display_show" {% if doctype_display != '0' %}checked="checked"{% endif %}/>
                         {{ 'Afficher une icone' | trans }}
                     </label>
 
@@ -671,8 +671,8 @@
             <div>
                 {% set basket_status_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') %}
                 <label for="basket_status_display" class="checkbox">
-                    <input onchange="userModule.setPref('basket_status_display',($(this).prop('checked') ? '1' :'0'));"
+                    <input
-                    name="basket_status_display" type="checkbox" class="checkbox" value="1"
+                    name="basket_status_display" type="checkbox preferences-options-basket-status" class="checkbox" value="1"
                     id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} />
                     {{ 'Afficher les status' | trans }}
                 </label>
@@ -680,8 +680,8 @@
             <div>
                 {% set basket_caption_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') %}
                 <label for="basket_caption_display" class="checkbox">
-                    <input onchange="userModule.setPref('basket_caption_display',($(this).prop('checked') ? '1' :'0'));"
+                    <input
-                    name="basket_caption_display" type="checkbox" class="checkbox" value="1"
+                    name="basket_caption_display" type="checkbox" class="checkbox preferences-options-basket-caption" value="1"
                     id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} />
                     {{ 'Afficher la fiche descriptive' | trans }}
                 </label>
@@ -689,8 +689,8 @@
             <div>
                 {% set basket_title_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') %}
                 <label for="basket_title_display" class="checkbox">
-                    <input onchange="userModule.setPref('basket_title_display',($(this).prop('checked') ? '1' :'0'));"
+                    <input
-                    name="basket_title_display" type="checkbox" class="checkbox" value="1"
+                    name="basket_title_display" type="checkbox" class="checkbox preferences-options-basket-title" value="1"
                     id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} />
                     {{ 'Afficher le titre' | trans }}
                 </label>
@@ -703,8 +703,8 @@
     <div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
 
     <script type="text/javascript" src="/assets/production/app{% if not app.debug %}.min{% endif %}.js"></script>
-    <script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>
+    {#<script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>#}
-    <script type="text/javascript" src="/assets/prod/js/prod{% if not app.debug %}.min{% endif %}.js"></script>
+    {#<script type="text/javascript" src="/assets/prod/js/prod{% if not app.debug %}.min{% endif %}.js"></script>#}
     <script type="text/javascript">
 
 
@@ -782,4 +782,5 @@
         }
 
     </script>
+    <script type="text/javascript" id="bitly_loader"></script>
 {% endblock %}