wait #7079 @0.75

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index e93c3710829f50c1c2486f8fd499022f8fae1cb1..c57d9938c5add6d70d7eaa35cf04a65b46da91b4 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -29,7 +29,8 @@ database.params.username = root
 database.params.password = FB8qVD7R0jqsXYNR
 database.params.dbname = fluidbook-v3
 
-seo.universalAnalytics = UA-4339912-2
+;seo.universalAnalytics = UA-4339912-2
+seo.googleTagManager = GTM-5BQBGS48
 seo.google = google93c0129ef18a399d.html
 seo.bing = 8986457D1D126C38A815027C839372DC
 

diff --git a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
index 44f64318e6f26350f115df32ab336512fc8876cf..9af34adad5d820ea09c495af97404fc0c1cf26ab 100644 (file)
--- a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
+++ b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
@@ -16,6 +16,11 @@ class Fluidbook_Form_CMS_Sub_Exemples_Fluidbook extends CubeIT_Form_List_Model {
                $text->setLabel('Texte');\r
                $this->addElementLocalized($text, false);\r
 \r
+        $title = new CubeIT_Form_Element_Text('button_text');\r
+        $title->setTranslate(false);\r
+        $title->setLabel('Bouton (si différent du texte par défaut)');\r
+        $this->addElementLocalized($title, false);\r
+\r
                $date = new CubeIT_Form_Element_Date('date');\r
                $date->setLabel('Date');\r
                $date->setPrecision(CubeIT_Date::DAY);\r

diff --git a/framework/application/models/Reference.php b/framework/application/models/Reference.php
index e372a8542d03049193b665722f6db958dabef66f..a199299ca25f6da93a4bf980279fe59dfc212cf2 100644 (file)
--- a/framework/application/models/Reference.php
+++ b/framework/application/models/Reference.php
@@ -15,6 +15,7 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table
     protected $categories;\r
     protected $featured_categories;\r
     protected $homeimage;\r
+    protected $button_text;\r
 \r
     protected $_types = array('categories' => 'list', 'featured_categories' => 'list', 'title' => 'json', 'text' => 'json', 'image' => 'json', 'homeimage' => 'json', 'fluidbook_id' => 'json', 'fluidbook_page' => 'json');\r
 \r
@@ -32,6 +33,7 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table
         $table->addColumn('homeimage', 'string', array('length' => 64));\r
         $table->addColumn('categories', 'string', array('length' => 64));\r
         $table->addColumn('featured_categories', 'string', array('length' => 64));\r
+        $table->addColumn('button_text', 'text');\r
         return $table;\r
     }\r
 \r

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index b441c4b75bb426096587db25b391a0c502b0cbfe..6cfa69cdaff4937ca712e485538f6e8938959066 100644 (file)
--- a/framework/application/views/helpers/Exemples.php
+++ b/framework/application/views/helpers/Exemples.php
@@ -142,7 +142,7 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract
         $res = '';\r
 \r
         if ($url && $url != '-') {\r
-            $res = $this->linkTruePopupFullscreen(__('Voir le Fluidbook'), $url, array('class' => 'button', 'data-event' => array('category' => 'exemple', 'action' => 'see', 'label' => $f->getTitle())));\r
+            $res = $this->linkTruePopupFullscreen($f->getButtonText() ?: __('Voir le Fluidbook'), $url, array('class' => 'button', 'data-event' => array('category' => 'exemple', 'action' => 'see', 'label' => $f->getTitle())));\r
         }\r
         if ($category == 3) {\r
             $firstCat = 0;\r