Merge pull request #1109 from coreos-inc/commonlistgrid

Create a common repo-list-view control and use it everywhere
This commit is contained in:
josephschorr 2016-01-04 15:42:36 -05:00
commit 4dfeb907c3
13 changed files with 115 additions and 77 deletions

View file

@ -17,12 +17,7 @@
</div>
<div class="co-main-content-panel" ng-if="user.anonymous || !isMember">
<div class="repo-list-grid"
repositories-resource="repositoriesResource"
starred="false"
namespace="namespace"
hide-title="true">
</div>
<div class="repo-list-view" namespaces="[organization]"></div>
</div>
<div class="cor-tab-panel" ng-if="!user.anonymous && isMember">
@ -65,13 +60,7 @@
<div class="cor-tab-content">
<!-- Repositories -->
<div id="repos" class="tab-pane active">
<h3>Repositories</h3>
<div class="repo-list-grid"
repositories-resource="repositoriesResource"
starred="false"
namespace="namespace"
hide-title="true">
</div>
<div class="repo-list-view" namespaces="[organization]"><h3>Repositories</h3></div>
</div>
<!-- Teams -->

View file

@ -59,33 +59,9 @@
<div class="col-lg-9 col-lg-pull-3 col-md-9 col-md-pull-3 col-sm-12">
<div class="repo-list-panel co-main-content-panel">
<div class="repo-list-toggleb btn-group">
<i class="btn btn-default fa fa-th-large" ng-class="!showAsList ? 'active' : ''"
ng-click="setShowAsList(false)" title="Grid View" data-container="body" bs-tooltip></i>
<i class="btn btn-default fa fa-th-list" ng-class="showAsList ? 'active' : ''"
ng-click="setShowAsList(true)" title="List View" data-container="body" bs-tooltip></i>
</div>
<!-- Table View -->
<div ng-if="showAsList">
<div class="repo-list-table" repositories-resources="resources" namespaces="namespaces"></div>
</div>
<!-- Grid View -->
<div ng-if="!showAsList">
<!-- Starred Repository Listing -->
<div class="repo-list-grid" repositories-resource="starred_repositories"
starred="true"
star-toggled="starToggled(repository)">
</div>
<!-- User and Org Repository Listings -->
<div ng-repeat="namespace in namespaces">
<div class="repo-list-grid" repositories-resource="namespace.repositories"
starred="false" user="user" namespace="namespace"
star-toggled="starToggled(repository)">
</div>
</div>
<div class="repo-list-view" namespaces="namespaces"
star-toggled="starToggled(repository)"
starred-repositories="starred_repositories">
</div>
</div>
</div>

View file

@ -5,27 +5,23 @@
<div class="cor-title">
<span class="cor-title-link"></span>
<span class="cor-title-content">
<span class="avatar" size="32" data="viewuser.avatar"></span>
<span class="user-name">{{ viewuser.username }}</span>
<span class="avatar" size="32" data="context.viewuser.avatar"></span>
<span class="user-name">{{ context.viewuser.username }}</span>
</span>
<span class="cor-title-action" ng-if="viewuser.is_me">
<a href="/new/?namespace={{ viewuser.username }}">
<span class="cor-title-action" ng-if="context.viewuser.is_me">
<a href="/new/?namespace={{ context.viewuser.username }}">
<i class="fa fa-plus" data-title="Create new repository"></i>
Create New Repository
</a>
</span>
</div>
<div class="co-main-content-panel user-repo-list" ng-if="!viewuser.is_me">
<div class="repo-list-grid"
repositories-resource="repositoriesResource"
starred="false"
namespace="namespace"
hide-title="true"></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>
<div class="cor-tab-panel" ng-if="viewuser.is_me">
<div class="cor-tabs" quay-show="viewuser.is_me">
<div class="cor-tab-panel" ng-if="context.viewuser.is_me">
<div class="cor-tabs" quay-show="context.viewuser.is_me">
<span class="cor-tab" tab-active="true" tab-title="Repositories" tab-target="#repos">
<i class="fa fa-hdd-o"></i>
</span>
@ -56,13 +52,7 @@
<div class="cor-tab-content">
<!-- Repositories -->
<div id="repos" class="tab-pane active">
<h3>Repositories</h3>
<div class="repo-list-grid"
repositories-resource="repositoriesResource"
starred="false"
namespace="namespace"
hide-title="true">
</div>
<div class="repo-list-view" namespaces="[context.viewuser]"><h3>Repositories</h3></div>
</div>
<!-- Robot Accounts -->
@ -119,7 +109,7 @@
<table class="col-md-6">
<tr>
<td>Current E-mail Address:</td>
<td>{{ viewuser.email }}</td>
<td>{{ context.viewuser.email }}</td>
</tr>
<tr>
<td>New E-mail Address:</td>
@ -133,7 +123,7 @@
</div>
<button class="btn btn-primary"
ng-disabled="changeEmailForm.$invalid || changeEmail.email == viewuser.email"
ng-disabled="changeEmailForm.$invalid || changeEmail.email == context.viewuser.email"
type="submit">
Change E-mail Address
</button>