diff --git a/module/mr/css/view.css b/module/mr/css/view.css index 15e8e8f9ce..4e42eafa41 100644 --- a/module/mr/css/view.css +++ b/module/mr/css/view.css @@ -2,5 +2,11 @@ .side-col .cell {padding: 0px;} .table-content tbody tr th{padding-left: 0; font-weight: 400; color: #838a9d; text-align: right; vertical-align: middle; border:none;} .table-content tbody tr td{border:none;} -.table-content thead tr th{text-align: left; vertical-align: middle;} +.table-content thead tr th{text-align: left; vertical-align: middle; border:none;} .detail-content{margin-top:0;} +.main-row .cell { + border: 1px solid #efefef; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045); + box-shadow: 0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045) +} +.side-col{padding-top:5px;} diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 1ceb3fac75..531209d7a9 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -42,116 +42,121 @@
  • id}") . "#bugs", html::icon($lang->icons['bug'], 'text-info') . ' ' . $lang->productplan->linkedBugs);?>
  • id}") . "#tasks", html::icon($lang->icons['todo'], 'text-info') . ' ' . $lang->mr->linkedTasks);?>
    • -
    -
    -
    -
    - - - - - - - - - - - - head_pipeline->status)): ?> - - - - - - - - changes_count)):?> - - - - - - - - - - -
    - mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'"); ?> -
    mr->status;?>mr->statusList, $MR->status);?>
    mr->pipeline}{$lang->mr->status}";?>mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?>
    mr->mergeStatus; ?> - mr->cantMerge; ?> - mr->noChanges;?> - mr->mergeStatusList, $rawMR->merge_status);?>
    mr->MRHasConflicts; ?>has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
    -
    -
    -
    -
    -
    - compile->job;?> -
    - compileID):?> - - - - - - - - - - - - - - - +
    +
    +
    +
    +
    + +
    job->common;?>name;?>
    compile->atTime;?>lastExec : $lang->mr->compileUnexecuted;?>
    compile->result;?> - compile->statusList, $compile->status);?>    - createLink('job', 'view', "jobID=$compileJob->id&compileID=$compile->id&onlybody=yes"), "{$lang->compile->logs}", "", "class='iframe'");?> -
    + + + + + + + + + + + head_pipeline->status)): ?> + + + + + + + + changes_count)):?> + + + + + + + + + + + + + + +
    + mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'"); ?> +
    mr->status;?>mr->statusList, $MR->status);?>
    mr->pipeline}{$lang->mr->status}";?>mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?>
    mr->mergeStatus; ?> + mr->cantMerge; ?> + mr->noChanges;?> + mr->mergeStatusList, $rawMR->merge_status);?>
    mr->MRHasConflicts; ?>has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
    mr->description;?> + description) ? $MR->description : $lang->noData; ?> +
    + +
    +
    +
    + + state == 'opened'): ?> +
    mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch); ?>
    + + +
    +
    + + state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), ' ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?> + state == 'opened'): ?> + has_conflicts or $MR->compileStatus != 'success'):?> + id&action=approve&onlybody=yes"), ' ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody' disabled"); ?> + + id&action=approve&onlybody=yes"), ' ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?> - - - -
    mr->noCompileJob;?>
    - -
    - -
    + id&action=reject&onlybody=yes"), ' ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?> + id"), ' ' . $lang->mr->close, '', "id='mergeButton' class='btn'"); ?> + id"), ' ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?> + + state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), ' ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?> + id"), ' ' . str_replace($lang->mr->common, '', $lang->mr->delete), '', "id='mergeButton' class='btn'"); ?> + + + -
    -
    -
    mr->description; ?>
    -
    - description) ? $MR->description : "
    " . $lang->noData . '
    '; ?> -
    -
    -
    - - state == 'opened'): ?> -
    mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch); ?>
    - - - -
    -
    - - state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), ' ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?> - state == 'opened'): ?> - has_conflicts or $MR->compileStatus != 'success'):?> - id&action=approve&onlybody=yes"), ' ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody' disabled"); ?> - - id&action=approve&onlybody=yes"), ' ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?> - - id&action=reject&onlybody=yes"), ' ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?> - id"), ' ' . $lang->mr->close, '', "id='mergeButton' class='btn'"); ?> - id"), ' ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?> - - state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), ' ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?> - id"), ' ' . str_replace($lang->mr->common, '', $lang->mr->delete), '', "id='mergeButton' class='btn'"); ?> +
    +
    +
    + compile->job;?> +
    + compileID):?> + + + + + + + + + + + + + + + + + +
    job->common;?>name;?>
    compile->atTime;?>lastExec : $lang->mr->compileUnexecuted;?>
    compile->result;?> + compile->statusList, $compile->status);?>    + createLink('job', 'view', "jobID=$compileJob->id&compileID=$compile->id&onlybody=yes"), "{$lang->compile->logs}", "", "class='iframe'");?> +
    + +
    mr->noCompileJob;?>
    + +
    +
    +
    +
    - +