From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 10 May 2017 19:00:27 +0000 (+0000)
Subject: #1404
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7168ad17dcb60965cd3e02e0351b83d060df8544;p=cubeextranet.git

#1404
---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index f00478e93..62f155ae8 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -333,6 +333,7 @@ class wsUrl {
 		$res .= '<tr><td class="min nowrap">' . __('Couleur de fond') . '</td><td>#' . form::field(array('settings[couleurD]', 'couleurD'), 6, 6, $collection->settings['couleurD']) . '</td></tr>';
 		$res .= '<tr><td class="min nowrap">' . __('Nombre de publication par ligne') . '</td><td>' . form::field(array('settings[perline]', 'perline'), 1, 1, $collection->settings['perline']) . '</td></tr>';
 		$res .= '<tr><td class="min nowrap">' . __('Contenu HTML alternatif') . '</td><td>' . form::textArea(array('settings[htmlalt]', 'htmlalt'), 100, 30, $collection->settings['htmlalt']) . '</td></tr>';
+		$res .= '<tr><td class="min nowrap">' . __('HTML Head') . '</td><td>' . form::textArea(array('settings[htmlhead]', 'htmlhead'), 100, 6, $collection->settings['htmlhead']) . '</td></tr>';
 		$res .= '<tr><td class="min nowrap">' . __('Fichiers pour le contenu alternatif') . '</td><td><input type="file" name="filesalt" />' . form::hidden(array('theme[filesalt]', 'theme_' . $i), $collection->theme['filesalt']) . self::viewCollectionFile($collection->theme['filesalt'], $collection->collection_id) . '</td></tr>';
 
 		$res .= '</table>';
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index e395b803b..3675113dc 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -104,7 +104,7 @@ class wsExporter {
 		);
 		if ($os == 'ios') {
 			$phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_EXTERNALFILEUTIL);
-			$phonegap->addFeature(CubeIT_Mobile_Phonegap_IOS::FEATURE_WKWEBVIEW);
+			//$phonegap->addFeature(CubeIT_Mobile_Phonegap_IOS::FEATURE_WKWEBVIEW);
 		} else if ($os == 'android') {
 			$phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_WEBINTENT);
 		}
diff --git a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
index 846b7c804..eebdb5975 100644
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -162,6 +162,9 @@ class wsHTML5AppCompiler {
 			$config['collection'] = $c;
 		}
 		$config['appver'] = $this->collection->settings['version'];
+		$index = file_get_contents($this->vdir . '/index.html');
+		$index = str_replace('	<!--$head-->', $this->collection->settings['htmlhead'], $index);
+		file_put_contents($this->vdir . '/index.html', $index);
 		file_put_contents($this->vdir . '/data/app.js', 'DATAS = ' . CubeIT_Util_Json::encode($config) . ';');
 	}