Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix help link not open in tabs.

Browse Source
This commit is contained in:
Catouse
2021-03-04 17:08:11 +08:00
parent cca6e18362
commit e70ab53ce5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+5 -5
View File
@@ -356,7 +356,7 @@ class commonModel extends model
//if($config->global->flow == 'full' && !commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->noviceTutorial, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
$manualUrl = (!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home'];
echo '<li>' . html::a($manualUrl, $lang->manual, '', "class='open-in-tab' id='helpLink' data-group='help'") . '</li>';
echo '<li>' . html::a($manualUrl, $lang->manual, '', "class='open-in-app' id='helpLink' data-app='help'") . '</li>';
echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
echo "</ul></li>\n";
@@ -1055,9 +1055,9 @@ class commonModel extends model
*/
public static function printLink($module, $method, $vars = '', $label, $target = '', $misc = '', $newline = true, $onlyBody = false, $object = null)
{
/* Add data-group attribute. */
/* Add data-app attribute. */
global $app;
if(strpos($misc, 'data-group') === false) $misc .= ' data-group="' . $app->openApp . '"';
if(strpos($misc, 'data-app') === false) $misc .= ' data-app="' . $app->openApp . '"';
if(!commonModel::hasPriv($module, $method, $object)) return false;
echo html::a(helper::createLink($module, $method, $vars, '', $onlyBody), $label, $target, $misc, $newline);
@@ -1150,8 +1150,8 @@ EOD;
global $app, $lang, $config;
/* Add data-group attribute. */
if(strpos($misc, 'data-group') === false) $misc .= ' data-group="' . $app->openApp . '"';
/* Add data-app attribute. */
if(strpos($misc, 'data-app') === false) $misc .= ' data-app="' . $app->openApp . '"';
/* Judge the $method of $module clickable or not, default is clickable. */
$clickable = true;
module/user/view/deny.html.php
+1 -1
View File
@@ -48,7 +48,7 @@ include '../../common/view/header.lite.html.php';
<?php
$isOnlybody = helper::inOnlyBodyMode();
unset($_GET['onlybody']);
echo html::a('javascript:void(0)', $lang->my->common, ($isOnlybody ? '_parent' : ''), 'class="btn show-in-tab" onclick="changeLeftNavigation()"');
echo html::a('javascript:void(0)', $lang->my->common, ($isOnlybody ? '_parent' : ''), 'class="btn show-in-app" onclick="changeLeftNavigation()"');
if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback, ($isOnlybody ? '_parent' : ''), "class='btn'");
echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin, ($isOnlybody ? '_parent' : ''), "class='btn btn-primary'");
?>