* Adjust js locate.

This commit is contained in:
holan20180123
2021-06-29 11:11:14 +08:00
parent 7fa1167376
commit 7b7ff8d209
3 changed files with 22 additions and 0 deletions
+4
View File
@@ -1002,6 +1002,10 @@ EOT;
{
$js .= "history.back(-1);\n";
}
elseif(strpos($target, '$.apps.open') !== false)
{
$js .= "$target('$url')";
}
else
{
$js .= "$target.location='$url';\n";
+17
View File
@@ -42,6 +42,23 @@ $sessionString .= session_name() . '=' . session_id();
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><i class='icon <?php echo $star;?>'></i></a>
<?php endif;?>
<?php if(isset($this->config->maxVersion)):?>
<?php
$canImportToPracitceLib = common::hasPriv('doc', 'importToPracitceLib');
$canImportToComponentLib = common::hasPriv('doc', 'importToComponentLib');
if($canImportToPracitceLib or $canImportToComponentLib)
{
echo "<div class='btn-group' id='more'>";
echo html::a('javascript:;', "<i class='icon icon-ellipsis-v'></i>", '', "data-toggle='dropdown' class='btn btn-link'");
echo "<ul class='dropdown-menu'>";
if($canImportToPracitceLib) echo '<li>' . html::a('#importToPracitceLib', $lang->doc->importToPracitceLib) . '</li>';
if($canImportToComponentLib) echo '<li>' . html::a('#canImportToComponentLib', $lang->doc->importToComponentLib) . '</li>';
echo '</ul></div>';
}
?>
<?php endif;?>
</div>
</div>
<div class="detail-content article-content">
+1
View File
@@ -897,6 +897,7 @@ class story extends control
$storyID = (int)$storyID;
$story = $this->story->getById($storyID, $version, true);
if(!$story) die(js::error($this->lang->notFound) . js::locate('back'));
if(!empty($story->lib)) die(js::locate($this->createLink('assetlib', 'storyView', "storyID=$storyID"), 'window.parent.$.apps.open'));
$story = $this->story->mergeReviewer($story, true);