From f665030cb1aebfa0dbd7e2df8c8545d5830ad801 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Wed, 11 Jan 2023 09:46:57 +0000
Subject: [PATCH] * Finish task #82697.

---
 module/zahost/js/browse.js              |  8 ++++----
 module/zanode/js/browse.js              |  8 ++++----
 module/zanode/view/createimage.html.php | 10 +++++++---
 module/zanode/view/getvnc.html.php      |  2 +-
 module/zanode/view/view.html.php        |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/module/zahost/js/browse.js b/module/zahost/js/browse.js
index 31399f3d9f..5ce8f99b34 100644
--- a/module/zahost/js/browse.js
+++ b/module/zahost/js/browse.js
@@ -6,12 +6,12 @@ $('#hostList tr[data-status="wait"]').hover(function(){
 
 if(showFeature)
 {
-    /* Show features dialog. */
-    new $.zui.ModalTrigger({url: $.createLink('zahost', 'introduction'), type: 'iframe', width: 900, className: 'showFeatures', showHeader: false, backdrop: 'static'}).show();
+    $.apps.close('help');
+    $.apps.open('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao', 'help');
 }
 
 $('#helpTab').click(function()
 {
-    /* Show features dialog. */
-    new $.zui.ModalTrigger({url: $.createLink('zahost', 'introduction'), type: 'iframe', width: 900, className: 'showFeatures', showHeader: false, backdrop: 'static'}).show();
+    $.apps.close('help');
+    $.apps.open('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao', 'help');
 })
diff --git a/module/zanode/js/browse.js b/module/zanode/js/browse.js
index ea3d670380..882c7a4cc0 100644
--- a/module/zanode/js/browse.js
+++ b/module/zanode/js/browse.js
@@ -1,11 +1,11 @@
 if(showFeature)
 {
-    /* Show features dialog. */
-    new $.zui.ModalTrigger({url: $.createLink('zahost', 'introduction'), type: 'iframe', width: 900, className: 'showFeatures', showHeader: false, backdrop: 'static'}).show();
+    $.apps.close('help');
+    $.apps.open('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao', 'help');
 }
 
 $('#helpTab').click(function()
 {
-    /* Show features dialog. */
-    new $.zui.ModalTrigger({url: $.createLink('zahost', 'introduction'), type: 'iframe', width: 900, className: 'showFeatures', showHeader: false, backdrop: 'static'}).show();
+    $.apps.close('help');
+    $.apps.open('https://www.zentao.net/book/zentaopms/978.html?fullScreen=zentao', 'help');
 })
diff --git a/module/zanode/view/createimage.html.php b/module/zanode/view/createimage.html.php
index d9d18dcf6b..934514162f 100644
--- a/module/zanode/view/createimage.html.php
+++ b/module/zanode/view/createimage.html.php
@@ -31,8 +31,12 @@
       <div class="progress-bar progress-bar-success rate" role="progressbar" aria-valuenow="<?php echo $task->rate;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $task->rate;?>%">
       </div>
     </div>
-    <?php  helper::createLink('zanode', 'create');?>
-    <h6 class='hide text-center success'><?php echo $lang->zanode->createImageSuccess . html::a(inLink('create'), $lang->zanode->createImageButton, "_parent");?></h6>
+    <?php 
+        $link = helper::createLink('zanode', 'create', "hostID={$node->parent}");
+        $link = str_replace('onlybody=yes', '', $link);
+        $link = trim($link, '?');
+    ?>
+    <h6 class='hide text-center success'><?php echo $lang->zanode->createImageSuccess . html::a($link, $lang->zanode->createImageButton, "_parent", "style='color:#2e7fff;'");?></h6>
     <h6 class='hide text-center fail'><?php echo $lang->zanode->createImageFail;?></h6>
     <?php else:?>
     <form class="load-indicator main-form form-ajax" method='post' enctype='multipart/form-data' id='dataform'>
@@ -99,5 +103,5 @@ function updateStatus(data)
     }, 'json');
 }
 </script>
-<?php endif;;?>
+<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/zanode/view/getvnc.html.php b/module/zanode/view/getvnc.html.php
index b439daa0f4..4eb04c8fbd 100644
--- a/module/zanode/view/getvnc.html.php
+++ b/module/zanode/view/getvnc.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
 <div class='clearfix'>
-  <?php echo "<iframe width='100%' id='urlIframe' src='http://$url/novnc?port=6080&path=websockify/?token=$token&password=pass'></iframe>";?>
+  <?php echo "<iframe width='100%' id='urlIframe' src='http://$url/novnc/vnc.html?resize=scale&autoconnect=true&port=6080&path=websockify/?token=$token&password=pass&resize=scale&autoconnect=true'></iframe>";?>
 </div>
 <script>
 $(function()
diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php
index b1a066fc59..b5a2a99303 100644
--- a/module/zanode/view/view.html.php
+++ b/module/zanode/view/view.html.php
@@ -137,7 +137,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
               </span>
             </div>
             <div class="status-notice">
-              <span class='init-success hide'><?php echo sprintf($lang->zanode->init->initSuccessNoticeTitle, "<a href='https://www.zentao.net/book/zentaopms/configure-environment-974.html' target='_blank'>{$lang->zanode->manual}</a>", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?></span>
+              <span class='init-success hide'><?php echo sprintf($lang->zanode->init->initSuccessNoticeTitle, "<a id='jumpManual' href='javascript:;'>{$lang->zanode->manual}</a>", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?></span>
               <span class='init-fail hide'><?php echo $lang->zanode->init->initFailNoticeTitle . '<br/>' . $lang->zanode->init->initFailNoticeDesc;?></span>
             </div>
           </div>