From 316ba36b9444953e4a7cfe0905c295012a860f43 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 16 May 2018 16:01:56 +0800 Subject: [PATCH] * adjust for bug-linkbugs page. --- module/bug/css/linkbugs.css | 2 +- module/bug/view/batchcreate.html.php | 2 +- module/bug/view/browse.html.php | 146 ++++++++++++++----------- module/bug/view/edit.html.php | 5 +- module/bug/view/linkbugs.html.php | 103 ++++++++--------- module/file/view/uploadimages.html.php | 27 +++-- module/search/view/buildform.html.php | 6 +- module/story/view/batchcreate.html.php | 1 + module/testcase/css/linkcases.css | 2 +- www/theme/default/style.css | 1 + 10 files changed, 159 insertions(+), 136 deletions(-) diff --git a/module/bug/css/linkbugs.css b/module/bug/css/linkbugs.css index c7e5a58b26..94b286b4eb 100644 --- a/module/bug/css/linkbugs.css +++ b/module/bug/css/linkbugs.css @@ -1 +1 @@ -#linkBugsForm {min-height: 300px} +#mainContent {min-height: 300px} diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 6942d5687d..b6e8d1b501 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -19,7 +19,7 @@
createLink('file', 'uploadImages', 'module=bug¶ms=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?> - pasteText, "data-toggle='importLinesModal'", 'btn btn-info')?> + createLink('custom', 'ajaxSaveCustomFields', 'module=bug§ion=custom&key=batchCreateFields')?>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index edd10051ec..43d7823737 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -255,44 +255,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : $class; if($misc) echo "
  • " . html::a('javascript:;', $lang->bug->activate, '', $misc) . "
    • "; - if(common::hasPriv('bug', 'batchChangeBranch') and $this->session->currentProductType != 'normal') - { - $withSearch = count($branches) > 8; - echo "
  • "; - echo html::a('javascript:;', $lang->product->branchName[$this->session->currentProductType], '', "id='branchItem'"); - echo "
    "; - echo "
      "; - foreach($branches as $branchID => $branchName) - { - $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID"); - echo "
    • " . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
      • "; - } - echo '
    '; - if($withSearch) echo "
    "; - echo '
    • '; - } - - if(common::hasPriv('bug', 'batchChangeModule')) - { - $withSearch = count($modules) > 8; - echo "
  • "; - echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'"); - echo "
    "; - echo '
      '; - foreach($modules as $moduleId => $module) - { - $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId"); - echo "
    • " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "
      • "; - } - echo "
    "; - if($withSearch) echo "
    "; - echo '
    • '; - } - else - { - echo '
  • ' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '
    • '; - } - $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : ''; if($misc) { @@ -330,37 +292,89 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow } echo ''; } - else - { - echo "
  • " . html::a('javascript:;', $lang->bug->resolve, '', $class); - } - - $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); - if($canBatchAssignTo && count($bugs)) - { - $withSearch = count($memberPairs) > 10; - $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); - echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); - echo "
  • "; - echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"'); - echo "
    "; - echo '
      '; - foreach ($memberPairs as $key => $value) - { - if(empty($key)) continue; - echo "
    • " . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', '') . '
      • '; - } - echo "
    "; - if($withSearch) echo "
    "; - echo "
    • "; - } - else - { - echo "
  • " . html::a('javascript:;', $lang->bug->assignedTo, '', $class); - } ?> + session->currentProductType != 'normal'):?> +
    + + 8;?> + +
    +
    + + + +
    + +
    + +
    + $branchName) + { + $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID"); + echo html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'"); + } + ?> +
    +
    +
    + + +
    + + 8;?> + +
    +
    + + + +
    + +
    + +
    + $module) + { + $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId"); + echo html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\" data-key='$moduleID'"); + } + ?> +
    +
    +
    + + +
    + + 10;?> + +
    +
    + + + +
    + +
    + +
    + createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); + echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); + foreach ($memberPairs as $key => $value) + { + if(empty($key)) continue; + echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', "data-key='$key'"); + } + ?> +
    +
    +
    +
    show('right', 'pagerjs');?>
    diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 76cf0449ff..43086c9240 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -264,8 +264,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->linkBug;?> + createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> + + + - createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?>
      linkBugTitles)) diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php index caa7b26cdb..e715e7f264 100644 --- a/module/bug/view/linkbugs.html.php +++ b/module/bug/view/linkbugs.html.php @@ -11,65 +11,66 @@ */ ?> -
      -
      -
      - icons['bug']);?> id;?> - createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?> - bug->linkBugs;?> icons['link']);?> -
      -
      +
      +
      +

      + id;?> + createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?> + arrow . $lang->bug->linkBugs;?> +

      -
      - - +
      + + +
      - - - - - - - - - + + + + + + + + + - - - createLink('bug', 'view', "bugID=$bug2Link->id");?> - - - - - - - - - - - + + + createLink('bug', 'view', "bugID=$bug2Link->id");?> + + + + + + + + + + + - - - - - - - - -
      idAB;?>priAB;?>bug->product;?>bug->title;?>bug->statusAB;?>openedByAB;?>assignedToAB;?>
      +
      + +
      + idAB;?> +       		priAB;?>bug->product;?>bug->title;?>bug->statusAB;?>openedByAB;?>assignedToAB;?>
      - - id));?> - bug->priList, $bug2Link->pri, $bug2Link->pri)?>'>bug->priList, $bug2Link->pri, $bug2Link->pri);?>createLink('product', 'browse', "productID=$bug2Link->product&branch=$bug2Link->branch"), $products[$bug2Link->product], '_blank');?>title);?>bug->statusList[$bug->status];?>openedBy];?>assignedTo];?>
      +
      + + +
      + id);?> +       		pri?>'>bug->priList, $bug2Link->pri, $bug2Link->pri);?>createLink('product', 'browse', "productID=$bug2Link->product&branch=$bug2Link->branch"), $products[$bug2Link->product], '_blank');?>title);?>bug->statusList, $bug->status, '');?>openedBy);?>assignedTo);?>
      -
      - -
      -
      +
      +
      +
      + id);?> +
      +
      - diff --git a/module/file/view/uploadimages.html.php b/module/file/view/uploadimages.html.php index 40ece425a3..a1c12ddde9 100644 --- a/module/file/view/uploadimages.html.php +++ b/module/file/view/uploadimages.html.php @@ -22,18 +22,23 @@ js::set('uid', $uid); #uploader{padding: 20px;} #uploader > span{display:block; margin-bottom:10px; color: #29a8cd;} -
      '> -
      -
      - +
      +
      +

      file->uploadImages;?>

      -
      -
      - lang->file->uploadImagesExplain?> -
      -
      - - +
      '> +
      +
      + +
      +
      +
      + lang->file->uploadImagesExplain?> +
      +
      + + +