Enable new layout everywhere and fix SCM icons

This commit is contained in:
Joseph Schorr 2015-05-03 16:54:27 -07:00
parent abe43e758a
commit 65bce31d96
4 changed files with 8 additions and 9 deletions

View file

@ -1206,9 +1206,9 @@ a:focus {
.co-alert.co-alert-danger:before { .co-alert.co-alert-danger:before {
font-family: core-icons; font-family: core-icons;
content: "\f108"; content: "\f109";
position: absolute; position: absolute;
top: 11px; top: 19px;
left: 12px; left: 12px;
font-size: 22px; font-size: 22px;
color: red; color: red;

View file

@ -635,7 +635,7 @@
<!-- GitLab Trigger --> <!-- GitLab Trigger -->
<div class="co-panel" ng-if="config.FEATURE_BUILD_SUPPORT" style="margin-top: 20px;"> <div class="co-panel" ng-if="config.FEATURE_BUILD_SUPPORT" style="margin-top: 20px;">
<div class="co-panel-heading"> <div class="co-panel-heading">
<i class="fa fa-git-square"></i> GitLab Build Triggers <i class="fa ci-gitlab"></i> GitLab Build Triggers
</div> </div>
<div class="co-panel-body"> <div class="co-panel-body">
<div class="description"> <div class="description">

View file

@ -72,8 +72,8 @@ angular.module('quay').factory('Config', [function() {
}; };
config.isNewLayout = function() { config.isNewLayout = function() {
// TODO(jschorr): Remove once new layout is in place for everyone. // TODO(jschorr): Remove in the cleanup CL.
return document.cookie.toString().indexOf('quay.exp-new-layout=true') >= 0; return true;
}; };
return config; return config;

View file

@ -19,8 +19,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' + var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' +
namespace + '/' + repository; namespace + '/' + repository;
// TODO(jschorr): Remove once the new layout is in place. if (Config.isNewLayout()) {
if (CookieService.get('quay.exp-new-layout') == 'true') {
redirect_uri += '/__new'; redirect_uri += '/__new';
} }
@ -103,7 +102,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
'is_enabled': function() { 'is_enabled': function() {
return Features.GITLAB_BUILD; return Features.GITLAB_BUILD;
}, },
'icon': 'fa-git-square', 'icon': 'ci-gitlab',
'title': function() { return 'GitLab Repository Push'; }, 'title': function() { return 'GitLab Repository Push'; },
'supports_full_directory_listing': false, 'supports_full_directory_listing': false,
'templates': { 'templates': {
@ -132,7 +131,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
}, },
'is_external': false, 'is_external': false,
'is_enabled': function() { return true; }, 'is_enabled': function() { return true; },
'icon': 'fa-git', 'icon': 'fa-git-square',
'title': function() { return 'Custom Git Repository Push'; }, 'title': function() { return 'Custom Git Repository Push'; },
'templates': { 'templates': {
'credentials': '/static/directives/trigger/custom-git/credentials.html', 'credentials': '/static/directives/trigger/custom-git/credentials.html',