diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 51cc27c42a..757fc00ace 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -81,13 +81,13 @@ $param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}"; $lang->task->create = $lang->project->wbs; - common::printIcon('task', 'create', $param, '', 'list', 'sitemap'); + common::printIcon('task', 'create', $param, '', 'list', 'smile'); $lang->task->batchCreate = $lang->project->batchWBS; common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack'); $lang->testcase->batchCreate = $lang->testcase->create; - if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'smile'); + if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap'); if(common::hasPriv('project', 'unlinkStory')) { diff --git a/module/tree/model.php b/module/tree/model.php index bc6e1c340b..11d3a78309 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -636,7 +636,7 @@ class treeModel extends model } else { - if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit', "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="ajax" data-width="400"'); + if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit', "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'data-toggle="modal" data-type="iframe" data-width="500"'); if(common::hasPriv('tree', 'browse') and strpos($this->config->tree->noBrowse, ",$module->type,") === false) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'browse', "root={$module->root}&type=$type&module={$module->id}"), $this->lang->tree->child); if(common::hasPriv('tree', 'delete')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'delete', "root={$module->root}&module={$module->id}"), $this->lang->delete, 'hiddenwin'); if(common::hasPriv('tree', 'updateorder')) $linkHtml .= ' ' . html::input("orders[$module->id]", $module->order, 'class="text-center w-30px form-control inline input-sm"'); diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index d20bb96590..4f94b3bc26 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -10,6 +10,7 @@ * @link http://www.zentao.net */ ?> + app->getWebRoot(); $jsRoot = $webRoot . "js/"; @@ -49,3 +50,4 @@ $jsRoot = $webRoot . "js/"; +