diff --git a/module/common/model.php b/module/common/model.php index 2fe896a978..6ab65febe0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -356,7 +356,7 @@ class commonModel extends model //if($config->global->flow == 'full' && !commonModel::isTutorialMode() and $app->user->account != 'guest') echo '
  • ' . 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'") . "
  • "; $manualUrl = (!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']; - echo '
  • ' . html::a($manualUrl, $lang->manual, '', "class='open-in-tab' id='helpLink' data-group='help'") . '
  • '; + echo '
  • ' . html::a($manualUrl, $lang->manual, '', "class='open-in-app' id='helpLink' data-app='help'") . '
  • '; echo '
  • ' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '
  • '; echo "\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; diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index bb6e7abe48..a8b49a492b 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -48,7 +48,7 @@ include '../../common/view/header.lite.html.php'; 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'"); ?>