From 87cf62ca032b7a6395a3cf2b02ad43cf2ec31d72 Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 28 Apr 2014 15:27:08 +0800 Subject: [PATCH 01/13] * ajusted layout of 'story/review'. * added location param to the function 'closeModal' in my.js and front.class.php. --- lib/front/front.class.php | 4 +- module/common/lang/zh-cn.php | 4 +- module/group/control.php | 2 + module/my/js/common.js | 5 +- module/my/view/profile.html.php | 2 +- module/story/view/review.html.php | 128 +++++++++++++++--------------- www/js/my.full.js | 33 +++----- 7 files changed, 82 insertions(+), 96 deletions(-) diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 6c02b9274d..dcfb6d3b6d 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -815,11 +815,11 @@ EOT; * @access public * @return void */ - static public function closeModal($window = 'self') + static public function closeModal($window = 'self', $location) { $js = self::start(); $js .= "if($window.location.href == self.location.href){ $window.window.close();}"; - $js .= "else{ $window.$.cookie('selfClose', 1);$window.$.closeModal();}"; + $js .= "else{ $window.$.cookie('selfClose', 1);$window.$.closeModal(null, '$location');}"; $js .= self::end(); return $js; } diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 7cab2d4940..8a478f2508 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -153,8 +153,8 @@ $lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'subMod $lang->my->menu->story = array('link' => '需求|my|story|', 'subModule' => 'story'); $lang->my->menu->myProject = '项目|my|project|'; $lang->my->menu->dynamic = '动态|my|dynamic|'; -$lang->my->menu->profile = array('link' => '档案|my|profile|onlybody=yes', 'alias' => 'editprofile'); -$lang->my->menu->changePassword = '密码|my|changepassword|onlybody=yes'; +$lang->my->menu->profile = array('link' => '档案|my|profile', 'alias' => 'editprofile'); +$lang->my->menu->changePassword = '密码|my|changepassword'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; diff --git a/module/group/control.php b/module/group/control.php index 922ade043e..d3a14f7193 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -107,6 +107,7 @@ class group extends control { $this->group->copy($groupID); if(dao::isError()) die(js::error(dao::getError())); + if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate($this->createLink('group', 'browse'), 'parent')); } @@ -198,6 +199,7 @@ class group extends control if(!empty($_POST)) { $this->group->updateUser($groupID); + if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate($this->createLink('group', 'browse'), 'parent')); } $group = $this->group->getById($groupID); diff --git a/module/my/js/common.js b/module/my/js/common.js index 379bcaf868..b68d3aed41 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -1,5 +1,6 @@ $(function() { - $('#submenuprofile').modalTrigger({width:600, type:'iframe'}); - $('#submenuchangePassword').modalTrigger({width:500, type:'iframe'}); + var sp = $('#submenuprofile'), scp = $('#submenuchangePassword'); + sp.attr('href', sp.attr('href') + '?onlybody=yes').modalTrigger({width:600, type:'iframe'}); + scp.attr('href', scp.attr('href') + '?onlybody=yes').modalTrigger({width:500, type:'iframe'}); }); diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 5dd946b5d5..bb468baa8e 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -15,7 +15,7 @@
icons['user']);?> my->profile;?>
- createLink('my', 'editprofile', '', '', true), $lang->user->editProfile, '', "class='btn btn-primary'");?> + createLink('my', 'editprofile'), $lang->user->editProfile, '', "class='btn btn-primary'");?>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 69efd0a483..6141c7c9c1 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -11,76 +11,72 @@ */ ?> + -
-
- icons['story']);?> id;?> - createLink('story', 'view', "storyID=$story->id"), $story->title);?> - icons['review']) . ' ' . $lang->story->review;?> -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - status == 'changed' or ($story->status == 'draft' and $story->version > 1)):?> - - - - - - - - - - - - - - - - - - - - - - - - - -
story->reviewedDate;?>
story->reviewResult;?>story->reviewResultList, '', 'class=form-control onchange="switchShow(this.value)"');?>
story->assignedTo;?>lastEditedBy ? $story->lastEditedBy : $story->openedBy, 'class=form-control');?>
story->reviewedBy;?>user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?>
story->comment;?>
story->checkAffection;?>
- - goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?> -
- +
+
+
+ icons['story']);?> id;?> + createLink('story', 'view', "storyID=$story->id"), $story->title);?> + icons['review']) . ' ' . $lang->story->review;?>
-
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + status == 'changed' or ($story->status == 'draft' and $story->version > 1)):?> + + + + + + + + + + + + + + + + + + + + + + + + + +
story->reviewedDate;?>
story->reviewResult;?>story->reviewResultList, '', 'class=form-control onchange="switchShow(this.value)"');?>
story->assignedTo;?>lastEditedBy ? $story->lastEditedBy : $story->openedBy, 'class=form-control');?>
story->reviewedBy;?>user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?>
story->comment;?>
story->checkAffection;?>
+ + goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?> +
+
+
+
diff --git a/www/js/my.full.js b/www/js/my.full.js index 91b1372925..e35798d130 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -965,9 +965,17 @@ function setModal() } $ajaxModal = $('#ajaxModal'); - $.extend({'closeModal':function(callback) + $.extend({'closeModal':function(callback, location) { - $ajaxModal.on('hidden.bs.modal', callback); + $ajaxModal.on('hidden.bs.modal', function() + { + if(location) + { + if(location == 'this') window.location.reload(); + else window.location = location; + } + callback(); + }); $ajaxModal.modal('hide'); }}); @@ -1056,25 +1064,6 @@ function condensedForm() }); } -/** - * Update data to the target element synchronous. - * - * @access public - * @return void - */ -function setSyncTrigger() -{ - $("[data-sync-target]").on('input propertychange', function() - { - var $this = $(this); - var val = $this.prop('tagName') == 'INPUT' ? $this.val() : $this.html(); - var target = $($this.attr('data-sync-target')); - if(target.prop('tagName') == 'INPUT') target.val(val); - else target.html(val); - }); -} - - /* Ping the server every some minutes to keep the session. */ needPing = true; @@ -1099,8 +1088,6 @@ $(document).ready(function() toggleSearch(); toggleTreeBox(); - setSyncTrigger(); - hideClearDataLink(); $(window).resize(saveWindowSize); // When window resized, call it again. From a4b32fbc8bfe3c9df273fb1b04250af22f9c9da7 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 28 Apr 2014 15:36:39 +0800 Subject: [PATCH 02/13] * adjust en lang. --- module/bug/lang/en.php | 1 + module/build/lang/en.php | 1 + module/common/lang/en.php | 4 +++ module/doc/lang/en.php | 1 + module/install/lang/en.php | 5 ++- module/install/lang/zh-cn.php | 6 ++-- module/misc/lang/en.php | 5 +++ module/my/lang/en.php | 2 ++ module/product/lang/en.php | 1 + module/product/lang/zh-cn.php | 1 - module/project/lang/en.php | 13 +++++++ module/project/lang/zh-cn.php | 5 ++- module/release/lang/en.php | 1 + module/story/lang/en.php | 1 + module/task/lang/en.php | 1 + module/testcase/lang/en.php | 1 + module/testtask/lang/en.php | 1 + module/user/lang/en.php | 65 ++++++++++++++++++----------------- module/webapp/lang/en.php | 3 ++ 19 files changed, 79 insertions(+), 39 deletions(-) diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 31a21ade70..90b0db30af 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -87,6 +87,7 @@ $lang->bug->activate = 'Activate'; $lang->bug->reportChart = 'Report'; $lang->bug->export = 'Export data'; $lang->bug->delete = 'Delete Bug'; +$lang->bug->deleted = 'Deleted'; $lang->bug->saveTemplate = 'Save template'; $lang->bug->deleteTemplate = 'Delete template'; $lang->bug->customFields = 'Custom'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 739540b721..d04e3a8aff 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -13,6 +13,7 @@ $lang->build->common = 'Build'; $lang->build->create = "Create"; $lang->build->edit = "Edit"; $lang->build->delete = "Delete"; +$lang->build->deleted = "Deleted"; $lang->build->view = "Info"; $lang->build->ajaxGetProductBuilds = 'API:Product builds'; $lang->build->ajaxGetProjectBuilds = 'API:Project builds'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index e04462e080..a219b2cff4 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -123,7 +123,11 @@ $lang->exportFileTypeList['html'] = 'html'; $lang->exportTypeList['all'] = 'All records'; $lang->exportTypeList['selected'] = 'Only checked'; +/* Language. */ +$lang->lang = 'Language'; + /* Themes. */ +$lang->theme = 'Theme'; $lang->themes['default'] = 'Default'; $lang->themes['green'] = 'Green'; $lang->themes['red'] = 'Red'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 33bda7b2e5..a5953c327f 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -30,6 +30,7 @@ $lang->doc->addedDate = 'Added date'; $lang->doc->editedBy = 'Edited by'; $lang->doc->editedDate = 'Edited date'; $lang->doc->basicInfo = 'Basic Info'; +$lang->doc->deleted = 'Deleted'; $lang->doc->moduleDoc = 'By module'; $lang->doc->searchDoc = 'By search'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 1bea102b74..e2e184c7f9 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -37,6 +37,7 @@ EOT; $lang->install->newReleased= "Notice：There is a new version %s, released on %s。"; $lang->install->choice = 'You can '; +$lang->install->or = 'or'; $lang->install->checking = 'System checking'; $lang->install->ok = 'OK(√)'; $lang->install->fail = 'Failed(×)'; @@ -127,7 +128,9 @@ $lang->install->groupList['TOP']['desc'] = 'for top manager'; $lang->install->groupList['OTHERS']['name'] = 'Others'; $lang->install->groupList['OTHERS']['desc'] = 'for others'; -$lang->install->success = "Success installed"; +$lang->install->success = "Success installed"; +$lang->install->login = 'Sign into ZentaoPMS'; +$lang->install->register = 'Register Zentao community website'; $lang->install->joinZentao = <<Please remove install.php in time。Now you can login ZenTaoPMS, create groups and grant priviledges. diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index a4ae077b9a..1567444183 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -128,9 +128,9 @@ $lang->install->groupList['TOP']['desc'] = '高层管理'; $lang->install->groupList['OTHERS']['name'] = '其他'; $lang->install->groupList['OTHERS']['desc'] = '其他'; -$lang->install->success = "安装成功"; -$lang->install->login = '登录禅道管理系统'; -$lang->install->regist = '禅道社区注册'; +$lang->install->success = "安装成功"; +$lang->install->login = '登录禅道管理系统'; +$lang->install->register = '禅道社区注册'; $lang->install->joinZentao = <<您已经成功安装禅道管理系统%s，请及时删除install.php。现在您可以直接 登录禅道管理系统，设置用户及分组！

diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index e9306e7832..165c2eba71 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -20,6 +20,11 @@ $lang->misc->zentao->labels['support'] = 'Support'; $lang->misc->zentao->labels['cowin'] = 'Help us'; $lang->misc->zentao->labels['service'] = 'Services'; +$lang->misc->zentao->icons['about'] = 'group'; +$lang->misc->zentao->icons['support'] = 'question-sign'; +$lang->misc->zentao->icons['cowin'] = 'hand-right'; +$lang->misc->zentao->icons['service'] = 'heart'; + $lang->misc->zentao->about['proversion'] = 'Try pro version free!'; $lang->misc->zentao->about['official'] = "Official site"; $lang->misc->zentao->about['changelog'] = "Change log"; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index a0514b2966..f131d3a1e1 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -39,7 +39,9 @@ $lang->my->home->productHome = 'Product home'; $lang->my->home->createProject = "create a project?"; $lang->my->home->createProduct = "create a product?"; $lang->my->home->help = "Help Book"; +$lang->my->home->noProductsTip = "There is no product."; +$lang->my->form = new stdclass(); $lang->my->form->lblBasic = 'Basic info'; $lang->my->form->lblContact = 'Contact info'; $lang->my->form->lblAccount = 'Account info'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 0553d43a3a..72fc50d5ad 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -19,6 +19,7 @@ $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create"; $lang->product->read = "Info"; $lang->product->delete = "Delete"; +$lang->product->deleted = "Deleted"; $lang->product->close = "Close"; $lang->product->select = '--select product--'; $lang->product->mine = 'I charge : '; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 425b325d5b..d37883d28a 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -25,7 +25,6 @@ $lang->product->select = '--请选择产品--'; $lang->product->mine = '我负责：'; $lang->product->other = '其他：'; $lang->product->closed = '已关闭»'; -$lang->product->deleted = '已删除'; $lang->product->basicInfo = '基本信息'; $lang->product->otherInfo = '其他信息'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b5e3ee7670..4c64559fdc 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -21,6 +21,8 @@ $lang->project->name = 'Name'; $lang->project->code = 'Code'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; +$lang->project->dateRange = 'Range'; +$lang->project->to = 'To'; $lang->project->days = 'Workdays'; $lang->project->day = 'day'; $lang->project->status = 'Status'; @@ -33,6 +35,7 @@ $lang->project->closedBy = 'Closed by'; $lang->project->closedDate = 'Closed date'; $lang->project->canceledBy = 'Canceled by'; $lang->project->canceledDate = 'Canceled date'; +$lang->project->owner = 'Owner'; $lang->project->PO = 'Product owner'; $lang->project->PM = 'Project manager'; $lang->project->QD = 'Quality director'; @@ -55,6 +58,7 @@ $lang->project->all = 'All'; $lang->project->typeDesc = 'No burndown and story in OPS'; $lang->project->mine = 'I charge : '; $lang->project->other = 'Other : '; +$lang->project->deleted = 'Deleted'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; @@ -178,7 +182,16 @@ $lang->project->whyNoStories = "There no active stories to added to this proj $lang->project->doneProjects = 'Done'; $lang->project->unDoneProjects = 'Undone'; $lang->project->copyTeam = 'Copy a team'; +$lang->project->copyFromTeam = 'Copy form team: %s'; $lang->project->noMatched = 'No matched project including "%s"'; +$lang->project->copyTitle = 'Choose A Project To Copy'; +$lang->project->copyTeamTitle = 'Choose A Team To Copy'; +$lang->project->copyNoProject = 'No Project To Copy'; +$lang->project->copyFromProject = 'Copy from: %s'; +$lang->project->reCopy = 'recopy'; +$lang->project->cancelCopy = 'cancel copy'; +$lang->project->byPeriod = 'By period'; +$lang->project->byUser = 'By user'; /* Confirm. */ $lang->project->confirmDelete = 'Are you sure to delete project [%s]?'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index e07c9a0600..0d281dbede 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -35,7 +35,7 @@ $lang->project->closedBy = '由谁关闭'; $lang->project->closedDate = '关闭日期'; $lang->project->canceledBy = '由谁取消'; $lang->project->canceledDate = '取消日期'; -$lang->project->Person = '负责人'; +$lang->project->owner = '负责人'; $lang->project->PO = '产品负责人'; $lang->project->PM = '项目负责人'; $lang->project->QD = '测试负责人'; @@ -191,6 +191,7 @@ $lang->project->copyFromProject = '复制自项目： %s'; $lang->project->reCopy = '重新复制'; $lang->project->cancelCopy = '取消复制'; $lang->project->byPeriod = '按时间段'; +$lang->project->byUser = '按用户'; /* 交互提示。*/ $lang->project->confirmDelete = '您确定删除项目[%s]吗？'; @@ -231,5 +232,3 @@ $lang->project->selectGroup->suspended = '(已挂起)'; $lang->project->selectGroup->done = '(已结束)'; $lang->project->projectTasks = '项目'; - -$lang->project->byUser = '按用户'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 672d5d8779..0109912603 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -13,6 +13,7 @@ $lang->release->common = 'Release'; $lang->release->create = "Create"; $lang->release->edit = "Edit"; $lang->release->delete = "Delete"; +$lang->release->deleted = 'Deleted'; $lang->release->view = "Info"; $lang->release->browse = "Browse"; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index c8adc9fc71..88c0050a02 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -160,6 +160,7 @@ $lang->story->lblReview = 'Review'; $lang->story->lblActivate = 'Activate'; $lang->story->lblClose = 'Close'; +$lang->story->checkAffection = 'Check Affection'; $lang->story->affectedProjects = 'Affected projects'; $lang->story->affectedBugs = 'Affected bugs'; $lang->story->affectedCases = 'Affected cases'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 3cb971276c..e6c2cc4628 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -16,6 +16,7 @@ $lang->task->batchEdit = "Batch edit"; $lang->task->import = "Import undone"; $lang->task->edit = "Update"; $lang->task->delete = "Delete"; +$lang->task->deleted = "Deleted"; $lang->task->view = "Info"; $lang->task->logEfforts = "Log working hours"; $lang->task->record = "Estimate"; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index f9e7c64c43..10cc2be30b 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -60,6 +60,7 @@ $lang->testcase->view = "Info"; $lang->testcase->edit = "Edit"; $lang->testcase->batchEdit = "Batch edit"; $lang->testcase->delete = "Delete"; +$lang->testcase->deleted = "Deleted"; $lang->testcase->browse = "Browse"; $lang->testcase->import = "Import"; $lang->testcase->importID = "Linenum"; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index e94d47a590..226fd49d86 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -12,6 +12,7 @@ $lang->testtask->index = "Index"; $lang->testtask->create = "Create"; $lang->testtask->delete = "Delete"; +$lang->testtask->deleted = "Deleted"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; $lang->testtask->browse = "Testtask browse"; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index eaa147dfb3..2ce418c494 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -9,37 +9,40 @@ * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->user->common = 'User'; -$lang->user->id = 'ID'; -$lang->user->company = 'Company'; -$lang->user->dept = 'Department'; -$lang->user->account = 'Account'; -$lang->user->password = 'Password'; -$lang->user->password2 = 'Repeat password'; -$lang->user->role = 'Role'; -$lang->user->group = 'Group'; -$lang->user->realname = 'Fullname'; -$lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commit account'; -$lang->user->avatar = 'Avatar'; -$lang->user->birthyear = 'Birth year'; -$lang->user->gender = 'Gender'; -$lang->user->email = 'Email'; -$lang->user->skype = 'Skype'; -$lang->user->qq = 'QQ'; -$lang->user->yahoo = 'Yahoo!'; -$lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = 'Wangwang'; -$lang->user->mobile = 'Mobile'; -$lang->user->phone = 'Phone'; -$lang->user->address = 'Address'; -$lang->user->zipcode = 'Zipcode'; -$lang->user->join = 'Join date'; -$lang->user->visits = 'Visits'; -$lang->user->ip = 'Last IP'; -$lang->user->last = 'Last login'; -$lang->user->status = 'Status'; -$lang->user->ditto = 'Ditto'; +$lang->user->common = 'User'; +$lang->user->id = 'ID'; +$lang->user->company = 'Company'; +$lang->user->dept = 'Department'; +$lang->user->account = 'Account'; +$lang->user->password = 'Password'; +$lang->user->password2 = 'Repeat password'; +$lang->user->role = 'Role'; +$lang->user->group = 'Group'; +$lang->user->realname = 'Fullname'; +$lang->user->nickname = 'Nickname'; +$lang->user->commiter = 'Commit account'; +$lang->user->avatar = 'Avatar'; +$lang->user->birthyear = 'Birth year'; +$lang->user->gender = 'Gender'; +$lang->user->email = 'Email'; +$lang->user->basicInfo = 'Basic info'; +$lang->user->accountInfo = 'Account info'; +$lang->user->contactInfo = 'Contact info'; +$lang->user->skype = 'Skype'; +$lang->user->qq = 'QQ'; +$lang->user->yahoo = 'Yahoo!'; +$lang->user->gtalk = 'GTalk'; +$lang->user->wangwang = 'Wangwang'; +$lang->user->mobile = 'Mobile'; +$lang->user->phone = 'Phone'; +$lang->user->address = 'Address'; +$lang->user->zipcode = 'Zipcode'; +$lang->user->join = 'Join date'; +$lang->user->visits = 'Visits'; +$lang->user->ip = 'Last IP'; +$lang->user->last = 'Last login'; +$lang->user->status = 'Status'; +$lang->user->ditto = 'Ditto'; $lang->user->index = "Index"; $lang->user->view = "Info"; diff --git a/module/webapp/lang/en.php b/module/webapp/lang/en.php index c0a19f8c2a..62fac8f6c2 100644 --- a/module/webapp/lang/en.php +++ b/module/webapp/lang/en.php @@ -60,6 +60,9 @@ $lang->webapp->targetList['popup'] = 'Popup'; $lang->webapp->targetList['iframe'] = 'Iframe'; $lang->webapp->targetList['blank'] = 'New Window'; +$lang->webapp->width = 'Width'; +$lang->webapp->height = 'Height'; + $lang->webapp->sizeList[''] = ""; $lang->webapp->sizeList['1024x600'] = "1024 x 600"; $lang->webapp->sizeList['900x600'] = "900 x 600"; From 535e82a70778392d6c64758552a758a937d89fda Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 28 Apr 2014 16:06:02 +0800 Subject: [PATCH 03/13] * ajusted style of 'testcase/showimport'. --- module/testcase/css/showimport.css | 1 + module/testcase/view/showimport.html.php | 77 +++++++++++++----------- 2 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 module/testcase/css/showimport.css diff --git a/module/testcase/css/showimport.css b/module/testcase/css/showimport.css new file mode 100644 index 0000000000..44be24ded4 --- /dev/null +++ b/module/testcase/css/showimport.css @@ -0,0 +1 @@ +.table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px!important; border: none!important;} diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index a06c68d487..c5f9df73f5 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -2,28 +2,33 @@ -
- - - - - - - - - - - - - - + +
testcase->id?>testcase->title?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->status?>testcase->frequency?>testcase->stage?>testcase->precondition?>testcase->steps?> - - - - - -
testcase->stepDesc?>testcase->stepExpect?>
-
+ + + + + + + + + + + + + + + $case):?> - - - - - - - - + + + + + + + + + + + + +
testcase->id?>testcase->title?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->status?>testcase->frequency?>testcase->stage?>testcase->precondition?> + + + + + + + + +
testcase->steps?>
testcase->stepDesc?>testcase->stepExpect?>
+
@@ -40,21 +45,21 @@ ?> title, "class='form-control' style='margin-top:2px'")?>module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='select-2'")?>story) ? $case->story : (!empty($case->id) ? $cases[$case->id]->story : ''), "class='select-2'")?>testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''))?>testcase->typeList, $case->type)?>testcase->statusList, isset($case->status) ? $case->status : '')?>frequency) ? $case->frequency : 1, "size='2'")?>testcase->stageList, isset($case->stage) ? $case->stage : '', "multiple='multiple'")?>precondition) ? $case->precondition : "", "style='margin-top:2px; height:65px;'")?>module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control'")?>story) ? $case->story : (!empty($case->id) ? $cases[$case->id]->story : ''), "class='form-control'")?>testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control'")?>testcase->typeList, $case->type, "class='form-control'")?>testcase->statusList, isset($case->status) ? $case->status : '', "class='form-control'")?>frequency) ? $case->frequency : 1, "class='form-control'")?>testcase->stageList, isset($case->stage) ? $case->stage : '', "multiple='multiple' class='form-control' style='height:auto'")?>precondition) ? $case->precondition : "", "class='form-control'")?> - +
$desc):?> - - + +
@@ -63,8 +68,12 @@
-