From 291bcb3bc22a5d6ec7f6a655699d3ca085b44740 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 28 Feb 2012 19:27:18 +0100 Subject: [PATCH 1/7] Fix list adder --- www/prod/jquery.Feedback.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/www/prod/jquery.Feedback.js b/www/prod/jquery.Feedback.js index f46e20b1bd..3b3a62eae4 100644 --- a/www/prod/jquery.Feedback.js +++ b/www/prod/jquery.Feedback.js @@ -576,9 +576,9 @@ var initRight = function(){ - var $container = this.container = $('#ListManager .editor'); + var $container = $('#ListManager .editor'); - $('form[name="list-editor-search"]', this.container).bind('submit', function(){ + $('form[name="list-editor-search"]', $container).bind('submit', function(){ var $this = $(this); var dest = $('.list-editor-results', $container); @@ -599,11 +599,11 @@ return false; }); - $('form[name="list-editor-search"] select', this.container).bind('change', function(){ + $('form[name="list-editor-search"] select', $container).bind('change', function(){ $(this).closest('form').trigger('submit'); }); - $('button', this.container).button(); + $('button', $container).button(); $('.EditToggle', $container).bind('click', function(){ $('.content.readonly, .content.readwrite', $('#ListManager')).toggle(); @@ -614,7 +614,7 @@ return false; }); - $('button.deleter', this.container).bind('click', function(event){ + $('button.deleter', $container).bind('click', function(event){ var list_id = $(this).find('input[name=list_id]').val(); From 7856ce58ab8933f43b386ddd6d62e52c1f84026a Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 28 Feb 2012 19:33:16 +0100 Subject: [PATCH 2/7] Push have default names --- lib/Alchemy/Phrasea/Controller/Prod/Push.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index 5cd9c0b497..52c937be1e 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php @@ -183,10 +183,12 @@ class Push implements ControllerProviderInterface $appbox = \appbox::get_instance($app['Core']); - $push_name = $request->get( - 'name' - , sprintf(_('Push from %s'), $user->get_display_name()) - ); + $push_name = $request->get('name'); + + if (trim($push_name) === '') + { + $push_name = sprintf(_('Push from %s'), $user->get_display_name()); + } $push_description = $request->get('push_description'); @@ -322,10 +324,12 @@ class Push implements ControllerProviderInterface $repository = $em->getRepository('\Entities\Basket'); - $validation_name = $request->get( - 'name' - , sprintf(_('Validation from %s'), $user->get_display_name()) - ); + $validation_name = $request->get('name'); + + if (trim($validation_name) === '') + { + $validation_name = sprintf(_('Validation from %s'), $user->get_display_name()); + } $validation_description = $request->get('validation_description'); From 7bf6767f789bb3e4d7ca80d31a8083fe0dfe1024 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 28 Feb 2012 20:04:03 +0100 Subject: [PATCH 3/7] Presentation fenetre Recherche avancee --- templates/web/prod/index.html.twig | 8 ++++---- www/skins/prod/000000/prodcolor.css | 3 +-- www/skins/prod/959595/prodcolor.css | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 197f049787..a2c763aff9 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -423,15 +423,12 @@