diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index f0df5425fdd..489b77224ff 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -31,10 +31,10 @@
objectType == 'case' ? 'testcase' : $action->objectType;?>
-
+
action->objectTypes[$action->objectType];?> |
objectID;?> |
- createLink($module, 'view', "id=$action->objectID"), $action->objectName);?> |
+ createLink($module, 'view', "id=$action->objectID"), $action->objectName);?> |
actor];?> |
date;?> |
diff --git a/module/admin/view/cleardata.html.php b/module/admin/view/cleardata.html.php
index 5e8d344d140..b9d76391fb7 100755
--- a/module/admin/view/cleardata.html.php
+++ b/module/admin/view/cleardata.html.php
@@ -16,7 +16,7 @@
admin->clearData;?>
|
admin->clearDataDesc);?> |
-
+ |
lang->admin->pleaseInputYes . html::input('sure', '', "class='text-2' onkeyup='showClearButton()' autocomplete='off'");?>
admin->clearData, "class='hidden btn btn-danger'");?>
|
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 30585ec00b6..9fe2a6e3a52 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -29,10 +29,10 @@
bug->files;?> |
- fetch('file', 'buildform');?> |
+ fetch('file', 'buildform');?> |
- goback, $this->session->bugList);?> |
+ goback, $this->session->bugList);?> |
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index b990f695342..8550a3eeacd 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -33,7 +33,7 @@
|
- goback, $this->server->http_referer);?> |
+ goback, $this->server->http_referer);?> |
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 74adf060c1d..a5eea7ba31a 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -29,11 +29,11 @@
bug->batchCreate; $i++):?>
-
+
|
- |
+ |
|
- |
+ |
|
|
bug->typeList, '');?> |
@@ -42,7 +42,7 @@
bug->browserList, '');?> |
- |
+ |
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index b85b79f713b..a02ab886ed3 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -35,7 +35,7 @@
if($bugs[$bugID]->type != 'newfeature') unset($this->lang->bug->typeList['newfeature']);
if($bugs[$bugID]->type != 'trackthings') unset($this->lang->bug->typeList['trackthings']);
?>
-
+
|
bug->typeList, $bugs[$bugID]->type, 'class=select-1');?> |
bug->severityList, $bugs[$bugID]->severity, 'class=select-1');?> |
@@ -53,7 +53,7 @@
|
- |
+ |
diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index 9c54c6195cb..92c591fb505 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -5,7 +5,7 @@
-
tree->manage);?>
+
tree->manage);?>
@@ -55,7 +55,7 @@
?>
-
+
id";
common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 13660406e69..83249a0f294 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -79,7 +79,7 @@
-
+
tree->manage);?>
tree->fix, 'hiddenwin');?>
@@ -126,7 +126,7 @@
id");?>
-
+
id));?>
@@ -135,14 +135,14 @@
| bug->priList[$bug->pri];?>'>bug->priList[$bug->pri];?> |
confirmed;?>
- [{$lang->bug->confirmedList[$bug->confirmed]}] " . html::a($bugLink, $bug->title);?> |
+ [{$lang->bug->confirmedList[$bug->confirmed]}] " . html::a($bugLink, $bug->title);?> |
cookie->windowWidth >= $this->config->wideSize):?>
bug->statusList[$bug->status];?> |
- createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?> |
+ createLink('story', 'view', "stoyID=$bug->story"), $bug->storyTitle, '_blank');?> |
bug->confirmStoryChange = $lang->confirm; common::printIcon('bug', 'confirmStoryChange', "bugID=$bug->id", '', 'list', '', 'hiddenwin')?> |
openedBy, $bug->openedBy);?> |
@@ -159,7 +159,7 @@
resolvedDate, 5, 11)?> |
-
+ |
id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 52e94f78313..4d7f083bfda 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -20,7 +20,7 @@
| |
- goback, $this->session->bugList);?> |
+ goback, $this->session->bugList);?> |
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 1a021187a44..df5f1f594ae 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -37,7 +37,7 @@
|
- goback, $this->server->http_referer);?> |
+ goback, $this->server->http_referer);?> |
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 645a6c27641..1646bffc319 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -113,7 +113,7 @@
fetch('file', 'buildform', 'fileCount=2&percent=0.85');?> |
-
+ |
|
diff --git a/module/bug/view/customfields.html.php b/module/bug/view/customfields.html.php
index d544c8d7a5e..f033227f815 100644
--- a/module/bug/view/customfields.html.php
+++ b/module/bug/view/customfields.html.php
@@ -39,7 +39,7 @@
bug->restoreDefault;?>
- |
+ |
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 619817bff33..5c5c8553410 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -54,7 +54,7 @@
fetch('file', 'buildform', 'filecount=2');?>
-
+
session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
diff --git a/module/bug/view/m.activate.html.php b/module/bug/view/m.activate.html.php
index b96aba95c57..c515e010184 100755
--- a/module/bug/view/m.activate.html.php
+++ b/module/bug/view/m.activate.html.php
@@ -16,7 +16,7 @@
|
-
+ |
bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
|
diff --git a/module/bug/view/m.assignto.html.php b/module/bug/view/m.assignto.html.php
index 23d7b2dcb9e..336a70df502 100755
--- a/module/bug/view/m.assignto.html.php
+++ b/module/bug/view/m.assignto.html.php
@@ -12,7 +12,7 @@
|
-
+ |
goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
|
diff --git a/module/bug/view/m.close.html.php b/module/bug/view/m.close.html.php
index 7bf818408fe..a318904f533 100755
--- a/module/bug/view/m.close.html.php
+++ b/module/bug/view/m.close.html.php
@@ -8,7 +8,7 @@
|
-
+ |
goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
|
diff --git a/module/bug/view/m.confirmbug.html.php b/module/bug/view/m.confirmbug.html.php
index 8b801ae53bf..37322bba66b 100755
--- a/module/bug/view/m.confirmbug.html.php
+++ b/module/bug/view/m.confirmbug.html.php
@@ -12,7 +12,7 @@
|
-
+ |
bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
|
diff --git a/module/bug/view/m.resolve.html.php b/module/bug/view/m.resolve.html.php
index 497e87376de..6e3d02186f0 100755
--- a/module/bug/view/m.resolve.html.php
+++ b/module/bug/view/m.resolve.html.php
@@ -28,7 +28,7 @@
|
-
+ |
goback, $this->createLink('bug', 'view', "bugID=$bug->id"), 'self', "data-inline='true'");?>
|
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 4fc92816769..0de14365b28 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -46,7 +46,7 @@
report->percent;?> |
$data):?>
-
+
name;?> |
value;?> |
percent * 100) . '%';?> |
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 760fdbdbac0..1231a3d8721 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -40,7 +40,7 @@
|
- goback, $this->session->bugList);?> |
+ goback, $this->session->bugList);?> |
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 3f9799fad75..188cf63669a 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -66,7 +66,7 @@
$story):?>
createLink('story', 'view', "storyID=$story->id", '', true); ?>
-
+
stage == 'developed' or $story->status == 'closed') echo 'checked';?>> id);?>
|
@@ -91,7 +91,7 @@
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index df65e9ddace..079e6fcbb12 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -75,7 +75,7 @@
$story):?>
createLink('story', 'view', "storyID=$story->id", '', true);?>
-
+
stories . ',', ',' . $story->id . ',') !== false) echo 'checked';?>> id);?> |
title, '', "class='preview'");?> |
story->statusList[$story->status];?> |
@@ -109,7 +109,7 @@
createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-
+
bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> id);?> |
title, '', "class='preview'");?> |
bug->statusList[$bug->status];?> |
@@ -131,7 +131,7 @@
build->desc;?> |
desc, "rows='10' class='area-1'");?> |
- project);?> |
+ project);?> |
packageType == 'file' ? 'fileform' : 'filePath')?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index c3bf2c7ee18..04e65c6c081 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -45,7 +45,7 @@
$story):?>
createLink('story', 'view', "storyID=$story->id", '', true);?>
-
+
id);?> |
story->priList[$story->pri]?>'>story->priList[$story->pri];?> |
title, '', "class='preview'");?> |
@@ -70,7 +70,7 @@
createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-
+
id);?> |
title, '', "class='preview'");?> |
bug->statusList[$bug->status];?> |
@@ -89,7 +89,7 @@
- build->product;?> |
+ build->product;?> |
productName;?> |
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 9a3ce21e2da..85041f82a08 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -412,20 +412,25 @@
$lang->icons['roadmap'] = 'code-fork';
$lang->icons['plan'] = 'flag';
$lang->icons['dynamic'] = 'volume-up';
-
-$lang->icons['create'] = 'plus';
-$lang->icons['edit'] = 'pencil';
-$lang->icons['delete'] = 'remove';
-$lang->icons['copy'] = 'copy';
-$lang->icons['report'] = 'bar-chart';
-$lang->icons['export'] = 'download-alt';
-$lang->icons['finish'] = 'ok-sign';
-$lang->icons['start'] = 'play';
-$lang->icons['assign'] = 'hand-right';
-$lang->icons['change'] = 'random';
-$lang->icons['link'] = 'link';
-$lang->icons['close'] = 'off';
-$lang->icons['activate'] = 'off';
-$lang->icons['review'] = 'search';
+$lang->icons['build'] = 'tag';
+$lang->icons['test'] = 'check';
+
+$lang->icons['create'] = 'plus';
+$lang->icons['batchCreate'] = 'plus-sign';
+$lang->icons['edit'] = 'pencil';
+$lang->icons['delete'] = 'remove';
+$lang->icons['copy'] = 'copy';
+$lang->icons['report'] = 'bar-chart';
+$lang->icons['export'] = 'download-alt';
+$lang->icons['finish'] = 'ok-sign';
+$lang->icons['resolve'] = 'ok-sign';
+$lang->icons['start'] = 'play';
+$lang->icons['assign'] = 'hand-right';
+$lang->icons['assignTo'] = 'hand-right';
+$lang->icons['change'] = 'random';
+$lang->icons['link'] = 'link';
+$lang->icons['close'] = 'off';
+$lang->icons['activate'] = 'off';
+$lang->icons['review'] = 'search';
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 7403d05af8b..6388e8a111c 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -24,7 +24,7 @@
dept->common;?>
- dept->manage);?>
+ dept->manage);?>
|
@@ -54,7 +54,7 @@
$canManageContacts = common::hasPriv('user', 'manageContacts');
?>
-
+
account'> ";
@@ -77,7 +77,7 @@
if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
{
$deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->user->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->user->delete}'");
}
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
{
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 2e245546700..d03d378e9e2 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -46,7 +46,7 @@
|
objectType == 'case' ? 'testcase' : $action->objectType;?>
-
+
date;?> |
actionLabel;?> |
action->objectTypes[$action->objectType];?> |
objectID;?> |
- objectLink, $action->objectName);?> |
+ objectLink, $action->objectName);?> |
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index 8865311ac91..ff326cb6fce 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -46,7 +46,7 @@
company->guest;?> |
company->guestList, $company->guest);?> |
- |
+ |
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php
index e840ef7c596..b052c66cc58 100644
--- a/module/company/view/view.html.php
+++ b/module/company/view/view.html.php
@@ -45,6 +45,6 @@
company->guest;?> |
company->guestList[$company->guest];?> |
- ' . $lang->edit, '', 'id="editCompany" class="btn"', true, true);?> |
+ ' . $lang->edit, '', 'id="editCompany" class="btn"', true, true);?> |
diff --git a/module/convert/view/checkbugfree.html.php b/module/convert/view/checkbugfree.html.php
index 6ba86cc1ee5..a16298f64b7 100644
--- a/module/convert/view/checkbugfree.html.php
+++ b/module/convert/view/checkbugfree.html.php
@@ -17,7 +17,7 @@
convert->ok) : printf($lang->convert->fail);?> |
-
+ |
|
-
+ |
|
- |
+ |
diff --git a/module/convert/view/convertbugfree.html.php b/module/convert/view/convertbugfree.html.php
index 414ae5fb4b8..9a83fa1ce4d 100644
--- a/module/convert/view/convertbugfree.html.php
+++ b/module/convert/view/convertbugfree.html.php
@@ -1,4 +1,4 @@
-
+
convert->item?> |
convert->count?> |
convert->info?> |
diff --git a/module/convert/view/convertredmine.html.php b/module/convert/view/convertredmine.html.php
index 0a4302fc6ea..70801b38d41 100644
--- a/module/convert/view/convertredmine.html.php
+++ b/module/convert/view/convertredmine.html.php
@@ -1,4 +1,4 @@
-
+
convert->item?> |
convert->count?> |
convert->info?> |
diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php
index ed1ae7f2500..22f4cf1487a 100644
--- a/module/convert/view/index.html.php
+++ b/module/convert/view/index.html.php
@@ -13,6 +13,6 @@
convert->common;?>
convert->desc);?> |
- createLink('convert', 'selectsource'), ' ' . $lang->convert->start, '', 'class="btn btn-primary"');?> |
+ createLink('convert', 'selectsource'), ' ' . $lang->convert->start, '', 'class="btn btn-primary"');?> |
diff --git a/module/convert/view/selectsource.html.php b/module/convert/view/selectsource.html.php
index cce18efcca9..733d5bff6e7 100644
--- a/module/convert/view/selectsource.html.php
+++ b/module/convert/view/selectsource.html.php
@@ -24,7 +24,7 @@
- |
+ |
diff --git a/module/convert/view/setconfig.html.php b/module/convert/view/setconfig.html.php
index b924c85c176..c1da3e1098e 100644
--- a/module/convert/view/setconfig.html.php
+++ b/module/convert/view/setconfig.html.php
@@ -15,7 +15,7 @@
convert->setting . $lang->colon . strtoupper($source);?>
- |
+ |
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 1690503363e..704325399f6 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -14,7 +14,7 @@
+
@@ -22,7 +22,7 @@
|
|
-
+ |
|
@@ -70,14 +70,14 @@
|
$value):?>
-
+
system : 1;?>
|
|
-
+ |
|
@@ -86,7 +86,7 @@
-
+ |
$lang->custom->currentLang, 'all' => $lang->custom->allLang);
echo html::radio('lang', $appliedTo, 'all');
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index e93c27ebaad..57b09e684e2 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -21,7 +21,7 @@
|
- dept->updateOrder);?>
+ dept->updateOrder);?>
|
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 8f160c95cb0..6ecf68e1e30 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -35,7 +35,7 @@
-
+
doc->manageType);?>
tree->fix, 'hiddenwin');?>
@@ -61,9 +61,9 @@
$viewLink = $this->createLink('doc', 'view', "docID=$doc->id");
$canView = common::hasPriv('doc', 'view');
?>
-
+
id)); else printf('%03d', $doc->id);?> |
- title);?> |
+ title);?> |
doc->types[$doc->type];?> |
addedBy]) ? print($users[$doc->addedBy]) : print($doc->addedBy);?> |
addedDate));?> |
@@ -73,7 +73,7 @@
if(common::hasPriv('doc', 'delete'))
{
$deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'");
}
?>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 4f503adf7e9..782205ffad4 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -19,7 +19,7 @@
|
- |
+ |
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 4164982ebb0..4241006bf28 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -21,7 +21,7 @@
doc->libName;?> |
|
- |
+ |
diff --git a/module/extension/view/activate.html.php b/module/extension/view/activate.html.php
index bc53bc5dd2c..62f7dceaa16 100644
--- a/module/extension/view/activate.html.php
+++ b/module/extension/view/activate.html.php
@@ -23,7 +23,7 @@
else
{
echo " {$title}";
- echo " " . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"') . ' ';
+ echo " " . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"') . ' ';
}
?>
diff --git a/module/extension/view/deactivate.html.php b/module/extension/view/deactivate.html.php
index 36d1af50ae9..75fb475aaf5 100644
--- a/module/extension/view/deactivate.html.php
+++ b/module/extension/view/deactivate.html.php
@@ -22,7 +22,7 @@
echo " {$lang->extension->unremovedFiles} ";
echo join($removeCommands, ' ');
}
- echo " " . html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"') . ' ';
+ echo " " . html::commonButton($lang->extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"') . ' ';
?>
diff --git a/module/extension/view/erase.html.php b/module/extension/view/erase.html.php
index b493fd41a18..9b6bf67dc98 100644
--- a/module/extension/view/erase.html.php
+++ b/module/extension/view/erase.html.php
@@ -22,7 +22,7 @@
echo " {$lang->extension->unremovedFiles} ";
echo join($removeCommands, ' ');
}
- echo " " . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . ' ';
+ echo " " . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . ' ';
?>
diff --git a/module/extension/view/install.html.php b/module/extension/view/install.html.php
index f2d57f2bc88..b79ad39d8e1 100644
--- a/module/extension/view/install.html.php
+++ b/module/extension/view/install.html.php
@@ -28,15 +28,15 @@
?>
{$lang->extension->license}";
+ echo " {$lang->extension->license}";
echo html::textarea('license', $license) . ' ';
echo ' ' . html::a($agreeLink, $lang->extension->agreeLicense) . '';
?>
{$lang->extension->successDownloadedPackage}";
- echo " " . sprintf($lang->extension->installFinished, $installType) . "";
- echo " " . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '"') . ' ';
+ echo " " . sprintf($lang->extension->installFinished, $installType) . "";
+ echo " " . html::commonButton($lang->extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '"') . ' ';
echo " {$lang->extension->successCopiedFiles}";
echo ' ';
foreach($files as $fileName => $md5)
diff --git a/module/extension/view/uninstall.html.php b/module/extension/view/uninstall.html.php
index 48635069823..f5867fe2da2 100644
--- a/module/extension/view/uninstall.html.php
+++ b/module/extension/view/uninstall.html.php
@@ -28,7 +28,7 @@
echo "{$lang->extension->unremovedFiles} ";
echo join($removeCommands, ' ');
}
- echo "" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . ' ';
+ echo "" . html::commonButton($lang->extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"') . ' ';
?>
diff --git a/module/extension/view/upload.html.php b/module/extension/view/upload.html.php
index 66cc5c83f85..5515777fecf 100644
--- a/module/extension/view/upload.html.php
+++ b/module/extension/view/upload.html.php
@@ -11,7 +11,7 @@
*/
?>
-
diff --git a/module/file/view/edit.html.php b/module/file/view/edit.html.php
index 8485cbba1b8..73e0c8af1d2 100644
--- a/module/file/view/edit.html.php
+++ b/module/file/view/edit.html.php
@@ -31,7 +31,7 @@ function closeWindow()
file->inputFileName;?>
-
+ |
title) . ".{$file->extension}";?>
|
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index cd6c7f42b19..3de0d354ea6 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -47,7 +47,7 @@ function switchEncode(fileType)
export;?>
-
+ |
setFileName . ' ';
echo html::input('fileName', '', 'class=text-2');
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index a85006ad1a7..94b8123c69b 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -30,12 +30,12 @@
|
id]);?>
-
+
id;?> |
- name;?> |
- desc;?> |
- |
-
+ | name;?> |
+ desc;?> |
+ |
+
group->managepriv = $lang->group->managePrivByGroup;?>
id", '', 'list');?>
group->managemember = $lang->group->manageMember;?>
@@ -46,7 +46,7 @@
if(common::hasPriv('group', 'delete'))
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->group->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->group->delete}'");
}
?>
|
@@ -55,7 +55,7 @@
- group->managePrivByModule, inlink('managePriv', 'type=byModule'));?> |
+ group->managePrivByModule, inlink('managePriv', 'type=byModule'));?> |
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index 3653887fc69..59129d4a719 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -26,7 +26,7 @@
group->option;?> |
group->copyOptions);?> |
- |
+ |
diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php
index 1cdb9a161ba..b6a568a5694 100644
--- a/module/group/view/create.html.php
+++ b/module/group/view/create.html.php
@@ -22,7 +22,7 @@
group->desc;?> |
|
- |
+ |
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index fd4cb4ce936..0133c60f885 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -22,7 +22,7 @@
group->desc;?> |
desc, "rows='5' class='area-1'");?> |
- |
+ |
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index d21746224a5..565cce2ef65 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -36,7 +36,7 @@
|
-
+ |
goback, $this->createLink('group', 'browse'));
diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php
index 8dc21d99da5..556476ae7a8 100644
--- a/module/group/view/privbymodule.html.php
+++ b/module/group/view/privbymodule.html.php
@@ -33,7 +33,7 @@
| |
-
+ |
save);
echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php
index 921a3040fda..53552cbd938 100644
--- a/module/install/view/index.html.php
+++ b/module/install/view/index.html.php
@@ -17,7 +17,7 @@
|
version, $config->version) > 0)):?>
install->newReleased, $latestRelease);?>
-
+
install->choice;
echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank');
@@ -25,7 +25,7 @@
?>
-
+
config->langs, $app->cookie->lang, 'onchange="selectLang(this.value)"');?>
createLink('install', 'step1'), $lang->install->start);?>
diff --git a/module/install/view/step2.html.php b/module/install/view/step2.html.php
index b60544b9efb..7f46bf6618e 100644
--- a/module/install/view/step2.html.php
+++ b/module/install/view/step2.html.php
@@ -16,7 +16,7 @@
install->setConfig;?>
install->key;?> |
- install->value?> |
+ install->value?> |
install->defaultLang;?> |
@@ -52,7 +52,7 @@
- |
+ |
diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php
index e915e9a0fc1..d00ee92a55c 100644
--- a/module/install/view/step3.html.php
+++ b/module/install/view/step3.html.php
@@ -40,7 +40,7 @@
install->saveConfig;?>
- |
+ |
@@ -63,7 +63,7 @@
printf($lang->install->save2File, $this->app->getConfigRoot() . 'my.php');
}
echo " ";
- echo "" . html::a($this->createLink('install', 'step4'), $lang->install->next) . ' ';
+ echo "" . html::a($this->createLink('install', 'step4'), $lang->install->next) . ' ';
?>
|
diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php
index 24940e23239..1989ddf88b0 100644
--- a/module/install/view/step4.html.php
+++ b/module/install/view/step4.html.php
@@ -39,7 +39,7 @@
install->password;?> |
install->importDemoData);?> |
-
+
|
diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php
index e46e7e83a56..b835f1bc843 100755
--- a/module/mail/view/detect.html.php
+++ b/module/mail/view/detect.html.php
@@ -14,7 +14,7 @@
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php
index a1c74bc863d..d2a5b2f1e19 100755
--- a/module/mail/view/edit.html.php
+++ b/module/mail/view/edit.html.php
@@ -60,7 +60,7 @@
|
-
+ |
config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'));
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php
index 710bf0dd179..004f1aae184 100755
--- a/module/mail/view/test.html.php
+++ b/module/mail/view/test.html.php
@@ -24,7 +24,7 @@
mail->sendmailTips;?>
|
-
+ |
user->account);
echo html::submitButton($lang->mail->test);
diff --git a/module/misc/view/about.html.php b/module/misc/view/about.html.php
index 81ce12aa36f..65ea11f1a57 100644
--- a/module/misc/view/about.html.php
+++ b/module/misc/view/about.html.php
@@ -7,7 +7,7 @@
|
- misc->copyright;?>
+ misc->copyright;?>
|
diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php
index f46328fa9fa..ae41cea6e5e 100755
--- a/module/misc/view/links.html.php
+++ b/module/misc/view/links.html.php
@@ -4,7 +4,7 @@
unset($lang->misc->zentao->version);
unset($lang->misc->zentao->labels);
?>
-
+
misc->zentao as $groupItems):?>
diff --git a/module/my/view/m.bug.html.php b/module/my/view/m.bug.html.php
index 99f3046452e..b46670a98ad 100755
--- a/module/my/view/m.bug.html.php
+++ b/module/my/view/m.bug.html.php
@@ -21,7 +21,7 @@
title;?>
steps;?>
-
+
id", $bug, 'button', '', '', 'iframe');
common::printIcon('bug', 'assignTo', "bugID=$bug->id", '', 'button', '', '', 'iframe');
diff --git a/module/my/view/m.story.html.php b/module/my/view/m.story.html.php
index 311d5d07675..d46d99ed2ae 100755
--- a/module/my/view/m.story.html.php
+++ b/module/my/view/m.story.html.php
@@ -26,7 +26,7 @@
session->storyID == $story->id) echo "";?>
title;?>
-
+
deleted)
{
diff --git a/module/my/view/m.task.html.php b/module/my/view/m.task.html.php
index 4871b90ff1f..2f020c92db0 100755
--- a/module/my/view/m.task.html.php
+++ b/module/my/view/m.task.html.php
@@ -28,7 +28,7 @@
name;?>
desc;?>
desc;?>
-
+
project&taskID=$task->id", $task);
common::printIcon('task', 'start', "taskID=$task->id", $task);
diff --git a/module/my/view/m.todo.html.php b/module/my/view/m.todo.html.php
index 5560d5c79f9..1cef8f5a5c3 100755
--- a/module/my/view/m.todo.html.php
+++ b/module/my/view/m.todo.html.php
@@ -28,7 +28,7 @@
name;?>
desc;?>
desc;?>
-
+
id", $todo, 'button', '', 'hiddenwin');
if($todo->account == $app->user->account)
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 44b553cf2b5..e4815089b67 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -12,7 +12,7 @@
?>
- my->story;?>
+ icons['story']);?> my->story;?>
|
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index f342fb2a20f..f0b08169cfd 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -40,7 +40,7 @@
-
+
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 15798bc5f68..4c9ff5a03f0 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -23,7 +23,7 @@
product->status;?> |
-
+
|
name, "class='text-1'");?> |
code, "class='text-1'");?> |
@@ -33,7 +33,7 @@
product->statusList, $products[$productID]->status);?> |
- |
+ |
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 4ea795076a1..34440da26b9 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -14,7 +14,7 @@
-
+
-
+
-
+
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index b7d398ff092..02c7eaf297e 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -20,7 +20,7 @@
|
- goback, $this->session->taskList); ?> |
+ goback, $this->session->taskList); ?> |
diff --git a/module/product/view/m.browse.html.php b/module/product/view/m.browse.html.php
index 30e6977ecf3..741e83a3569 100755
--- a/module/product/view/m.browse.html.php
+++ b/module/product/view/m.browse.html.php
@@ -8,7 +8,7 @@
title;?>
-
-
+ |
productplan->linkBug);?>
|
@@ -77,7 +77,7 @@
-
+ |
@@ -102,7 +102,7 @@
|
-
+ |
productplan->batchUnlink);
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index ff4c31e044b..a956fca79d9 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -38,7 +38,7 @@
if($story->plan and helper::diffDate($plans[$story->plan], helper::today()) > 0) continue;
?>
|
-
+ |
createLink('story', 'view', "storyID=$story->id"), $story->id);?>
|
@@ -55,7 +55,7 @@
| |