wait #7756 @1.5

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 0114a76169210ffe9259393a301f1a6a2b8566d1..c7b1bd7ef5388ffcce83d70a8b26aa06edc783cb 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-252.25557.131">
+  <component name="dataSourceStorageLocal" created-in="IU-252.26199.169">
     <data-source name="MySQL - dev.fluidbook.com" uuid="9a7a0ad9-c6dc-4e29-b76d-f95d9cb2182a">
       <database-info product="MySQL" version="5.6.27-0ubuntu0.15.04.1-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )" dbms="MYSQL" exact-version="5.6.27">
         <extra-name-characters>#@</extra-name-characters>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a33375054495a1776e47af8ec992ca5f5a66773b..d8e51f5a50bbf5b698bb6e39a526eecc3ee84b66 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7699 @0:20">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #1419 @1">
+      <change afterPath="$PROJECT_DIR$/framework/application/views/helpers/HomeAir.php" 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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/forms/CMS/Home.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/forms/CMS/Home.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/views/helpers/Home.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/helpers/Home.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -259,42 +263,42 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;SHELLCHECK.PATH&quot;: &quot;C:\\Users\\vince\\AppData\\Roaming\\JetBrains\\IntelliJIdea2025.2\\plugins\\Shell Script\\shellcheck.exe&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookWebV3/.docker&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "SHELLCHECK.PATH": "C:\\Users\\vince\\AppData\\Roaming\\JetBrains\\IntelliJIdea2025.2\\plugins\\Shell Script\\shellcheck.exe",
+    "WebServerToolWindowFactoryState": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
+    "WebServerToolWindowPanel.toolwindow.show.date": "false",
+    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
+    "WebServerToolWindowPanel.toolwindow.show.size": "false",
+    "git-widget-placeholder": "master",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Works/FluidbookWebV3/framework/application/views/helpers",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.2",
+    "ruby.rails.projectView.checked": "true",
+    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Works\FluidbookWebV3\framework\application\views\helpers" />
       <recent name="D:\Works\FluidbookWebV3\.docker" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\CubeIT\Bootstrap" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\Zend\Xml" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\Zend" />
-      <recent name="H:\Works\FluidbookWebV3\framework\application\views\scripts\templates" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookWebV3\.docker" />
@@ -636,8 +640,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.25557.131" />
-        <option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-IU-252.25557.131" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.26199.169" />
+        <option value="bundled-js-predefined-d6986cc7102b-9c94529fcfe0-JavaScript-IU-252.26199.169" />
       </set>
     </attachedChunks>
   </component>
@@ -862,7 +866,8 @@
       <workItem from="1757060344328" duration="1210000" />
       <workItem from="1757063759669" duration="765000" />
       <workItem from="1757316854703" duration="360000" />
-      <workItem from="1757510406092" duration="98000" />
+      <workItem from="1757510406092" duration="1991000" />
+      <workItem from="1758795752724" duration="1062000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1207,7 +1212,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="188" />
+    <option name="localTasksCounter" value="189" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1250,7 +1255,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #5341 @1" />
     <MESSAGE value="wip #5392" />
     <MESSAGE value="wip #5220 @3" />
     <MESSAGE value="try #5868 @0.5" />
@@ -1275,7 +1279,8 @@
     <MESSAGE value="wait #7698 @1" />
     <MESSAGE value="wait #7710 @0.5" />
     <MESSAGE value="wait #7699 @0:20" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #7699 @0:20" />
+    <MESSAGE value="wait #1419 @1" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #1419 @1" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index a264328fe601e40c17aae4a30d917a1f157e098e..ba657dd7195477e31bf6d1e11fcd3cb79efa24dc 100644 (file)
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -10,6 +10,7 @@ class Fluidbook_Form_CMS_Home extends Fluidbook_Form_CMS {
                        'mobile' => array('class' => 'Fluidbook_Form_CMS_Sub_Home_Mobile', 'label' => 'Mobile First'),
                        'customers' => array('class' => 'Fluidbook_Form_CMS_Sub_Home_Customers', 'label' => 'Clients'),
                        'services' => array('class' => 'Fluidbook_Form_CMS_Sub_Home_Services', 'label' => 'Services'),
+            'air' => array('class' => 'Fluidbook_Form_CMS_Sub_Home_Mobile', 'label' => 'Fluidbook Air'),
                        'references' => array('class' => 'Fluidbook_Form_CMS_Sub_Home_References', 'label' => 'Référeces'),
                );
 

diff --git a/framework/application/views/helpers/Home.php b/framework/application/views/helpers/Home.php
index 7272b3a4e8cce3b48810f2ef352779f57939313f..50699785d24167cdc749c07dab474f3f63c5486c 100644 (file)
--- a/framework/application/views/helpers/Home.php
+++ b/framework/application/views/helpers/Home.php
@@ -6,14 +6,29 @@ class Fluidbook_View_Helper_Home extends CubeIT_View_Helper_Abstract {
         */\r
        public function home() {\r
                $res = '';\r
-               $blocs = array(\r
-                       'intro',\r
-                       'features',\r
-                       'mobile',\r
-                       'services',\r
-                       'references',\r
-                       'customers',\r
-               );\r
+\r
+\r
+        if(Bootstrap::getInstance()->isAllowed('admin')) {\r
+            $blocs = array(\r
+                'intro',\r
+                'features',\r
+                'mobile',\r
+                'services',\r
+                'air',\r
+                'references',\r
+                'customers',\r
+            );\r
+        }else{\r
+            $blocs = array(\r
+                'intro',\r
+                'features',\r
+                'mobile',\r
+                'services',\r
+              //  'air',\r
+                'references',\r
+                'customers',\r
+            );\r
+        }\r
 \r
                foreach ($blocs as $bloc) {\r
 \r

diff --git a/framework/application/views/helpers/HomeAir.php b/framework/application/views/helpers/HomeAir.php
new file mode 100644 (file)
index 0000000..18c6c29
--- /dev/null
+++ b/framework/application/views/helpers/HomeAir.php
@@ -0,0 +1,17 @@
+<?php
+
+class Fluidbook_View_Helper_HomeAir extends Fluidbook_View_Helper_HomeLayer {
+       /**
+        * @return string
+        */
+       public function homeAir($data) {
+
+        $this->headScript()->addScriptAndStyle('212-home-mobile');
+
+               $this->data = $data;
+
+               $res = $this->_leftText();
+
+               return $this->_layer($res, 'air');
+       }
+}