Merge pull request #1370 from coreos-inc/smalluifixes

Lots of small UI fixes
This commit is contained in:
josephschorr 2016-04-14 15:13:57 -04:00
commit a65012a71e
6 changed files with 15 additions and 8 deletions

View file

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

View file

@ -5,7 +5,7 @@
<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>
<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 class="login-text" ng-if="action == 'attach'" style="vertical-align: middle">
Attach to {{ providerInfo.title() }}

View file

@ -3,6 +3,10 @@
Create new account
</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">
<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}$/">

View file

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

View file

@ -17,7 +17,7 @@
</div>
<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 class="cor-tab-panel" ng-if="!user.anonymous && isMember">

View file

@ -17,7 +17,7 @@
</div>
<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 class="cor-tab-panel" ng-if="context.viewuser.is_me">