diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 18a72bb565..e4ceb29d98 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -12,229 +12,232 @@ ?>
-
-
-

- icons['story']);?> id;?> - createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?> - arrow . ' ' . $lang->story->edit;?> -

-
- save)?> -
-
-
-
-
-
-
- - title, 'class="form-control disabled" disabled="disabled" autocomplete="off"');?> + +
+

+ icons['story']);?> id;?> + createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?> + arrow . ' ' . $lang->story->edit;?> +

+
+ save)?> +
+
+
+
+
+
+
+ + title, 'class="form-control disabled" disabled="disabled" autocomplete="off"');?> +
+
+
+
story->legendSpec;?>
+
spec;?>
+
+
+
story->verify;?>
+
verify;?>
+
+
+
story->comment;?>
+
+ +
+
+
linkStories);?>
+
childStories);?>
+
+ lastEditedDate); + echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary'); + echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); + ?> +
+
+
-
- story->legendSpec;?> -
spec;?>
-
-
- story->verify;?> -
verify;?>
-
-
- story->comment;?> -
- +
+
+
+
story->legendBasicInfo;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + status != 'draft'):?> + + + + + + + + + + + + + + + + + + + + + +
story->product;?> +
+ product, "onchange='loadProduct(this.value);' class='form-control chosen'");?> + type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?> +
+
story->module;?> +
+ module, "class='form-control chosen'"); + if(count($moduleOptionMenu) == 1) + { + echo ""; + echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story¤tModuleID=0&branch=$story->branch"), $lang->tree->manage, '_blank'); + echo '  '; + echo html::a("javascript:loadProductModules($story->product)", $lang->refresh); + echo ''; + } + ?> +
+
story->plan;?> +
+ session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?> + plan, "class='form-control chosen'" . ($multiple ? ' multiple' : '')); + if(count($plans) == 1) + { + echo ""; + echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch"), $lang->productplan->create, '_blank'); + echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh); + echo ''; + } + ?> +
+
story->source;?>story->sourceList, $story->source, "class='form-control chosen'");?>
story->sourceNote;?>sourceNote, "class='form-control' autocomplete='off'");?> +
story->status;?>story->statusList[$story->status];?>
story->stage;?>story->stageList, $story->stage, "class='form-control chosen'");?>
story->pri;?>story->priList, $story->pri, "class='form-control chosen'");?>
story->estimate;?>estimate, "class='form-control' autocomplete='off'");?>
story->keywords;?>keywords, "class='form-control' autocomplete='off'");?>
story->mailto;?> + mailto), "class='form-control' multiple");?> + fetch('my', 'buildContactLists')?> +
+
+
+
story->legendLifeTime;?>
+ + + + + + + + + + reviewedBy):?> + + + + + + status == 'closed'):?> + + + + + + + + + +
story->openedBy;?>openedBy];?>
story->assignedTo;?>assignedTo, 'class="form-control chosen"');?>
story->reviewedBy;?>reviewedBy), 'class="form-control chosen" multiple');?>
story->closedBy;?>closedBy, 'class="form-control chosen"');?>
story->closedReason;?>story->reasonList, $story->closedReason, "class='form-control' onchange='setStory(this.value)'");?>
+
+ +
+
story->legendMisc;?>
+ + status == 'closed'):?> + + + + + + + + + + status == 'closed'):?> + + + + + +
story->duplicateStory;?>duplicateStory, "class='form-control' autocomplete='off'");?>
story->linkStories;?> + createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> + linkStories):?> +
    + linkStories); + foreach($linkStories as $linkStoryID) + { + if(isset($story->extraStories[$linkStoryID])) + { + echo '
  • '; + echo html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID], '_blank'); + echo html::a("javascript:unlinkStory($story->id, \"linkStories\", $linkStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); + echo '
    • '; + } + } + ?> +
+ +
story->childStories;?> + createLink('story', 'linkStory', "storyID=$story->id&type=childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> +
    + childStories); + foreach($childStories as $childStoryID) + { + if(isset($story->extraStories[$childStoryID])) + { + echo '
  • '; + echo html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID" . $story->extraStories[$childStoryID], '_blank'); + echo html::a("javascript:unlinkStory($story->id, \"childStories\", $childStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); + echo '
    • '; + } + } + ?> +
+
+
-
-
linkStories);?>
-
childStories);?>
-
- lastEditedDate); - echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary'); - echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); - ?>
-
-
-
-
-
- story->legendBasicInfo;?> - - - - - - - - - - - - - - - - - - - - - - - - - - status != 'draft'):?> - - - - - - - - - - - - - - - - - - - - - -
story->product;?> -
- product, "onchange='loadProduct(this.value);' class='form-control chosen'");?> - type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?> -
-
story->module;?> -
- module, "class='form-control chosen'"); - if(count($moduleOptionMenu) == 1) - { - echo ""; - echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story¤tModuleID=0&branch=$story->branch"), $lang->tree->manage, '_blank'); - echo '  '; - echo html::a("javascript:loadProductModules($story->product)", $lang->refresh); - echo ''; - } - ?> -
-
story->plan;?> -
- session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?> - plan, "class='form-control chosen'" . ($multiple ? ' multiple' : '')); - if(count($plans) == 1) - { - echo ""; - echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch"), $lang->productplan->create, '_blank'); - echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh); - echo ''; - } - ?> -
-
story->source;?>story->sourceList, $story->source, "class='form-control chosen'");?>
story->sourceNote;?>sourceNote, "class='form-control' autocomplete='off'");?> -
story->status;?>story->statusList[$story->status];?>
story->stage;?>story->stageList, $story->stage, "class='form-control chosen'");?>
story->pri;?>story->priList, $story->pri, "class='form-control chosen'");?>
story->estimate;?>estimate, "class='form-control' autocomplete='off'");?>
story->keywords;?>keywords, "class='form-control' autocomplete='off'");?>
story->mailto;?> - mailto), "class='form-control' multiple");?> - fetch('my', 'buildContactLists')?> -
-
-
- story->legendLifeTime;?> - - - - - - - - - - reviewedBy):?> - - - - - - status == 'closed'):?> - - - - - - - - - -
story->openedBy;?>openedBy];?>
story->assignedTo;?>assignedTo, 'class="form-control chosen"');?>
story->reviewedBy;?>reviewedBy), 'class="form-control chosen" multiple');?>
story->closedBy;?>closedBy, 'class="form-control chosen"');?>
story->closedReason;?>story->reasonList, $story->closedReason, "class='form-control' onchange='setStory(this.value)'");?>
-
- -
- story->legendMisc;?> - - status == 'closed'):?> - - - - - - - - - - status == 'closed'):?> - - - - - -
story->duplicateStory;?>duplicateStory, "class='form-control' autocomplete='off'");?>
story->linkStories;?> - createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> -
    - linkStories); - foreach($linkStories as $linkStoryID) - { - if(isset($story->extraStories[$linkStoryID])) - { - echo '
  • '; - echo html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID], '_blank'); - echo html::a("javascript:unlinkStory($story->id, \"linkStories\", $linkStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); - echo '
    • '; - } - } - ?> -
-
story->childStories;?> - createLink('story', 'linkStory', "storyID=$story->id&type=childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> -
    - childStories); - foreach($childStories as $childStoryID) - { - if(isset($story->extraStories[$childStoryID])) - { - echo '
  • '; - echo html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID" . $story->extraStories[$childStoryID], '_blank'); - echo html::a("javascript:unlinkStory($story->id, \"childStories\", $childStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); - echo '
    • '; - } - } - ?> -
-
-
-
-
-
- +
diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css index 655a1401aa..dfd2b0a558 100644 --- a/module/user/css/batchcreate.css +++ b/module/user/css/batchcreate.css @@ -1 +1,2 @@ .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important} +th.required:after {position: relative; right: 10px;} diff --git a/module/user/css/batchedit.css b/module/user/css/batchedit.css index 655a1401aa..dfd2b0a558 100644 --- a/module/user/css/batchedit.css +++ b/module/user/css/batchedit.css @@ -1 +1,2 @@ .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important} +th.required:after {position: relative; right: 10px;} diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 9065295a57..3a7a5b0c93 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -11,98 +11,103 @@ */ ?> - -
-
- icons['user']);?> - icons['batchCreate']);?> user->batchCreate;?> -
- +
+
+

user->batchCreate;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchCreateFields')?> +
-
- 5) ? 'w-150px' : ''; -?> -
- - - - - - - - - - - - - - - - - - - - - - - + 5) ? 'w-150px' : ''; + ?> + +
idAB;?>'>user->dept;?>user->account;?> user->realname;?> user->role;?> user->group;?>'>user->email;?>'>user->gender;?>user->password;?> '>user->commiter;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'>user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + $lang->user->ditto)?> + user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?> + $lang->user->ditto)?> + user->batchCreate; $i++):?> + + + + + + + + + + + + + + + + + + + + + - - $lang->user->ditto)?> - user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?> - $lang->user->ditto)?> - user->batchCreate; $i++):?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>'>user->dept;?>user->account;?>user->realname;?>user->role;?>user->group;?>'>user->email;?>'>user->gender;?>user->password;?>'>user->commiter;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'>user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
' style='overflow:visible'> 0 ? 'ditto' : $deptID, "class='form-control chosen'");?>user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control chosen'");?>>>user->genderList, 'm');?> +
+ 0 ? "checked" : '') . " /> {$lang->user->ditto}"; + ?> +
+ 		'>'> '> '> '> '> '>'> '> '> '>
' style='overflow:visible'> 0 ? 'ditto' : $deptID, "class='form-control chosen'");?>user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control chosen'");?>>>user->genderList, 'm');?> -
- 0 ? "checked" : '') . " /> {$lang->user->ditto}"; - ?> -
- - 		'>'> '> '> '> '> '>'> '> '> '>
user->verifyPassword?> -
- - user->placeholder->verify}'");?> -
-
+ + + user->verifyPassword?> + +
+ + user->placeholder->verify}'");?> + + + + + + + save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?> + + + + + +
-createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchCreateFields')?> - diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index ee2624613e..35724b4248 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -11,90 +11,95 @@ */ ?> - -
-
- icons['user']);?> - icons['batchEdit']);?> user->batchEdit;?> -
- +
+
+

user->batchEdit;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchEditFields')?> +
-
- 7) ? 'w-120px' : ''; -?> -
- - - - - - - - - - - - - - - - - - - - + 7) ? 'w-120px' : ''; + ?> + +
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
+ + + + + + + + + + + + + + + + + + + + + + + $lang->user->ditto) + $depts;?> + user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> + + + dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); + $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); + $first = false; + ?> + + + + + + + + + + + + + + + + + + - - $lang->user->ditto) + $depts;?> - user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> - - - dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); - $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); - $first = false; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
user->verifyPassword?> -
- - - user->placeholder->verify}'");?> -
-
+ + + user->verifyPassword?> + +
+ + + user->placeholder->verify}'");?> + + + + + + + save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?> + + + + + +
-createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchEditFields')?> - diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 3b77343dc3..bee9848e53 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -83,4 +83,7 @@ body.body-modal #mainMenu{margin-top:5px;} .fixedTfootAction.scrolled .pager .dropdown > a:hover, .fixedTfootAction.scrolled .pager > a:hover {background-color: #2e6dad} +.fixedTheadOfList {position: fixed; top: 0px; z-index:1000;} +.fixedTheadOfList > thead > tr > th {background-color: #2e6dad; border-bottom-color: #bbb; color: #dedede} + .search-list .list-group {max-height: 214px; height:auto !important;}