.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 926b699b7e3fab732d062c6219c069917765566a..73acb27920303dac49c5fcfbefb7edbff4be9659 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-253.31033.145">
+  <component name="dataSourceStorageLocal" created-in="IU-253.32098.37">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8191d8962366dbb9cccfb48748de16b78b32ab0e..d9cac2ef4f473431d708205ccb246f820d9d3c76 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,43 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/phpdocker/php-fpm/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/phpdocker/php-fpm/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/earth.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/suncurve.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/install.md" beforeDir="false" afterPath="$PROJECT_DIR$/install.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/xplanet.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/jarvis/commands" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/jarvis/console.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/jarvis/events" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/pop.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/scanner.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/startpopdaemon" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/stoppopdaemon" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pophttp/config.ini" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/config" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/earth_lights_4800.tif" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200401.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200402.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200403.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200404.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200405.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200406.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200407.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200408.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200409.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200410.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200411.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200412.3x5400x2700.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/xplanet-earth" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/xplanet-suncurve" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -456,8 +423,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-30f59d01ecdd-2fc7cc6b9a17-intellij.indexing.shared.core-IU-253.31033.145" />
-        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-IU-253.31033.145" />
+        <option value="bundled-jdk-30f59d01ecdd-2fc7cc6b9a17-intellij.indexing.shared.core-IU-253.32098.37" />
+        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-IU-253.32098.37" />
       </set>
     </attachedChunks>
   </component>
@@ -1396,6 +1363,8 @@
       <workItem from="1761736064320" duration="5487000" />
       <workItem from="1772365933816" duration="4000" />
       <workItem from="1772370387714" duration="7090000" />
+      <workItem from="1773390371781" duration="506000" />
+      <workItem from="1774028822942" duration="23000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1740,7 +1709,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="631" />
+    <option name="localTasksCounter" value="632" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/js/home.js b/js/home.js
index 377856ca06cc5f693846b29aacaadf0ff8fba341..33b3a3d8da2c005b82c34f526600a4751a3fb4a2 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -624,7 +624,7 @@ function updateScreenSaver(force) {
         $(img).on('load', function () {
             $(".screensaver").html(img);
         })
-        img.src = 'https://tools.cocodrilo.enhydra.fr/images/suncurve.png?j=' + Date.now();
+        img.src = 'https://tools.cocodrilo.enhydra.fr/images/xplanet/suncurve.png?j=' + Date.now();
     }
 
     if (raspberry && !ecomode && !videoPlaying) {

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index 9d20a96d8ecff8b5b09becf56e353ebbfbf3efdc..81d05c145ff0ad097dbae0a0dce17c98bcb5832b 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -189,7 +189,7 @@ function _curve($weather, $curve)
     $res = '<div class="curve curve-' . $curve . '">';
     $res .= '<div class="astre" style="transform: rotate(' . $sunangle . 'deg)"><img src="' . $icon . '" width="20" height="20" style="transform: rotate(' . (-$sunangle) . 'deg)" /></div>';
     if ($curve === 'sun') {
-        $res .= '<div class="orbit earth" style="background-image:url(\'https://tools.cocodrilo.enhydra.fr/images/suncurve.png?j=' . time() . '\'"></div>';
+        $res .= '<div class="orbit earth" style="background-image:url(\'https://tools.cocodrilo.enhydra.fr/images/xplanet/suncurve.png?j=' . time() . '\'"></div>';
     } else {
         $res .= '<div class="orbit"></div>';
     }