wip #5041 @0.25

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ca9f0aa4983e805cb0b85ffaed762b75d2f57949..4d376a38ac1b04435d595bf842605eb53950ed34 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,22 +22,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5093 @0.25">
-      <change afterPath="$PROJECT_DIR$/app/Jobs/Base.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Jobs/Tools/Base.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Mail/Base.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/tools/mail.blade.php" afterDir="false" />
+    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5093 @3">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/Tools/FluidbookAssetsDownloader.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/Tools/FluidbookAssetsDownloader.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/DownloadBase.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/DownloadBase.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/GenerateThemePreview.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/GenerateThemePreview.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/ProcessTotals.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/ProcessTotals.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/Tools/FluidbookAssetsDownloader.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/Tools/FluidbookAssetsDownloader.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/UpdateWS2ThemeTable.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/UpdateWS2ThemeTable.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Mail/DeferredDownload.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/DeferredDownload.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Mail/FluidbookQuoteAssign.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/FluidbookQuoteAssign.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Mail/FluidbookQuoteReceived.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Mail/FluidbookQuoteReceived.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/elearningpackage/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/resources/elearningpackage/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/elearningpackage/sass/app.sass" beforeDir="false" afterPath="$PROJECT_DIR$/resources/elearningpackage/sass/app.sass" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -692,14 +680,8 @@
       <workItem from="1644828785862" duration="9853000" />
       <workItem from="1644851528057" duration="636000" />
       <workItem from="1644852994411" duration="9344000" />
-      <workItem from="1644907547410" duration="22676000" />
-    </task>
-    <task id="LOCAL-00200" summary="wip #4891 @2">
-      <created>1637247578195</created>
-      <option name="number" value="00200" />
-      <option name="presentableId" value="LOCAL-00200" />
-      <option name="project" value="LOCAL" />
-      <updated>1637247578196</updated>
+      <workItem from="1644907547410" duration="24512000" />
+      <workItem from="1644946789585" duration="233000" />
     </task>
     <task id="LOCAL-00201" summary="wip #4891 @0.5">
       <created>1637249592707</created>
@@ -1037,7 +1019,14 @@
       <option name="project" value="LOCAL" />
       <updated>1644862137930</updated>
     </task>
-    <option name="localTasksCounter" value="249" />
+    <task id="LOCAL-00249" summary="wip #5093 @3">
+      <created>1644934041814</created>
+      <option name="number" value="00249" />
+      <option name="presentableId" value="LOCAL-00249" />
+      <option name="project" value="LOCAL" />
+      <updated>1644934041814</updated>
+    </task>
+    <option name="localTasksCounter" value="250" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1069,7 +1058,6 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="wait #4891 @0.5" />
     <MESSAGE value="wait #4949 @2" />
     <MESSAGE value="wait #4951 @3" />
     <MESSAGE value="wip #4962 @0.5" />
@@ -1094,7 +1082,8 @@
     <MESSAGE value="wip #5041 @1" />
     <MESSAGE value="wip #5093 @2" />
     <MESSAGE value="wip #5093 @0.25" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #5093 @0.25" />
+    <MESSAGE value="wip #5093 @3" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #5093 @3" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/resources/elearningpackage/index.html b/resources/elearningpackage/index.html
index be577b32ece907d374d0b9763c7bc218c04e858b..3ded32f64add0b48793e1173219c29d7edd3cdfd 100644 (file)
--- a/resources/elearningpackage/index.html
+++ b/resources/elearningpackage/index.html
@@ -52,6 +52,15 @@
               d="M25.2,25.2c2.3-2.4,3.8-5.8,3.8-9.4c0-3.7-1.5-7-3.8-9.4 M23,21.8c1.5-1.5,2.4-3.7,2.4-6c0-2.3-0.9-4.5-2.4-6"
         />
     </symbol>
+    <symbol id="icon-FC" viewBox="0 0 32 33">
+        <path fill="currentColor"  d="M21.8,30.6c-0.1,0-0.1,0-0.2,0L6.2,27.8c-0.4-0.1-0.6-0.5-0.6-0.9V5.1c0-0.5,0.3-0.8,0.6-0.9l15.4-2.8
+       c0.2,0,0.4,0,0.6,0.2c0.2,0.2,0.3,0.4,0.3,0.7v27.5c0,0.3-0.1,0.6-0.3,0.7C22.1,30.6,22,30.6,21.8,30.6z M21.8,29.6L21.8,29.6
+       C21.8,29.6,21.8,29.6,21.8,29.6z M6.5,26.9l15,2.7l0-27.2l-15,2.7L6.5,26.9z M21.8,2.4L21.8,2.4C21.8,2.4,21.8,2.4,21.8,2.4z"/>
+        <path fill="currentColor" d="M13.2,21.4c-3.5,0-6.4-0.4-8.5-1.3c-2.4-1-3.8-2.5-3.9-4.1c-0.1-0.8,0.3-2,2.1-3.2l0.6,0.8
+       c-0.8,0.5-1.7,1.4-1.7,2.3c0.1,1.3,1.3,2.4,3.3,3.3c2.6,1.1,6.4,1.4,11.1,1.1c7.1-0.5,10.1-2.5,14.8-6l0.6,0.8
+       c-4.7,3.5-8,5.7-15.4,6.2C15.2,21.4,14.2,21.4,13.2,21.4z"/>
+        <polygon fill="currentColor"  points="26.2,13.3 26.1,14.3 31,14.9 30.1,19.7 31.1,19.9 32.2,14 "/>
+    </symbol>
     <symbol id="check-ok-green" viewBox="0 0 30 30">
         <style type="text/css">
             .st0 {

diff --git a/resources/elearningpackage/sass/app.sass b/resources/elearningpackage/sass/app.sass
index 53e4ff379e9c5889e098617c12bbd318078ceb81..cfbb4e2bbb8cdf1aa34d345b61aec4f60fb6b9ec 100644 (file)
--- a/resources/elearningpackage/sass/app.sass
+++ b/resources/elearningpackage/sass/app.sass
@@ -1,4 +1,4 @@
-$colors: (IN: #47484e, VI: #d0167c, Ti5: #d0167c, AN: #84156f, FB: #f8971d, PD: #00a0af, QZ: #00abeb, FC: #00abeb)
+$colors: (IN: #47484e, VI: #d0167c, Ti5: #d0167c, AN: #84156f, FB: #f8971d, PD: #00a0af, QZ: #00abeb, FC: #1988CC)
 
 @mixin media-mob
     @media screen and (max-width: 1024px)