(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 4ea08f36a97f94d38e381c702a0ab28027016215..ff6b8f6694f2aa08db27f42581980b2d15daaea3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -998,7 +998,7 @@ class wsAjax extends cubeAjax {
 \r
        public static function publishCollection($args, &$x) {\r
                global $core;\r
-               $collection = $args[1];\r
+               $collection = $_POST['collection'];\r
 \r
                $env = Zend_Mobile_Push_Apns::SERVER_SANDBOX_URI;\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 171a5789818a9903be6420a9ebf2e3b325c0de8e..442e3c1ddc126e7d39960d44b92a07badd92a355 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -615,8 +615,13 @@ class wsServices extends cubeFlashGateway {
 \r
                        $langs = array_unique($langs);\r
 \r
+                       $w2h=new wiki2xhtml();\r
+                       $w2h->setOpt('active_pre',0);\r
+                       \r
+                       $contents = $collection->contents;\r
                        foreach ($langs as $lang) {\r
                                $langsnames[$lang] = cubeLang::getNameByCode($lang);\r
+                               $contents[$lang]['apropos']=$w2h->transform($contents[$lang]['apropos']);\r
                        }\r
 \r
 \r
@@ -626,7 +631,7 @@ class wsServices extends cubeFlashGateway {
                                $traductions[$r->lang_id] = json_decode($r->traductions);\r
                        }\r
 \r
-                       $d = array('id' => $id, 'langs' => $langs, 'langnames' => $langsnames, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures, 'traductions' => $traductions, 'contents' => $collection->contents);\r
+                       $d = array('id' => $id, 'langs' => $langs, 'langnames' => $langsnames, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures, 'traductions' => $traductions, 'contents' => $contents);\r
                        $d = array_merge($d, $this->_getManifest($publications, '/fluidbook/collections/versions/' . $id . '/' . $version . '/' . $os, $books, $resolution));\r
 \r
                        $dao = new wsDAOCollection($core->con);\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 31b74814fde694061361734f7d8a599c33322cc6..d107a9378314b9a3ed3b5c3a7c352bebde5fc94b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -350,8 +350,18 @@ class wsUrl {
                        }\r
                        $res.='</table>';\r
                }\r
-               $res.='<br /><a href="#" class="right ajax" rel="publishCollection/' . $collection->collection_id . '">' . $core->typo->Ajouter(__('Publier et notifier les utilisateurs')) . '</a>';\r
 \r
+               $res.='<h3>' . __('Notifications') . '</h3>';\r
+               $res.='<p>' . __('Indiquez le texte de la notification à envoyer aux utilisateurs') . ' (' . __('Max 200 caractères') . ').<br />'.__('Laissez vide si vous souhaitez simplement afficher un badge').'</p>';\r
+               $res.='<form method="post" action="publishCollection">';\r
+               $res.=form::hidden('collection', $collection->collection_id);\r
+               $res.='<table class="max">';\r
+               foreach ($langs as $lang) {\r
+                       $res.='<tr><td class="min nowrap">' . __('Notification') . '[' . $lang . ']</td><td class="pad">' . form::textArea(array('notification[' . $lang . ']'), 60, 3) . '</td></tr>';\r
+               }\r
+               $res.='<tr><td colspan="2" class="right"></td><a href="#" class="submit">' . $core->typo->Ajouter(__('Publier et notifier les utilisateurs')) . '</a></tr>';\r
+               $res.='</table>';\r
+               $res.='</form>';\r
                $res.='<h3>' . __('Export') . '</h3>';\r
                $res.='<a href="#" class="right ajax" rel="exportCollection/' . $collection->collection_id . '/android">' . $core->typo->Ajouter(__('Exporter pour Android')) . '</a> <a href="#" class="right ajax" rel="exportCollection/' . $collection->collection_id . '/ios">' . $core->typo->Ajouter(__('Exporter pour iOS')) . '</a>';\r
 \r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 003f645b21e11d5443c03e911894a8d53341fd6c..38ea387368d9eaf80646878856b659cd78d2b2f9 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -25,6 +25,7 @@ class wsHTML5Compiler {
                'js/libs/fix/detect-zoom.js',
                'js/libs/cube/fb.js',
                'js/libs/cube/util.js',
+               'js/libs/fastclick/fastclick.js',
                'js/libs/modernizr/modernizr.js',
                'js/libs/modernizr/tests.js',
                'js/libs/json2.js',
@@ -969,7 +970,7 @@ class wsHTML5Compiler {
                        mkdir(dirname($t), 0777, true);
                }
 
-               $res=copy($s, $t);
+               $res = copy($s, $t);
                touch($t, filemtime($s));
                return true;
        }

diff --git a/style/ws/style.css b/style/ws/style.css
index 14dca5dfcb049730d6b8998b71819341328b4168..ff3e508b5f19d6ce939057a8a1bc44f741d57aa5 100644 (file)
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -592,6 +592,10 @@ a.btbook.edit>div{
        padding:5px;\r
 }\r
 \r
+#collection td.pad{\r
+       padding:15px 0; \r
+}\r
+\r
 #collection .min.nowrap{\r
        padding:0 15px 0 0;\r
 }\r
@@ -609,7 +613,7 @@ a.btbook.edit>div{
        padding:2px 6px;\r
 }\r
 \r
-#collection h3{margin:10px 0 10px 0 !important;}\r
+#collection h3{margin:10px 0 10px 0 !important;border-top:2px solid #BEBFB1;padding:10px 0 0 0;}\r
 #collection .group,\r
 #collection .publication{\r
        padding:5px;border:1px solid #ccc;margin:2px 0;background-color:#eee;\r