Merge branch '3.8'

Conflicts: CHANGELOG.md bin/console bin/developer bin/setup bower.json composer.json composer.lock features/bootstrap/FeatureContext.php features/bootstrap/GuiContext.php lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php lib/Alchemy/Phrasea/Command/CreateCollection.php lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Client/Baskets.php lib/Alchemy/Phrasea/Controller/Client/Root.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Property.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Controller/Prod/Tools.php lib/Alchemy/Phrasea/Controller/Prod/Upload.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php lib/Alchemy/Phrasea/Helper/DatabaseHelper.php lib/Alchemy/Phrasea/Helper/User/Edit.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/Doctrine/Entities/AuthFailure.php lib/Doctrine/Entities/Basket.php lib/Doctrine/Entities/BasketElement.php lib/Doctrine/Entities/LazaretAttribute.php lib/Doctrine/Entities/LazaretCheck.php lib/Doctrine/Entities/LazaretFile.php lib/Doctrine/Entities/LazaretSession.php lib/Doctrine/Entities/Session.php lib/Doctrine/Entities/SessionModule.php lib/Doctrine/Entities/StoryWZ.php lib/Doctrine/Entities/UsrList.php lib/Doctrine/Entities/UsrListEntry.php lib/Doctrine/Entities/UsrListOwner.php lib/Doctrine/Entities/ValidationData.php lib/Doctrine/Entities/ValidationParticipant.php lib/Doctrine/Entities/ValidationSession.php lib/Doctrine/Logger/MonologSQLLogger.php lib/Doctrine/Repositories/BasketRepository.php lib/Doctrine/Repositories/ValidationParticipantRepository.php lib/Doctrine/Types/Binary.php lib/Doctrine/Types/Blob.php lib/Doctrine/Types/Enum.php lib/Doctrine/Types/LongBlob.php lib/Doctrine/Types/VarBinary.php lib/classes/API/OAuth2/Account.php lib/classes/API/OAuth2/Application.php lib/classes/API/OAuth2/Application/OfficePlugin.php lib/classes/API/OAuth2/AuthCode.php lib/classes/API/OAuth2/RefreshToken.php lib/classes/API/OAuth2/Token.php lib/classes/API/V1/Abstract.php lib/classes/API/V1/Interface.php lib/classes/API/V1/adapter.php lib/classes/API/V1/exception/abstract.php lib/classes/API/V1/exception/badrequest.php lib/classes/API/V1/exception/forbidden.php lib/classes/API/V1/exception/internalservererror.php lib/classes/API/V1/exception/maintenance.php lib/classes/API/V1/exception/methodnotallowed.php lib/classes/API/V1/exception/notfound.php lib/classes/API/V1/exception/unauthorized.php lib/classes/API/V1/result.php lib/classes/Exception/Feed/EntryNotFound.php lib/classes/Exception/Feed/ItemNotFound.php lib/classes/Exception/Feed/PublisherNotFound.php lib/classes/Feed/Abstract.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/CollectionInterface.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Collection.php lib/classes/Feed/Entry/CollectionInterface.php lib/classes/Feed/Entry/Interface.php lib/classes/Feed/Entry/Item.php lib/classes/Feed/Entry/ItemInterface.php lib/classes/Feed/Interface.php lib/classes/Feed/Link.php lib/classes/Feed/LinkInterface.php lib/classes/Feed/Publisher/Adapter.php lib/classes/Feed/Publisher/Interface.php lib/classes/Feed/Token.php lib/classes/Feed/TokenAggregate.php lib/classes/Feed/XML/Abstract.php lib/classes/Feed/XML/Atom.php lib/classes/Feed/XML/Cooliris.php lib/classes/Feed/XML/Interface.php lib/classes/Feed/XML/RSS.php lib/classes/Feed/XML/RSS/Image.php lib/classes/Feed/XML/RSS/ImageInterface.php lib/classes/User/Adapter.php lib/classes/User/Interface.php lib/classes/appbox/register.php lib/classes/connection.php lib/classes/connection/abstract.php lib/classes/connection/interface.php lib/classes/connection/pdo.php lib/classes/connection/pdoStatementDebugger.php lib/classes/deprecated/countries.php lib/classes/deprecated/inscript.api.php lib/classes/eventsmanager/event/test.php lib/classes/ftpclient.php lib/classes/http/request.php lib/classes/media/subdef.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskState.php lib/classes/module/console/tasklist.php lib/classes/module/console/taskrun.php lib/classes/patch/320alpha4b.php lib/classes/patch/3715alpha1a.php lib/classes/patch/379alpha1a.php lib/classes/patch/380alpha10a.php lib/classes/patch/380alpha11a.php lib/classes/patch/380alpha13a.php lib/classes/patch/380alpha14a.php lib/classes/patch/380alpha15a.php lib/classes/patch/380alpha16a.php lib/classes/patch/380alpha17a.php lib/classes/patch/380alpha18a.php lib/classes/patch/380alpha3a.php lib/classes/patch/380alpha4a.php lib/classes/patch/380alpha6a.php lib/classes/patch/380alpha8a.php lib/classes/patch/380alpha9a.php lib/classes/patch/381alpha1b.php lib/classes/patch/381alpha2a.php lib/classes/patch/381alpha3a.php lib/classes/patch/381alpha4a.php lib/classes/patch/383alpha1a.php lib/classes/patch/383alpha2a.php lib/classes/patch/383alpha3a.php lib/classes/patch/383alpha4a.php lib/classes/record/adapter.php lib/classes/record/preview.php lib/classes/recordutils.php lib/classes/recordutils/audio.php lib/classes/recordutils/document.php lib/classes/recordutils/map.php lib/classes/recordutils/video.php lib/classes/registry.php lib/classes/registryInterface.php lib/classes/set/order.php lib/classes/system/url.php lib/classes/task/Scheduler.php lib/classes/task/appboxAbstract.php lib/classes/task/databoxAbstract.php lib/classes/task/manager.php lib/classes/task/period/RecordMover.php lib/classes/task/period/apibridge.php lib/classes/task/period/apiwebhooks.php lib/classes/task/period/archive.php lib/classes/task/period/cindexer.php lib/classes/task/period/emptyColl.php lib/classes/task/period/ftp.php lib/classes/task/period/ftpPull.php lib/classes/task/period/subdef.php lib/classes/task/period/test.php lib/classes/task/period/writemeta.php lib/conf.d/PhraseaFixture/AbstractWZ.php lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php lib/conf.d/PhraseaFixture/Story/LoadOneStory.php lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php lib/conf.d/PhraseaFixture/UsrLists/UsrList.php lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php templates/web/admin/collection/collection.html.twig templates/web/common/dialog_export.html.twig templates/web/common/menubar.html.twig templates/web/prod/actions/Tools/index.html.twig templates/web/prod/index.html.twig templates/web/prod/upload/upload-flash.html.twig templates/web/prod/upload/upload.html.twig templates/web/report/report_layout_child.html.twig templates/web/setup/step2.html.twig templates/web/thesaurus/new-synonym-dialog.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
2025-10-23 09:53:15 +00:00 · 2015-02-05 18:38:49 +01:00
parent 5e33fdafe4 e9fb3d44fc
commit 949bf06cac
759 changed files with 1932 additions and 1653 deletions
--- a/www/api.php
+++ b/www/api.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/include/jquery.p4.preview.js
+++ b/www/include/jquery.p4.preview.js
@@ -147,7 +147,10 @@ function openPreview(env, pos, contId, reload) {
                $('#PREVIEWBOX img.record.zoomable').draggable();
            }

-            setTitle(data.title);
+            $('#SPANTITLE').empty().append(data.title);
+            $("#PREVIEWTITLE_COLLLOGO").empty().append(data.collection_logo);
+            $("#PREVIEWTITLE_COLLNAME").empty().append(data.collection_name);
+
            setPreview();

            if (env != 'RESULT') {
--- a/www/index.php
+++ b/www/index.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/index_dev.php
+++ b/www/index_dev.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/app.js
+++ b/www/scripts/apps/admin/fields/app.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/collections/dcFields.js
+++ b/www/scripts/apps/admin/fields/collections/dcFields.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/collections/fields.js
+++ b/www/scripts/apps/admin/fields/collections/fields.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/collections/vocabularies.js
+++ b/www/scripts/apps/admin/fields/collections/vocabularies.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/errors/error.js
+++ b/www/scripts/apps/admin/fields/errors/error.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/errors/errorManager.js
+++ b/www/scripts/apps/admin/fields/errors/errorManager.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/errors/errorModel.js
+++ b/www/scripts/apps/admin/fields/errors/errorModel.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/main.js
+++ b/www/scripts/apps/admin/fields/main.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/alert.js
+++ b/www/scripts/apps/admin/fields/views/alert.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/create.js
+++ b/www/scripts/apps/admin/fields/views/create.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/dcField.js
+++ b/www/scripts/apps/admin/fields/views/dcField.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/edit.js
+++ b/www/scripts/apps/admin/fields/views/edit.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/fieldError.js
+++ b/www/scripts/apps/admin/fields/views/fieldError.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/list.js
+++ b/www/scripts/apps/admin/fields/views/list.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/listRow.js
+++ b/www/scripts/apps/admin/fields/views/listRow.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/modal.js
+++ b/www/scripts/apps/admin/fields/views/modal.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/admin/fields/views/save.js
+++ b/www/scripts/apps/admin/fields/views/save.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/bind.js
+++ b/www/scripts/apps/login/home/bind.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/common.js
+++ b/www/scripts/apps/login/home/common.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/config.js
+++ b/www/scripts/apps/login/home/config.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/forgotPassword.js
+++ b/www/scripts/apps/login/home/forgotPassword.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/login.js
+++ b/www/scripts/apps/login/home/login.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/mapping.js
+++ b/www/scripts/apps/login/home/mapping.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/oauthLogin.js
+++ b/www/scripts/apps/login/home/oauthLogin.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/recoverPassword.js
+++ b/www/scripts/apps/login/home/recoverPassword.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/register.js
+++ b/www/scripts/apps/login/home/register.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/registerProvider.js
+++ b/www/scripts/apps/login/home/registerProvider.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/renewEmail.js
+++ b/www/scripts/apps/login/home/renewEmail.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/apps/login/home/renewPassword.js
+++ b/www/scripts/apps/login/home/renewPassword.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/forms/validator.js
+++ b/www/scripts/common/forms/validator.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/forms/views/error.js
+++ b/www/scripts/common/forms/views/error.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/forms/views/form.js
+++ b/www/scripts/common/forms/views/form.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/forms/views/formType/passwordSetter.js
+++ b/www/scripts/common/forms/views/formType/passwordSetter.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/forms/views/input.js
+++ b/www/scripts/common/forms/views/input.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/common/multiviews.js
+++ b/www/scripts/common/multiviews.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/models/dcField.js
+++ b/www/scripts/models/dcField.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/models/field.js
+++ b/www/scripts/models/field.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/scripts/models/vocabulary.js
+++ b/www/scripts/models/vocabulary.js
@@ -1,7 +1,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/www/skins/admin/template-dialogs.js
+++ b/www/skins/admin/template-dialogs.js
@@ -4,7 +4,7 @@ var dialogUserResetTemplateConfirm = function (callback) {
    buttons[language.reset_template_do_reset_apply_button] = function () { p4.Dialog.Close(2); callback('1'); };

    var $dialog = p4.Dialog.Create({
-        size : '500x150',
+        size : '550x200',
        closeOnEscape : true,
        closeButton:false,
        cancelButton:true,
@@ -21,7 +21,7 @@ var dialogUserTemplate = function (callback) {
    buttons[language.reset_template_do_reset_button] = function () { p4.Dialog.Close(1); dialogUserResetTemplateConfirm(callback); };

    var $dialog = p4.Dialog.Create({
-        size : '500x150',
+        size : '550x200',
        closeOnEscape : true,
        closeButton:false,
        cancelButton:true,
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -4226,3 +4226,11 @@ ui-dialog-titlebar {
    position: relative;
    float: left;
 }
+
+#clientModal,  #clientModal .modal-footer {
+    background-color: #404040;
+}
+
+#clientModal .close {
+    color: #fff;
+}
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -4350,3 +4350,12 @@ ui-dialog-titlebar {
    position: relative;
    float: left;
 }
+
+#clientModal,  #clientModal .modal-footer {
+    background-color: #999999;
+    color: #fff;
+}
+
+#clientModal .close {
+    color: #404040;
+}
--- a/www/skins/prod/jquery.main-prod.js
+++ b/www/skins/prod/jquery.main-prod.js
@@ -756,6 +756,16 @@ function HueToRgb(m1, m2, hue) {

 $(document).ready(function () {

+    $('input[name=search_type]').bind('click', function () {
+        var $this = $(this);
+        var $record_types = $('#recordtype_sel');
+        if ($this.hasClass('mode_type_reg')) {
+            $record_types.hide();
+        } else {
+            $record_types.show();
+        }
+    });
+
    $('.adv_search_button').live('click', function () {
        var searchForm = $('#searchForm');
        var parent = searchForm.parent();
--- a/www/skins/report/report.js
+++ b/www/skins/report/report.js
@@ -74,9 +74,14 @@ function bindEvents() {
        loadDash();
    });
    //load all the report
-    $('form .formsubmiter').bind('click', function () {
+    $('form input.formsubmiter').bind('click', function () {
        submiterAction($(this));
    });
+
+    $('form select.formsubmiter').bind('change', function () {
+        submiterAction($("option:selected", $(this)));
+    });
+
    //reload the content by pressing enter key, it concerns the number of result by report
    $('form .entersubmiter').bind('keypress', function (event) {
        if (event.keyCode == '13') {