Merge branch 'dockerbuild' of https://bitbucket.org/yackob03/quay into dockerbuild

This commit is contained in:
root 2013-10-30 19:44:34 +00:00
commit eb4696abad
2 changed files with 11 additions and 11 deletions

View file

@ -928,6 +928,10 @@ function V1Ctrl($scope, $location, UserService) {
} }
function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanService) { function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanService) {
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
$scope.user = currentUser;
}, true);
$scope.repo = { $scope.repo = {
'is_public': 1, 'is_public': 1,
'description': '', 'description': '',
@ -1016,14 +1020,6 @@ function NewRepoCtrl($scope, $location, $http, UserService, Restangular, PlanSer
} }
}; };
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
$scope.user = currentUser;
if ($scope.user.anonymous) {
$location.path('/signin/');
}
}, true);
$scope.editDescription = function() { $scope.editDescription = function() {
if (!$scope.markdownDescriptionEditor) { if (!$scope.markdownDescriptionEditor) {
var converter = Markdown.getSanitizingConverter(); var converter = Markdown.getSanitizingConverter();

View file

@ -1,12 +1,16 @@
<div class="container" ng-show="building"> <div class="container" ng-show="user.anonymous">
<h3>Please <a href="/signin/">sign in</a></h3>
</div>
<div class="container" ng-show="!user.anonymous && building">
<i class="fa fa-spinner fa-spin fa-3x"></i> <i class="fa fa-spinner fa-spin fa-3x"></i>
</div> </div>
<div class="container" ng-show="creating"> <div class="container" ng-show="!user.anonymous && creating">
<i class="fa fa-spinner fa-spin fa-3x"></i> <i class="fa fa-spinner fa-spin fa-3x"></i>
</div> </div>
<div class="container" ng-show="uploading"> <div class="container" ng-show="!user.anonymous && uploading">
<span class="message">Uploading file {{ upload_file }}</span> <span class="message">Uploading file {{ upload_file }}</span>
<div class="progress progress-striped active"> <div class="progress progress-striped active">
<div class="progress-bar" role="progressbar" aria-valuenow="{{ upload_progress }}" aria-valuemin="0" aria-valuemax="100" style="{{ 'width: ' + upload_progress + '%' }}"> <div class="progress-bar" role="progressbar" aria-valuenow="{{ upload_progress }}" aria-valuemin="0" aria-valuemax="100" style="{{ 'width: ' + upload_progress + '%' }}">