Webasyst Framework v.3.0.1

Leonix · Leonix · commit 2340c1ccc228 · 2024-05-28T16:43:23.000+03:00
* Added a link, pointing to the Webasyst ID profile, to the user’s drop-down menu. * Made improvements to the Webasyst 2 interface and fixed a few found bugs. * Improved support for the latest PHP versions. * For developers: * Added a new template helper {$wa->headerSingleAppUser()} to be used instead of the default navigation menu helper {$wa->header()} in the single-app mode https://developers.webasyst.com/docs/cookbook/single-app-mode/
diff --git a/wa-apps/installer/lib/config/app.php b/wa-apps/installer/lib/config/app.php
@@ -4,7 +4,7 @@
     'description' => 'Install new apps from the Webasyst Store',
     'icon'        => 'img/installer.svg',
     'mobile'      => false,
-    'version'     => '3.0.1', // developer preview
+    'version'     => '3.0.1',
     'critical'    => '3.0.1',
     'system'      => true,
     'vendor'      => 'webasyst',
diff --git a/wa-content/css/wa/wa-2.0.css b/wa-content/css/wa/wa-2.0.css
@@ -796,9 +796,10 @@ input.state-caution, textarea.state-caution, select.state-caution, .wa-select.st
 #wa-header #wa-header-user-area #wa-userprofile { position: relative; border-bottom: 0 none;}
 #wa-header #wa-header-user-area #wa-userprofile.is-opened::before { position: absolute; top: 0; right: 0; bottom: 0; width: 115px; content: ''; }
 #wa-header #wa-header-user-area #wa-notifications-dropdown { z-index: 1;}
-#wa-header #wa-userprofile .dropdown-body { width: 300px; background: var(--background-color); }
+#wa-header #wa-userprofile .dropdown-body { width: 300px; background: var(--background-color); box-shadow: 0 10px 25px -10px var(--drawer-shadow-color); }
 #wa-header #wa-userprofile .dropdown-body .bricks > .brick { width: calc(33% - 2.25rem); text-align: center; font-size: 0.75rem; }
 #wa-header #wa-userprofile .dropdown-body .bricks > .brick > .icon { margin: 0.125em auto 0.25em; }
+#wa-header #wa-userprofile .dropdown-body .webasyst-id-button { color: var(--bricks-link-color-selected); background: var(--bricks-background-color-selected); border-radius: 0.75rem; }
 
 #wa-nav ~ .wa-header-background { display: none;}
 #wa-nav.wa-nav-unfolded ~ .wa-header-background { display: block; position: fixed; width: 100vw; height: 100vh; background: rgba(0, 0, 0, 0.2); top: 0; left: 0; z-index: 999; }
diff --git a/wa-content/js/jquery-wa/wa.header.singleapp.js b/wa-content/js/jquery-wa/wa.header.singleapp.js
@@ -1,3 +1,7 @@
+if (typeof WaHeaderSingleApp === 'undefined') {
+
+window.WaHeaderSingleApp = (function() {
+
 class WaHeaderSingleApp {
     constructor() {
         // Variables
@@ -49,3 +53,9 @@ class WaHeaderSingleApp {
         });
     }
 }
+
+return WaHeaderSingleApp;
+
+}());
+
+}
diff --git a/wa-system/design/templates/Design.html b/wa-system/design/templates/Design.html
@@ -267,7 +267,7 @@ <h3 class="dialog-header">[s`Upload theme`]</h3>
     }
 
     function waDesignConfirm() {
-        if ($("#wa-design-button").length && $('#wa-design-button').hasClass('yellow')) {
+        if ($("#wa-design-button").length && $('#wa-design-button').hasClass('yellow') || $("#bb_submit").length && $('#bb_submit').hasClass('yellow') ) {
             if (!confirm("[s`Unsaved changes will be lost if you leave this page now. Are you sure?`]")) {
                 return false;
             }
diff --git a/wa-system/plugin/templates/Plugins.html b/wa-system/plugin/templates/Plugins.html
@@ -308,6 +308,7 @@ <h5 class="heading custom-mt-12">[s`Installed`]</h5>
                 let hash = $('.js-plugin-list').find('> li:first-child > a').attr('href');
                 if (hash) {
                     $.wa.setHash(hash);
+                    setTimeout(function() { $.plugins.dispatch(location.hash, true); }, 0);
                 }
                 return;
             }
diff --git a/wa-system/webasyst/lib/actions/backend/webasystBackend.actions.php b/wa-system/webasyst/lib/actions/backend/webasystBackend.actions.php
@@ -21,6 +21,7 @@ public function defaultMobileAction()
         $this->view->assign('public_dashboards', $this->getPublicDashboards());
         $this->view->assign('counts', wa()->getStorage()->read('apps-count'));
         $this->view->assign($this->getCalendarData());
+        $this->view->assign('is_user_connected_to_waid', !!(new waContactWaidModel())->get($this->getUserId()));
         $this->dashboardAction();
     }
 
diff --git a/wa-system/webasyst/lib/actions/backend/webasystBackendHeader.action.php b/wa-system/webasyst/lib/actions/backend/webasystBackendHeader.action.php
@@ -123,7 +123,8 @@ public function execute()
             'current_domain'  => $this->getCurrentDomain(),
             'app_info'        => $app_info,
             'frontend_links'  => $this->getFrontendLinks(),
-            'custom_params'   => $this->params['custom']
+            'custom_params'   => $this->params['custom'],
+            'is_user_connected_to_waid' => !!(new waContactWaidModel())->get($user->getId()),
         ] + $this->getCalendarData());
 
         if ($this->single_app_mode) {
@@ -155,6 +156,7 @@ protected function executeSingleAppUserNavigation()
             'backend_url'    => $backend_url,
             'request_uri'    => $request_uri,
             'user'           => $user,
+            'is_user_connected_to_waid' => !!(new waContactWaidModel())->get($user->getId()),
         ]);
 
         $this->assignNotificationsData(['backend_header_notification' => $header_notification]);
diff --git a/wa-system/webasyst/lib/config/app.php b/wa-system/webasyst/lib/config/app.php
@@ -3,7 +3,7 @@
 return array(
     'name'         => 'Webasyst',
     'prefix'       => 'webasyst',
-    'version'      => '3.0.1', // developer preview
+    'version'      => '3.0.1',
     'critical'     => '3.0.1',
     'vendor'       => 'webasyst',
     'csrf'         => true,
diff --git a/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.mo b/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.mo
diff --git a/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po b/wa-system/webasyst/locale/ru_RU/LC_MESSAGES/webasyst.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Webasyst\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-05-16 15:13+0300\n"
+"PO-Revision-Date: 2024-05-21 11:40+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -6963,3 +6963,9 @@ msgstr "Возникла неизвестная ошибка. Обновите 
 
 msgid "Plugins for %s"
 msgstr "Плагины для %s"
+
+msgid "https://www.webasyst.com/my/"
+msgstr "https://www.webasyst.ru/my/"
+
+msgid "My Webasyst ID"
+msgstr "Мой Webasyst ID"
diff --git a/wa-system/webasyst/templates/actions/backend/BackendHeaderCurrentUser.inc.html b/wa-system/webasyst/templates/actions/backend/BackendHeaderCurrentUser.inc.html
@@ -53,23 +53,33 @@
     <div class="dropdown-body{if empty($dropdown_body_left)} right{/if}">
         <div class="bricks custom-mt-12">
             {if empty($without_link_profile)}
-            <a class="brick" href="{$backend_url}?module=profile">
+            <a class="brick selected" href="{$backend_url}?module=profile">
                 <span class="icon"><i class="userpic size-24" style="background-image: url('{$user->getPhoto(96)}');"></i></span>
                 <span>[s`Profile`]</span>
             </a>
             {/if}
-            <a href="javascript:void(0)" class="brick" data-wa-mode-toggle>
+            <a href="javascript:void(0)" class="brick selected" data-wa-mode-toggle>
                 <span class="icon"><i class="fas fa-adjust"></i></span>
                 <span>[s`Mode`]</span>
             </a>
-            <a href="{$backend_url}?action=logout" class="brick">
+            <a href="{$backend_url}?action=logout" class="brick selected">
                 <span class="icon"><i class="fas fa-sign-out-alt"></i></span>
                 <span>[s`Logout`]</span>
             </a>
         </div>
+
+        {if $is_user_connected_to_waid}
+            <div class="custom-pb-12 custom-px-12">
+                <a href="[s`https://www.webasyst.com/my/`]" target="_blank" class="button white full-width smaller webasyst-id-button"><i class="icon webasyst-magic-wand custom-mr-8"></i>[s`My Webasyst ID`]</a>
+            </div>
+        {/if}
+
         {if $change_status_access}
             <div class="blank custom-pt-12 custom-pb-4">
-                <h5 class="heading">{sprintf('[s`Status for %s`]', $smarty.now|wa_datetime:'humandate')}</h5>
+                <h5 class="heading flexbox">
+                  <span class="wide nowrap">{sprintf('[s`Status for %s`]', $smarty.now|wa_datetime:'humandate')}</span>
+                  <a href="{$backend_url}team/calendar/" class="button smaller light-gray rounded bold">[s`Calendar`]</a>
+                </h5>
                 <ul id="js-user-dropdown-menu" class="menu custom-mb-0">
                     <li class="{if !$current_status}hidden{/if}" data-action-id="delete">
                         <a href="javascript:void(0)">

Original file line number	Diff line number	Diff line change
@@ -267,7 +267,7 @@ <h3 class="dialog-header">[s`Upload theme`]</h3>
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`function waDesignConfirm() {`
`270`		`- if ($("#wa-design-button").length && $('#wa-design-button').hasClass('yellow')) {`
	`270`	`+ if ($("#wa-design-button").length && $('#wa-design-button').hasClass('yellow') \|\| $("#bb_submit").length && $('#bb_submit').hasClass('yellow') ) {`
`271`	`271`	if (!confirm("[s`Unsaved changes will be lost if you leave this page now. Are you sure?`]")) {
`272`	`272`	`return false;`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
@@ -308,6 +308,7 @@ <h5 class="heading custom-mt-12">[s`Installed`]</h5>
`308`	`308`	`let hash = $('.js-plugin-list').find('> li:first-child > a').attr('href');`
`309`	`309`	`if (hash) {`
`310`	`310`	`$.wa.setHash(hash);`
	`311`	`+ setTimeout(function() { $.plugins.dispatch(location.hash, true); }, 0);`
`311`	`312`	`}`
`312`	`313`	`return;`
`313`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public function defaultMobileAction()`
`21`	`21`	`$this->view->assign('public_dashboards', $this->getPublicDashboards());`
`22`	`22`	`$this->view->assign('counts', wa()->getStorage()->read('apps-count'));`
`23`	`23`	`$this->view->assign($this->getCalendarData());`
	`24`	`+ $this->view->assign('is_user_connected_to_waid', !!(new waContactWaidModel())->get($this->getUserId()));`
`24`	`25`	`$this->dashboardAction();`
`25`	`26`	`}`
`26`	`27`