From e288a2af2e7c8327e8bcf882bf3cd7e2ed27711e Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 18:50:32 +0100
Subject: [PATCH 1/8] PHRAS-336 #fix download of xml caption

---
 lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
index b0575ab619..416bb41d73 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
@@ -92,6 +92,8 @@ class DoDownload implements ControllerProviderInterface
      */
     public function prepareDownload(Application $app, Request $request, $token)
     {
+
+
         $datas = $app['tokens']->helloToken($token);
 
         if (false === $list = @unserialize((string) $datas['datas'])) {
@@ -207,12 +209,12 @@ class DoDownload implements ControllerProviderInterface
         $app['session']->save();
         ignore_user_abort(true);
 
-        \set_export::build_zip(
-            $app,
-            $token,
-            $list,
-            sprintf($app['root.path'] . '/tmp/download/%s.zip', $datas['value']) // Dest file
-        );
+        if ($list['count'] > 1) {
+            \set_export::build_zip($app, $token, $list, sprintf($app['root.path'] . '/tmp/download/%s.zip', $datas['value']));
+        } else {
+            $list['complete'] = true;
+            $app['tokens']->updateToken($token, serialize($list));
+        }
 
         return $app->json(array(
             'success' => true,

From 6e7f8cbb7ef475f5082c5b00ca190e825d5923ba Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 18:51:07 +0100
Subject: [PATCH 2/8] PHRAS-294 #fix default date selection

---
 templates/web/prod/index.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index a6b1b1e518..82d0d59859 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -334,9 +334,9 @@
 
                                             <span>{% trans 'Trier par ' %}</span>
                                             <select name="sort" class="input-small">
-                                                <option value="" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected default-selection"{% endif %}>{{ "No sort"|trans }}</option>
+                                                <option value="" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected" class="default-selection"{% endif %}>{{ "No sort"|trans }}</option>
                                                 {% for sort in search_datas['sort'] %}
-                                                <option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected default-selection"{% endif %}>{{ sort.fieldname }}</option>
+                                                    <option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected" class="default-selection"{% endif %}>{{ sort.fieldname }}</option>
                                                 {% endfor %}
                                             </select>
                                             <select name="ord" class="input-medium">

From d65e81ebf2aed54b7c6bc291d9867d55aba30b36 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 19:04:21 +0100
Subject: [PATCH 3/8] PHRAS-334 #fix connected users module display

---
 templates/web/admin/connected-users.html.twig | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/templates/web/admin/connected-users.html.twig b/templates/web/admin/connected-users.html.twig
index 2bef2def0e..d4bc7b8a55 100644
--- a/templates/web/admin/connected-users.html.twig
+++ b/templates/web/admin/connected-users.html.twig
@@ -67,12 +67,9 @@
             <td  class="colValue" >{{ data['applications'][5] }}</td>
         </tr>
         <tr>
+            {# module witj id 7 has been removed keep it for bc #}
             <td  class="colTitle" >{{ 'admin::monitor: module comparateur' | trans }}</td>
-            <td  class="colValue" >{{ data['applications'][6] }}</td>
-        </tr>
-        <tr>
-            <td  class="colTitle" >{{ 'admin::monitor: module validation' | trans }}</td>
-            <td  class="colValue" >{{ data['applications'][7] }}</td>
+            <td  class="colValue" >{{ data['applications'][6] + data['applications'][7] }}</td>
         </tr>
         {% if data['applications'][0] != 0 %}
         <tr>

From 188a0f44b37d1d347523699d285a9d883b4a9944 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 19:41:17 +0100
Subject: [PATCH 4/8] PHRAS-333 #fix reset email

---
 lib/Alchemy/Phrasea/Controller/Root/Account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php
index 3077be9d7a..370ccfdf5a 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Account.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php
@@ -145,7 +145,7 @@ class Account implements ControllerProviderInterface
         }
 
         $date = new \DateTime('1 day');
-        $token = $app['tokens']->getUrlToken(\random::TYPE_EMAIL, $app['authentication']->getUser()->get_id(), $date, $app['authentication']->getUser()->get_email());
+        $token = $app['tokens']->getUrlToken(\random::TYPE_EMAIL, $app['authentication']->getUser()->get_id(), $date, $email);
         $url = $app->url('account_reset_email', array('token' => $token));
 
         try {

From 2f261c64b254b5d2f9df58c926f894012f1c9482 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 19:43:19 +0100
Subject: [PATCH 5/8] PHRAS-322 #fix missing image

---
 www/skins/thesaurus/win.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/skins/thesaurus/win.js b/www/skins/thesaurus/win.js
index 4d30c99781..bfd7a93048 100644
--- a/www/skins/thesaurus/win.js
+++ b/www/skins/thesaurus/win.js
@@ -1638,7 +1638,7 @@ function GUI(varname, idbody, skin) {
     node.style.left = "50px";
     node.style.zIndex = 99;
     node.style.visibility = "hidden";
-    node.src = "cursors/nodrop01.gif";
+    node.src = "/skins/icons/nodrop01.gif";
     dragObj.objCursor = desk.appendChild(node);
 
     desk.onmousemove = function (e) {

From 4b8ab74f7b4878bb79052ce81dbc379fc0490ee5 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 12 Nov 2014 20:35:08 +0100
Subject: [PATCH 6/8] #fix missing image

---
 .../jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css b/www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css
index 5a713247d5..e8355c138e 100644
--- a/www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css
+++ b/www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css
@@ -823,7 +823,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 	border: 1px solid #202020;
-	background: #313131 url(images/ui-bg_flat_75_313131_40x100.png) 50% 50% repeat-x;
+	background: #313131 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
 	font-weight: bold;
 	color: #ffffff;
 }
@@ -855,7 +855,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
 	border: 1px solid #202020;
-	background: #555555 url(images/ui-bg_flat_65_555555_40x100.png) 50% 50% repeat-x;
+	background: #555555 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
 	font-weight: bold;
 	color: #ff9000;
 }

From 701a91e5c2c5564e4a11eb23605bbf5c4027b7c6 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 13 Nov 2014 12:22:49 +0100
Subject: [PATCH 7/8] fix tests

---
 tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php | 4 ++--
 tests/classes/api/v1/api_v1_adapterTest.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
index 55ffb2537c..05308b48d1 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
@@ -1308,7 +1308,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
 
         $tochange = array();
         foreach ($status_bits as $n => $datas) {
-            $tochange[$n] = substr($record_status, ($n - 1), 1) == '0' ? '1' : '0';
+            $tochange[$n] = substr($record_status, ($n), 1) == '0' ? '1' : '0';
         }
         $this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
 
@@ -2709,7 +2709,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
             $this->assertTrue(is_int($status['bit']));
             $this->assertTrue(is_bool($status['state']));
 
-            $retrieved = !!substr($r_status, ($status['bit'] - 1), 1);
+            $retrieved = !!substr($r_status, ($status['bit']), 1);
 
             $this->assertEquals($retrieved, $status['state']);
         }
diff --git a/tests/classes/api/v1/api_v1_adapterTest.php b/tests/classes/api/v1/api_v1_adapterTest.php
index fa734e57bd..0c928ff5f6 100644
--- a/tests/classes/api/v1/api_v1_adapterTest.php
+++ b/tests/classes/api/v1/api_v1_adapterTest.php
@@ -76,7 +76,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     public function testGet_version()
     {
-        $this->assertEquals('1.3', $this->object->get_version());
+        $this->assertEquals('1.4.1', $this->object->get_version());
     }
 
     public function testGet_databoxes()

From efa00928e9450e6179c74be7d01df17d2a5c9ca6 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 13 Nov 2014 15:23:29 +0100
Subject: [PATCH 8/8] PHRAS-333 #fix locale

---
 lib/Alchemy/Phrasea/Controller/Report/Activity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Report/Activity.php b/lib/Alchemy/Phrasea/Controller/Report/Activity.php
index f258e92b43..a07e7d2291 100644
--- a/lib/Alchemy/Phrasea/Controller/Report/Activity.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Activity.php
@@ -345,7 +345,7 @@ class Activity implements ControllerProviderInterface
             'ddate'     => array(_('report:: jour'), 0, 0, 0, 0),
             'total'     => array(_('report:: total des telechargements'), 0, 0, 0, 0),
             'preview'   => array(_('report:: preview'), 0, 0, 0, 0),
-            'document'  => array(_('report:: document original'), 0, 0, 0, 0)
+            'document'  => array(_('report:: document'), 0, 0, 0, 0)
         );
 
         $activity = new \module_report_activity(