From 1ff011f6419724c0d5c90bfdca7f268d7c0a7e25 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 25 Mar 2014 19:57:12 +0800 Subject: [PATCH] * ajusted views of module 'project'. --- module/product/view/view.html.php | 2 +- module/productplan/view/view.html.php | 2 +- module/project/view/view.html.php | 2 +- module/release/view/view.html.php | 2 +- module/task/css/create.css | 5 +- module/task/css/edit.css | 3 - module/task/js/create.js | 7 +- module/task/lang/zh-cn.php | 1 + module/task/view/assignto.html.php | 30 +++-- module/task/view/cancel.html.php | 21 ++- module/task/view/close.html.php | 21 ++- module/task/view/create.html.php | 165 ++++++++++++----------- module/task/view/edit.html.php | 157 ++++++++++----------- module/task/view/finish.html.php | 35 +++-- module/task/view/recordestimate.html.php | 67 +++++---- module/task/view/start.html.php | 32 +++-- module/task/view/view.html.php | 165 ++++++++++++----------- www/js/my.full.js | 14 +- www/theme/default/style.css | 15 ++- 19 files changed, 412 insertions(+), 334 deletions(-) diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 5faaed43e2..7673d27b76 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -16,7 +16,7 @@ icons['product']) . ' #' . $product->id;?> name;?> deleted):?> - product->deleted;?> + product->deleted;?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index da121588b9..39af20de01 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -19,7 +19,7 @@ icons['plan']) . ' #' . $plan->id;?> title;?> deleted):?> - plan->deleted;?> + plan->deleted;?>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 6299c89cc6..2a9250c4be 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -16,7 +16,7 @@ icons['project']) . ' #' . $project->id;?> name;?> deleted):?> - project->deleted;?> + project->deleted;?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 70ef9b41b7..a93bfcc26f 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -16,7 +16,7 @@ icons['release']) . ' #' . $release->id;?> name;?> deleted):?> - release->deleted;?> + release->deleted;?>
diff --git a/module/task/css/create.css b/module/task/css/create.css index 2da40a3fb5..10010701ab 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1,4 +1 @@ -.button-c {padding:2px} -#mailto {width:90.5%} -#preview{line-height: 24px;position: relative;top: -10px;+top:0;} -caption .f-right a{color:red} +#preview, #copyButton{line-height: 30px; position: relative; left: 10px} diff --git a/module/task/css/edit.css b/module/task/css/edit.css index df6266076f..e69de29bb2 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -1,3 +0,0 @@ -select.select-1,#module,#mailto {width:220px} -.text-1 {width:213px} -#estStarted,#realStarted,#deadline {width:190px} diff --git a/module/task/js/create.js b/module/task/js/create.js index 6df7fe95f0..750306af33 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -41,8 +41,6 @@ function setPreview() $('#copyButton').removeClass('hidden'); } - $("#preview").colorbox({width:960, height:550, iframe:true, transition:'none', scrolling:true}); - setAfter(); } @@ -99,7 +97,8 @@ function setStories(moduleID, projectID) $(document).ready(function() { + var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSoomeOptions}; setPreview(); - $("#story").chosen({no_results_text: noResultsMatch}); - $("#mailto").chosen({no_results_text: noResultsMatch}); + $("#story").chosen(options); + $("#mailto").chosen(options); }); diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 2c8fdced7e..8c28a86bea 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -16,6 +16,7 @@ $lang->task->batchEdit = "批量编辑"; $lang->task->import = "导入之前未完任务"; $lang->task->edit = "编辑"; $lang->task->delete = "删除"; +$lang->task->deleted = "已删除"; $lang->task->view = "查看任务"; $lang->task->logEfforts = "记录工时"; $lang->task->record = "工时"; diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index bef74dfdde..b0b07d7433 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -12,25 +12,33 @@ ?> -
- - +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->assign;?> icons['assign']);?> +
+
+ +
name;?>
- - + + - - + + - - + + - +
task->assignedTo;?>task->assignedTo;?>
task->left;?>left, "class='text-3'") . $lang->task->hour;?>task->left;?>
left, "class='form-control'");?> task->hour;?>
comment;?>comment;?>
-
+
+ +
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php index 4ab31aabdf..79b45d0b5d 100644 --- a/module/task/view/cancel.html.php +++ b/module/task/view/cancel.html.php @@ -12,15 +12,24 @@ ?> -
- - +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->cancel;?> icons['cancel']);?> +
+
+ + +
name;?>
- - + +
comment;?>comment;?>
-
+
+ +
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php index 3a25b846ee..79bbe2e777 100644 --- a/module/task/view/close.html.php +++ b/module/task/view/close.html.php @@ -12,17 +12,26 @@ ?> -
- - +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->close;?> icons['close']);?> +
+
+ + +
name;?>
- - + +
comment;?>comment;?>
-
+
+ +
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 184cfc0257..26cc098d40 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -15,81 +15,92 @@ task->placeholder);?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
task->create;?>
task->project;?>name;?>
task->module;?>module, "class='select-3' onchange='setStories(this.value,$project->id)'");?>
task->assignedTo;?>assignedTo, "class='select-3 chosen'");?>
task->type;?>task->typeList, $task->type, 'class=select-3 onchange="setOwners(this.value)"');?>
task->story;?> - story, 'class=select-1 onchange=setPreview();');?> - preview;?> -
task->name;?> - name, "class='text-1'"); - echo html::commonButton($lang->task->copyStoryTitle, 'onclick=copyStoryTitle() id="copyButton"');?> -
task->desc;?>desc, "rows='7' class='area-1'");?>
task->pri;?>task->priList, $task->pri, 'class=select-3');?> -
task->estimate;?>estimate, "class='text-3'") . $lang->task->hour;?>
task->estStarted;?>estStarted, "class='text-3 date'");?>
task->deadline;?>deadline, "class='text-3 date'");?>
task->mailto;?> - mailto), 'multiple'); - if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\""); - ?> -
files;?>fetch('file', 'buildform');?>
task->afterSubmit;?>task->afterChoices, 'continueAdding');?>
- -
+
+
+
+ icons['task']);?> + task->create;?> +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
task->project;?>name;?>
task->module;?>module, "class='form-control' onchange='setStories(this.value,$project->id)'");?>
task->assignedTo;?>assignedTo, "class='form-control chosen'");?>
task->type;?>task->typeList, $task->type, 'class=form-control onchange="setOwners(this.value)"');?>
task->story;?> + story, 'class=form-control onchange=setPreview();');?> + preview;?>
task->name;?> + name, "class='form-control'");?> + task->copyStoryTitle;?>
task->desc;?>desc, "rows='7' class='form-control'");?>
task->pri;?>task->priList, $task->pri, 'class=form-control');?>
task->estimate;?> +
+ estimate, "class='form-control'")?> + task->hour;?> +
+
task->estStarted;?>estStarted, "class='form-control form-date'");?>
task->deadline;?>deadline, "class='form-control form-date'");?>
task->mailto;?> + mailto), "multiple class='form-control'"); + if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\""); + ?> +
files;?>fetch('file', 'buildform');?>
task->afterSubmit;?>task->afterChoices, 'continueAdding');?>
+ +
+
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 667a4ed6dc..e1deb807e2 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -17,141 +17,148 @@ story); ?> task->confirmChangeProject); ?> -
+
-
TASK #id . $lang->colon . html::input('name', $task->name, 'class="text-1"');?>
-
+
+ icons['task']) . ' #' . $task->id;?> + createLink('task', 'view', "taskID=$task->id"), $task->name);?> + icons['edit']) . ' ' . $lang->task->edit;?> +
+
+ save)?> +
- - - - - - - -
- - -
-
- task->desc;?> - desc, "rows='8' class='area-1'");?> -
-
- comment;?> - -
-
- files;?> - fetch('file', 'buildform');?> -
-
-
goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
+
+
+
+
+ name, 'class="form-control"');?> +
+
+ task->desc;?> + desc, "rows='8' class='area-1'");?> +
+
+ comment;?> + +
+
+ files;?> + fetch('file', 'buildform');?> +
+
+ save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?> +
-
+ + +
+
task->legendBasic;?> - +
- - + + - - + + - - + + - - + + - - + + - - + + - - + - - + +
task->project;?>project, 'class="select-1" onchange="loadAll(this.value)"');?>task->project;?>project, 'class="form-control" onchange="loadAll(this.value)"');?>
task->module;?>module, 'class="select-1" onchange="loadModuleRelated()"');?>task->module;?>module, 'class="form-control" onchange="loadModuleRelated()"');?>
task->story;?>story, 'class=select-1');?>task->story;?>story, 'class=form-control');?>
task->assignedTo;?>assignedTo, "class='select-1 chosen'");?>task->assignedTo;?>assignedTo, "class='form-control chosen'");?>
task->type;?>task->typeList, $task->type, 'class=select-1');?>task->type;?>task->typeList, $task->type, 'class=form-control');?>
task->status;?>task->statusList, $task->status, 'class=select-1');?>task->status;?>task->statusList, $task->status, 'class=form-control');?>
task->pri;?>task->priList, $task->pri, 'class=select-1');?> + task->pri;?>task->priList, $task->pri, 'class=form-control');?>
task->mailto;?>mailto), 'class="text-1" multiple');?>task->mailto;?>mailto), 'class="form-control" multiple');?>
task->legendEffort;?> - +
- - + + - - + + - - + + - - + + - + - - + +
task->estStarted;?>estStarted, "class='text-1 date'");?>task->estStarted;?>estStarted, "class='form-control form-date'");?>
task->realStarted;?>realStarted, "class='text-1 date'");?>task->realStarted;?>realStarted, "class='form-control form-date'");?>
task->deadline;?>deadline, "class='text-1 date'");?>task->deadline;?>deadline, "class='form-control form-date'");?>
task->estimate;?>estimate, "class='text-1'");?>task->estimate;?>estimate, "class='form-control'");?>
task->consumed;?>task->consumed;?> consumed . ' '; common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?>
task->left;?>left, "class='text-1'");?>task->left;?>left, "class='form-control'");?>
task->legendLife;?> - +
- + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
task->openedBy;?>task->openedBy;?> openedBy];?>
task->finishedBy;?>finishedBy, 'class=select-1');?>task->finishedBy;?>finishedBy, 'class=form-control');?>
task->finishedDate;?>finishedDate, 'class="text-1"');?>task->finishedDate;?>finishedDate, 'class="form-control"');?>
task->canceledBy;?>canceledBy, 'class="select-1"');?>task->canceledBy;?>canceledBy, 'class="form-control"');?>
task->canceledDate;?>canceledDate, 'class="text-1"');?>task->canceledDate;?>canceledDate, 'class="form-control"');?>
task->closedBy;?>closedBy, 'class="select-1"');?>task->closedBy;?>closedBy, 'class="form-control"');?>
task->closedReason;?>task->reasonList, $task->closedReason, 'class="select-1"');?>task->closedReason;?>task->reasonList, $task->closedReason, 'class="form-control"');?>
task->closedDate;?>closedDate, 'class="text-1"');?>task->closedDate;?>closedDate, 'class="form-control"');?>
-
+
+ + diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 6e5ff91835..d9f820963e 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -12,30 +12,39 @@ ?> -
- - + +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->finish;?> icons['finish']);?> +
+
+ +
name;?>
- - + + - - + + - - + + - - + + - +
task->consumed;?>consumed, "class='text-3'") . $lang->task->hour;?>task->consumed;?>
consumed, "class='form-control'");?> task->hour;?>
task->assignedTo;?>openedBy, "class='select-3 chosen'");?>task->assignedTo;?>openedBy, "class='form-control chosen'");?>
task->finishedDate;?>task->finishedDate;?>
comment;?>comment;?>
-
+
+ +
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index cc84366994..7a77c4b89b 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -13,17 +13,26 @@ task->confirmRecord);?> -
- - - - - - - - - - +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->logEfforts;?> icons['recordEstimate']);?> +
+
+ +
name;?>
idAB;?>task->date;?>task->consumedThisTime;?>task->leftThisTime;?>comment;?>actions;?>
+ + + + + + + + + + + @@ -35,31 +44,31 @@ status == 'wait' or $task->status == 'doing') { - common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', '', '', 'showinonlybody', true); - common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', '', 'hiddenwin', 'showinonlybody'); + common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true); + common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody'); } ?> -
idAB;?>task->date;?>task->consumedThisTime;?>task->leftThisTime;?>comment;?>actions;?>
id;?>
- status == 'wait' or $task->status == 'doing'):?> - - - - - - - - - + + status == 'wait' or $task->status == 'doing'):?> + + + + + + + + + - + - - - - + + + + diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index ef22e7466a..1f1600fa13 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -14,29 +14,35 @@ task->confirmFinish);?> - -
task->logEfforts;?>
idAB;?>task->date;?>task->consumedThisTime;?>task->leftThisTime;?>comment;?>
idAB;?>task->date;?>task->consumedThisTime;?>task->leftThisTime;?>comment;?>
- +
+
+ icons['task']) . ' #' . $task->id;;?> + createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> + task->start;?> icons['start']);?> +
+
+ +
name;?>
- - + + - - + + - - + + - - + + - +
task->realStarted;?>task->realStarted;?>
task->consumed;?>consumed, "class='text-2'") . $lang->task->hour;?>task->consumed;?>
consumed, "class='form-control'");?> task->hour;?>
task->left;?>left, "class='text-2'") . $lang->task->hour;?>task->left;?>
left, "class='form-control'");?> task->hour;?>
comment;?>comment;?>
-
+
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index d1b9ef4986..a90f99c19b 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -13,80 +13,85 @@
- id $task->name"; - if($task->fromBug != 0) $name .= "({$lang->task->fromBug}$lang->colon$task->fromBug)"; - ?> -
'>
-
- session->taskList != false ? $app->session->taskList : $this->createLink('project', 'browse', "projectID=$task->project"); - $actionLinks = ''; - if(!$task->deleted) - { - ob_start(); - common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); +
+ icons['task']) . ' #' . $task->id;?> + name;?> + deleted):?> + task->deleted;?> + + fromBug != 0):?> + icons['bug']) . " {$lang->task->fromBug}$lang->colon$task->fromBug"; ?> + +
+
+ session->taskList != false ? $app->session->taskList : $this->createLink('project', 'browse', "projectID=$task->project"); + $actionLinks = ''; + if(!$task->deleted) + { + ob_start(); + echo "
"; + common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); + common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); + common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe text-success', true); + common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); + echo '
'; - common::printDivider(); - common::printIcon('task', 'edit', "taskID=$task->id"); - common::printCommentIcon('task'); - common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", '', 'button', 'copy'); - common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", '', 'button', '', 'hiddenwin'); + echo "
"; + common::printIcon('task', 'edit', "taskID=$task->id"); + common::printCommentIcon('task'); + common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", '', 'button', 'copy'); + common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", '', 'button', '', 'hiddenwin'); + echo '
'; - common::printDivider(); - common::printRPN($browseLink, $preAndNext); + echo "
"; + common::printRPN($browseLink, $preAndNext); + echo '
'; - $actionLinks = ob_get_contents(); - ob_clean(); - echo $actionLinks; - } - else - { - common::printRPN($browseLink); - } - ?> + $actionLinks = ob_get_contents(); + ob_clean(); + echo $actionLinks; + } + else + { + common::printRPN($browseLink); + } + ?>
- - - - - - - -
+
+
+
task->legendDesc;?>
desc;?>
fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?> -
deleted) echo $actionLinks;?>
- -
+
deleted) echo $actionLinks;?>
+
+ comment;?> +
id&comment=true")?>'> +
+ +
+
+ + +
+
task->legendBasic;?> - +
- + - + - + - + - + - + - + - +
task->project;?>task->project;?> project", $project->name)) echo $project->name;?>
task->module;?>task->module;?>
task->story;?>task->story;?> storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle)) echo $task->storyTitle; @@ -120,40 +125,40 @@
task->assignedTo;?>task->assignedTo;?> assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : '';?>
task->type;?>task->type;?> task->typeList[$task->type];?>
task->status;?>task->status;?> show($lang->task->statusList, $task->status);?>
task->pri;?>task->pri;?> show($lang->task->priList, $task->pri);?>
task->mailto;?>task->mailto;?> mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?>
task->legendEffort;?> - +
- + - + - + - + - + - +
task->estStarted;?>task->estStarted;?> estStarted;?>
task->realStarted;?>task->realStarted;?> realStarted; ?>
task->deadline;?>task->deadline;?> deadline; @@ -162,50 +167,50 @@
task->estimate;?>task->estimate;?> estimate . $lang->workingHour;?>
task->consumed;?>task->consumed;?> consumed, 2) . $lang->workingHour;?>
task->left;?>task->left;?> left . $lang->workingHour;?>
task->legendLife;?> - +
- + - + - + - + - + - +
task->openedBy;?>task->openedBy;?> openedBy) echo $users[$task->openedBy] . $lang->at . $task->openedDate;?>
task->finishedBy;?>task->finishedBy;?> finishedBy) echo $users[$task->finishedBy] . $lang->at . $task->finishedDate;?>
task->canceledBy;?>task->canceledBy;?> canceledBy) echo $users[$task->canceledBy] . $lang->at . $task->canceledDate;?>
task->closedBy;?>task->closedBy;?> closedBy) echo $users[$task->closedBy] . $lang->at . $task->closedDate;?>
task->closedReason;?>task->closedReason;?> task->reasonList[$task->closedReason];?>
task->lastEdited;?>task->lastEdited;?> lastEditedBy) echo $users[$task->lastEditedBy] . $lang->at . $task->lastEditedDate;?>
-
+
+ + diff --git a/www/js/my.full.js b/www/js/my.full.js index 4e9f0a6bb8..f4fadfa4f5 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -847,15 +847,17 @@ function setModal() modal.removeClass('modal-loading'); if(options.height == 'auto') { - setTimeout(function() + try { - try + var $frame = $(window.frames[options.name].document); + if($frame.find('#titlebar').length) modal.addClass('with-titlebar'); + + setTimeout(function() { - var $frame = $(window.frames[options.name].document); modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 100); - } - catch(e){} - }, 100); + }, 100); + } + catch(e){} } } modal.modal('show'); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 2bda242089..8114bd6ebb 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -12,7 +12,7 @@ /* Width definitions */ .w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%} -.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px} +.w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px} .mw-200px {max-width:200px} .mw-400px {max-width:400px} .mw-500px {max-width:500px} .mw-600px {max-width:600px} .mw-700px {max-width:700px} .mw-800px {max-width:800px} .mw-900px {max-width:900px} .w-id {width:60px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px} @@ -57,7 +57,7 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ /* Datepicker */ .datepicker-wrapper {position: relative;} -.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 6px; color: #808080; font-size: 14px;} +.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 6px; color: #808080; font-size: 14px; top: 4px} .datepicker-wrapper > .form-control {padding-right: 30px;} .datepicker-wrapper.datepicker-date:before {content: '\e66c'} .datepicker-wrapper:hover:before {color: #145CCD} @@ -227,6 +227,8 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .form-condensed legend:before {font-family: ZenIcon; content: '\e6b8'; font-size: 14px; color: #999; display: inline-block; margin-right: 4px; -webkit-font-smoothing: antialiased;} .form-condensed legend:hover {color: #333;} .form-condensed fieldset.collapsed legend:before {content: '\e6bb'} +.form-condensed .chosen-container-single .chosen-single {padding: 4px 10px; height: 30px} +.form-condensed .chosen-container-single .chosen-single div {padding: 4px 10px} /* help in form */ .help-block {margin-bottom: 5px;} @@ -327,6 +329,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} #defaultMenu > ul > li, #moreMenu > ul > li,#searchResult > ul > li {display: block; float: none; margin: 0 -15px; padding: 2px 10px; border-bottom: 1px dashed #ddd;} #defaultMenu > ul > li:hover, #defaultMenu > .actions > a:hover, #moreMenu > ul > li:hover, #searchResult > ul > li:hover {background: #f1f1f1} #defaultMenu > ul > li > a, #moreMenu > ul > li > a, #searchResult > ul > li > a {line-height: 24px} +#moreMenu > ul > li > a {color: #808080} #defaultMenu > ul > li > a:hover, #moreMenu > ul > li > a:hover, #searchResult > ul > li > a:hover {background: none} #defaultMenu > .actions > a {display: block; text-align: right; margin: 0 -15px; padding-right: 15px; line-height: 30px} #searchResult.show-more #defaultMenu > ul > li, #defaultMenu > .actions > a {border-right: 1px solid #ddd} @@ -372,7 +375,6 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} #titlebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666; border-radius: 4px; margin-bottom: 5px;} #titlebar > .heading > .prefix > i {font-size: 28px; vertical-align: middle; color: #808080} #titlebar > .heading > strong {display: inline-block; vertical-align: middle; margin-right: 5px;} -#titlebar > .heading > small {color: #808080;} #titlebar > .heading > small > i {position: relative; top: 1px;} #titlebar .actions {position: absolute; right: 20px; top: 13px;} #titlebar .actions > .btn, #titlebar .actions > .btn-group {margin-left: 8px;} @@ -472,7 +474,14 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} /* modal with iframe */ .modal-iframe .modal-body {transition: all 0.5s; padding: 0} +.modal.with-titlebar .modal-header {position: relative; height: 0; padding: 0; border: none; z-index: 999; min-height: 0} +.modal.with-titlebar .modal-header .modal-body {z-index: 990} +.modal.with-titlebar .modal-header .modal-title {display: none} +.modal.with-titlebar .modal-header .close {position: absolute; right: 15px; top: 20px} .body-modal {padding-bottom: 0; overflow: hidden;} +.body-modal .outer > form {margin: 10px 5px 20px} +.body-modal .outer > .main {padding: 10px 20px; margin: 0} +.body-modal > form {padding-bottom: 15px;} /*-----------------------LAYOUT SETTING ----------------------------*/