* task #41783, #task 41765, implement tutorial mode and add new tutorial task.

This commit is contained in:
Hao Sun
2021-08-26 08:45:07 +08:00
parent 6b275b3487
commit 4779bb64b3
17 changed files with 588 additions and 477 deletions
+5 -2
View File
@@ -705,9 +705,13 @@ class commonModel extends model
$activeMenu = '';
$openApp = $app->openApp;
$isTutorialMode = commonModel::isTutorialMode();
$currentModule = $app->rawModule;
$currentMethod = $app->rawMethod;
if($isTutorialMode and defined('WIZARD_MODULE')) $currentModule = WIZARD_MODULE;
if($isTutorialMode and defined('WIZARD_METHOD')) $currentMethod = WIZARD_METHOD;
/* Print all main menus. */
$menu = customModel::getMainMenu();
$lastMenu = end($menu);
@@ -715,7 +719,7 @@ class commonModel extends model
echo "<ul class='nav nav-default'>\n";
foreach($menu as $menuItem)
{
if(isset($menuItem->hidden) && $menuItem->hidden) continue;
if(isset($menuItem->hidden) && $menuItem->hidden && (!isset($menuItem->tutorial) || !$menuItem->tutorial)) continue;
if(empty($menuItem->link)) continue;
if($menuItem->divider) echo "<li class='divider'></li>";
@@ -765,7 +769,6 @@ class commonModel extends model
{
if(isset($dropMenuItem->hidden) and $dropMenuItem->hidden) continue;
/* Parse drop menu link. */
$dropMenuLink = $dropMenuItem;
if(is_array($dropMenuItem) and isset($dropMenuItem['link'])) $dropMenuLink = $dropMenuLink['link'];
+1 -1
View File
@@ -52,7 +52,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
$wizardMethod = defined('WIZARD_METHOD') ? WIZARD_METHOD : $this->methodName;
$requiredFields = '';
if(isset($config->$wizardModule->$wizardMethod->requiredFields)) $requiredFields = str_replace(' ', '', $config->$wizardModule->$wizardMethod->requiredFields);
echo "<script>window.TUTORIAL = {'module': '$wizardModule', 'method': '$wizardMethod', tip: '$lang->tutorialConfirm'}; if(config) config.requiredFields = '$requiredFields'; </script>";
echo "<script>window.TUTORIAL = {'module': '$wizardModule', 'method': '$wizardMethod', tip: '$lang->tutorialConfirm'}; if(config) config.requiredFields = '$requiredFields'; $(function(){window.top.checkTutorialState && setTimeout(window.top.checkTutorialState, 500);});</script>";
}
if(isset($pageCSS)) css::internal($pageCSS);