From bb4db397d147c1e5aa980e6eff75953635715147 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 10:36:26 +0800 Subject: [PATCH 1/4] * removed popover frome productplan list. --- module/productplan/css/browse.css | 4 +--- module/productplan/js/browse.js | 4 ---- module/productplan/view/browse.html.php | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 module/productplan/js/browse.js diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css index c35493e2c8..dc42081a24 100644 --- a/module/productplan/css/browse.css +++ b/module/productplan/css/browse.css @@ -1,4 +1,2 @@ #productplan tbody > tr > td{border-right:1px solid #E4E4E4;} -.popover {max-width: 500px;} -.popover-content .article-content {max-width: 500px; overflow: hidden; max-height: 150px} -.table td .article-content {max-height: 20px; overflow: hidden; padding: 0} +.table td .article-content {padding: 0} diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js deleted file mode 100644 index 6d3ce83fb1..0000000000 --- a/module/productplan/js/browse.js +++ /dev/null @@ -1,4 +0,0 @@ -$(function() -{ - $('[data-toggle="popover"]').popover({container: 'body', placement: 'top', html: true, trigger: 'hover'}); -}); diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 3a735572c9..dd609ecf31 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -35,7 +35,7 @@ id;?> id"), $plan->title);?> -
desc;?>
+
desc;?>
begin;?> end;?> From a84ef67f6def781e90fad23f04d8e489d1f6f468 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 10:37:15 +0800 Subject: [PATCH 2/4] * ajusted grid layout. * ajusted style of treeview. --- module/bug/view/edit.html.php | 6 +++--- module/bug/view/view.html.php | 6 +++--- module/build/view/view.html.php | 6 +++--- module/doc/view/view.html.php | 6 +++--- module/my/view/index.html.php | 14 +++++++------- module/product/view/view.html.php | 6 +++--- module/project/view/view.html.php | 6 +++--- module/release/view/view.html.php | 6 +++--- module/story/lang/zh-cn.php | 1 + module/story/view/edit.html.php | 6 +++--- module/task/view/edit.html.php | 6 +++--- module/task/view/view.html.php | 6 +++--- module/testcase/view/edit.html.php | 6 +++--- module/testcase/view/view.html.php | 6 +++--- module/testtask/view/view.html.php | 6 +++--- module/tree/view/browse.html.php | 4 ++-- module/tree/view/browsetask.html.php | 4 ++-- www/theme/default/treeview.css | 6 +++--- 18 files changed, 54 insertions(+), 53 deletions(-) diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 4bb4bc8112..fe3e9e9f23 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -39,8 +39,8 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); save)?> -
-
+
+
title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?> @@ -67,7 +67,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
-
+
bug->legendBasicInfo;?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index a95d2e291c..b9b6240d34 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -63,8 +63,8 @@
-
-
+
+
bug->legendSteps;?> @@ -84,7 +84,7 @@
-
+
    diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 942c6d2769..20ad5ccbf6 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -20,8 +20,8 @@
-
-
+
+
build->desc;?> @@ -123,7 +123,7 @@
-
+
build->basicInfo?> diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 7b816bb8ad..a3deb486f6 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -45,8 +45,8 @@ ?>
-
-
+
+
doc->digest;?> @@ -75,7 +75,7 @@
deleted) echo $actionLinks;?>
-
+
doc->basicInfo;?> diff --git a/module/my/view/index.html.php b/module/my/view/index.html.php index 724813c96d..59b05c5a86 100644 --- a/module/my/view/index.html.php +++ b/module/my/view/index.html.php @@ -22,28 +22,28 @@
-
+
user->role and strpos('qa|qd', $app->user->role) !== false):?> -
+
-
+
user->role and strpos('po|pd', $app->user->role) !== false):?> -
+
-
+
-
+
-
+
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 51a702e4cc..32435e6442 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -45,8 +45,8 @@ ?>
-
-
+
+
product->desc;?> @@ -56,7 +56,7 @@
deleted) echo $actionLinks;?>
-
+
product->basicInfo?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 84c4167bc1..edcb3d7c23 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -51,8 +51,8 @@ ?>
-
-
+
+
project->desc;?> @@ -62,7 +62,7 @@
deleted) echo $actionLinks;?>
-
+
project->basicInfo?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 15a56fbe83..907131fe28 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -46,8 +46,8 @@ ?>
-
-
+
+
release->desc;?> @@ -162,7 +162,7 @@
-
+
release->basicInfo?> diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 6da420eb37..d3f3f3e898 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -24,6 +24,7 @@ $lang->story->batchClose = '批量关闭'; $lang->story->activate = '激活'; $lang->story->delete = "删除"; $lang->story->view = "需求详情"; +$lang->story->legend = "相关"; $lang->story->tasks = "相关任务"; $lang->story->taskCount = '任务数'; $lang->story->bugs = "Bug"; diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index ac877e428b..894f9e91ec 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -22,8 +22,8 @@ save)?>
-
-
+
+
story->legendSpec;?> @@ -48,7 +48,7 @@
-
+
story->legendBasicInfo;?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 9cda0c541c..9a37a1e7fa 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -28,8 +28,8 @@ save)?>
-
-
+
+
name, 'class="form-control" placeholder="' . $lang->task->name . '"');?> @@ -54,7 +54,7 @@
-
+
task->legendBasic;?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index e040d33806..91cce60d59 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -62,8 +62,8 @@ ?>
-
-
+
+
task->legendDesc;?> @@ -81,7 +81,7 @@
-
+
task->legendBasic;?> diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 4522b5a3c0..773e0dd817 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -27,8 +27,8 @@ save)?>
-
-
+
+
title, 'class="form-control" placeholder="' . $lang->case->title . '"');?> @@ -83,7 +83,7 @@
-
+
testcase->legendBasicInfo;?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index a8f6b124f5..a9a7c109e8 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -72,8 +72,8 @@
-
-
+
+
testcase->precondition;?> @@ -115,7 +115,7 @@
-
+
testcase->legendBasicInfo;?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index 920b50534c..99c7ec01ce 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -50,8 +50,8 @@ ?>
-
-
+
+
testtask->legendDesc;?> @@ -65,7 +65,7 @@
-
+
testtask->legendBasicInfo;?> diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 455107f785..b766a62aaf 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -16,7 +16,7 @@
tree->common;?>
-
+
id}&viewType=$viewType");?>'>
@@ -31,7 +31,7 @@
-
+
id}&viewType=$viewType");?>'>
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index ceb2811222..eff66f494f 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -16,7 +16,7 @@
tree->common;?>
-
+
id}&viewType=task");?>'>
@@ -31,7 +31,7 @@
-
+
id}&viewType=task");?>'>
diff --git a/www/theme/default/treeview.css b/www/theme/default/treeview.css index d320e17c6f..b1f2121df0 100644 --- a/www/theme/default/treeview.css +++ b/www/theme/default/treeview.css @@ -1,8 +1,8 @@ /*treeview*/ -.treeview .hitarea {position: absolute; left: 15px; top: 10px; background-color: #fff; cursor: pointer;} -.treeview > li > .hitarea {left: -1px; top: -1px;} +.treeview .hitarea {position: absolute; left: 15px; top: 5px; background-color: #fff; cursor: pointer;} +.treeview > li > .hitarea {left: -1px; top: 0px;} .treeview .hitarea:before {color: #999; content: '\e6f1'; font-family: ZenIcon; transition:all 0.3s; font-size: 14px} .treeview li:hover .hitarea:before {color: #2973EA;} .treeview .hitarea.collapsable-hitarea:before {content: '\e6f2';} -.treeview .form-control {padding: 1px 2px; height: 22px; display: inline-block;} +.treeview .form-control, .treeview input[type='text'] {padding: 1px 2px; height: 20px; display: inline-block;} From 2e632c9b74d9e3c5249c49c81bb0560a147a4352 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 10:44:37 +0800 Subject: [PATCH 3/4] * fixed display of story id. * fixed style of columns. --- module/story/view/view.html.php | 81 +++++++++++++++++++-------------- www/theme/default/style.css | 16 +++++-- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 6cf9d71707..0cb55490b1 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -14,7 +14,7 @@
- icons['story']);?> id;?> + icons['story']);?> id;?> title;?> version > 1):?> @@ -227,43 +227,56 @@
-
    -
  • story->legendBugs?>
    • -
  • -
      - id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " {$lang->story->legendFromBug}"; - ?> - -
    • story->legendCases?>
      • -
    • -
        - id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . ''; - } - ?> -
      -
      • -
    • story->legendLinkStories?>
      • -
    • -
        + + + + + + + + + + + + + +
        story->legendBugs;?> +
          linkStories) ; - foreach($linkStories as $linkStoryID) + if(!empty($fromBug)) echo "
        • " . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " {$lang->story->legendFromBug}
          • "; + ?> + extraStories[$linkStoryID])) echo '
        • ' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '
          • '; - } - $childStories = explode(',', $story->childStories) ; - foreach($childStories as $childStoryID) - { - if(isset($story->extraStories[$childStoryID])) echo '
        • ' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " {$lang->story->legendChildStories}
          • "; + echo "
        • " . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '
          • '; } ?> -
        - - + +
        story->legendCases;?> +
          + id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . ''; + } + ?> +
        +
        story->legendLinkStories;?> +
          + linkStories) ; + foreach($linkStories as $linkStoryID) + { + if(isset($story->extraStories[$linkStoryID])) echo '
        • ' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '
          • '; + } + $childStories = explode(',', $story->childStories) ; + foreach($childStories as $childStoryID) + { + if(isset($story->extraStories[$childStoryID])) echo '
        • ' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " {$lang->story->legendChildStories}
          • "; + } + ?> +
        +
diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 47b184952f..2fba431beb 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -40,7 +40,13 @@ tr.text-center > td, tr.text-center > th {text-align: center;} tr.text-center > td.text-left, tr.text-center > th.text-left {text-align: left;} tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: right;} -tr.text-top td {vertical-align: top!important;} +tr.text-top td, tr.text-top th {vertical-align: top!important;} + +/* columns */ +.row-table {display: table; width: 100%} +.col-side, .col-main {padding: 0; display: table-cell; vertical-align: top;} +.col-side {width: 350px; padding-left: 10px;} +.col-main {padding-right: 10px;} /* === Components === */ /* remove outline of links */ @@ -222,7 +228,7 @@ fieldset > .form-group {margin-bottom: 0;} .form-condensed .chosen-container-multi .chosen-choices li.search-field {margin-bottom: 4px;} .form-condensed .table-fixed .form-control {padding: 5px 6px} .form-condensed .table-fixed select.form-control {padding: 5px} -.form-condensed .chosen-container {font-size: 12px} +.form-condensed .chosen-container {font-size: 13px} .form-condensed .chosen-container-single .chosen-single {padding: 5px 10px} .form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px} .form-condensed .chosen-container-single .chosen-search:before {top: 10px} @@ -524,7 +530,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #_pageID, #goto {display: none} /* modal */ -.modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)} +.modal .modal-dialog {border: 8px solid #666; border-color: rgba(0,0,0,.25)} .modal-title {font-size: 14px;} /* modal with iframe */ @@ -543,6 +549,8 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .body-modal #titlebar .actions {right: 40px} .body-modal .outer, .body-modal #wrap{padding: 0!important; margin: 0!important;} +.body-modal .row-table {padding: 20px} + .modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;} .modal-dialog.fullscreen .modal-body iframe {height: 100%} @@ -557,7 +565,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .tree {padding: 0; margin: 0;} .tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;} .tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 6px;} -.tree > li > ul li {padding: 6px 15px 0; margin: 0;} +.tree > li > ul li {padding: 6px 5px 0 15px; margin: 0;} .tree li:before {display: inline-block; margin-right: 6px; position: relative; top: 0; left: 0; content: ' '; width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px} .tree > li ul {border-left: 1px dotted #aaa; margin-left: 3px; font-weight: normal;} .tree > li ul > li:before {margin-right: 4px;} From 51c38b382df4daf5f18cacc9d217b5d9f5be5e58 Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 2 May 2014 10:48:40 +0800 Subject: [PATCH 4/4] * removed function 'condensedFrom' from my.js. --- www/js/my.full.js | 15 --------------- www/theme/default/style.css | 1 - 2 files changed, 16 deletions(-) diff --git a/www/js/my.full.js b/www/js/my.full.js index e35798d130..ac1809c9a1 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1050,27 +1050,12 @@ function setTableBehavior() $('#wrap .outer > .table, #wrap .outer > form > .table, #wrap .outer > .mian > .table, #wrap .outer > .mian > form > .table, #wrap .outer > .container > .table').not('.table-data, .table-form').addClass('table table-condensed table-hover table-striped tablesorter'); } -/** - * Make form condensed - * - * @access public - * @return void - */ -function condensedForm() -{ - $('.form-condensed legend').click(function() - { - $(this).closest('fieldset').toggleClass('collapsed'); - }); -} - /* Ping the server every some minutes to keep the session. */ needPing = true; /* When body's ready, execute these. */ $(document).ready(function() { - condensedForm(); setModal(); setTableBehavior(); setForm(); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 2fba431beb..904df220ae 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -176,7 +176,6 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable /* fieldset */ fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;} fieldset.fieldset-pure {background: none; padding: 0; border: none; padding-top: 5px;} -fieldset.collapsed {border: none} fieldset > legend {width: auto; margin: 0 0 0 -5px; font-size: 13px; font-weight: bold; border-bottom: none; padding: 0 5px} fieldset > .form-group {margin-bottom: 0;}