From 48502e04e486f8e39774f53cfbb8a718ede73f4f Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 6 Nov 2013 10:42:34 +0100
Subject: [PATCH 1/4] phpdoc

---
 core/lib/Thelia/Core/Template/Element/BaseLoop.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 7344843ed..6d4e6ed92 100755
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -410,6 +410,11 @@ abstract class BaseLoop
         }
     }
 
+    /**
+     * @param LoopResult $loopResult
+     *
+     * @return LoopResult
+     */
     abstract public function parseResults(LoopResult $loopResult);
 
     /**

From 3f8a68802b8f30c485e8eed85e78d31dfa47c3f3 Mon Sep 17 00:00:00 2001
From: touffies <claffont@openstudio.fr>
Date: Wed, 6 Nov 2013 10:49:27 +0100
Subject: [PATCH 2/4] Add language strings for the toolbar

---
 templates/default/I18n/en_US.php        |  4 ++++
 templates/default/I18n/es_ES.php        |  4 ++++
 templates/default/I18n/fr_FR.php        |  5 +++++
 templates/default/I18n/it_IT.php        |  4 ++++
 templates/default/includes/toolbar.html | 12 ++++++------
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php
index 19b58a6c4..24bf81612 100755
--- a/templates/default/I18n/en_US.php
+++ b/templates/default/I18n/en_US.php
@@ -152,6 +152,10 @@ return array (
   'Select Country' => 'Select Country',
   'Create' => 'Create',
   'Related' => 'Related',
+  'Grid' => 'Grid',
+  'List' => 'List',
+  'Next' => 'Next',
+  'Previous' => 'Previous',
 /*
   'The page cannot be found' => 'The page cannot be found',
   'What\'s your name?' => 'What\'s your name?',
diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index 9e276a02b..427227f1c 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -152,6 +152,10 @@ return array (
   'Select Country' => '',
   'Create' => '',
   'Related' => '',
+  'Grid' => '',
+  'List' => '',
+  'Next' => '',
+  'Previous' => '',
 /*
   'The page cannot be found' => '',
   'What\'s your name?' => '',
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index a9f92fa95..b5f6a6290 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -152,6 +152,11 @@ return array (
     'Select Country' => 'Choisissez un pays',
     'Create' => 'Créer',
     'Related' => 'Liés', // voir le contexte pour l'accord
+    'Grid' => 'Grille',
+    'List' => 'Liste',
+    'Next' => 'Suivant',
+    'Previous' => 'Précédent',
+
     /*
       'The page cannot be found' => '',
       'What\'s your name?' => '',
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index 9e276a02b..427227f1c 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -152,6 +152,10 @@ return array (
   'Select Country' => '',
   'Create' => '',
   'Related' => '',
+  'Grid' => '',
+  'List' => '',
+  'Next' => '',
+  'Previous' => '',
 /*
   'The page cannot be found' => '',
   'What\'s your name?' => '',
diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html
index 33f5ba9e5..c512ba90a 100644
--- a/templates/default/includes/toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -30,8 +30,8 @@
             <span class="view-mode">
                 <span class="view-mode-label">{intl l="View as"}:</span>
                 <span class="view-mode-btn">
-                    <a href="{url path="{navigate to="current"}" mode='grid'}" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
-                    <a href="{url path="{navigate to="current"}" mode="list"}" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode="grid"}" data-toggle="view" role="button" title="{intl l="Grid"}" rel="nofollow" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode="list"}" data-toggle="view" role="button" title="{intl l="List"}" rel="nofollow" class="btn btn-list"><i class="icon-list"></i></a>
                 </span>
             </span><!-- /.view-mode -->
 
@@ -42,9 +42,9 @@
         <ul class="pagination">
 
             {if $product_page > 1}
-                <li><a href="{url path={navigate to="current"} page={$product_page-1} }" class="prev"><i class="icon-prev"></i></a></li>
+                <li><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
             {else}
-                <li><a href="#" class="prev"><i class="icon-prev"></i></a></li>
+                <li><a href="#" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
             {/if}
             {pageloop rel="product_list"}
             {if $PAGE != $CURRENT}
@@ -54,9 +54,9 @@
             {/if}
             {if $PAGE == $LAST}
                 {if $CURRENT < $LAST}
-                    <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }" class="next"><i class="icon-next"></i></a></li>
+                    <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
                 {else}
-                    <li><a href="#" class="next"><i class="icon-next"></i></a></li>
+                    <li><a href="#" title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
                 {/if}
 
             {/if}

From 1471a8ed21e3bdaefca3d1950823b32b3ebe78a0 Mon Sep 17 00:00:00 2001
From: touffies <claffont@openstudio.fr>
Date: Wed, 6 Nov 2013 10:57:12 +0100
Subject: [PATCH 3/4] Remove duplicate icon error

---
 templates/default/order-invoice.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index bc9d7047b..d75c08b78 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -143,7 +143,7 @@
                                             <button type="submit" class="btn btn-coupon">{intl l="Ok"}</button>
                                         </span>
                                     </div>
-                                    {if $error}<span class="help-block"><i class="icon-remove"></i> {$message}</span>{/if}
+                                    {if $error}<span class="help-block">{$message}</span>{/if}
                                 </div>
                             {/form_field}
                             <!-- /input-group -->

From 3db734437367350a785470639a4028d80615847b Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Wed, 6 Nov 2013 11:07:31 +0100
Subject: [PATCH 4/4] fix tests

---
 core/lib/Thelia/Model/Map/ConfigTableMap.php              | 2 +-
 core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php | 7 +++++++
 core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php  | 7 +++++++
 core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php   | 7 +++++++
 core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php  | 7 +++++++
 core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php  | 5 +++++
 install/thelia.sql                                        | 2 +-
 7 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php
index ebd5d6edf..8208b56fe 100644
--- a/core/lib/Thelia/Model/Map/ConfigTableMap.php
+++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php
@@ -166,7 +166,7 @@ class ConfigTableMap extends TableMap
         // columns
         $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
         $this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, null);
-        $this->addColumn('VALUE', 'Value', 'VARCHAR', true, 255, null);
+        $this->addColumn('VALUE', 'Value', 'LONGVARCHAR', true, null, null);
         $this->addColumn('SECURED', 'Secured', 'TINYINT', true, null, 1);
         $this->addColumn('HIDDEN', 'Hidden', 'TINYINT', true, null, 1);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php
index ce5f56747..c3fbe56d9 100755
--- a/core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php
@@ -53,6 +53,13 @@ class CategoryTest extends BaseLoopTestor
     public function testSearchById()
     {
         $category = CategoryQuery::create()->findOne();
+        if(null === $category) {
+            $category = new \Thelia\Model\Category();
+            $category->setParent(0);
+            $category->setVisible(1);
+            $category->setTitle('foo');
+            $category->save();
+        }
 
         $this->baseTestSearchById($category->getId());
     }
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php
index 3a286200a..dbb705b03 100755
--- a/core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php
@@ -53,6 +53,13 @@ class ContentTest extends BaseLoopTestor
     public function testSearchById()
     {
         $content = ContentQuery::create()->findOne();
+        if(null === $content) {
+            $content = new \Thelia\Model\Content();
+            $content->setDefaultFolder(0);
+            $content->setVisible(1);
+            $content->setTitle('foo');
+            $content->save();
+        }
 
         $this->baseTestSearchById($content->getId());
     }
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php
index 15ea3968c..a5210839e 100755
--- a/core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php
@@ -53,6 +53,13 @@ class FolderTest extends BaseLoopTestor
     public function testSearchById()
     {
         $folder = FolderQuery::create()->findOne();
+        if(null === $folder) {
+            $folder = new \Thelia\Model\Folder();
+            $folder->setParent(0);
+            $folder->setVisible(1);
+            $folder->setTitle('foo');
+            $folder->save();
+        }
 
         $this->baseTestSearchById($folder->getId());
     }
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php
index 07e179cbd..e806a6971 100755
--- a/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php
@@ -54,6 +54,13 @@ class ProductTest extends BaseLoopTestor
     public function testSearchById()
     {
         $product = ProductQuery::create()->orderById(Criteria::ASC)->findOne();
+        if(null === $product) {
+            $product = new \Thelia\Model\Product();
+            $product->setDefaultCategory(0);
+            $product->setVisible(1);
+            $product->setTitle('foo');
+            $product->save();
+        }
 
         $this->baseTestSearchById($product->getId());
     }
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php
index fa24d72ee..7e2da4b26 100644
--- a/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/TaxRuleTest.php
@@ -53,6 +53,11 @@ class TaxRuleTest extends BaseLoopTestor
     public function testSearchById()
     {
         $tr = TaxRuleQuery::create()->findOne();
+        if(null === $tr) {
+            $tr = new \Thelia\Model\TaxRule();
+            $tr->setTitle('foo');
+            $tr->save();
+        }
 
         $this->baseTestSearchById($tr->getId(), array('force_return' => true));
     }
diff --git a/install/thelia.sql b/install/thelia.sql
index b213c114f..ed27071fb 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -416,7 +416,7 @@ CREATE TABLE `config`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `name` VARCHAR(255) NOT NULL,
-    `value` VARCHAR(255) NOT NULL,
+    `value` TEXT NOT NULL,
     `secured` TINYINT DEFAULT 1 NOT NULL,
     `hidden` TINYINT DEFAULT 1 NOT NULL,
     `created_at` DATETIME,