vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

almost all PR discussion fixes

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-04-21 18:04:25 -04:00
parent d25cc4db9c
commit 02498d72ba
13 changed files with 200 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/directives/repo-view/repo-panel-builds.html
View file

@ -91,7 +91,7 @@
</button>
<ul class="dropdown-menu dropdown-menu-right pull-right">
<li ng-repeat="type in TriggerService.getTypes()">
<a href="{{ TriggerService.getRedirectUrl(type, repository.namespace, repository.name) }}" target="{{ TriggerService.getMetadata(type).target }}">
<a href="{{ TriggerService.getRedirectUrl(type, repository.namespace, repository.name) }}" target="{{ TriggerService.getMetadata(type).is_external ? '' : '_self' }}">
<i class="fa fa-lg" ng-class="TriggerService.getMetadata(type).icon"></i>
{{ TriggerService.getTitle(type) }}
</a>
@ -140,7 +140,7 @@
</td>
<td>
<span class="cor-options-menu">
<span class="cor-option" option-click="showTriggerCredentialsModal(trigger)" ng-show="trigger.service == 'custom'">
<span class="cor-option" option-click="showTriggerCredentialsModal(trigger)" ng-show="trigger.service == 'custom-git'">
<i class="fa fa-unlock-alt"></i> View Credentials
</span>
<span class="cor-option" option-click="askRunTrigger(trigger)"

5
static/directives/setup-trigger-dialog.html
View file

@ -19,7 +19,7 @@
next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
analyze="checkAnalyze(isValid)"></div>
</div>
<div ng-switch-when="custom">
<div ng-switch-when="custom-git">
<div class="trigger-setup-custom" repository="repository" trigger="trigger"
next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
analyze="checkAnalyze(isValid)"></div>
@ -35,6 +35,7 @@
<div class="trigger-option-section" ng-show="currentView == 'analyzed'">
<!-- Messaging -->
<!-- TODO(jschorr): eventually ng-switch on pullINfo.analysis.status -->
<div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'">
{{ pullInfo.analysis.message }}
</div>
@ -113,7 +114,7 @@
</div>
<div class="trigger-option-section" ng-show="currentView == 'postActivation'" ng-switch on="trigger.service">
<div ng-switch-when="custom">
<div ng-switch-when="custom-git">
<div class="alert alert-warning">
The trigger has been successfully created, but the following first requires action:
<ul>

13
static/directives/trigger-description.html
View file

@ -1,4 +1,5 @@
<span class="trigger-description-element" ng-switch on="trigger.service">
<!-- GitHub -->
<span ng-switch-when="github">
<i class="fa fa-github fa-lg" style="margin-right: 6px" data-title="GitHub" bs-tooltip="tooltip.title"></i>
Push to GitHub <span ng-if="KeyService.isEnterprise('github-trigger')">Enterprise</span> repository
@ -14,22 +15,24 @@
<div>
<span class="trigger-description-subtitle">Dockerfile:</span>
<span ng-if="trigger.config.subdir">//{{ TriggerService.trimSubdir(trigger.config.subdir) }}/Dockerfile</span>
<span ng-if="!trigger.config.subdir">//Dockerfile</span>
<span>{{ TriggerService.getDockerfileLocation(trigger) }}</span>
</div>
</div>
</span>
<span ng-switch-when="custom">
<!-- Git -->
<span ng-switch-when="custom-git">
<i class="fa fa-git fa-lg" style="margin-right: 6px;" data-title="git" bs-tooltip="tooltip.title"></i>
Push to {{ trigger.config.build_source }}
<div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
<div>
<span class="trigger-description-subtitle">Dockerfile:</span>
<span ng-if="trigger.config.subdir">//{{ TriggerService.trimSubdir(trigger.config.subdir) }}/Dockerfile</span>
<span ng-if="!trigger.config.subdir">//Dockerfile</span>
<span>{{ TriggerService.getDockerfileLocation(trigger) }}</span<
</div>
</div>
</span>
<!-- Who knows? -->
<span ng-switch-default>
Unknown
</span>

3
static/directives/trigger-setup-custom.html
View file

@ -18,9 +18,10 @@
<!-- Step view -->
<div class="step-view" next-step-counter="nextStepCounter" current-step-valid="currentStepValid"
steps-completed="stepsCompleted()">
steps-completed="stepsCompleted()">
<!-- Git URL Input -->
<!-- TODO(jschorr): make nopLoad(callback) no longer required -->
<div class="step-view-step" complete-condition="trigger['config']['build_source']" load-callback="nopLoad(callback)"
load-message="Loading Git URL Input">
<div style="margin-bottom: 12px;">Please enter an HTTP or SSH style URL used to clone your git repository:</div>

97
static/directives/triggered-build-description.html
View file

@ -1,18 +1,17 @@
<div class="triggered-build-description-element">
<span class="tbd-content" class="manual" ng-if="!build.trigger && !build.job_config.manual_user">
(Manually Triggered Build)
</span>
<span class="tbd-content" class="manual" ng-if="!build.trigger && !build.job_config.manual_user">
(Manually Triggered Build)
</span>
<span class="tbd-content" ng-if="!build.trigger && build.job_config.manual_user">
<i class="fa fa-user"></i> {{ build.job_config.manual_user }}
</span>
<span class="tbd-content" ng-if="!build.trigger && build.job_config.manual_user">
<i class="fa fa-user"></i> {{ build.job_config.manual_user }}
</span>
<span ng-switch on="build.trigger.service" ng-if="build.trigger">
<!-- GitHub -->
<span ng-switch-when="github">
<!-- Full Commit Information -->
<span class="tbd-content" ng-if="build.job_config.trigger_metadata.commit_info">
<!-- Full Commit Information -->
<span class="tbd-content" ng-if="build.job_config.trigger_metadata.commit_info" ng-switch on="build.trigger.service">
<!-- GitHub -->
<div ng-switch-when="github">
<div class="commit-message">
<a ng-href="{{ getGitHubRepoURL(build) }}/commit/{{ build.job_config.trigger_metadata.commit_sha }}"
target="_blank">
@ -39,30 +38,10 @@
branch-template="getGitHubRepoURL(build) + '/tree/{branch}'"
tag-template="getGitHubRepoURL(build) + '/releases/tag/{tag}'"></span>
</div>
</span>
</div>
<!-- Just commit SHA -->
<span class="tbd-content" ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info">
Triggered by commit
<span class="source-commit-link"
commit-sha="build.job_config.trigger_metadata.commit_sha"
url-template="getGitHubRepoURL(build) + '/commit/{sha}'"></span>
</span>
<!-- No information -->
<span class="tbd-content" ng-if="!build.job_config.trigger_metadata">
Triggered by commit to
<i class="fa fa-github fa-lg" data-title="GitHub" data-container="body" bs-tooltip></i>
<a ng-href="{{ getGitHubRepoURL(build) }}" target="_new">
{{ build.trigger.config.build_source }}
</a>
</span>
</span>
<!-- Custom -->
<span ng-switch-when="custom">
<!-- Full Commit Information -->
<span ng-if="build.job_config.trigger_metadata.commit_info">
<!-- Git -->
<div ng-switch-when="custom-git">
<div class="commit-message">
{{ build.job_config.trigger_metadata.commit_info.message }}
</div>
@ -81,25 +60,41 @@
{{ build.job_config.trigger_metadata.ref }}
</span>
</div>
</span>
</div>
</span>
<!-- Just commit SHA -->
<span ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info">
Triggered by commit
<span>
{{ build.job_config.trigger_metadata.commit_sha }}
</span>
</span>
<!-- Just commit SHA -->
<span class="tbd-content" ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info" ng-switch on="build.trigger.service">
Triggered by commit
<!-- GitHub -->
<div ng-switch-when="github">
<span class="source-commit-link"
commit-sha="build.job_config.trigger_metadata.commit_sha"
url-template="getGitHubRepoURL(build) + '/commit/{sha}'"></span>
</div>
<!-- No information -->
<span ng-if="!build.job_config.trigger_metadata">
Triggered by commit to
<i class="fa fa-git fa-lg" data-title="git" bs-tooltip="tooltip.title"></i>
{{ build.trigger.config.build_source }}
</span>
<!-- Git -->
<div ng-switch-when="custom-git">
<span>{{ build.job_config.trigger_metadata.commit_sha }}</span>
</div>
</span>
<!-- No information -->
<span class="tbd-content" ng-if="!build.job_config.trigger_metadata" ng-switch on="build.trigger.service">
Triggered by commit to
<!-- GitHub -->
<div ng-switch-when="github">
<i class="fa fa-github fa-lg" data-title="GitHub" data-container="body" bs-tooltip></i>
<a ng-href="{{ getGitHubRepoURL(build) }}" target="_new">
{{ build.trigger.config.build_source }}
</a>
</div>
<!-- Git -->
<div ng-switch-when="custom-git">
<i class="fa fa-git fa-lg" data-title="git" data-container="body" bs-tooltip></i>
{{ build.trigger.config.build_source }}
</div>
</span>
<!-- Unknown -->
<span ng-switch-default>Unknown Build Trigger</span>
</span>
</div>