.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8027baad9103b5b357cacf888c32a9a6787d55c..d7fc086a4de3155674fb41c93f4858a231246766 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,51 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/images/weather/01.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/02.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/03.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/04.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/05.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/06.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/07.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/08.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/11.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/12.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/13.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/14.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/15.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/16.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/17.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/18.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/19.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/20.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/21.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/22.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/23.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/24.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/25.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/26.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/29.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/30.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/31.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/32.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/33.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/34.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/35.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/36.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/37.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/38.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/39.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/40.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/41.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/42.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/43.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/weather/44.svg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/medialibrary.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/medialibrary.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$/style/weatherstation.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/weatherstation.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/style/weatherstation.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/weatherstation.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -835,14 +794,7 @@
       <workItem from="1580059999939" duration="6428000" />
       <workItem from="1580372411103" duration="5070000" />
       <workItem from="1580457212034" duration="1914000" />
-      <workItem from="1580459154087" duration="1262000" />
-    </task>
-    <task id="LOCAL-00237" summary=".">
-      <created>1571595588959</created>
-      <option name="number" value="00237" />
-      <option name="presentableId" value="LOCAL-00237" />
-      <option name="project" value="LOCAL" />
-      <updated>1571595588959</updated>
+      <workItem from="1580459154087" duration="2613000" />
     </task>
     <task id="LOCAL-00238" summary=".">
       <created>1571598034347</created>
@@ -1180,7 +1132,14 @@
       <option name="project" value="LOCAL" />
       <updated>1580458203776</updated>
     </task>
-    <option name="localTasksCounter" value="286" />
+    <task id="LOCAL-00286" summary=".">
+      <created>1580460969814</created>
+      <option name="number" value="00286" />
+      <option name="presentableId" value="LOCAL-00286" />
+      <option name="project" value="LOCAL" />
+      <updated>1580460969815</updated>
+    </task>
+    <option name="localTasksCounter" value="287" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1232,12 +1191,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="1580459136096" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1580458186654">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1580460948439">
       <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="1580458186654" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1580460948439" />
     <state x="92" y="92" width="2376" height="856" key="DiffContextDialog" timestamp="1580377344165">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index 8809d68cf6d304f7fb876f36a650b0eae3c34411..263b966e53f70f8f99019aa791bb15207be65d2f 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -84,7 +84,11 @@ 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>';
-    $res .= '<div class="orbit"></div>';
+    if($curve==='sun') {
+        $res .= '<div class="orbit earth" style="background-image:url(\'/images/earth.png?j=' . time() . '\'"></div>';
+    }else{
+        $res .= '<div class="orbit"></div>';
+    }
     $res .= '<div class="horizon" style="top:' . ($sunrisePos['y'] + 3) . 'px;"></div>';
     $res .= '<div class="point rise" style="top:' . $sunrisePos['y'] . 'px;left:' . $sunrisePos['x'] . 'px;"><span>' . date('H:i', $rise) . '</span></div>';
     $res .= '<div class="point set" style="top:' . $sunsetPos['y'] . 'px;left:' . $sunsetPos['x'] . 'px;"><span>' . date('H:i', $set) . '</span></div>';

diff --git a/style/weatherstation.css b/style/weatherstation.css
index 538d22d65ef83a469f9b11302ac80ecea098e2bb..e8422de5079f745d8b5f00e08d832fc12ea64138 100644 (file)
--- a/style/weatherstation.css
+++ b/style/weatherstation.css
@@ -222,6 +222,10 @@
   top: 5px;
   left: 12px;
 }
+#weatherstation .curves .curve.curve-sun .orbit.earth {
+  background-position: 50% 50%;
+  background-size: 100% 100%;
+}
 #weatherstation .curves .curve.curve-moon {
   position: absolute;
   width: 120px;

diff --git a/style/weatherstation.less b/style/weatherstation.less
index f4d081ec51712acad8c421685e722d9b64cccfb3..d9ecaac1833da5a47d093891de4a727c6c32a89c 100644 (file)
--- a/style/weatherstation.less
+++ b/style/weatherstation.less
@@ -193,6 +193,12 @@
     .curve {
       &.curve-sun {
         .curvemix(150, 10, #fc0);
+
+        .orbit.earth {
+          background-position: 50% 50%;
+          background-size: 100% 100%;
+
+        }
       }
 
       &.curve-moon {