#1328

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index d4cadc4e8b3e3978b035428f544c9cda074957cc..b05f4f745b9891358ea92503015aabbb320e9de6 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -232,6 +232,11 @@ class wsAjax extends cubeAjax {
                                $ext = CubeIT_Files::getExtension($_FILES[$t]['name']);
                                move_uploaded_file($_FILES[$t]['tmp_name'], $wdir . '/' . $t . '.' . $ext);
                                $save['theme'][$t] = $t . '.' . $ext;
+
+                               if ($t == 'filesalt') {
+                                       CubeIT_Files::rmdir($wdir . '/filesalt');
+                                       $unzip = CubeIT_Util_Zip::extract($wdir . '/' . $t . '.' . $ext, $wdir . '/filesalt');
+                               }
                        }
                }
 

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 1fd96e2eb62557b51579c4f472092530d11d4ae6..f00478e93ebcc0b01e4ccf8f2825e33f8f3994c0 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -332,6 +332,8 @@ class wsUrl {
                $res .= '<tr><td class="min nowrap">' . __('Couleur des titres de publication') . '</td><td>#' . form::field(array('settings[couleurE]', 'couleurC'), 6, 6, $collection->settings['couleurE']) . '</td></tr>';
                $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">' . __('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 da67ff7ca150cccba454b30eaeee4cbecb360c34..e395b803b84f6c14cda0522c936e4eb1864ca853 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -104,6 +104,7 @@ class wsExporter {
                );
                if ($os == 'ios') {
                        $phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_EXTERNALFILEUTIL);
+                       $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 fc83274e04cefd210ae45a4e5f1ceed841c0e250..846b7c80445b667228b8e5c385865993b91852fe 100644 (file)
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -149,6 +149,7 @@ class wsHTML5AppCompiler {
                $config['couleurC'] = $this->collection->settings['couleurC'];
                $config['couleurD'] = $this->collection->settings['couleurD'];
                $config['couleurE'] = $this->collection->settings['couleurE'];
+               $config['htmlAlt'] = $this->collection->settings['htmlalt'];
                $config['offline'] = false;
                if (isset($this->collection->settings['offline'])) {
                        $config['offline'] = $this->collection->settings['offline'];
@@ -184,6 +185,9 @@ class wsHTML5AppCompiler {
 
                $this->copy($this->wdir . '/' . $this->collection->theme['back'], $imagesdir . '/' . $this->collection->theme['back']);
                $this->copy($this->wdir . '/' . $this->collection->theme['etagere'], $imagesdir . '/' . $this->collection->theme['etagere']);
+               if (file_exists($this->wdir . '/filesalt')) {
+                       $this->copyRecursive($this->wdir . '/filesalt', $this->vdir);
+               }
 
                $c[] = 'body{background-image:url("images/' . $this->collection->theme['back'] . '");}';
                $c[] = '#shelves{background-image:url("images/' . $this->collection->theme['etagere'] . '");}';