diff --git a/db/update9.8.1.sql b/db/update9.8.1.sql index 198fc4943f..eb64935fcf 100644 --- a/db/update9.8.1.sql +++ b/db/update9.8.1.sql @@ -1,3 +1,3 @@ ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`; -ALTER TABLE `zt_doc` ADD `collector` text NOT NULL default '' AFTER `views`, -ADD `visitedDate` text NOT NULL default '' AFTER `editedDate`; +ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`; +ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`; diff --git a/db/zentao.sql b/db/zentao.sql index c3180eb72f..11296be034 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -255,10 +255,12 @@ CREATE TABLE IF NOT EXISTS `zt_doc` ( `keywords` varchar(255) NOT NULL, `type` varchar(30) NOT NULL, `views` smallint(5) unsigned NOT NULL, + `collector` text NOT NULL, `addedBy` varchar(30) NOT NULL, `addedDate` datetime NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, + `visitedDate` datetime NOT NULL, `acl` varchar(10) NOT NULL DEFAULT 'open', `groups` varchar(255) NOT NULL, `users` text NOT NULL, @@ -518,6 +520,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` ( `branch` mediumint(8) unsigned NOT NULL default '0', `build` mediumint(8) unsigned NOT NULL, `name` char(30) NOT NULL default '', + `marker` enum('0','1') NOT NULL default '0', `date` date NOT NULL, `stories` text NOT NULL, `bugs` text NOT NULL, diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index a543d98780..6cfeb4e519 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -48,7 +48,10 @@ - + + + + diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php index da941688b4..c1d63908e6 100644 --- a/module/admin/view/sso.html.php +++ b/module/admin/view/sso.html.php @@ -41,9 +41,10 @@ - - - + + + + diff --git a/module/block/lang/en.php b/module/block/lang/en.php index b7b0d5e403..8d6f6049d2 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -374,8 +374,8 @@ $lang->block->gridOptions[8] = 'Left'; $lang->block->gridOptions[4] = 'Right'; $lang->block->flowchart = array(); -$lang->block->flowchart[] = array('Administration', 'Manage a Company', 'Add Users', 'Maintain Privileges'); -$lang->block->flowchart[] = array($lang->productCommon . ' Manager', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release'); -$lang->block->flowchart[] = array($lang->projectCommon . ' Manager', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks'); -$lang->block->flowchart[] = array('DEV Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); -$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Implement Cases', 'Report Bugs', 'Resolve Bugs', 'Close Bugs'); +$lang->block->flowchart[] = array('Administlrator', 'Add Departments', 'Add Users', 'Maintain Privileges'); +$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release'); +$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks'); +$lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); +$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Execute Cases', 'Report Bugs', 'Check Bugs', 'Close Bugs'); diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php index 01300d243b..9862c733f8 100644 --- a/module/mail/view/browse.html.php +++ b/module/mail/view/browse.html.php @@ -12,11 +12,11 @@ ?> app->getModuleRoot() . 'message/view/header.html.php';?>
-
-
- mail->browse?> +
+
+ mail->browse?> +
-
' target='hiddenwin' id='mailForm' data-ride='table'> recTotal}&recPerPage={$pager->recPerPage}"; ?> diff --git a/module/misc/css/changelog.css b/module/misc/css/changelog.css index 3c67368578..20a2f25952 100644 --- a/module/misc/css/changelog.css +++ b/module/misc/css/changelog.css @@ -1,4 +1,4 @@ -#versionMenu {margin: 20px;} +#versionMenu {margin-left: 20px;} #versionMenu .dropdown-menu {min-width: 130px; max-height:180px;overflow-y:auto;} #featureList {padding: 0 20px 20px; min-height:200px;} diff --git a/module/misc/view/changelog.html.php b/module/misc/view/changelog.html.php index 5126af6224..d2ac0d12f9 100644 --- a/module/misc/view/changelog.html.php +++ b/module/misc/view/changelog.html.php @@ -1,33 +1,35 @@ -
-
-
- changeLog ?> +
+
+
+

changeLog ?>

+
+ +
-
- -
- - -
-

-
+ app->getClientLang() != 'en'):?> + +
+
- - - app->getClientLang() != 'en'):?> - -
-
diff --git a/module/misc/view/checktable.html.php b/module/misc/view/checktable.html.php deleted file mode 100644 index 5983fefe0b..0000000000 --- a/module/misc/view/checktable.html.php +++ /dev/null @@ -1,53 +0,0 @@ - - * @package user - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
misc->repairTable;?>
-
- -
- misc->noticeRepair, $this->session->checkFileName);?> -
-

lang->refresh, '', "class='btn'")?>

- -
-
- - - - - - - - - $tableStatus):?> - - - - - - - - - - - - -
misc->tableName?>misc->tableStatus?>
'>
misc->needRepair, '', "class='btn btn-primary'")?>
-
- -
- - - diff --git a/module/misc/view/qrcode.html.php b/module/misc/view/qrcode.html.php index 618f808511..e77cd2f455 100644 --- a/module/misc/view/qrcode.html.php +++ b/module/misc/view/qrcode.html.php @@ -1,5 +1,5 @@ - +
misc->mobile?>
diff --git a/module/project/css/create.css b/module/project/css/create.css index a7dcb82c26..9d61fde70e 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -15,3 +15,5 @@ .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;} .type-tips {display: none;} + +#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;} diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 0765739716..1cae122707 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -54,6 +54,10 @@ project->dateRange;?> + project->endList , '', "onclick='computeEndDate(this.value)'");?> + + +
begin) ? $plan->begin : date('Y-m-d')), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "' required");?> @@ -61,7 +65,7 @@ end) ? $plan->end : ''), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "' required");?>
- project->endList , '', "onclick='computeEndDate(this.value)'");?> + project->days;?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index fa8271f01d..314e1494ac 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -185,7 +185,7 @@ if(common::hasPriv('project', 'unlinkStory', $project)) { $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn btn-link' title='{$lang->project->unlinkStory}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn' title='{$lang->project->unlinkStory}'"); } ?> diff --git a/module/search/view/savequery.html.php b/module/search/view/savequery.html.php index 7ee2a2a413..0c3ad5f592 100644 --- a/module/search/view/savequery.html.php +++ b/module/search/view/savequery.html.php @@ -26,4 +26,3 @@ - diff --git a/module/sso/view/bind.html.php b/module/sso/view/bind.html.php index 10fd2b611d..8f590062b0 100644 --- a/module/sso/view/bind.html.php +++ b/module/sso/view/bind.html.php @@ -14,64 +14,64 @@ safe->mode)) $lang->user->placeholder->password1 = $lang->user->placeholder->passwordStrength[$config->safe->mode]?> user->placeholder);?> -
-
-
sso->bind?>
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sso->bindType?>sso->bindTypeList, 'bind')?>
sso->bindUser?>account, "class='form-control chosen'")?>
user->password?>
user->account?>account, "class='form-control' autocomplete='off'")?>
user->password?> - - - - -
user->password2?>
user->realname?>realname, "class='form-control' autocomplete='off'")?>
user->gender?>user->genderList, $data->gender)?>
user->email?>email, "class='form-control' autocomplete='off'")?>
sso->bindNotice?>
-
-
+
+
+

sso->bind?>

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
sso->bindType?>sso->bindTypeList, 'bind')?>
sso->bindUser?>account, "class='form-control chosen'")?>
user->password?>
user->account?>account, "class='form-control' autocomplete='off'")?>
user->password?> + + + + +
user->password2?>
user->realname?>realname, "class='form-control' autocomplete='off'")?>
user->gender?>user->genderList, $data->gender)?>
user->email?>email, "class='form-control' autocomplete='off'")?>
sso->bindNotice?>
+
+