From 1a7ea47c41019f5171cde9316235703523e3135e Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 2 Aug 2013 16:07:32 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.ajax.php          |  2 +-
 inc/ws/Controlleur/class.ws.services.php      |  7 ++++++-
 inc/ws/Controlleur/class.ws.url.php           | 12 +++++++++++-
 inc/ws/Util/html5/class.ws.html5.compiler.php |  3 ++-
 style/ws/style.css                            |  6 +++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 4ea08f36a..ff6b8f669 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -998,7 +998,7 @@ class wsAjax extends cubeAjax {
 
 	public static function publishCollection($args, &$x) {
 		global $core;
-		$collection = $args[1];
+		$collection = $_POST['collection'];
 
 		$env = Zend_Mobile_Push_Apns::SERVER_SANDBOX_URI;
 
diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 171a57898..442e3c1dd 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -615,8 +615,13 @@ class wsServices extends cubeFlashGateway {
 
 			$langs = array_unique($langs);
 
+			$w2h=new wiki2xhtml();
+			$w2h->setOpt('active_pre',0);
+			
+			$contents = $collection->contents;
 			foreach ($langs as $lang) {
 				$langsnames[$lang] = cubeLang::getNameByCode($lang);
+				$contents[$lang]['apropos']=$w2h->transform($contents[$lang]['apropos']);
 			}
 
 
@@ -626,7 +631,7 @@ class wsServices extends cubeFlashGateway {
 				$traductions[$r->lang_id] = json_decode($r->traductions);
 			}
 
-			$d = array('id' => $id, 'langs' => $langs, 'langnames' => $langsnames, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures, 'traductions' => $traductions, 'contents' => $collection->contents);
+			$d = array('id' => $id, 'langs' => $langs, 'langnames' => $langsnames, 'time' => $version, 'datas' => $composition, 'couvertures' => $couvertures, 'traductions' => $traductions, 'contents' => $contents);
 			$d = array_merge($d, $this->_getManifest($publications, '/fluidbook/collections/versions/' . $id . '/' . $version . '/' . $os, $books, $resolution));
 
 			$dao = new wsDAOCollection($core->con);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 31b74814f..d107a9378 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -350,8 +350,18 @@ class wsUrl {
 			}
 			$res.='</table>';
 		}
-		$res.='<br /><a href="#" class="right ajax" rel="publishCollection/' . $collection->collection_id . '">' . $core->typo->Ajouter(__('Publier et notifier les utilisateurs')) . '</a>';
 
+		$res.='<h3>' . __('Notifications') . '</h3>';
+		$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>';
+		$res.='<form method="post" action="publishCollection">';
+		$res.=form::hidden('collection', $collection->collection_id);
+		$res.='<table class="max">';
+		foreach ($langs as $lang) {
+			$res.='<tr><td class="min nowrap">' . __('Notification') . '[' . $lang . ']</td><td class="pad">' . form::textArea(array('notification[' . $lang . ']'), 60, 3) . '</td></tr>';
+		}
+		$res.='<tr><td colspan="2" class="right"></td><a href="#" class="submit">' . $core->typo->Ajouter(__('Publier et notifier les utilisateurs')) . '</a></tr>';
+		$res.='</table>';
+		$res.='</form>';
 		$res.='<h3>' . __('Export') . '</h3>';
 		$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>';
 
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 003f645b2..38ea38736 100644
--- 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 14dca5dfc..ff3e508b5 100644
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -592,6 +592,10 @@ a.btbook.edit>div{
 	padding:5px;
 }
 
+#collection td.pad{
+	padding:15px 0;	
+}
+
 #collection .min.nowrap{
 	padding:0 15px 0 0;
 }
@@ -609,7 +613,7 @@ a.btbook.edit>div{
 	padding:2px 6px;
 }
 
-#collection h3{margin:10px 0 10px 0 !important;}
+#collection h3{margin:10px 0 10px 0 !important;border-top:2px solid #BEBFB1;padding:10px 0 0 0;}
 #collection .group,
 #collection .publication{
 	padding:5px;border:1px solid #ccc;margin:2px 0;background-color:#eee;
-- 
2.39.5