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

Lots of small UI fixes

Browse source 
Fixes #1369
Fixes #1368
This commit is contained in:
Joseph Schorr 2016-04-14 15:12:54 -04:00
parent cf04fedd6a
commit 1ce47fd228
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/css/directives/ui/repo-list-view.css
View file

@ -3,6 +3,10 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.repo-list-view.padded {
padding: 10px;
}
.repo-list-view-element { .repo-list-view-element {
min-height: 40px; min-height: 40px;
} }

2
static/directives/external-login-button.html
View file

@ -5,7 +5,7 @@
<img ng-src="{{ providerInfo.icon().url }}" ng-if="providerInfo.icon().url"> <img ng-src="{{ providerInfo.icon().url }}" ng-if="providerInfo.icon().url">
<i class="fa" ng-class="providerInfo.icon().icon" ng-if="providerInfo.icon().icon"></i> <i class="fa" ng-class="providerInfo.icon().icon" ng-if="providerInfo.icon().icon"></i>
<span class="login-text" ng-if="action != 'attach'" style="vertical-align: middle"> <span class="login-text" ng-if="action != 'attach'" style="vertical-align: middle">
<span class="prefix">Sign in with </span><span class="suffix">{{ providerInfo.title() }}</span> <span class="prefix">Sign in with&nbsp;</span><span class="suffix">{{ providerInfo.title() }}</span>
</span> </span>
<span class="login-text" ng-if="action == 'attach'" style="vertical-align: middle"> <span class="login-text" ng-if="action == 'attach'" style="vertical-align: middle">
Attach to {{ providerInfo.title() }} Attach to {{ providerInfo.title() }}

4
static/directives/signup-form.html
View file

@ -3,6 +3,10 @@
Create new account Create new account
</h4> </h4>
<div class="co-alert co-alert-warning" ng-show="registerIssue">
{{ registerIssue }}
</div>
<form class="form-signup" name="signupForm" ng-submit="register()" ng-show="!awaitingConfirmation && !registering"> <form class="form-signup" name="signupForm" ng-submit="register()" ng-show="!awaitingConfirmation && !registering">
<label for="username">Username:</label> <label for="username">Username:</label>
<input type="text" class="form-control" placeholder="Requested username" name="username" ng-model="newUser.username" autofocus required ng-pattern="/^[a-z0-9_]{4,30}$/"> <input type="text" class="form-control" placeholder="Requested username" name="username" ng-model="newUser.username" autofocus required ng-pattern="/^[a-z0-9_]{4,30}$/">

9
static/js/directives/ui/signup-form.js
View file

@ -13,16 +13,15 @@ angular.module('quay').directive('signupForm', function () {
'hideRegisteredMessage': '@hideRegisteredMessage', 'hideRegisteredMessage': '@hideRegisteredMessage',
'userRegistered': '&userRegistered' 'userRegistered': '&userRegistered'
}, },
controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, UIService, ExternalLoginService) { controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, ExternalLoginService) {
$('.form-signup').popover();
$scope.awaitingConfirmation = false; $scope.awaitingConfirmation = false;
$scope.registering = false; $scope.registering = false;
$scope.Config = Config; $scope.Config = Config;
$scope.registerIssue = null;
$scope.register = function() { $scope.register = function() {
UIService.hidePopover('#signupButton');
$scope.registering = true; $scope.registering = true;
$scope.registerIssue = null;
if ($scope.inviteCode) { if ($scope.inviteCode) {
$scope.newUser['invite_code'] = $scope.inviteCode; $scope.newUser['invite_code'] = $scope.inviteCode;
@ -45,7 +44,7 @@ angular.module('quay').directive('signupForm', function () {
UserService.load(); UserService.load();
}, function(result) { }, function(result) {
$scope.registering = false; $scope.registering = false;
UIService.showFormError('#signupButton', result); $scope.registerIssue = ApiService.getErrorMessage(result);
}); });
}; };
} }

2
static/partials/org-view.html
View file

@ -17,7 +17,7 @@
</div> </div>
<div class="co-main-content-panel" ng-if="user.anonymous || !isMember"> <div class="co-main-content-panel" ng-if="user.anonymous || !isMember">
<div class="repo-list-view" namespaces="[organization]"></div> <div class="repo-list-view padded" namespaces="[organization]">&nbsp;</div>
</div> </div>
<div class="cor-tab-panel" ng-if="!user.anonymous && isMember"> <div class="cor-tab-panel" ng-if="!user.anonymous && isMember">

2
static/partials/user-view.html
View file

@ -17,7 +17,7 @@
</div> </div>
<div class="co-main-content-panel user-repo-list" ng-if="!context.viewuser.is_me"> <div class="co-main-content-panel user-repo-list" ng-if="!context.viewuser.is_me">
<div class="repo-list-view" namespaces="[context.viewuser]"></div> <div class="repo-list-view padded" namespaces="[context.viewuser]">&nbsp;</div>
</div> </div>
<div class="cor-tab-panel" ng-if="context.viewuser.is_me"> <div class="cor-tab-panel" ng-if="context.viewuser.is_me">