From 74f68f5d1f57247cd3d2f9eddca24398a114abd9 Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Tue, 18 Jul 2017 13:29:29 +0800 Subject: [PATCH 01/13] * Finish task #3067. --- module/release/css/view.css | 6 ++ module/release/view/view.html.php | 125 +++++++++++++++--------------- 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/module/release/css/view.css b/module/release/css/view.css index f791e86b18..cb46e0d642 100644 --- a/module/release/css/view.css +++ b/module/release/css/view.css @@ -6,3 +6,9 @@ .tabs .tab-content .tab-pane #querybox form{padding-left:0px;} .table-actions {padding-left: 5px;} + +#releaseInfo {border-top: 1px solid #ddd;} +#releaseInfo > div {padding-top: 15px;} + +#querybox form {margin: 0px !important;} +#moreOrLite {right: 0px !important;} diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index d55c6f2123..95525390ad 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -69,6 +69,7 @@
  • >icons['bug'], 'green') . ' ' . $lang->release->bugs;?>
  • >icons['bug'], 'red') . ' ' . $lang->release->generatedBugs;?>
    • +
  • >icons['plan'], 'blue') . ' ' . $lang->release->view;?>
    • config->global->flow != 'onlyStory' and ($countBugs or $countLeftBugs))):?>
    • @@ -251,71 +252,73 @@ + +
    ' id='releaseInfo'> +
    +
    + release->desc;?> +
    desc;?>
    +
    +
    + release->basicInfo?> + + + + + + productType != 'normal'):?> + + + + + + + + + + + + + + + + + + + + + +
    release->product;?>productName;?>
    product->branch;?>
    release->name;?>name;?>
    release->build;?> + project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?> +
    release->status;?>release->statusList[$release->status];?>
    release->date;?>date;?>
    +
    +
    + files?> +
    + files) + { + echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false')); + } + elseif($release->filePath) + { + echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank'); + } + elseif($release->scmPath) + { + echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank'); + } + ?> +
    +
    + +
    +
    + -
    -
    -
    - release->desc;?> -
    desc;?>
    -
    -
    - release->basicInfo?> - - - - - - productType != 'normal'):?> - - - - - - - - - - - - - - - - - - - - - -
    release->product;?>productName;?>
    product->branch;?>
    release->name;?>name;?>
    release->build;?> - project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?> -
    release->status;?>release->statusList[$release->status];?>
    release->date;?>date;?>
    -
    -
    - files?> -
    - files) - { - echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false')); - } - elseif($release->filePath) - { - echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank'); - } - elseif($release->scmPath) - { - echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank'); - } - ?> -
    -
    - -
    -