From d53b44263b412bcb6776b21363800485a80a93cb Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:26:48 +0000 Subject: [PATCH 01/14] - remove unused style. --- module/bug/css/browse.css | 1 - 1 file changed, 1 deletion(-) diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index 575c976ff1..d8a67e11eb 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -4,4 +4,3 @@ .confirm0 {color:gray; font-size:9px} .confirm1 {color:green; font-size:9px} tfoot .f-left {color:#141414;} -table.border-sep {border-collapse:separate;} From 7837ceefeceac9b2379b72ae81438f0d89f45cc6 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:31:31 +0000 Subject: [PATCH 02/14] - remove unused class. --- module/bug/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 1b9a02e3a8..a8449a5545 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -62,7 +62,7 @@ var customed = ; recTotal}&recPerPage={$pager->recPerPage}"; ?> - +
From c4898b9c6ea3ac93045732ceaa4f77de2f8f5779 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:45:15 +0000 Subject: [PATCH 03/14] * Remove notice2 lang. --- module/bug/view/create.html.php | 2 +- module/build/lang/en.php | 3 +-- module/build/lang/zh-cn.php | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 0a7a9a0645..b097d6e6f6 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -37,7 +37,7 @@ userList = "".split(','); diff --git a/module/build/lang/en.php b/module/build/lang/en.php index f24f2f327a..3f38c5da77 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -39,5 +39,4 @@ $lang->build->bugs = 'Linked bugs'; $lang->build->finishStories = 'The total demand for a complete %s'; $lang->build->resolvedBugs = 'The total solution of bug%s'; -$lang->build->notice = '(No build in your system, create it in build of project right now.)'; -$lang->build->notice2 = '(If the build is empty, please create it in build of project right now.)'; +$lang->build->notice = "Please create a build in project view's build page."; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index d86b6ac8a9..159364bec7 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -39,5 +39,4 @@ $lang->build->bugs = '已关联Bug'; $lang->build->finishStories = '本次共完成需求%s个'; $lang->build->resolvedBugs = '本次共解决Bug%s个'; -$lang->build->notice = '(还没有相应的版本信息哦，马上到[项目视图]-[版本]创建一个吧)'; -$lang->build->notice2 = '(如果还没有相应的版本信息，请到[项目视图]-[版本]创建)'; +$lang->build->notice = '版本请到[项目视图]-[版本]创建'; From a58d888922083d97bfd3edda9a19b58b6fda2dc0 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:50:07 +0000 Subject: [PATCH 04/14] * sync the export lang item. --- module/release/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/release/lang/en.php b/module/release/lang/en.php index f08032e688..5679f4e824 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -34,4 +34,4 @@ $lang->release->bugs = 'Linked bugs'; $lang->release->ajaxGetStoriesAndBugs = 'API: Get storeis and bugs'; $lang->release->finishStories = 'The total demand for a complete %s'; $lang->release->resolvedBugs = 'The total solution of bug%s'; -$lang->release->exportStoriesAndBugs = 'Export as HTML'; +$lang->release->export = 'Export as HTML'; From 7c098e20dd626d3df61615911bdcfcfbc8dbfdca Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:53:55 +0000 Subject: [PATCH 05/14] * adjust the build-notice logic. * sync zh-tw lang. --- module/bug/view/create.html.php | 2 +- module/build/lang/zh-cn.php | 2 +- module/build/lang/zh-tw.php | 5 ++--- module/common/lang/zh-tw.php | 4 ++-- module/release/lang/zh-tw.php | 4 ++-- module/report/lang/zh-tw.php | 4 +++- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index b097d6e6f6..f4dceb3db7 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -37,7 +37,7 @@ userList = "".split(','); diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 159364bec7..8ee155d78a 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -39,4 +39,4 @@ $lang->build->bugs = '已关联Bug'; $lang->build->finishStories = '本次共完成需求%s个'; $lang->build->resolvedBugs = '本次共解决Bug%s个'; -$lang->build->notice = '版本请到[项目视图]-[版本]创建'; +$lang->build->notice = '版本请到[项目视图]-[版本]创建。'; diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index 4f116f81bb..f795a22f41 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -6,7 +6,7 @@ * @license LGPL (http://www.gnu.org/licenses/lgpl.html) * @author Chunsheng Wang * @package build - * @version $Id: zh-tw.php 3010 2012-06-06 08:45:54Z shiyangyangwork@yahoo.cn $ + * @version $Id: zh-tw.php 3307 2012-07-03 02:45:15Z wwccss $ * @link http://www.zentao.net */ $lang->build->common = "Build"; @@ -39,5 +39,4 @@ $lang->build->bugs = '已關聯Bug'; $lang->build->finishStories = '本次共完成需求%s個'; $lang->build->resolvedBugs = '本次共解決Bug%s個'; -$lang->build->notice = '(還沒有相應的版本信息哦，馬上到[項目視圖]-[版本]創建一個吧)'; -$lang->build->notice2 = '(如果還沒有相應的版本信息，請到[項目視圖]-[版本]創建)'; +$lang->build->notice = '版本請到[項目視圖]-[版本]創建。'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 0f7ec334c4..4eb59dd6ca 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -6,7 +6,7 @@ * @license LGPL (http://www.gnu.org/licenses/lgpl.html) * @author Chunsheng Wang * @package ZenTaoPMS - * @version $Id: zh-tw.php 3276 2012-07-02 12:12:06Z wwccss $ + * @version $Id: zh-tw.php 3283 2012-07-02 14:19:23Z zhujinyonging@gmail.com $ * @link http://www.zentao.net */ $lang->arrow = '  '; @@ -137,7 +137,7 @@ $lang->my->menu->story = '我的需求|my|story|'; $lang->my->menu->myProject = '我的項目|my|project|'; $lang->my->menu->dynamic = '我的動態|my|dynamic|'; $lang->my->menu->profile = array('link' => '我的檔案|my|profile|', 'alias' => 'editprofile'); -$lang->my->menu->changePassword = '修改密碼|my|changePassword|'; +$lang->my->menu->changePassword = '修改密碼|my|changepassword|'; $lang->todo->menu = $lang->my->menu; /* 產品視圖設置。*/ diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php index 585e651ec5..258b9cafa9 100644 --- a/module/release/lang/zh-tw.php +++ b/module/release/lang/zh-tw.php @@ -6,7 +6,7 @@ * @license LGPL (http://www.gnu.org/licenses/lgpl.html) * @author Chunsheng Wang * @package release - * @version $Id: zh-tw.php 3198 2012-07-01 02:54:03Z areyou123456 $ + * @version $Id: zh-tw.php 3301 2012-07-03 01:25:29Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ $lang->release->common = '發佈'; @@ -34,4 +34,4 @@ $lang->release->bugs = '已關聯Bugs'; $lang->release->ajaxGetStoriesAndBugs = '介面：獲得需求和Bug'; $lang->release->finishStories = '本次共完成需求%s個'; $lang->release->resolvedBugs = '本次共解決Bug%s個'; -$lang->release->exportStoriesAndBugs = '導出HTML'; +$lang->release->export = '導出HTML'; diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php index bc6b00e253..3d31f63e94 100644 --- a/module/report/lang/zh-tw.php +++ b/module/report/lang/zh-tw.php @@ -6,7 +6,7 @@ * @license LGPL (http://www.gnu.org/licenses/lgpl.html) * @author Chunsheng Wang * @package report - * @version $Id: zh-tw.php 3277 2012-07-02 12:14:08Z wwccss $ + * @version $Id: zh-tw.php 3299 2012-07-03 01:00:09Z zhujinyonging@gmail.com $ * @link http://www.zentao.net */ $lang->report->common = '統計視圖'; @@ -58,5 +58,7 @@ $lang->report->devTestRate = '開發/測試'; $lang->report->details = '詳情'; $lang->report->total = '總計'; $lang->report->to = '至'; +$lang->report->taskTotal = "共%s個任務，需%s工時"; +$lang->report->bugTotal = "共%s個Bug"; $lang->report->proVersion = '更多精彩，盡在專業版！'; From 575c0277311bafd45455034e171d1cb4dd1b3fff Mon Sep 17 00:00:00 2001 From: "shiyangyangwork@yahoo.cn" Date: Tue, 3 Jul 2012 02:54:09 +0000 Subject: [PATCH 06/14] * add ssleay32.dll for xampp. --- build/windows/xampp/build.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/windows/xampp/build.php b/build/windows/xampp/build.php index 9fe39ccdc2..dc9faf2f51 100644 --- a/build/windows/xampp/build.php +++ b/build/windows/xampp/build.php @@ -239,9 +239,11 @@ $file->batchRemoveFile('./xampp/php/*.php'); $file->rename('./xampp/php/php5apache2_2.dll', './xampp/php/php5apache2_2.bak'); $file->rename('./xampp/php/php5ts.dll', './xampp/php/php5ts.bak'); +$file->rename('./xampp/php/ssleay32.dll', './xampp/php/ssleay32.dll.bak'); $file->batchRemoveFile('./xampp/php/*.dll'); $file->rename('./xampp/php/php5apache2_2.bak', './xampp/php/php5apache2_2.dll'); $file->rename('./xampp/php/php5ts.bak', './xampp/php/php5ts.dll'); +$file->rename('./xampp/php/ssleay32.dll.bak', './xampp/php/ssleay32.dll'); /* Process php ini file. */ $phpConfig = file_get_contents('./xampp/php/php.ini'); From dbc1add468318db98e9bf83d534cc99680b8555f Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 02:58:19 +0000 Subject: [PATCH 07/14] * adjust the code format. --- module/bug/view/view.html.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 967fccaec7..29ca9736d8 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -225,15 +225,15 @@ From 92019b09fd356e5992060d5122b4dee5cb2f77b6 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 3 Jul 2012 03:01:08 +0000 Subject: [PATCH 08/14] * fix a bug for demo login link. --- module/user/view/login.html.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index aeba3ecabd..ef59cea3c8 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -41,11 +41,12 @@ include '../../common/view/colorbox.html.php';
" . $lang->user->loginWithDemoUser . ""; - if(isset($demoUsers['productManager'])) echo html::a($this->inLink('login', "account=productManager&password=123456"), $demoUsers['productManager'], 'hiddenwin'); - if(isset($demoUsers['projectManager'])) echo html::a($this->inLink('login', "account=projectManager&password=123456"), $demoUsers['projectManager'], 'hiddenwin'); - if(isset($demoUsers['testManager'])) echo html::a($this->inLink('login', "account=testManager&password=123456"), $demoUsers['testManager'], 'hiddenwin'); - if(isset($demoUsers['dev1'])) echo html::a($this->inLink('login', "account=dev1&password=123456"), $demoUsers['dev1'], 'hiddenwin'); - if(isset($demoUsers['tester1'])) echo html::a($this->inLink('login', "account=tester1&password=123456"), $demoUsers['tester1'], 'hiddenwin'); + $sign = $config->requestType == 'GET' ? '&' : '?'; + if(isset($demoUsers['productManager'])) echo html::a(inlink('login') . $sign . "account=productManager&password=123456", $demoUsers['productManager'], 'hiddenwin'); + if(isset($demoUsers['projectManager'])) echo html::a(inlink('login') . $sign . "account=projectManager&password=123456", $demoUsers['projectManager'], 'hiddenwin'); + if(isset($demoUsers['testManager'])) echo html::a(inlink('login') . $sign . "account=testManager&password=123456", $demoUsers['testManager'], 'hiddenwin'); + if(isset($demoUsers['dev1'])) echo html::a(inlink('login') . $sign . "account=dev1&password=123456", $demoUsers['dev1'], 'hiddenwin'); + if(isset($demoUsers['tester1'])) echo html::a(inlink('login') . $sign . "account=tester1&password=123456", $demoUsers['tester1'], 'hiddenwin'); ?>
From 0dd0c547ced59d6d70119eaa0c6fb381a58657e0 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 03:01:12 +0000 Subject: [PATCH 09/14] + add id for bug's story. * adjust code format. --- module/bug/view/view.html.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 29ca9736d8..4f1b463dcb 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -198,15 +198,15 @@ From 582a69279070b0d9d6bfab83f03bf8bccf18cc74 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 03:03:18 +0000 Subject: [PATCH 10/14] * adjust code format. --- module/bug/view/view.html.php | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 4f1b463dcb..cbfd7d4eb5 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -86,13 +86,13 @@ @@ -147,17 +147,17 @@ @@ -171,10 +171,10 @@ From fdb9e43840cbe49185635e309d20fcd3d02ef1b3 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 03:11:44 +0000 Subject: [PATCH 11/14] * adjust the resovled date field. --- module/bug/control.php | 1 - module/bug/view/resolve.html.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index fb44e8d271..f43fb8c0af 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -555,7 +555,6 @@ class bug extends control $this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve; $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); $this->view->position[] = $this->lang->bug->resolve; - $this->view->date = strftime("%Y-%m-%d %X", strtotime('now')); $this->view->bug = $bug; $this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID); diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 842b45202a..dd080dbd70 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -28,7 +28,7 @@ - + From e0c4024f9730300f01d8d42140485ec18747fe8f Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Tue, 3 Jul 2012 03:30:06 +0000 Subject: [PATCH 12/14] * add method order of report. --- module/group/lang/resource.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index fc06a180b1..a27d62124b 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -521,6 +521,12 @@ $lang->resource->report->productInfo = 'productInfo'; $lang->resource->report->bugSummary = 'bugSummary'; $lang->resource->report->workload = 'workload'; +$lang->report->methodOrder[0] = 'index'; +$lang->report->methodOrder[5] = 'projectDeviation'; +$lang->report->methodOrder[10] = 'productInfo'; +$lang->report->methodOrder[15] = 'bugSummary'; +$lang->report->methodOrder[20] = 'workload'; + /* Search. */ $lang->resource->search->buildForm = 'buildForm'; $lang->resource->search->buildQuery = 'buildQuery'; From 802bd2789f6e13e709c690f3aec3c06b947e1436 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Tue, 3 Jul 2012 03:39:16 +0000 Subject: [PATCH 13/14] * Remove changlog of checkDB. * Rename exportStoriesAndBugs instead export. --- module/group/lang/resource.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a27d62124b..104a70434f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -193,7 +193,7 @@ $lang->release->methodOrder[15] = 'edit'; $lang->release->methodOrder[20] = 'delete'; $lang->release->methodOrder[25] = 'view'; $lang->release->methodOrder[30] = 'ajaxGetStoriesAndBugs'; -$lang->release->methodOrder[35] = 'exportStoriesAndBugs'; +$lang->release->methodOrder[35] = 'export'; /* Project. */ $lang->resource->project->index = 'index'; @@ -672,11 +672,10 @@ $lang->changelog['3.1'][] = 'todo-batchCreate'; $lang->changelog['3.2'][] = 'my-changePassword'; $lang->changelog['3.2'][] = 'story-batchClose'; $lang->changelog['3.2'][] = 'task-batchEdit'; -$lang->changelog['3.2'][] = 'release-exportStoriesAndBugs'; +$lang->changelog['3.2'][] = 'release-export'; $lang->changelog['3.2'][] = 'report-index'; $lang->changelog['3.2'][] = 'report-projectDeviation'; $lang->changelog['3.2'][] = 'report-productInfo'; $lang->changelog['3.2'][] = 'report-bugSummary'; $lang->changelog['3.2'][] = 'report-workload'; -$lang->changelog['3.2'][] = 'admin-checkDB'; $lang->changelog['3.2'][] = 'tree-fix'; From 6d6c45e272338d40453bf2ff359c7bff0ea3e783 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 3 Jul 2012 05:23:39 +0000 Subject: [PATCH 14/14] * add the tag. --- module/project/view/create.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 4e5b0b155f..376dc86c1d 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -57,7 +57,7 @@ $(document).ready(function() -
idAB);?>bug->openedBuild;?> - build->notice2;?> + build->notice;?>
bug->openedBuild;?> - build->notice;?> + build->notice;?>
bug->linkBug;?> -linkBugTitles)) - { - foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle) - { - echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '
'; - } - } -?> + linkBugTitles)) + { + foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle) + { + echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '
'; + } + } + ?>
bug->story;?> -story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), $bug->storyTitle); - if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion) - { - echo "({$lang->story->changed} "; - echo html::a($this->createLink('bug', 'confirmStoryChange', "bugID=$bug->id"), $lang->confirm, 'hiddenwin'); - echo ")"; - } -?> + story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), "#$bug->story $bug->storyTitle"); + if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion) + { + echo "({$lang->story->changed} "; + echo html::a($this->createLink('bug', 'confirmStoryChange', "bugID=$bug->id"), $lang->confirm, 'hiddenwin'); + echo ")"; + } + ?>
bug->module;?> - $module) - { - if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; - } -?> + $module) + { + if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; + if(isset($modulePath[$key + 1])) echo $lang->arrow; + } + ?>
bug->openedBuild;?> -openedBuild) - { - $openedBuilds = explode(',', $bug->openedBuild); - foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '
') : print($openedBuild . '
'); - } - else - { - echo $bug->openedBuild; - } -?> + openedBuild) + { + $openedBuilds = explode(',', $bug->openedBuild); + foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '
') : print($openedBuild . '
'); + } + else + { + echo $bug->openedBuild; + } + ?>
bug->resolution;?> -bug->resolutionList[$bug->resolution]; - if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle); -?> + bug->resolutionList[$bug->resolution]; + if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle); + ?>
bug->resolvedDate;?>
bug->assignedTo;?>
project->days;?>project->day;?> + project->day;?>
project->teamname;?>