Example：Name is 'Test'", Code is 'test', Key is '20c8eb0d522d2e1a09d4ea18e4df3a59',IP list is "192.168.11.*,127.0.0.1"。
+1.User Auth
+Application request API of user auth, check if the account and password is correct, to realize single sign-on (SSO).
+The API is from sso module, auth method. POST data is account and encrypted string [md5(md5(password) + key)]. Return user info(json) if success, return fail if fail.
+Example: url is 'http:://www.demo.com/sso-auth-test'，POST string is 'account=admin&authcode=c44c577432230ad8e67160d3f9f0b91c'.
+ Note: 'test' is App code, 'c44c577432230ad8e67160d3f9f0b91' is md5(md5('123456') + '20c8eb0d522d2e1a09d4ea18e4df3a59')
+2.Get User List
+Application request API of user list, get all user info of zentao.
+The API if from sso module, users method. POST data is key. Return user list (json) if success, return fail if fail.
+Example:url is 'http:://www.demo.com/sso-users-test', POST string is 'key=20c8eb0d522d2e1a09d4ea18e4df3a59'.
+ Note: 'test' is App code, '20c8eb0d522d2e1a09d4ea18e4df3a59' is App key.
+3.Get Dept List
+Application request API of dept list, get all dept info of zentao.
+The API if from sso module, depts method. POST data is key. Return dept list (json) if success, return fail if fail.
+Example:url is 'http:://www.demo.com/sso-depts-test', POST string is 'key=20c8eb0d522d2e1a09d4ea18e4df3a59'.
+ Note: 'test' is App code, '20c8eb0d522d2e1a09d4ea18e4df3a59' is App key.
EOT;
diff --git a/module/sso/lang/zh-cn.php b/module/sso/lang/zh-cn.php
index 19f97c2df7..5520d0237d 100644
--- a/module/sso/lang/zh-cn.php
+++ b/module/sso/lang/zh-cn.php
@@ -1,21 +1,21 @@
sso->common = '单点登录';
-$lang->sso->browse = '授权列表';
-$lang->sso->create = '创建授权';
-$lang->sso->edit = '编辑授权';
-$lang->sso->delete = '删除授权';
+$lang->sso->browse = '应用列表';
+$lang->sso->create = '添加应用';
+$lang->sso->edit = '编辑应用';
+$lang->sso->delete = '删除应用';
$lang->sso->code = '代号';
$lang->sso->title = '名称';
$lang->sso->key = '密钥';
$lang->sso->ip = 'IP列表';
$lang->sso->createKey = '重新生成密钥';
-$lang->sso->confirmDelete = '您确定删除该授权吗？';
+$lang->sso->confirmDelete = '您确定删除该应用吗？';
$lang->sso->note = new stdClass();
-$lang->sso->note->title = '授权站点名称';
-$lang->sso->note->code = '授权站点代号';
-$lang->sso->note->ip = "允许该站点使用这些ip访问，多个ip使用逗号隔开。支持IP段，如192.168.1.*";
+$lang->sso->note->title = '授权应用名称';
+$lang->sso->note->code = '授权应用代号';
+$lang->sso->note->ip = "允许该应用使用这些ip访问，多个ip使用逗号隔开。支持IP段，如192.168.1.*";
$lang->sso->error = new stdClass();
$lang->sso->error->title = '名称不能为空';
diff --git a/module/sso/lang/zh-tw.php b/module/sso/lang/zh-tw.php
index e69de29bb2..b6b208c353 100644
--- a/module/sso/lang/zh-tw.php
+++ b/module/sso/lang/zh-tw.php
@@ -0,0 +1,43 @@
+sso->common = '單點登錄';
+$lang->sso->browse = '應用列表';
+$lang->sso->create = '添加應用';
+$lang->sso->edit = '編輯應用';
+$lang->sso->delete = '刪除應用';
+$lang->sso->code = '代號';
+$lang->sso->title = '名稱';
+$lang->sso->key = '密鑰';
+$lang->sso->ip = 'IP列表';
+$lang->sso->createKey = '重新生成密鑰';
+
+$lang->sso->confirmDelete = '您確定刪除該應用嗎？';
+
+$lang->sso->note = new stdClass();
+$lang->sso->note->title = '授權應用名稱';
+$lang->sso->note->code = '授權應用代號';
+$lang->sso->note->ip = "允許該應用使用這些ip訪問，多個ip使用逗號隔開。支持IP段，如192.168.1.*";
+
+$lang->sso->error = new stdClass();
+$lang->sso->error->title = '名稱不能為空';
+$lang->sso->error->code = '代號不能為空';
+$lang->sso->error->key = '密鑰不能為空';
+$lang->sso->error->ip = 'IP列表不能為空';
+
+$lang->sso->instruction = <<示例應用：名稱為"測試"，代號為"test"，密鑰為"20c8eb0d522d2e1a09d4ea18e4df3a59"，IP列表為"192.168.11.*,127.0.0.1"。
+1.用戶驗證
+授權應用請求禪道的用戶驗證API，檢查用戶在該應用輸入的用戶名和密碼是否正確，實現單點登錄。
+API地址為sso模組的auth方法，POST數據為登錄用戶的用戶名account和密碼與密鑰形成的加密字元串md5(md5(password) + key)，成功則返回用戶信息（json格式），失敗則返回fail。
+示例：請求地址 http:://www.demo.com/sso-auth-test，POST字元串 account=admin&authcode=c44c577432230ad8e67160d3f9f0b91c。
+ 註：test為應用代號，c44c577432230ad8e67160d3f9f0b91為md5(md5('123456') + '20c8eb0d522d2e1a09d4ea18e4df3a59')
+2.獲取用戶列表
+授權應用訪問禪道的用戶列表API，獲取禪道所有用戶信息。
+API地址為sso模組的users方法，POST數據為應用密鑰，成功返回用戶列表（json格式），失敗返回fail。
+示例：請求地址 http:://www.demo.com/sso-users-test，POST字元串 key=20c8eb0d522d2e1a09d4ea18e4df3a59。
+ 註：test為應用代號，20c8eb0d522d2e1a09d4ea18e4df3a59為應用密鑰
+3.獲取部門列表
+授權應用訪問禪道的部門列表API，獲取禪道所有部門信息。
+API地址為sso模組的depts方法，POST數據為應用密鑰，成功返回用戶列表（json格式），失敗返回fail。
+示例：請求地址 http:://www.demo.com/sso-depts-test，POST字元串 key=20c8eb0d522d2e1a09d4ea18e4df3a59。
+ 註：test為應用代號，20c8eb0d522d2e1a09d4ea18e4df3a59為應用密鑰
+EOT;
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 2d9fadf106..7efd42928b 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -30,6 +30,8 @@ $lang->story->bugs = "Bug";
$lang->story->linkStory = 'Related story';
$lang->story->export = "Export";
$lang->story->reportChart = "Report";
+$lang->story->batchChangePlan = "Batch change plan";
+$lang->story->batchChangeStage = "Batch change stage";
$lang->story->common = 'Story';
$lang->story->id = 'ID';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 52bd9502c1..0a0728d689 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -30,6 +30,8 @@ $lang->story->bugs = "Bug";
$lang->story->linkStory = '关联需求';
$lang->story->export = "导出";
$lang->story->reportChart = "统计报表";
+$lang->story->batchChangePlan = "批量修改计划";
+$lang->story->batchChangeStage = "批量修改阶段";
$lang->story->common = '需求';
$lang->story->id = '编号';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 3fddd06781..e182186108 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang
* @package story
- * @version $Id: zh-tw.php 4684 2013-04-27 05:49:28Z chencongzhi520@gmail.com $
+ * @version $Id: zh-tw.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->story->browse = "需求列表";
@@ -16,6 +16,7 @@ $lang->story->batchCreate = "批量添加";
$lang->story->change = "變更";
$lang->story->changed = '需求變更';
$lang->story->review = '評審';
+$lang->story->batchReview = '批量評審';
$lang->story->edit = "編輯";
$lang->story->batchEdit = "批量編輯";
$lang->story->close = '關閉';
@@ -29,6 +30,8 @@ $lang->story->bugs = "Bug";
$lang->story->linkStory = '關聯需求';
$lang->story->export = "導出";
$lang->story->reportChart = "統計報表";
+$lang->story->batchChangePlan = "批量修改計劃";
+$lang->story->batchChangeStage = "批量修改階段";
$lang->story->common = '需求';
$lang->story->id = '編號';
@@ -194,6 +197,7 @@ $lang->story->report = new stdclass();
$lang->story->report->common = '報表';
$lang->story->report->select = '請選擇報表類型';
$lang->story->report->create = '生成報表';
+$lang->story->report->value = '需求數';
$lang->story->report->charts['storysPerProduct'] = '產品需求數量';
$lang->story->report->charts['storysPerModule'] = '模組需求數量';
@@ -236,6 +240,19 @@ $lang->story->report->storysPerClosedReason = new stdclass();
$lang->story->report->storysPerEstimate = new stdclass();
$lang->story->report->storysPerChange = new stdclass();
+$lang->story->report->storysPerProduct->item = '產品';
+$lang->story->report->storysPerModule->item = '模組';
+$lang->story->report->storysPerSource->item = '來源';
+$lang->story->report->storysPerPlan->item = '計劃';
+$lang->story->report->storysPerStatus->item = '狀態';
+$lang->story->report->storysPerStage->item = '階段';
+$lang->story->report->storysPerPri->item = '優先順序';
+$lang->story->report->storysPerOpenedBy->item = '用戶';
+$lang->story->report->storysPerAssignedTo->item = '用戶';
+$lang->story->report->storysPerClosedReason->item = '原因';
+$lang->story->report->storysPerEstimate->item = '預計工時';
+$lang->story->report->storysPerChange->item = '變更次數';
+
$lang->story->report->storysPerProduct->graph = new stdclass();
$lang->story->report->storysPerModule->graph = new stdclass();
$lang->story->report->storysPerSource->graph = new stdclass();
@@ -264,4 +281,6 @@ $lang->story->report->storysPerChange->graph->xAxisName = '變更次數';
$lang->story->placeholder = new stdclass();
$lang->story->placeholder->estimate = "完成該需求的工作量";
-$lang->story->placeholder->mailto = '輸入用戶名自動完成';
+
+$lang->story->chosen = new stdClass();
+$lang->story->chosen->reviewedBy = '選擇評審人...';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 191fb1d9c2..8f6beef9e6 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -155,6 +155,7 @@ $lang->task->report = new stdclass();
$lang->task->report->common = '報表';
$lang->task->report->select = '請選擇報表類型';
$lang->task->report->create = '生成報表';
+$lang->task->report->value = '任務數';
$lang->task->report->charts['tasksPerProject'] = '項目任務數統計';
$lang->task->report->charts['tasksPerModule'] = '模組任務數統計';
@@ -199,6 +200,20 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
+$lang->task->report->tasksPerProject->item ='項目';
+$lang->task->report->tasksPerModule->item ='模組';
+$lang->task->report->tasksPerAssignedTo->item ='用戶';
+$lang->task->report->tasksPerType->item ='類型';
+$lang->task->report->tasksPerPri->item ='優先順序';
+$lang->task->report->tasksPerStatus->item ='狀態';
+$lang->task->report->tasksPerDeadline->item ='日期';
+$lang->task->report->tasksPerEstimate->item ='預計';
+$lang->task->report->tasksPerLeft->item ='剩餘';
+$lang->task->report->tasksPerConsumed->item ='消耗';
+$lang->task->report->tasksPerFinishedBy->item ='用戶';
+$lang->task->report->tasksPerClosedReason->item ='原因';
+$lang->task->report->finishedTasksPerDay->item ='日期';
+
$lang->task->report->tasksPerProject->graph = new stdclass();
$lang->task->report->tasksPerModule->graph = new stdclass();
$lang->task->report->tasksPerAssignedTo->graph = new stdclass();
@@ -233,4 +248,3 @@ $lang->task->report->finishedTasksPerDay->graph->rotateNames = '1';
$lang->task->placeholder = new stdclass();
$lang->task->placeholder->estimate = '對該任務最初的預計';
-$lang->task->placeholder->mailto = '輸入用戶名進行選擇';
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 3d3b8eb054..beaf4af3f5 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -72,7 +72,8 @@
- |
+ type != 'sprint')) ? $this->config->task->batchEdit->columns + 1 : $this->config->task->batchEdit->columns;?>
+ |
|
|
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index da4c2833f2..5b2a8a9d42 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -66,7 +66,6 @@ $lang->testcase->importID = "Linenum";
$lang->testcase->showImport = "Show import";
$lang->testcase->exportTemplet = "Export templet";
$lang->testcase->export = "Export";
-$lang->testcase->export = "Export";
$lang->testcase->confirmChange = 'Confirm case change';
$lang->testcase->confirmStoryChange = 'Confirm story change';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 93fd0e11bd..4f18d5b153 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -28,6 +28,7 @@ $lang->testcase->lastEditedBy = '最後修改者';
$lang->testcase->lastEditedDate = '最後修改日期';
$lang->testcase->version = '用例版本';
$lang->testcase->result = '測試結果';
+$lang->testcase->lastRunResult = '結果';
$lang->testcase->real = '實際情況';
$lang->testcase->keywords = '關鍵詞';
$lang->testcase->files = '附件';
@@ -43,6 +44,7 @@ $lang->testcase->lastEditedDateAB = '修改日期';
$lang->testcase->allProduct = '所有產品';
$lang->testcase->fromBug = '來源Bug';
$lang->testcase->toBug = '生成Bug';
+$lang->testcase->changed = '用例變更';
$lang->case = $lang->testcase; // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
$lang->testcase->stepID = '編號';
@@ -59,10 +61,19 @@ $lang->testcase->edit = "編輯";
$lang->testcase->batchEdit = "批量編輯 ";
$lang->testcase->delete = "刪除";
$lang->testcase->browse = "用例列表";
-$lang->testcase->import = "導入用例";
+$lang->testcase->import = "導入";
+$lang->testcase->importID = "行號";
+$lang->testcase->showImport = "顯示導入內容";
+$lang->testcase->exportTemplet = "導出模板";
$lang->testcase->export = "導出";
+$lang->testcase->confirmChange = '確認用例變動';
$lang->testcase->confirmStoryChange = '確認需求變動';
+$lang->testcase->editHaved = '修改已有用例';
+$lang->testcase->addNew = '添加新用例';
+
+$lang->testcase->num = '導入用例個數：';
+
$lang->testcase->deleteStep = '刪除';
$lang->testcase->insertBefore = '之前添加';
$lang->testcase->insertAfter = '之後添加';
@@ -143,3 +154,5 @@ $lang->testcase->resultList['blocked'] = '阻塞';
$lang->testcase->buttonEdit = '編輯';
$lang->testcase->buttonToList = '返回';
+
+$lang->testcase->errorEncode = '無數據，請選擇正確的編碼重新上傳！';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 35344b19f7..641e6d3102 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -49,6 +49,10 @@ $lang->testtask->lastRunTime = '執行時間';
$lang->testtask->lastRunResult = '結果';
$lang->testtask->report = '測試總結';
+$lang->testtask->legendDesc = '任務描述';
+$lang->testtask->legendReport = '測試總結';
+$lang->testtask->legendBasicInfo = '基本信息';
+
$lang->testtask->statusList['wait'] = '未開始';
$lang->testtask->statusList['doing'] = '進行中';
$lang->testtask->statusList['done'] = '已完成';
@@ -64,11 +68,13 @@ $lang->testtask->unlinkedCases = '未關聯';
$lang->testtask->linkedCases = '已關聯';
$lang->testtask->linkByStory = '按需求關聯';
$lang->testtask->linkByBug = '按Bug關聯';
-$lang->testtask->confirmDelete = '您確認要刪除該測試任務嗎？';
$lang->testtask->passAll = '全部通過';
$lang->testtask->pass = '通過';
$lang->testtask->fail = '失敗';
+$lang->testtask->confirmDelete = '您確認要刪除該測試任務嗎？';
+$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
+
$lang->testtask->byModule = '按模組';
$lang->testtask->assignedToMe = '指派給我';
$lang->testtask->allCases = '所有用例';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index bbc16c1110..0a5ed76c85 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -23,6 +23,7 @@ $lang->todo->export = "導出";
$lang->todo->delete = "刪除待辦";
$lang->todo->browse = "瀏覽待辦";
$lang->todo->import2Today = "導入到今天";
+$lang->todo->import = "導入到";
$lang->todo->changeStatus = "更改";
$lang->todo->id = '編號';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index e15810cddf..330c1d004f 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -38,6 +38,7 @@ $lang->upgrade->toVersion = 'To version';
$lang->upgrade->confirm = 'Confirm the sql to executed.';
$lang->upgrade->sureExecute = 'Execute';
$lang->upgrade->forbiddenExt = 'Because it is incompatible with this version, the following extension automatically disabled, ：';
+$lang->upgrade->checkExtension = 'Checking plugin compatibility, please wait ...';
$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA';
$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 6ebb1c8865..36e3161374 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang
* @package upgrade
- * @version $Id: zh-tw.php 4989 2013-07-03 07:05:45Z zhujinyonging@gmail.com $
+ * @version $Id: zh-tw.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
$lang->upgrade->common = '升級';
@@ -37,6 +37,8 @@ $lang->upgrade->fromVersion = '原來的版本';
$lang->upgrade->toVersion = '升級到';
$lang->upgrade->confirm = '確認要執行的SQL語句';
$lang->upgrade->sureExecute = '確認執行';
+$lang->upgrade->forbiddenExt = '以下插件與新版本不兼容，已經自動禁用：';
+$lang->upgrade->checkExtension = '正在檢查插件的兼容性，請稍後 ...';
$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA';
$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA';
@@ -69,3 +71,4 @@ $lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2';
$lang->upgrade->fromVersions['4_0'] = '4.0';
$lang->upgrade->fromVersions['4_0_1'] = '4.0.1';
$lang->upgrade->fromVersions['4_1'] = '4.1';
+$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e797e71033..27edd4eba1 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -142,6 +142,7 @@ class upgradeModel extends model
case '4_0': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0'));
case '4_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.1'));
case '4_1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.1'));
+ case '4_2_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('4.2'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 6f6ef280a7..c8af0508c1 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -124,6 +124,8 @@ $lang->user->loginWithDemoUser = '使用demo賬號登錄：';
$lang->user->placeholder = new stdclass();
$lang->user->placeholder->account = '英文、數字和下劃線的組合，三位以上';
$lang->user->placeholder->password1 = '六位以上';
+$lang->user->placeholder->role = '角色影響內容和用戶列表的順序。';
+$lang->user->placeholder->group = '分組決定用戶的權限列表。';
$lang->user->placeholder->join = '入職日期';
$lang->user->placeholder->commiter = '版本控制系統(subversion)中的帳號';
diff --git a/tools/check.php b/tools/check.php
index 5ac62db33c..66f750ce0d 100755
--- a/tools/check.php
+++ b/tools/check.php
@@ -111,8 +111,8 @@ foreach(glob($moduleRoot . '*') as $modulePath)
/* checking actions of every module. */
echo '-------------lang checking-----------------' . "\n";
-include '../../module/common/lang/zh-cn.php';
-include '../../config/config.php';
+include '../module/common/lang/zh-cn.php';
+include '../config/config.php';
foreach(glob($moduleRoot . '*') as $modulePath)
{
unset($lang);
@@ -142,7 +142,7 @@ foreach(glob($moduleRoot . '*') as $modulePath)
$key = trim($key);
$lineNO = $lineNO + 1;
echo "module $moduleName need checking, command is:";
- echo " vim -O +$lineNO ../../module/$moduleName/lang/zh-cn.php +$lineNO ../../module/$moduleName/lang/en.php \n";
+ echo " vim -O +$lineNO ../module/$moduleName/lang/zh-cn.php +$lineNO ../module/$moduleName/lang/en.php \n";
break;
}
}
diff --git a/tools/minifyfront.php b/tools/minifyfront.php
index 747ce05f8d..8bf7b82796 100755
--- a/tools/minifyfront.php
+++ b/tools/minifyfront.php
@@ -21,6 +21,7 @@ $jsFiles[] = $jqueryRoot . 'datepicker/date.js';
$jsFiles[] = $jqueryRoot . 'datepicker/min.js';
$jsFiles[] = $jqueryRoot . 'alert/min.js';
$jsFiles[] = $jqueryRoot . 'colorize/min.js';
+$jsFiles[] = $jqueryRoot . 'dropmenu/dropmenu.js';
/* Combine these js files. */
$allJSFile = $jsRoot . 'all.js';
@@ -70,6 +71,7 @@ foreach($langs as $lang)
$cssCode .= file_get_contents($themeRoot . 'default/treeview.css');
$cssCode .= file_get_contents($themeRoot . 'default/datepicker.css');
$cssCode .= file_get_contents($themeRoot . 'default/alert.css');
+ $cssCode .= file_get_contents($themeRoot . 'default/dropmenu.css');
/* Css file for current lang and current them. */
$cssCode .= file_get_contents($themeRoot . "lang/$lang.css");
diff --git a/www/js/my.full.js b/www/js/my.full.js
index a5364d6fa0..19193fc2bb 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -801,6 +801,8 @@ function setModal4List(colorboxClass, replaceID, callback)
$('.colored').colorize();
$('tfoot td').css('background', 'white').unbind('click').unbind('hover');
+ $(".date").datePicker({createButton:true, startDate:startDate})
+ .dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_RIGHT)
if(typeof(callback) == 'function') callback();
$.cookie('selfClose', 0);
});
diff --git a/www/upgrade.php b/www/upgrade.php
index 9f1d1518af..e2bad61d14 100644
--- a/www/upgrade.php
+++ b/www/upgrade.php
@@ -37,7 +37,7 @@ $app->setDebug();
/* Check the installed version is the latest or not. */
$config->installedVersion = $common->loadModel('setting')->getVersion();
-if(version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
+if(!$_SERVER['HTTP_X_REQUESTED_WITH'] and version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
/* Run it. */
$app->parseRequest();