Skip to content

Commit

Permalink
Merge pull request #951 from spadgett/jenkinsfile-last
Browse files Browse the repository at this point in the history 
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Nov 29, 2016
2 parents 4d79ddb + 3e9ea55 commit ec1d6de
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 56 deletions.
65 changes: 32 additions & 33 deletions app/views/browse/build-config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,39 +225,16 @@ <h2>No builds.</h2>
<dt ng-if="buildConfig.spec.source.contextDir">Source Context Dir:</dt>
<dd ng-if="buildConfig.spec.source.contextDir">{{buildConfig.spec.source.contextDir}}</dd>
</div>
<div ng-if="buildConfig | isJenkinsPipelineStrategy">
<div ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath">
<dt>Jenkinsfile Path:</dt>
<dd ng-if="buildConfig | jenkinsfileLink">
<a ng-href="{{buildConfig | jenkinsfileLink}}">{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</a>
</dd>
<dd ng-if="!(buildConfig | jenkinsfileLink)">
{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}
</dd>
<div class="small">
<a href="" ng-click="showJenkinsfileExamples()">What's a Jenkinsfile?</a>
</div>
</div>
<div ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
<div class="small pull-right mar-top-sm">
<a href="" ng-click="showJenkinsfileExamples()">What's a Jenkinsfile?</a>
</div>
<dt>
Jenkinsfile:
</dt><dd></dd>
<div ui-ace="{
mode: 'groovy',
theme: 'eclipse',
showGutter: false,
rendererOptions: {
fadeFoldWidgets: true,
highlightActiveLine: false,
showPrintMargin: false
},
advanced: {
highlightActiveLine: false
}
}" readonly ng-model="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile" class="ace-bordered ace-inline ace-read-only"></div>
<div ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath">
<dt>Jenkinsfile Path:</dt>
<dd ng-if="buildConfig | jenkinsfileLink">
<a ng-href="{{buildConfig | jenkinsfileLink}}">{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}</a>
</dd>
<dd ng-if="!(buildConfig | jenkinsfileLink)">
{{buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath}}
</dd>
<div class="small">
<a href="" ng-click="showJenkinsfileExamples()">What's a Jenkinsfile?</a>
</div>
</div>
<dt ng-if-start="buildConfig.spec.source.binary.asFile">Binary Input as File:</dt>
Expand Down Expand Up @@ -326,6 +303,7 @@ <h4>{{imageSource.from | imageObjectRef : buildConfig.metadata.namespace}}</h4>
</span>
</dd>
</div>
<!-- Put the field values that use full editors last so that they don't interrupt the flow of other <dl> items. -->
<div ng-if="buildConfig.spec.source.dockerfile">
<dt>Dockerfile:</dt><dd></dd>
<div ui-ace="{
Expand All @@ -344,6 +322,27 @@ <h4>{{imageSource.from | imageObjectRef : buildConfig.metadata.namespace}}</h4>
}
}" readonly ng-model="buildConfig.spec.source.dockerfile" class="ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md"></div>
</div>
<div ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
<div class="small pull-right mar-top-sm">
<a href="" ng-click="showJenkinsfileExamples()">What's a Jenkinsfile?</a>
</div>
<dt>
Jenkinsfile:
</dt><dd></dd>
<div ui-ace="{
mode: 'groovy',
theme: 'eclipse',
showGutter: false,
rendererOptions: {
fadeFoldWidgets: true,
highlightActiveLine: false,
showPrintMargin: false
},
advanced: {
highlightActiveLine: false
}
}" readonly ng-model="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile" class="ace-bordered ace-inline ace-read-only"></div>
</div>
</dl>
</div>
<div class="col-lg-6">
Expand Down
45 changes: 22 additions & 23 deletions dist/scripts/templates.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<dt ng-if=\"buildConfig.spec.source.contextDir\">Source Context Dir:</dt>\n" +
"<dd ng-if=\"buildConfig.spec.source.contextDir\">{{buildConfig.spec.source.contextDir}}</dd>\n" +
"</div>\n" +
"<div ng-if=\"buildConfig | isJenkinsPipelineStrategy\">\n" +
"<div ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath\">\n" +
"<dt>Jenkinsfile Path:</dt>\n" +
"<dd ng-if=\"buildConfig | jenkinsfileLink\">\n" +
Expand All @@ -1913,28 +1912,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<a href=\"\" ng-click=\"showJenkinsfileExamples()\">What's a Jenkinsfile?</a>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
"<div class=\"small pull-right mar-top-sm\">\n" +
"<a href=\"\" ng-click=\"showJenkinsfileExamples()\">What's a Jenkinsfile?</a>\n" +
"</div>\n" +
"<dt>\n" +
"Jenkinsfile:\n" +
"</dt><dd></dd>\n" +
"<div ui-ace=\"{\n" +
" mode: 'groovy',\n" +
" theme: 'eclipse',\n" +
" showGutter: false,\n" +
" rendererOptions: {\n" +
" fadeFoldWidgets: true,\n" +
" highlightActiveLine: false,\n" +
" showPrintMargin: false\n" +
" },\n" +
" advanced: {\n" +
" highlightActiveLine: false\n" +
" }\n" +
" }\" readonly=\"readonly\" ng-model=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\" class=\"ace-bordered ace-inline ace-read-only\"></div>\n" +
"</div>\n" +
"</div>\n" +
"<dt ng-if-start=\"buildConfig.spec.source.binary.asFile\">Binary Input as File:</dt>\n" +
"<dd ng-if-end>{{buildConfig.spec.source.binary.asFile}}</dd>\n" +
"<div ng-if=\"buildConfig.spec.source.type == 'None' && !(buildConfig | isJenkinsPipelineStrategy)\">\n" +
Expand Down Expand Up @@ -1999,6 +1976,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</span>\n" +
"</dd>\n" +
"</div>\n" +
"\n" +
"<div ng-if=\"buildConfig.spec.source.dockerfile\">\n" +
"<dt>Dockerfile:</dt><dd></dd>\n" +
"<div ui-ace=\"{\n" +
Expand All @@ -2017,6 +1995,27 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
" }\n" +
" }\" readonly=\"readonly\" ng-model=\"buildConfig.spec.source.dockerfile\" class=\"ace-bordered ace-read-only ace-inline dockerfile-mode mar-top-md\"></div>\n" +
"</div>\n" +
"<div ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
"<div class=\"small pull-right mar-top-sm\">\n" +
"<a href=\"\" ng-click=\"showJenkinsfileExamples()\">What's a Jenkinsfile?</a>\n" +
"</div>\n" +
"<dt>\n" +
"Jenkinsfile:\n" +
"</dt><dd></dd>\n" +
"<div ui-ace=\"{\n" +
" mode: 'groovy',\n" +
" theme: 'eclipse',\n" +
" showGutter: false,\n" +
" rendererOptions: {\n" +
" fadeFoldWidgets: true,\n" +
" highlightActiveLine: false,\n" +
" showPrintMargin: false\n" +
" },\n" +
" advanced: {\n" +
" highlightActiveLine: false\n" +
" }\n" +
" }\" readonly=\"readonly\" ng-model=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\" class=\"ace-bordered ace-inline ace-read-only\"></div>\n" +
"</div>\n" +
"</dl>\n" +
"</div>\n" +
"<div class=\"col-lg-6\">\n" +
Expand Down

0 comments on commit ec1d6de

Please sign in to comment.