rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pipeline fixes

This commit is contained in:
lvuch 2018-02-28 13:15:32 -07:00
parent a5fd2fef38
commit 08945b09e7
9 changed files with 102 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/styles/components/_pipeline.scss
View File

@ -135,13 +135,11 @@
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
z-index: -1;
} }
>.steps-wrap { >.steps-wrap {
padding: 4px; padding: 4px;
// margin-right: 10px; text-align: center;
// &.active{
// border: 2px dashed $border;
// }
} }
.step-content { .step-content {
position: relative; position: relative;
@ -291,6 +289,12 @@
position: relative; position: relative;
top: 0; top: 0;
height: 36.5px; height: 36.5px;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
.label-wrap{ .label-wrap{
position: absolute; position: absolute;
left: 0; left: 0;

6
lib/pipeline/addon/components/pipeline-stages/template.hbs
View File

@ -23,11 +23,11 @@
dragEndHook=(action "dragEnd") dragEndHook=(action "dragEnd")
}} }}
{{#if (eq index 0)}} {{#if (eq index 0)}}
<div class="stage-name text-muted clip"> <div class="stage-name clip">
{{index-add index}}. {{item.name}} {{index-add index}}. {{item.name}}
</div> </div>
{{else}} {{else}}
<div class="stage-name text-muted clip" style="curosor: pointer;" {{action 'editStage' index}}> <div class="stage-name clip" style="curosor: pointer;" {{action 'editStage' index}}>
<a href="javascript:void(0);">{{index-add index}}. {{item.name}}</a> <a href="javascript:void(0);">{{index-add index}}. {{item.name}}</a>
</div> </div>
{{/if}} {{/if}}
@ -69,7 +69,7 @@
{{else}} {{else}}
{{#each pipeline.stages as |item index|}} {{#each pipeline.stages as |item index|}}
<div class="stage-wrap"> <div class="stage-wrap">
<div class="stage-name text-muted clip" {{action 'editStage' index}}> <div class="stage-name clip" {{action 'editStage' index}}>
{{index-add index}}. {{item.name}} {{index-add index}}. {{item.name}}
</div> </div>
{{pipeline-steps {{pipeline-steps

9
lib/pipeline/addon/components/pipeline-steps/template.hbs
View File

@ -37,11 +37,10 @@
{{/if}} {{/if}}
{{#if editable}} {{#if editable}}
{{#unless (eq stepMode 'scm')}} {{#unless (eq stepMode 'scm')}}
<div class="step-add step-content" {{action 'addStep'}}> <button class="mt-10 btn bg-link icon-btn p-0" {{action 'addStep'}} style="margin: 0 auto;">
<a href="javascript:void(0);" class="text-small"> <span class="darken"><i class="icon icon-plus text-small"/></span>
{{t 'newPipelineStage.addStep'}} <span>{{t 'newPipelineStage.addStep'}}</span>
</a> </button>
</div>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
</div> </div>

5
lib/pipeline/addon/components/pipeline-trigger/template.hbs
View File

@ -1,16 +1,17 @@
<hr/>
<div class="inline-form"> <div class="inline-form">
<label>{{t 'newPipelineStep.stepType.scm.trigger'}}</label> <label>{{t 'newPipelineStep.stepType.scm.trigger'}}</label>
<div class="pt-10"></div> <div class="pt-10"></div>
<div class="inline-form"> <div class="inline-form">
{{input disabled=disabled type="checkbox" id="webhook" checked=pipeline.triggerWebhook}} {{input disabled=disabled type="checkbox" id="webhook" checked=pipeline.triggerWebhook}}
<label for="webhook"> <label class="acc-label" for="webhook">
{{t 'newPipelineStage.trigger.webhook'}} {{t 'newPipelineStage.trigger.webhook'}}
</label> </label>
</div> </div>
<div class="pt-10"></div> <div class="pt-10"></div>
<div class="inline-form"> <div class="inline-form">
{{input disabled=disabled type="checkbox" id="cron" checked=state.setCustomCron}} {{input disabled=disabled type="checkbox" id="cron" checked=state.setCustomCron}}
<label for="cron"> <label class="acc-label" for="cron">
{{t 'newPipelineStage.trigger.cron'}} {{t 'newPipelineStage.trigger.cron'}}
</label> </label>
</div> </div>

2
lib/pipeline/addon/components/settings-git/template.hbs
View File

@ -69,7 +69,7 @@
{{#unless model.githubConfig}} {{#unless model.githubConfig}}
<section class="box mt-30"> <section class="box mt-30">
<h3>{{t 'authPage.github.notAuthenticated.headerVariable' GitHub='GitHub'}}</h3> <h3>{{t 'authPage.github.notAuthenticated.headerVariable'}}</h3>
<hr/> <hr/>
<p> <p>
<ol class="alphalist ml-40"> <ol class="alphalist ml-40">

23
lib/pipeline/addon/components/step-scm/template.hbs
View File

@ -4,7 +4,7 @@
<div class="pt-20"></div> <div class="pt-20"></div>
<div class="inline-form"> <div class="inline-form">
<label>{{t 'newPipelineStep.stepType.scm.user'}}{{field-required}}</label> <label>{{t 'newPipelineStep.stepType.scm.user'}}{{field-required}}</label>
<div class="pt-10"></div>
{{#if accountsInfo}} {{#if accountsInfo}}
<div class="row"> <div class="row">
<div class="col span-12"> <div class="col span-12">
@ -33,8 +33,10 @@
{{/if}} {{/if}}
</div> </div>
<div class="pt-20"></div> <hr/>
<div class="inline-form">
<div class="row">
<div class="col span-6">
<label> <label>
{{t 'pipelineHistories.repository'}}{{field-required}} {{t 'pipelineHistories.repository'}}{{field-required}}
{{#if (not-eq modalOpts.type 'review')}} {{#if (not-eq modalOpts.type 'review')}}
@ -50,7 +52,7 @@
{{/unless}} {{/unless}}
{{/if}} {{/if}}
</label> </label>
<div class="pt-10"></div>
{{#if (eq modalOpts.type 'review')}} {{#if (eq modalOpts.type 'review')}}
{{input class="form-control" value=selectedModel.sourceCodeConfig.url disabled=(if (eq modalOpts.type 'review') true false)}} {{input class="form-control" value=selectedModel.sourceCodeConfig.url disabled=(if (eq modalOpts.type 'review') true false)}}
{{else}} {{else}}
@ -67,15 +69,15 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
<div class="pt-20"></div>
<div class="inline-form"> <div class="col span-6">
<label>{{t 'newPipelineStep.stepType.scm.branch'}}{{field-required}}</label> <label>{{t 'newPipelineStep.stepType.scm.branch'}}{{field-required}}</label>
<div class="pt-10"></div>
{{#each branchTypes as |type| }} {{#each branchTypes as |type| }}
<div class="pipeline-input-group"> <div class="pipeline-input-group">
<div class="label-wrap"> <div class="label-wrap">
{{radio-button disabled=(if (eq modalOpts.type 'review') true false) id=type.value selection=selectedModel.sourceCodeConfig.branchCondition value=type.value}} {{radio-button disabled=(if (eq modalOpts.type 'review') true false) id=type.value selection=selectedModel.sourceCodeConfig.branchCondition value=type.value}}
<label for={{type.value}}> <label class="acc-label" for={{type.value}}>
{{type.label}} {{type.label}}
</label> </label>
</div> </div>
@ -85,11 +87,10 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class="mb-10"></div>
{{/each}} {{/each}}
</div> </div>
<div class="pt-10"></div> </div>
{{#pipeline-trigger {{#pipeline-trigger
selectedModel=selectedModel selectedModel=selectedModel
modalOpts=modalOpts modalOpts=modalOpts

4
lib/pipeline/addon/models/pipeline.js
View File

@ -64,8 +64,8 @@ let Pipeline = Resource.extend({
{ label: 'action.viewConfig', icon: 'icon icon-files', action: 'viewCode', enabled: !!l.exportConfig, bulkable: false }, { label: 'action.viewConfig', icon: 'icon icon-files', action: 'viewCode', enabled: !!l.exportConfig, bulkable: false },
{ label: 'action.exportConfig', icon: 'icon icon-download', action: 'exportConfig', enabled: !!l.exportConfig, bulkable: false }, { label: 'action.exportConfig', icon: 'icon icon-download', action: 'exportConfig', enabled: !!l.exportConfig, bulkable: false },
{ divider: true }, { divider: true },
{ label: 'action.activate', icon: 'icon icon-plus-circle', action: 'activate', enabled: !isActive, bulkable: !isActive}, { label: 'action.activate', icon: 'icon icon-play', action: 'activate', enabled: !isActive, bulkable: !isActive},
{ label: 'action.deactivate', icon: 'icon icon-minus-circle', action: 'deactivate', enabled: isActive, bulkable: isActive}, { label: 'action.deactivate', icon: 'icon icon-stop', action: 'deactivate', enabled: isActive, bulkable: isActive},
{ divider: true }, { divider: true },
{ label: 'action.remove', icon: 'icon icon-trash', action: 'remove', enabled: true, bulkable: true }, { label: 'action.remove', icon: 'icon icon-trash', action: 'remove', enabled: true, bulkable: true },
]; ];

8
lib/pipeline/addon/pipelines/template.hbs
View File

@ -1,11 +1,7 @@
{{#containers-header tags=tags simpleMode=true showGroup=false}} {{#containers-header tags=tags simpleMode=true showGroup=false}}
{{!-- {{#link-to "pipelines.project.import" classNames="btn btn-sm bg-default mr-10"}}{{t 'pipelinesPage.import'}}{{/link-to}} --}} {{#link-to "new-pipeline" class="btn bg-primary btn-sm"}}
<div class="btn bg-link btn-sm icon-btn p-0"> {{t 'pipelinesPage.add'}}
{{#link-to "new-pipeline" class="btn bg-link icon-btn p-0"}}
<span class="darken"><i class="icon icon-plus text-small"/></span>
<span>{{t 'pipelinesPage.add'}}</span>
{{/link-to}} {{/link-to}}
</div>
{{/containers-header}} {{/containers-header}}
<div class="mt-10"></div> <div class="mt-10"></div>

4
lib/pipeline/translations/en-us.yaml
View File

@ -200,7 +200,7 @@ authPage:
enterprise: GitHub Enterprise enterprise: GitHub Enterprise
header: header:
enabled: enabled:
label: "{github} is enabled" label: "GitHub is enabled"
required: | required: |
{appName} is configured to allow access to {orgs, plural, {appName} is configured to allow access to {orgs, plural,
=0 {no organizations} =0 {no organizations}
@ -241,7 +241,7 @@ authPage:
disable: Disable access control disable: Disable access control
notAuthenticated: notAuthenticated:
header: "1. Setup a GitHub Application" header: "1. Setup a GitHub Application"
headerVariable: "1. Setup a {GitHub} Application" headerVariable: "1. Setup a GitHub Application"
ul: ul:
li1: li1:
text: 'For standard GitHub, <a href="https://github.com/settings/developers" target="_blank">click here</a> to go applications settings in a new window.' text: 'For standard GitHub, <a href="https://github.com/settings/developers" target="_blank">click here</a> to go applications settings in a new window.'