diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index f0df5425fd..489b77224f 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 5e8d344d14..b9d76391fb 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 30585ec00b..9fe2a6e3a5 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 b990f69534..8550a3eeac 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -33,7 +33,7 @@ js::set('page', 'assignedto'); - 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 74adf060c1..a5eea7ba31 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 b85b79f713..a02ab886ed 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 9c54c6195c..92c591fb50 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 13660406e6..83249a0f29 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -79,7 +79,7 @@ if($customed)
-
+
tree->manage);?> tree->fix, 'hiddenwin');?>
@@ -126,7 +126,7 @@ if($customed) id");?> - + id));?> @@ -135,14 +135,14 @@ if($customed) 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 @@ if($customed) 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 52e94f7831..4d7f083bfd 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 1a021187a4..df5f1f594a 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -37,7 +37,7 @@ js::set('page', 'confirmbug'); - 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 645a6c2764..1646bffc31 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -113,7 +113,7 @@ js::set('refresh', $lang->refresh); 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 d544c8d7a5..f033227f81 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 619817bff3..5c5c855341 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -54,7 +54,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->legendAttatch;?> 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 b96aba95c5..c515e01018 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 23d7b2dcb9..336a70df50 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 7bf818408f..a318904f53 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 8b801ae53b..37322bba66 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 497e87376d..6e3d02186f 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 4fc9281676..0de14365b2 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 760fdbdbac..1231a3d872 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 3f9799fad7..188cf63669 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); ?> - + @@ -91,7 +91,7 @@
stage == 'developed' or $story->status == 'closed') echo 'checked';?>> id);?>
createLink('bug', 'view', "bugID=$bug->id", '', true);?> - + @@ -115,7 +115,7 @@ - +
status == 'resolved' or $bug->status == 'closed') echo "checked";?>> id);?> build->desc;?>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index df65e9ddac..079e6fcbb1 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);?> - + @@ -109,7 +109,7 @@
stories . ',', ',' . $story->id . ',') !== false) echo 'checked';?>> id);?> title, '', "class='preview'");?> story->statusList[$story->status];?>
createLink('bug', 'view', "bugID=$bug->id", '', true);?> - + @@ -131,7 +131,7 @@ - +
bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> id);?> title, '', "class='preview'");?> bug->statusList[$bug->status];?>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 c3bf2c7ee1..04e65c6c08 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->basicInfo?> - + diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9a3ce21e2d..85041f82a0 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -412,20 +412,25 @@ $lang->icons['release'] = 'tags'; $lang->icons['roadmap'] = 'code-fork'; $lang->icons['plan'] = 'flag'; $lang->icons['dynamic'] = 'volume-up'; +$lang->icons['build'] = 'tag'; +$lang->icons['test'] = 'check'; -$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['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 7403d05af8..6388e8a111 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -24,7 +24,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
dept->common;?>
-
dept->manage);?>
+
dept->manage);?>
@@ -54,7 +54,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); $canManageContacts = common::hasPriv('user', 'manageContacts'); ?> - + objectType == 'case' ? 'testcase' : $action->objectType;?> - + - + diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 8865311ac9..ff326cb6fc 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -46,7 +46,7 @@ - +
build->product;?>build->product;?> productName;?>
account'> "; @@ -77,7 +77,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); 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 2e24554670..d03d378e9e 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -46,7 +46,7 @@ var browseType = '';
date;?> '; actionLabel;?> action->objectTypes[$action->objectType];?> objectID;?>objectLink, $action->objectName);?>objectLink, $action->objectName);?>
company->guest;?> company->guestList, $company->guest);?>
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php index e840ef7c59..b052c66cc5 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 6ba86cc1ee..a16298f64b 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 414ae5fb4b..9a83fa1ce4 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 0a4302fc6e..70801b38d4 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 ed1ae7f250..22f4cf1487 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 cce18efcca..733d5bff6e 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 b924c85c17..c1da3e1098 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 1690503363..704325399f 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -14,7 +14,7 @@ + @@ -22,7 +22,7 @@ $itemRow = << - + @@ -70,14 +70,14 @@ EOT; $value):?> - + system : 1;?> - + @@ -86,7 +86,7 @@ EOT; - + $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 e93c27ebaa..57b09e684e 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 8f160c95cb..6ecf68e1e3 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -35,7 +35,7 @@ var browseType = '';
-
+
doc->manageType);?> tree->fix, 'hiddenwin');?>
@@ -61,9 +61,9 @@ var browseType = ''; $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 @@ var browseType = ''; 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 4f503adf7e..782205ffad 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 4164982ebb..4241006bf2 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 bc53bc5dd2..62f7dceaa1 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 36d1af50ae..75fb475aaf 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 b493fd41a1..9b6bf67dc9 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 f2d57f2bc8..b79ad39d8e 100644 --- a/module/extension/view/install.html.php +++ b/module/extension/view/install.html.php @@ -28,15 +28,15 @@ if(isset($license) and $upgrade == 'yes') printf($lang->extension->upgradeVersio ?> {$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 4863506982..f5867fe2da 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 66cc5c83f8..5515777fec 100644 --- a/module/extension/view/upload.html.php +++ b/module/extension/view/upload.html.php @@ -11,7 +11,7 @@ */ ?> -
    + extension->install);?>
    diff --git a/module/file/view/edit.html.php b/module/file/view/edit.html.php index 8485cbba1b..73e0c8af1d 100644 --- a/module/file/view/edit.html.php +++ b/module/file/view/edit.html.php @@ -31,7 +31,7 @@ function closeWindow() - diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index cd6c7f42b1..3de0d354ea 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -47,7 +47,7 @@ function switchEncode(fileType)
    file->inputFileName;?>
    + title) . ".{$file->extension}";?>
    - id]);?> - + - - - - + + + @@ -55,7 +55,7 @@ - +
    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 a85006ad1a..94b8123c69 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -30,12 +30,12 @@
    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}'"); } ?>
    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 3653887fc6..59129d4a71 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 1cdb9a161b..b6a568a569 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 fd4cb4ce93..0133c60f88 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 d21746224a..565cce2ef6 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 8dc21d99da..556476ae7a 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 921a3040fd..53552cbd93 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 b60544b9ef..7f46bf6618 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 e915e9a0fc..d00ee92a55 100644 --- a/module/install/view/step3.html.php +++ b/module/install/view/step3.html.php @@ -40,7 +40,7 @@ EOT; - + diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index 24940e2323..1989ddf88b 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -39,7 +39,7 @@ - +
    install->saveConfig;?>
    @@ -63,7 +63,7 @@ EOT; 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) . '
    '; ?>
    install->password;?> install->importDemoData);?>
    diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php index e46e7e83a5..b835f1bc84 100755 --- a/module/mail/view/detect.html.php +++ b/module/mail/view/detect.html.php @@ -14,7 +14,7 @@ include '../../common/view/header.html.php';
    - +
    mail->inputFromEmail; ?>
    mail->nextStep);?>
    mail->nextStep);?>
    diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php index a1c74bc863..d2a5b2f1e1 100755 --- a/module/mail/view/edit.html.php +++ b/module/mail/view/edit.html.php @@ -60,7 +60,7 @@ include '../../common/view/header.html.php'; - + 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 710bf0dd17..004f1aae18 100755 --- a/module/mail/view/test.html.php +++ b/module/mail/view/test.html.php @@ -24,7 +24,7 @@ if(isset($error))
    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 81ce12aa36..65ea11f1a5 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 f46328fa9f..ae41cea6e5 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 99f3046452..b46670a98a 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 311d5d0767..d46d99ed2a 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 4871b90ff1..2f020c92db 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 5560d5c79f..1cef8f5a5c 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 44b553cf2b..e4815089b6 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/batchedit.html.php b/module/product/view/batchedit.html.php index 15798bc5f6..4c9ff5a03f 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 4ea795076a..34440da26b 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -14,7 +14,7 @@
- +
-
+
-
+
icons['product']);?>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php index b7d398ff09..02c7eaf297 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 30e6977ecf..741e83a356 100755 --- a/module/product/view/m.browse.html.php +++ b/module/product/view/m.browse.html.php @@ -8,7 +8,7 @@

title;?>

-
+
deleted) { diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index e8544fc977..6551805924 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -36,7 +36,7 @@ if($bug->plan and helper::diffDate($plans[$bug->plan], helper::today()) > 0) continue; ?> - + createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> @@ -51,7 +51,7 @@ - + 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 ff4c31e044..a956fca79d 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 @@ - + story->linkStory);?> @@ -83,7 +83,7 @@ - + @@ -110,7 +110,7 @@ - + productplan->batchUnlink); diff --git a/module/release/view/ajaxgetstoriesandbugs.html.php b/module/release/view/ajaxgetstoriesandbugs.html.php index b68c862f0c..5f909d76f6 100644 --- a/module/release/view/ajaxgetstoriesandbugs.html.php +++ b/module/release/view/ajaxgetstoriesandbugs.html.php @@ -23,7 +23,7 @@ $story):?> createLink('story', 'view', "storyID=$storyID", '', true);?> - + @@ -59,7 +59,7 @@
stage == 'developed' or $story->status == 'closed') echo 'checked';?>> id);?>
createLink('bug', 'view', "bugID=$bug->id", '', true);?> - + diff --git a/module/release/view/export.html.php b/module/release/view/export.html.php index fac82a12d2..31d5458683 100755 --- a/module/release/view/export.html.php +++ b/module/release/view/export.html.php @@ -38,7 +38,7 @@ function closeWindow()
status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> id);?>
- + diff --git a/module/report/view/productinfo.html.php b/module/report/view/productinfo.html.php index adc4f62846..1bc043b70d 100644 --- a/module/report/view/productinfo.html.php +++ b/module/report/view/productinfo.html.php @@ -35,7 +35,7 @@ plans as $plan):?> - "?> + "?> diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 07c8450c86..6a611ed039 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -321,7 +321,7 @@ foreach($fieldParams as $fieldName => $param) ?> - $auth):?> - + - - +
export;?>
+ setFileName;?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 3979ca7489..70ef9b41b7 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -124,7 +124,7 @@ createLink('bug', 'view', "bugID=$bug->id", '', true);?> -
id);?> title, '', "class='preview'");?> bug->statusList[$bug->status];?> title;?> begin;?> end;?> + diff --git a/module/sso/view/browse.html.php b/module/sso/view/browse.html.php index 8f127f6bc7..ff385a2b75 100644 --- a/module/sso/view/browse.html.php +++ b/module/sso/view/browse.html.php @@ -17,12 +17,12 @@
title?> key?> ip?> + sso->ip;?> sso->note->ip}'");?>
sso->instruction;?>
diff --git a/module/sso/view/edit.html.php b/module/sso/view/edit.html.php index 51da02b476..25b8ac3af5 100644 --- a/module/sso/view/edit.html.php +++ b/module/sso/view/edit.html.php @@ -21,7 +21,7 @@ sso->ip;?> ip, "class='text-5'");?> - + diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php index bc1205293c..971e82a47e 100644 --- a/module/story/view/activate.html.php +++ b/module/story/view/activate.html.php @@ -23,7 +23,7 @@ - + goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id")); diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 01984fdd92..4d9d045dd9 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -23,9 +23,9 @@ story->comment;?> - + - title;?> + title;?> story->statusList[$stories[$storyID]->status];?> status != 'closed'):?> @@ -59,7 +59,7 @@
- + diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index ddca51a391..fbd837200d 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -27,7 +27,7 @@ story->batchCreate; $i++):?> - + @@ -38,7 +38,7 @@ story->reviewList, 0, "class='text-1'");?> - + diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index c2106ec7d3..0b6498f313 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -28,7 +28,7 @@ story->closedReason;?> - + product], $stories[$storyID]->module, 'class=select-1');?> product], $stories[$storyID]->plan, 'class=select-1');?> @@ -70,7 +70,7 @@
- + diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 0145a06f8e..de5698bc2a 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -93,7 +93,7 @@ story->legendAttatch;?> fetch('file', 'buildform');?> - + diff --git a/module/story/view/m.close.html.php b/module/story/view/m.close.html.php index abb32cf951..093e69e720 100755 --- a/module/story/view/m.close.html.php +++ b/module/story/view/m.close.html.php @@ -32,7 +32,7 @@ - + goback, $this->createLink('story', 'view', "storyID=$story->id"), 'self', "data-inline='true'"); diff --git a/module/story/view/m.review.html.php b/module/story/view/m.review.html.php index f7e4d153f8..5f39b197d8 100755 --- a/module/story/view/m.review.html.php +++ b/module/story/view/m.review.html.php @@ -54,7 +54,7 @@ - + goback, $this->createLink('story', 'view', "storyID=$story->id"), 'self', "data-inline='true'"); diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php index e690bf0f94..82fc676f12 100644 --- a/module/story/view/report.html.php +++ b/module/story/view/report.html.php @@ -45,7 +45,7 @@ report->percent;?> $data):?> - + name;?> value;?> percent * 100) . '%';?> diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 4b230c5c5b..bdea7e72b7 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -28,7 +28,7 @@ - + goback, $this->session->taskList); diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index 9df4a92c04..bef74dfdde 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -28,7 +28,7 @@ - + diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 0c144cc585..cb2592dde5 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -49,9 +49,9 @@ } ?> - + - + ", '', "class='sameAsStory' title='{$lang->task->copyStoryTitle}'"); @@ -66,7 +66,7 @@ task->priList, $pri, 'class=select-1');?> - + diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 291592d97d..f8a170d4e1 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -37,7 +37,7 @@ $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted'); } ?> - + name, 'class=text-1');?> module, 'class=select-1')?> @@ -60,7 +60,7 @@ - + diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php index d7a03dd743..4ab31aabdf 100644 --- a/module/task/view/cancel.html.php +++ b/module/task/view/cancel.html.php @@ -19,7 +19,7 @@ comment;?> - + diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php index 63112797d7..3a25b846ee 100644 --- a/module/task/view/close.html.php +++ b/module/task/view/close.html.php @@ -20,7 +20,7 @@ - + diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 4d55c59d01..184cfc0257 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -80,14 +80,14 @@ files;?> - fetch('file', 'buildform');?> + fetch('file', 'buildform');?> task->afterSubmit;?> task->afterChoices, 'continueAdding');?> - + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 938ed51d57..667a4ed6dc 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -42,7 +42,7 @@ -
goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
+
goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php index 1c38d4bddf..99623af1ca 100644 --- a/module/task/view/editestimate.html.php +++ b/module/task/view/editestimate.html.php @@ -33,7 +33,7 @@ work, "class=text-5");?> - + diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 3a4ec291f6..6e5ff91835 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -33,7 +33,7 @@ - + diff --git a/module/task/view/m.assignto.html.php b/module/task/view/m.assignto.html.php index 428e91e77c..e05767d67c 100644 --- a/module/task/view/m.assignto.html.php +++ b/module/task/view/m.assignto.html.php @@ -15,7 +15,7 @@ comment;?> - + comment;?> - + comment;?> - + - + diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 615562bad9..75a4b3783d 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -47,7 +47,7 @@ report->percent;?> $data):?> - + name;?> value;?> percent * 100) . '%';?> diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index ffb37f3d79..ef22e7466a 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -34,7 +34,7 @@ - + diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index 1334b9df1f..25a5c62c18 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -106,7 +106,7 @@ function createRow() { if(newRowID == 0) newRowID = $('.stepID').size(); newRowID ++; - var newRow = ""; + var newRow = ""; newRow += ""; newRow += ""; newRow += ""; diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index c55cd13edb..741db2e08f 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -28,15 +28,15 @@ testcase->same; if($i != 0) $currentModuleID = 'same';?> testcase->typeList['same'] = $lang->testcase->same; $type = ($i == 0 ? 'feature' : 'same');?> - + testcase->typeList, $type, "class=select-1");?> - + - ' class='a-center'> + ' class='text-center'> diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index d26bef31bd..27cd41619b 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -25,20 +25,20 @@ tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0); ?> - + testcase->priList, $cases[$caseID]->pri, 'class=select-1');?> testcase->statusList, $cases[$caseID]->status, 'class=select-1');?> module, "class='select-1'");?> title, 'class=text-1'); echo "*";?> testcase->typeList, $cases[$caseID]->type, 'class=select-1');?> - testcase->stageList, $cases[$caseID]->stage, "class='select-1 chosen' multiple data-placeholder='{$lang->testcase->stage}'");?> + testcase->stageList, $cases[$caseID]->stage, "class='select-1 chosen' multiple data-placeholder='{$lang->testcase->stage}'");?>
- + diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 37121d20f2..b3f42e2691 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -65,7 +65,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
-
+
tree->manage);?> tree->fix, 'hiddenwin');?>
@@ -94,16 +94,16 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); - + id");?> id));?> pri?>'>pri?> - title);?> + title);?> - createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?> + createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?> testcase->confirmStoryChange = $lang->confirm; common::printIcon('testcase', 'confirmStoryChange', "caseID=$case->id", '', 'list', '', 'hiddenwin');?> testcase->typeList[$case->type];?> @@ -112,7 +112,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> testcase->statusList[$case->status];?> - + id&version=$case->version", '', 'list', '', '', 'runCase'); common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'results'); @@ -122,7 +122,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); if(common::hasPriv('testcase', 'delete')) { $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); } common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug'); diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index aab915b3ec..ab6495c594 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -81,7 +81,7 @@ foreach($steps as $stepID => $step) { $stepID += 1; - echo ""; + echo ""; echo "$stepID"; echo '' . html::textarea('steps[]', $step->desc, "rows='3' class='w-p100'") . ''; echo '' . html::textarea('expects[]', $step->expect, "rows='3' class='w-p100'") . ''; @@ -105,7 +105,7 @@ fetch('file', 'buildform');?> - + diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index b7b0195dcb..2b993bc2d4 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -43,7 +43,7 @@ foreach($case->steps as $stepID => $step) { $stepID += 1; - echo ""; + echo ""; echo "$stepID"; echo '' . html::textarea('steps[]', $step->desc, "rows='3' class='w-p100'") . ''; echo '' . html::textarea('expects[]', $step->expect, "rows='3' class='w-p100'") . ''; @@ -66,7 +66,7 @@ fetch('file', 'buildform', 'filecount=2');?> -
+
"' /> @@ -89,7 +89,7 @@ testcase->story;?> -
story, 'class=select-1');?>
+
story, 'class=select-1');?>
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index 116ea0d45e..aac6780e63 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -31,7 +31,7 @@ table .table-1 td{border:0px;} loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?> - + version)?> testcase->priList[$cases[$caseID]->pri]?> module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . ""?> @@ -55,7 +55,7 @@ table .table-1 td{border:0px;} - +