.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e3b766c555bb5a19709f07ae8ebcfd032a3b723c..cdebdcaee3ecd9091da72eba27c22245e4772f6a 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,51 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/js/cordova.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/balcon.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/bureau.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/bureausun.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/chambre.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/cour.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/cuisine.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/litjerome.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/litvincent.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/salon.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/sdb.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/medium/wc.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/originaux/bureausun.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/originaux/cuisine.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/originaux/entree.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/balcon.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/bureau.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/bureausun.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/chambre.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/cour.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/cuisine.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/entree.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/litjerome.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/litvincent.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/salon.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/sdb.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/rooms/small/wc.jpg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/switch.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/switch.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/-litjerome.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/balcon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/balcon.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/bureau.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/bureausun.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/bureau.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/chambre.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/chambre.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/cour.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/cour.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/cuisine.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/entree.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/medium/entree.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/litjerome.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/litjerome.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/litvincent.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/litvincent.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/salon.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/sdb.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/sdb.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/images/backgrounds/wc.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/wc.jpg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/webapp.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/webapp.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/cordova.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/cordova.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -244,11 +285,11 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\images\rooms" />
       <recent name="T:\Drive\Works\home\js\mmenu" />
       <recent name="T:\Drive\Works\home\tools\xplanet" />
       <recent name="T:\Drive\Works\home\style\fonts\webfonts" />
       <recent name="T:\Drive\Works\home\style\fonts\webfonts\520" />
-      <recent name="T:\Drive\Works\home\images" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home\style\fonts\fontawesome" />
@@ -908,14 +949,7 @@
       <workItem from="1604828693023" duration="1255000" />
       <workItem from="1605001866699" duration="7793000" />
       <workItem from="1605087671373" duration="102000" />
-      <workItem from="1605087787424" duration="18827000" />
-    </task>
-    <task id="LOCAL-00334" summary=".">
-      <created>1595521318353</created>
-      <option name="number" value="00334" />
-      <option name="presentableId" value="LOCAL-00334" />
-      <option name="project" value="LOCAL" />
-      <updated>1595521318354</updated>
+      <workItem from="1605087787424" duration="23688000" />
     </task>
     <task id="LOCAL-00335" summary=".">
       <created>1595609479854</created>
@@ -1253,7 +1287,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605102367599</updated>
     </task>
-    <option name="localTasksCounter" value="383" />
+    <task id="LOCAL-00383" summary=".">
+      <created>1605111184884</created>
+      <option name="number" value="00383" />
+      <option name="presentableId" value="LOCAL-00383" />
+      <option name="project" value="LOCAL" />
+      <updated>1605111184884</updated>
+    </task>
+    <option name="localTasksCounter" value="384" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1299,12 +1340,12 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605102357852">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605120298951">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605102357852" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605120298951" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/switch.php b/config/switch.php
index a384d6197fbb82e9d5ba73e9b04cfbc58ddbaa5b..ffa373853c703abdb77eda2e09efb157738c7bb6 100644 (file)
--- a/config/switch.php
+++ b/config/switch.php
@@ -1,9 +1,16 @@
 <?php
 $shortcuts['switch'] = [];
-$rooms = ['salon' => 'Salon', 'bureausun' => 'Bureau', 'entree' => 'Entrée', 'cuisine' => 'Cuisine', 'chambre' => 'Chambre', 'litvincent' => 'Lit Vincent', 'litjerome' => 'Lit Jérôme', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'balcon' => 'Balcon', 'wc' => 'WC'];
+$shortcuts['switchshare'] = [];
+$share = ['salon', 'bureau', 'sdb', 'cuisine', 'chambre'];
+$rooms = ['salon' => 'Salon', 'bureau' => 'Bureau', 'entree' => 'Entrée', 'cuisine' => 'Cuisine', 'chambre' => 'Chambre', 'litvincent' => 'Lit Vincent', 'litjerome' => 'Lit Jérôme', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'balcon' => 'Balcon', 'wc' => 'WC'];
 foreach ($rooms as $room => $label) {
     if (config('DEVICE') === $room) {
         continue;
     }
     $shortcuts['switch'][] = ['type' => 'switch', 'room' => $room, 'label' => $label];
+
+}
+
+foreach ($share as $item) {
+    $shortcuts['switchshare'][] = ['type' => 'switchshare', 'room' => $item, 'label' => $rooms[$item]];
 }
\ No newline at end of file

diff --git a/images/backgrounds/-litjerome.jpg b/images/backgrounds/-litjerome.jpg
deleted file mode 100644 (file)
index 2f06ce9..0000000
Binary files a/images/backgrounds/-litjerome.jpg and /dev/null differ

diff --git a/images/backgrounds/balcon.jpg b/images/backgrounds/balcon.jpg
deleted file mode 100644 (file)
index a5e7e73..0000000
Binary files a/images/backgrounds/balcon.jpg and /dev/null differ

diff --git a/images/backgrounds/bureau.jpg b/images/backgrounds/bureau.jpg
deleted file mode 100644 (file)
index ee66cf5..0000000
Binary files a/images/backgrounds/bureau.jpg and /dev/null differ

diff --git a/images/backgrounds/bureausun.jpg b/images/backgrounds/bureausun.jpg
deleted file mode 100644 (file)
index 2ecb1be..0000000
Binary files a/images/backgrounds/bureausun.jpg and /dev/null differ

diff --git a/images/backgrounds/chambre.jpg b/images/backgrounds/chambre.jpg
deleted file mode 100644 (file)
index 8cabff2..0000000
Binary files a/images/backgrounds/chambre.jpg and /dev/null differ

diff --git a/images/backgrounds/cour.jpg b/images/backgrounds/cour.jpg
deleted file mode 100644 (file)
index b7404c5..0000000
Binary files a/images/backgrounds/cour.jpg and /dev/null differ

diff --git a/images/backgrounds/cuisine.jpg b/images/backgrounds/cuisine.jpg
deleted file mode 100644 (file)
index 68bd0e6..0000000
Binary files a/images/backgrounds/cuisine.jpg and /dev/null differ

diff --git a/images/backgrounds/entree.jpg b/images/backgrounds/entree.jpg
deleted file mode 100644 (file)
index cd25fde..0000000
Binary files a/images/backgrounds/entree.jpg and /dev/null differ

diff --git a/images/backgrounds/litjerome.jpg b/images/backgrounds/litjerome.jpg
deleted file mode 100644 (file)
index 78796c3..0000000
Binary files a/images/backgrounds/litjerome.jpg and /dev/null differ

diff --git a/images/backgrounds/litvincent.jpg b/images/backgrounds/litvincent.jpg
deleted file mode 100644 (file)
index 2f56534..0000000
Binary files a/images/backgrounds/litvincent.jpg and /dev/null differ

diff --git a/images/backgrounds/salon.jpg b/images/backgrounds/salon.jpg
deleted file mode 100644 (file)
index 1e8b28c..0000000
Binary files a/images/backgrounds/salon.jpg and /dev/null differ

diff --git a/images/backgrounds/sdb.jpg b/images/backgrounds/sdb.jpg
deleted file mode 100644 (file)
index 9288a51..0000000
Binary files a/images/backgrounds/sdb.jpg and /dev/null differ

diff --git a/images/backgrounds/wc.jpg b/images/backgrounds/wc.jpg
deleted file mode 100644 (file)
index bb50a4e..0000000
Binary files a/images/backgrounds/wc.jpg and /dev/null differ

diff --git a/images/rooms/medium/balcon.jpg b/images/rooms/medium/balcon.jpg
new file mode 100644 (file)
index 0000000..5e9947a
Binary files /dev/null and b/images/rooms/medium/balcon.jpg differ

diff --git a/images/rooms/medium/bureau.jpg b/images/rooms/medium/bureau.jpg
new file mode 100644 (file)
index 0000000..e25d00c
Binary files /dev/null and b/images/rooms/medium/bureau.jpg differ

diff --git a/images/rooms/medium/bureausun.jpg b/images/rooms/medium/bureausun.jpg
new file mode 100644 (file)
index 0000000..3bdde35
Binary files /dev/null and b/images/rooms/medium/bureausun.jpg differ

diff --git a/images/rooms/medium/chambre.jpg b/images/rooms/medium/chambre.jpg
new file mode 100644 (file)
index 0000000..b7139ab
Binary files /dev/null and b/images/rooms/medium/chambre.jpg differ

diff --git a/images/rooms/medium/cour.jpg b/images/rooms/medium/cour.jpg
new file mode 100644 (file)
index 0000000..36ede8c
Binary files /dev/null and b/images/rooms/medium/cour.jpg differ

diff --git a/images/rooms/medium/cuisine.jpg b/images/rooms/medium/cuisine.jpg
new file mode 100644 (file)
index 0000000..7895241
Binary files /dev/null and b/images/rooms/medium/cuisine.jpg differ

diff --git a/images/rooms/medium/entree.jpg b/images/rooms/medium/entree.jpg
new file mode 100644 (file)
index 0000000..cd25fde
Binary files /dev/null and b/images/rooms/medium/entree.jpg differ

diff --git a/images/rooms/medium/litjerome.jpg b/images/rooms/medium/litjerome.jpg
new file mode 100644 (file)
index 0000000..1b72952
Binary files /dev/null and b/images/rooms/medium/litjerome.jpg differ

diff --git a/images/rooms/medium/litvincent.jpg b/images/rooms/medium/litvincent.jpg
new file mode 100644 (file)
index 0000000..2386353
Binary files /dev/null and b/images/rooms/medium/litvincent.jpg differ

diff --git a/images/rooms/medium/salon.jpg b/images/rooms/medium/salon.jpg
new file mode 100644 (file)
index 0000000..fe0c1a4
Binary files /dev/null and b/images/rooms/medium/salon.jpg differ

diff --git a/images/rooms/medium/sdb.jpg b/images/rooms/medium/sdb.jpg
new file mode 100644 (file)
index 0000000..924dcf0
Binary files /dev/null and b/images/rooms/medium/sdb.jpg differ

diff --git a/images/rooms/medium/wc.jpg b/images/rooms/medium/wc.jpg
new file mode 100644 (file)
index 0000000..65fb78f
Binary files /dev/null and b/images/rooms/medium/wc.jpg differ

diff --git a/images/rooms/originaux/balcon.jpg b/images/rooms/originaux/balcon.jpg
new file mode 100644 (file)
index 0000000..a5e7e73
Binary files /dev/null and b/images/rooms/originaux/balcon.jpg differ

diff --git a/images/rooms/originaux/bureau.jpg b/images/rooms/originaux/bureau.jpg
new file mode 100644 (file)
index 0000000..2ecb1be
Binary files /dev/null and b/images/rooms/originaux/bureau.jpg differ

diff --git a/images/rooms/originaux/bureausun.jpg b/images/rooms/originaux/bureausun.jpg
new file mode 100644 (file)
index 0000000..2ecb1be
Binary files /dev/null and b/images/rooms/originaux/bureausun.jpg differ

diff --git a/images/rooms/originaux/chambre.jpg b/images/rooms/originaux/chambre.jpg
new file mode 100644 (file)
index 0000000..8cabff2
Binary files /dev/null and b/images/rooms/originaux/chambre.jpg differ

diff --git a/images/rooms/originaux/cour.jpg b/images/rooms/originaux/cour.jpg
new file mode 100644 (file)
index 0000000..b7404c5
Binary files /dev/null and b/images/rooms/originaux/cour.jpg differ

diff --git a/images/rooms/originaux/cuisine.jpg b/images/rooms/originaux/cuisine.jpg
new file mode 100644 (file)
index 0000000..8ddf21e
Binary files /dev/null and b/images/rooms/originaux/cuisine.jpg differ

diff --git a/images/rooms/originaux/entree.jpg b/images/rooms/originaux/entree.jpg
new file mode 100644 (file)
index 0000000..cd25fde
Binary files /dev/null and b/images/rooms/originaux/entree.jpg differ

diff --git a/images/rooms/originaux/litjerome.jpg b/images/rooms/originaux/litjerome.jpg
new file mode 100644 (file)
index 0000000..78796c3
Binary files /dev/null and b/images/rooms/originaux/litjerome.jpg differ

diff --git a/images/rooms/originaux/litvincent.jpg b/images/rooms/originaux/litvincent.jpg
new file mode 100644 (file)
index 0000000..2f56534
Binary files /dev/null and b/images/rooms/originaux/litvincent.jpg differ

diff --git a/images/rooms/originaux/salon.jpg b/images/rooms/originaux/salon.jpg
new file mode 100644 (file)
index 0000000..1e8b28c
Binary files /dev/null and b/images/rooms/originaux/salon.jpg differ

diff --git a/images/rooms/originaux/sdb.jpg b/images/rooms/originaux/sdb.jpg
new file mode 100644 (file)
index 0000000..9288a51
Binary files /dev/null and b/images/rooms/originaux/sdb.jpg differ

diff --git a/images/rooms/originaux/wc.jpg b/images/rooms/originaux/wc.jpg
new file mode 100644 (file)
index 0000000..bb50a4e
Binary files /dev/null and b/images/rooms/originaux/wc.jpg differ

diff --git a/images/rooms/small/balcon.jpg b/images/rooms/small/balcon.jpg
new file mode 100644 (file)
index 0000000..28fbc58
Binary files /dev/null and b/images/rooms/small/balcon.jpg differ

diff --git a/images/rooms/small/bureau.jpg b/images/rooms/small/bureau.jpg
new file mode 100644 (file)
index 0000000..efaea14
Binary files /dev/null and b/images/rooms/small/bureau.jpg differ

diff --git a/images/rooms/small/bureausun.jpg b/images/rooms/small/bureausun.jpg
new file mode 100644 (file)
index 0000000..efaea14
Binary files /dev/null and b/images/rooms/small/bureausun.jpg differ

diff --git a/images/rooms/small/chambre.jpg b/images/rooms/small/chambre.jpg
new file mode 100644 (file)
index 0000000..9f4c83f
Binary files /dev/null and b/images/rooms/small/chambre.jpg differ

diff --git a/images/rooms/small/cour.jpg b/images/rooms/small/cour.jpg
new file mode 100644 (file)
index 0000000..339caf7
Binary files /dev/null and b/images/rooms/small/cour.jpg differ

diff --git a/images/rooms/small/cuisine.jpg b/images/rooms/small/cuisine.jpg
new file mode 100644 (file)
index 0000000..fdd2242
Binary files /dev/null and b/images/rooms/small/cuisine.jpg differ

diff --git a/images/rooms/small/entree.jpg b/images/rooms/small/entree.jpg
new file mode 100644 (file)
index 0000000..fb77812
Binary files /dev/null and b/images/rooms/small/entree.jpg differ

diff --git a/images/rooms/small/litjerome.jpg b/images/rooms/small/litjerome.jpg
new file mode 100644 (file)
index 0000000..dfb0690
Binary files /dev/null and b/images/rooms/small/litjerome.jpg differ

diff --git a/images/rooms/small/litvincent.jpg b/images/rooms/small/litvincent.jpg
new file mode 100644 (file)
index 0000000..469d947
Binary files /dev/null and b/images/rooms/small/litvincent.jpg differ

diff --git a/images/rooms/small/salon.jpg b/images/rooms/small/salon.jpg
new file mode 100644 (file)
index 0000000..4fe3d2a
Binary files /dev/null and b/images/rooms/small/salon.jpg differ

diff --git a/images/rooms/small/sdb.jpg b/images/rooms/small/sdb.jpg
new file mode 100644 (file)
index 0000000..475ed39
Binary files /dev/null and b/images/rooms/small/sdb.jpg differ

diff --git a/images/rooms/small/wc.jpg b/images/rooms/small/wc.jpg
new file mode 100644 (file)
index 0000000..6b33c6c
Binary files /dev/null and b/images/rooms/small/wc.jpg differ

diff --git a/index.php b/index.php
index f3a5f4ca879376b27e2c5eaa2aa9dc7984c0f0ee..e6717621134219262b1d69aaebc109f662b035da 100644 (file)
--- a/index.php
+++ b/index.php
@@ -58,12 +58,12 @@ function relativePath($p)
     <?php endif; ?>
     <style type="text/css">
         #weatherstation {
-            background-image: url('<?php echo relativePath('images/backgrounds/'.getCurrentConfig().'.jpg') ?>'), linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5));
+            background-image: url('<?php echo relativePath('images/rooms/medium/'.getCurrentConfig().'.jpg') ?>'), linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5));
             background-blend-mode: multiply;
         }
 
         #background {
-            background-image: url('<?php echo relativePath('images/backgrounds/'.getCurrentConfig().'.jpg') ?>');
+            background-image: url('<?php echo relativePath('images/rooms/medium/'.getCurrentConfig().'.jpg') ?>');
         }
     </style>
 </head>

diff --git a/js/cordova.js b/js/cordova.js
index 7b0e81c9d6df6fd7bc71d8c477b315676ee3f30a..e0872a363d6a39637c19ac5f3b0e4a4d9c3ab334 100644 (file)
--- a/js/cordova.js
+++ b/js/cordova.js
@@ -4,9 +4,8 @@ function onDeviceReady() {
     initCordova();
 }
 
-
 function initCordova() {
-    console.log('init cordova');
+
     try {
         screen.orientation.lock('landscape');
     } catch (e) {
@@ -20,15 +19,11 @@ function initCordova() {
     }
 
     try {
-        window.plugins.intent.setNewIntentHandler(function (intent) {
-            // To get browser URL I had to use
-            var subject = intent.extras['android.intent.extra.SUBJECT'];
-            var url = intent.extras['android.intent.extra.TEXT'];
-            $.ajax({
-                url: '/scripts/share.php?text=' + url
-            })
+        window.plugins.intentShim.onIntent(function (intent) {
+            window.shareurl = intent.extras[window.plugins.intentShim.EXTRA_TEXT];
+            window.location.hash = '#/section/switchshare/';
         });
-    }catch (e){
-
+    } catch (e) {
+        console.log(e);
     }
 }
\ No newline at end of file

diff --git a/js/home.js b/js/home.js
index fde3b574e8bf93dfa5cb025c09f4c48202fcb8c5..dcca7e94a28a1d1091143b24fe3865a22751d22d 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -122,6 +122,10 @@ $(function () {
         return false;
     });
 
+    $(document).on(clickevent, '.switchshare', function () {
+        window.location = $(this).attr('href') + 'scripts/share.php?text=' + encodeURIComponent(window.shareurl);
+    });
+
     $(document).on(clickevent, '[data-volume]', function () {
         $.get('scripts/volume.php?volume=' + $(this).data('volume') + '%');
         return true;

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index a742e2d9e5ab3c5aa6c7219943bcd1f999b1194a..68e603f161f326e4990c50f22a012989099e61e2 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -311,10 +311,15 @@ function shortcut($s, $hash)
     } else if ($s['type'] == 'ifttt') {
         $attrs['class'] = 'ifttt';
         $attrs['data-event'] = $s['event'];
-    } else if ($s['type'] == 'switch') {
-        $h = isset($_GET['h']) && $_GET['h'] ? $_GET['h'] : $_SERVER['HTTP_HOST'];
-        $attrs['href'] = '//' . $s['room'] . '.home.tortuga.enhydra.fr/?h=' . $h;
-        $attrs['style'] = 'background-image:url(/images/backgrounds/' . $s['room'] . '.jpg);background-size:cover;color:#fff;text-shadow:3px;';
+    } else if ($s['type'] == 'switch' || $s['type'] === 'switchshare') {
+        $attrs['href'] = '//' . $s['room'] . '.home.tortuga.enhydra.fr/';
+        if ($s['type'] == 'share') {
+            $h = isset($_GET['h']) && $_GET['h'] ? $_GET['h'] : $_SERVER['HTTP_HOST'];
+            $attrs['href'] .= '?h=' . $h;
+        } else {
+            $attrs['class'] = $s['type'];
+        }
+        $attrs['style'] = 'background-image:url(/images/rooms/small/' . $s['room'] . '.jpg);background-size:cover;color:#fff;text-shadow:3px;';
     }
 
     if (isset($s['seen']) && $s['seen']) {