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

Merge pull request #195 from coreos-inc/tidy

Browse source 
Delete all the old UI code and branches for new UI
This commit is contained in:
Jake Moshenko 2015-06-30 14:34:43 -04:00
commit 411ddceee0
63 changed files with 312 additions and 4719 deletions
Download patch file Download diff file Expand all files Collapse all files

28
static/js/directives/ui/entity-reference.js
View file

@ -21,14 +21,6 @@ angular.module('quay').directive('entityReference', function () {
};
$scope.getRobotUrl = function(name) {
if (Config.isNewLayout()) {
return $scope.getNewRobotUrl(name);
} else {
return $scope.getOldRobotUrl(name);
}
};
$scope.getNewRobotUrl = function(name) {
var namespace = $scope.getPrefix(name);
if (!namespace) {
return '';
@ -47,26 +39,6 @@ angular.module('quay').directive('entityReference', function () {
return '/organization/' + org['name'] + '?tab=robots&showRobot=' + UtilService.textToSafeHtml(name);
};
// TODO(jschorr): Remove when new layout is in prod.
$scope.getOldRobotUrl = function(name) {
var namespace = $scope.getPrefix(name);
if (!namespace) {
return '';
}
if (!$scope.getIsAdmin(namespace)) {
return '';
}
var org = UserService.getOrganization(namespace);
if (!org) {
// This robot is owned by the user.
return '/user/?tab=robots&showRobot=' + UtilService.textToSafeHtml(name);
}
return '/organization/' + org['name'] + '/admin?tab=robots&showRobot=' + UtilService.textToSafeHtml(name);
};
$scope.getTitle = function(entity) {
if (!entity) { return ''; }

51
static/js/directives/ui/header-bar.js
View file

@ -14,41 +14,36 @@ angular.module('quay').directive('headerBar', function () {
},
controller: function($rootScope, $scope, $element, $location, $timeout, hotkeys, UserService,
PlanService, ApiService, NotificationService, Config, CreateService, Features) {
$scope.isNewLayout = Config.isNewLayout();
var hotkeysAdded = false;
var userUpdated = function(cUser) {
$scope.searchingAllowed = Features.ANONYMOUS_ACCESS || !cUser.anonymous;
if (hotkeysAdded) { return; }
hotkeysAdded = true;
if ($scope.isNewLayout) {
hotkeysAdded = true;
// Register hotkeys.
if ($scope.searchingAllowed) {
hotkeys.add({
combo: '/',
description: 'Show search',
callback: function(e) {
e.preventDefault();
e.stopPropagation();
$scope.toggleSearch();
}
});
}
// Register hotkeys.
if ($scope.searchingAllowed) {
hotkeys.add({
combo: '/',
description: 'Show search',
callback: function(e) {
e.preventDefault();
e.stopPropagation();
$scope.toggleSearch();
}
});
}
if (!cUser.anonymous) {
hotkeys.add({
combo: 'alt+c',
description: 'Create new repository',
callback: function(e) {
e.preventDefault();
e.stopPropagation();
$location.url('/new');
}
});
}
if (!cUser.anonymous) {
hotkeys.add({
combo: 'alt+c',
description: 'Create new repository',
callback: function(e) {
e.preventDefault();
e.stopPropagation();
$location.url('/new');
}
});
}
};

2
static/js/directives/ui/trigger-description.js
View file

@ -10,10 +10,8 @@ angular.module('quay').directive('triggerDescription', function () {
restrict: 'C',
scope: {
'trigger': '=trigger',
'short': '=short'
},
controller: function($scope, $element, KeyService, TriggerService) {
// TODO(jschorr): Clean up and remove the 'short' once we're on new layout.
$scope.KeyService = KeyService;
$scope.TriggerService = TriggerService;
TriggerService.populateTemplate($scope, 'trigger-description');