.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 24fe93420192a4a70c97ed157c6e9dc13b94edc5..f0442cc6a57bee1e7c6c53b6925467397ddfaddb 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/images/netflix.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/netflix.svg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/gradient.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/mediacast.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/youtubedl-download.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/youtubedl-download.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/freeboxchannel.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxchannel.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/style/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/style/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -242,13 +247,6 @@
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\CloudStation\Works\home\style\fonts" />
-      <recent name="T:\CloudStation\Drive\Works\home\tools\jarvis" />
-      <recent name="T:\CloudStation\Drive\Works\home" />
-      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts" />
-      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts\550" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home\tools\pop" />
       <recent name="T:\Drive\Works\home\scripts\lib" />
@@ -256,6 +254,13 @@
       <recent name="T:\CloudStation\Drive\Works\home\images\backgrounds" />
       <recent name="T:\CloudStation\Drive\Works\home\scripts" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\images" />
+      <recent name="D:\CloudStation\Works\home\style\fonts" />
+      <recent name="T:\CloudStation\Drive\Works\home\tools\jarvis" />
+      <recent name="T:\CloudStation\Drive\Works\home" />
+      <recent name="T:\CloudStation\Drive\Works\home\style\fonts\webfonts" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration default="true" type="Applet">
@@ -780,14 +785,8 @@
       <workItem from="1577378088885" duration="2201000" />
       <workItem from="1577380387468" duration="866000" />
       <workItem from="1577785483253" duration="3506000" />
-      <workItem from="1577891426611" duration="8164000" />
-    </task>
-    <task id="LOCAL-00217" summary=".">
-      <created>1567019261000</created>
-      <option name="number" value="00217" />
-      <option name="presentableId" value="LOCAL-00217" />
-      <option name="project" value="LOCAL" />
-      <updated>1567019261001</updated>
+      <workItem from="1577891426611" duration="8746000" />
+      <workItem from="1578343490755" duration="2798000" />
     </task>
     <task id="LOCAL-00218" summary=".">
       <created>1567064583593</created>
@@ -1125,18 +1124,16 @@
       <option name="project" value="LOCAL" />
       <updated>1578040991600</updated>
     </task>
-    <option name="localTasksCounter" value="266" />
+    <task id="LOCAL-00266" summary=".">
+      <created>1578043868577</created>
+      <option name="number" value="00266" />
+      <option name="presentableId" value="LOCAL-00266" />
+      <option name="project" value="LOCAL" />
+      <updated>1578043868577</updated>
+    </task>
+    <option name="localTasksCounter" value="267" />
     <servers />
   </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -1186,12 +1183,12 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1578040988584">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1578043863426">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1578040988584" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1578043863426" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1578038647334">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1201,17 +1198,17 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1577787700897" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1577891427221">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1578343490530">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1577891427221" />
-    <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1578043836670">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1578343490530" />
+    <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1578343507511">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="257" width="607" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1577380471547" />
-    <state x="976" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1578043836670" />
+    <state x="976" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1578343507511" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

diff --git a/config/media.php b/config/media.php
index 03fbcc4869980e17d1e7247dfda8fbd3c7c475da..c7f5e513b1c2cd1aa4e3a77860ee5765fe0d0073 100644 (file)
--- a/config/media.php
+++ b/config/media.php
@@ -7,6 +7,9 @@ $device = config('DEVICE');
 $shortcuts['media'] = [['label' => 'TV', 'type' => 'sub', 'sub' => 'tv'], ['label' => 'Ajoutés récemment', 'type' => 'sub', 'sub' => 'mediarecent']];
 $shortcuts['media'][] = ['label' => 'Séries TV', 'type' => 'sub', 'sub' => 'seriestv'];
 $shortcuts['media'][] = ['label' => 'Films', 'type' => 'sub', 'sub' => 'movies'];
+if ($device == 'salon') {
+    $shortcuts['media'][] = array('type' => 'freebox', 'url' => 'scripts/freeboxchannel.php?menu=netflix', 'label' => '<img src="images/netflix.png">');
+}
 if ($device == 'salon' || $device == 'bureau') {
     $shortcuts['media'][] = ['label' => 'Nintendo Switch', 'type' => 'harmonyactivity', 'activity' => 'nintendo-switch'];
     $shortcuts['media'][] = ['label' => 'Jeux PC', 'type' => 'ajax', 'url' => '/scripts/pcgames.php'];

diff --git a/config/tv.php b/config/tv.php
index e444d39853910232d6f9aaea32f919aaf7a6be8f..7463034c3f61d3c38df9ecf3419bb5ce69449863 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -19,6 +19,7 @@ if (!$mapdvb) {
 
 $tv = array(
     'Replay' => array('freebox' => 'replay'),
+    'Netflix' => array('freebox' => 'netflix'),
     'Infos',
     'France Info' => array('stream' => 'tvheadend:franceinfo:', 'channel' => 27),
     'Cnews' => array('stream' => 'tvheadend:CNEWS', 'channel' => 16),

diff --git a/images/netflix.png b/images/netflix.png
new file mode 100644 (file)
index 0000000..c5e2e9e
Binary files /dev/null and b/images/netflix.png differ

diff --git a/images/netflix.svg b/images/netflix.svg
new file mode 100644 (file)
index 0000000..00d975b
--- /dev/null
+++ b/images/netflix.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="114.94727mm" height="114.94727mm" viewBox="0 0 407.29349 407.29348" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="Netflix icon.svg">
+  <title id="title5759">Netflix icon</title>
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" id="linearGradient5625">
+      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop5627"/>
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop5629"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5625" id="radialGradient5631" cx="367.99158" cy="280.36646" fx="367.99158" fy="280.36646" r="368.71729" gradientTransform="matrix(0.30406823,-0.10528244,3.8564095,11.137765,-825.1108,-2803.5461)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5625" id="radialGradient5757" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.30406823,-0.10528244,3.8564095,11.137765,-825.1108,-2803.5461)" cx="367.99158" cy="280.36646" fx="367.99158" fy="280.36646" r="368.71729"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.70710678" inkscape:cx="133.94373" inkscape:cy="222.84368" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1366" inkscape:window-height="705" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title>Netflix icon</dc:title>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
+        <dc:date>17/11/2016</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>CMetalCore</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>CMetalCore</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="translate(12.494543,6.7556334)">
+    <g id="g4182">
+      <g transform="matrix(0.29074008,0,0,0.29074008,81.631476,113.77111)" id="g5747">
+        <path inkscape:connector-curvature="0" style="fill:#b1060f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 451.82617,-188.60352 -0.36914,210.000004 -0.37109,209.999996 -17.27735,-48.75 c -0.006,-0.0168 -0.0273,-0.0789 -0.0332,-0.0957 l -22.32617,467.51563 c 21.95088,61.98892 33.71165,95.08081 33.84375,95.21289 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.96875,1.2385 18.54796,1.87275 19.06445,1.41016 0.5165,-0.4626 0.79775,-214.28135 0.625,-475.15235 l -0.31445,-474.31055 -93.125,0 -93.125,0 z" id="path4155"/>
+        <path inkscape:connector-curvature="0" style="fill:#b1060f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 114.95117,-189.22852 0,474.79102 c 0,261.1354 0.25552,475.04843 0.56836,475.36133 0.31282,0.3128 16.4847,-1.21398 35.9375,-3.39258 19.45278,-2.1787 46.33789,-4.88783 59.74414,-6.01953 20.56097,-1.7358 81.94995,-5.68286 89.0586,-5.72656 2.06786,-0.013 2.20049,-10.68157 2.5,-201.10157 l 0.3164,-201.08789 14.85352,42.02539 c 2.29551,6.49543 3.01555,8.52378 5.25195,14.85157 l 22.32031,-467.400394 c -4.72927,-13.371182 -2.25012,-6.352022 -7.66992,-21.675782 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.62891,0 z" id="path4157"/>
+        <path inkscape:connector-curvature="0" style="fill:url(#radialGradient5757);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 114.95117,-189.22852 0,266.513676 187.7461,498.023434 c 0.0196,-11.41266 0.042,-17.57934 0.0625,-30.625 l 0.3164,-201.08789 14.85352,42.02539 c 82.68109,233.9563 127.10203,359.39701 127.36328,359.65821 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.96875,1.2385 18.54796,1.87275 19.06445,1.41016 0.355,-0.31796 0.58674,-105.15812 0.64844,-253.0586 l -186.86718,-537.244139 -0.0899,50.839843 -0.37109,209.999996 -17.27735,-48.75 c -16.88185,-47.6341 -28.15376,-79.49 -95.97656,-271.249996 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.62891,0 z" id="path5623"/>
+        <path inkscape:connector-curvature="0" style="fill:#e50914;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 114.95508,-189.22852 188.12109,533.06641 0,-0.24219 14.85352,42.02539 c 82.68109,233.9563 127.10203,359.39701 127.36328,359.65821 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.91766,1.23215 18.45293,1.86506 19.04883,1.41601 l -186.66406,-529.5664 0,0.0976 -17.27735,-48.75 c -16.88185,-47.6341 -28.15376,-79.49 -95.97656,-271.249996 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.625,0 z" id="path4159"/>
+        <path inkscape:connector-curvature="0" id="path5715" d="m 451.82617,-188.60352 -0.36914,210.000004 -0.37109,209.999996 -17.27735,-48.75 c -0.006,-0.0168 -0.0273,-0.0789 -0.0332,-0.0957 l -22.32617,467.51563 c 21.95088,61.98892 33.71165,95.08081 33.84375,95.21289 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.96875,1.2385 18.54796,1.87275 19.06445,1.41016 0.5165,-0.4626 0.79775,-214.28135 0.625,-475.15235 l -0.31445,-474.31055 -93.125,0 -93.125,0 z" style="fill:#b1060f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path inkscape:connector-curvature="0" id="path5717" d="m 114.95117,-189.22852 0,474.79102 c 0,261.1354 0.25552,475.04843 0.56836,475.36133 0.31282,0.3128 16.4847,-1.21398 35.9375,-3.39258 19.45278,-2.1787 46.33789,-4.88783 59.74414,-6.01953 20.56097,-1.7358 81.94995,-5.68286 89.0586,-5.72656 2.06786,-0.013 2.20049,-10.68157 2.5,-201.10157 l 0.3164,-201.08789 14.85352,42.02539 c 2.29551,6.49543 3.01555,8.52378 5.25195,14.85157 l 22.32031,-467.400394 c -4.72927,-13.371182 -2.25012,-6.352022 -7.66992,-21.675782 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.62891,0 z" style="fill:#b1060f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path inkscape:connector-curvature="0" id="path5719" d="m 114.95117,-189.22852 0,266.513676 187.7461,498.023434 c 0.0196,-11.41266 0.042,-17.57934 0.0625,-30.625 l 0.3164,-201.08789 14.85352,42.02539 c 82.68109,233.9563 127.10203,359.39701 127.36328,359.65821 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.96875,1.2385 18.54796,1.87275 19.06445,1.41016 0.355,-0.31796 0.58674,-105.15812 0.64844,-253.0586 l -186.86718,-537.244139 -0.0899,50.839843 -0.37109,209.999996 -17.27735,-48.75 c -16.88185,-47.6341 -28.15376,-79.49 -95.97656,-271.249996 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.62891,0 z" style="fill:url(#radialGradient5631);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+        <path inkscape:connector-curvature="0" id="path5721" d="m 114.95508,-189.22852 188.12109,533.06641 0,-0.24219 14.85352,42.02539 c 82.68109,233.9563 127.10203,359.39701 127.36328,359.65821 0.17284,0.1729 12.68225,0.92753 27.79883,1.67773 45.79984,2.2727 102.55492,7.14269 145.60937,12.49219 9.91766,1.23215 18.45293,1.86506 19.04883,1.41601 l -186.66406,-529.5664 0,0.0976 -17.27735,-48.75 c -16.88185,-47.6341 -28.15376,-79.49 -95.97656,-271.249996 -18.23693,-51.562504 -33.71225,-95.296904 -34.39062,-97.187504 l -1.23438,-3.4375 -93.62695,0 -93.625,0 z" style="fill:#e50914;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file

diff --git a/js/home.js b/js/home.js
index 45b6f0c18a49b970a4c07b58c86c2069b2064a57..2c3dc7019b8f698092390e9e34ce545878dc5cdd 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -141,7 +141,11 @@ $(function () {
 
     $(document).on(clickevent, 'a.ajax', function () {
         displayLoader($(this));
+        var goremote = $(this).attr('data-remote') === '1';
         $.get($(this).attr('href'), {}, function () {
+            if (goremote) {
+                window.location = '#/section/remote';
+            }
             hideLoader();
         });
 
@@ -825,6 +829,10 @@ function resize() {
     $("#iframeHolder").css({left: fz * 1.3, width: ww - fz * 1.3});
 
     $("section:visible .col > *").each(function () {
+        if ($(this).find('img').length > 0) {
+            $(this).css('padding', 0);
+            return;
+        }
         var paddingSide = 0.5;
         if ($(this).hasClass('velib')) {
             paddingSide = 0.1;

diff --git a/scripts/freeboxchannel.php b/scripts/freeboxchannel.php
index c49a95ffd8e15004fc76f955f761a3306b8e83fc..804bcaad6b154ebba5eb81c8e9e885794d4caefe 100644 (file)
--- a/scripts/freeboxchannel.php
+++ b/scripts/freeboxchannel.php
@@ -5,9 +5,11 @@ harmonyActivity('tv');
 if (isset($_GET['channel'])) {
     $commands = array_merge(['ok', 'pause=5'], str_split((string)$_GET['channel']));
 } else if (isset($_GET['menu']) && $_GET['menu'] == 'replay') {
-    $commands = ['right', 'down', 'down', 'ok', 'pause=5', 'down', 'down', 'down', 'down', 'right', 'right', 'right', 'right'];
+    $commands = ['right', 'ok', 'pause=5', 'down', 'down', 'down', 'down', 'right', 'right', 'right', 'right'];
+} else if (isset($_GET['menu']) && $_GET['menu'] == 'netflix') {
+    $commands = ['right', 'down', 'down', 'ok', 'pause=25', 'ok'];
 }
-$keys = array_merge(array('home', 'pause=2', 'home', 'pause=1'), $commands);
+$keys = array_merge(array('home', 'pause=2', 'home', 'pause=1', 'home', 'home'), $commands);
 
 if ($currentActivity != 'tv') {
     sleep(40);

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 4124b95e89cb0109a5be8a055be31df6c21389ce..85cf08073fcea385f0f5a29d098a790c5f675f41 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -291,6 +291,7 @@ function shortcut($s, $hash)
     } elseif ($s['type'] == 'freebox') {
         $attrs['href'] = $s['url'];
         $attrs['class'] = 'ajax';
+        $attrs['data-remote'] = "1";
     } else if ($s['type'] == 'map') {
         $rand = rand(1, 1000000);
         $html = '<img width="' . $s['width'] . '" height="' . $s['height'] . '" src="' . $s['image'] . '" usemap="#map_' . $rand . '" /><map class="' . $s['class'] . '" name="map_' . $rand . '">' . $s['map'] . '</map>';

diff --git a/style/style.css b/style/style.css
index 43bf31046f5b8ffae3ad619d13c508e15b7a53b8..e8e26d0aa1b8459210029567a465ac8187c88051 100644 (file)
--- a/style/style.css
+++ b/style/style.css
@@ -150,6 +150,9 @@ section .col > * {
   overflow: hidden;
   position: relative;
 }
+section .col > * img {
+  max-width: 100%;
+}
 section .col > * .sw-corner {
   position: absolute;
   left: 0.7em;

diff --git a/style/style.less b/style/style.less
index 5322e4809cb55cf16ad7e8913fb9d7a888f1b90b..dfa714cd9e7f3191519b469cccddd758b072b154 100644 (file)
--- a/style/style.less
+++ b/style/style.less
@@ -173,6 +173,10 @@ section {
       overflow: hidden;
       position: relative;
 
+      img {
+        max-width: 100%;
+      }
+
       .sw-corner {
         position: absolute;
         left: 0.7em;
@@ -188,7 +192,7 @@ section {
         background-size: 100% 100%;
         background-position: 50% 50%;
 
-        &:after,&:before {
+        &:after, &:before {
           mix-blend-mode: exclusion;
           color: #fff;
         }