Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Conflicts:
	endpoints/api.py
This commit is contained in:
yackob03 2013-09-27 14:57:03 -04:00
commit 98dc20542c
4 changed files with 30 additions and 3 deletions

View file

@ -43,10 +43,13 @@ def create_repo_api():
@login_required @login_required
def list_repos_api(): def list_repos_api():
def repo_view(repo_perm): def repo_view(repo_perm):
return { return {
'namespace': repo_perm.repository.namespace, 'namespace': repo_perm.repository.namespace,
'name': repo_perm.repository.name, 'name': repo_perm.repository.name,
'role': repo_perm.role.name, 'role': repo_perm.role.name,
'description': repo_perm.repository.description,
} }
repos = [repo_view(repo) repos = [repo_view(repo)

View file

@ -75,3 +75,26 @@ p.editable:hover i {
border: 1px solid #ddd; border: 1px solid #ddd;
width: 300px; width: 300px;
} }
.repo-listing {
display: block;
margin-bottom: 20px;
border-bottom: 1px solid #eee;
padding: 10px;
}
.repo-listing a {
font-size: 1.5em;
}
.repo-listing i {
font-size: 1.5em;
color: #999;
display: inline-block;
margin-right: 6px;
}
.repo-listing .description {
margin-top: 6px;
padding-left: 36px;
}

View file

@ -1,6 +1,8 @@
<div class="container"> <div class="container">
<h3>Repositories</h3> <h3>Repositories</h3>
<div ng-repeat="repository in repositories"> <div class="repo-listing" ng-repeat="repository in repositories">
<i class="icon-hdd icon-large"></i>
<a ng-href="#/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a> <a ng-href="#/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
<div class="description">{{repository.description}}</div>
</div> </div>
</div> </div>

View file

@ -55,7 +55,6 @@
<a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{ user.username }} <b class="caret"></b></a> <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{ user.username }} <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#">Settings</a></li>
<li><a href="/signout">Sign out</a></li> <li><a href="/signout">Sign out</a></li>
</ul> </ul>
</li> </li>