aboutsummaryrefslogtreecommitdiff
path: root/src/main/webapp/apps/frontPageApp
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-06 12:43:09 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-06 12:43:09 +0100
commit37207267bf3a1149f78a5022ed8e016cac6b85ca (patch)
tree6cb1166ba3904780ab64f5edf52528bc743c0817 /src/main/webapp/apps/frontPageApp
parenta9543bd5570b7435b760a8eb3c8b457c889a5fca (diff)
downloadesper-testing-37207267bf3a1149f78a5022ed8e016cac6b85ca.tar.gz
esper-testing-37207267bf3a1149f78a5022ed8e016cac6b85ca.tar.bz2
esper-testing-37207267bf3a1149f78a5022ed8e016cac6b85ca.tar.xz
esper-testing-37207267bf3a1149f78a5022ed8e016cac6b85ca.zip
o Adding a view for showing a list of people.
Diffstat (limited to 'src/main/webapp/apps/frontPageApp')
-rwxr-xr-xsrc/main/webapp/apps/frontPageApp/frontPage.html2
-rwxr-xr-xsrc/main/webapp/apps/frontPageApp/frontPageApp.js11
-rwxr-xr-xsrc/main/webapp/apps/frontPageApp/person.html102
-rwxr-xr-xsrc/main/webapp/apps/frontPageApp/personList.html35
4 files changed, 94 insertions, 56 deletions
diff --git a/src/main/webapp/apps/frontPageApp/frontPage.html b/src/main/webapp/apps/frontPageApp/frontPage.html
index 84e991b..c3db55c 100755
--- a/src/main/webapp/apps/frontPageApp/frontPage.html
+++ b/src/main/webapp/apps/frontPageApp/frontPage.html
@@ -22,7 +22,7 @@
<h3>Newcomers</h3>
<ul class="unstyled">
- <li ng-repeat="person in persons.rows">
+ <li ng-repeat="person in persons">
<a href="#/person/{{person.person.uuid}}">{{person.person.name}}</a>
</li>
</ul>
diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/webapp/apps/frontPageApp/frontPageApp.js
index ef0de81..c973983 100755
--- a/src/main/webapp/apps/frontPageApp/frontPageApp.js
+++ b/src/main/webapp/apps/frontPageApp/frontPageApp.js
@@ -3,15 +3,20 @@
var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'pagingTableService', 'core.directives']).config(function ($routeProvider, $locationProvider) {
$routeProvider.
when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}).
+ when('/person/', {controller: PersonListCtrl, templateUrl: '/apps/frontPageApp/personList.html?noCache=' + noCache}).
when('/person/:personUuid', {controller: PersonCtrl, templateUrl: '/apps/frontPageApp/person.html?noCache=' + noCache});
});
-function FrontPageCtrl($scope, Person, Badge, PagingTableService) {
- $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person));
+function FrontPageCtrl($scope, Person, Badge) {
+ $scope.persons = Person.query();
$scope.recentBadges = Badge.query();
}
-function PersonCtrl($scope, $routeParams, Person, Badge, Build, PagingTableService) {
+function PersonListCtrl($scope, Person, PagingTableService) {
+ $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person, {orderBy: "name"}));
+}
+
+function PersonCtrl($scope, $routeParams, Person, Build, PagingTableService) {
var personUuid = $routeParams.personUuid;
$scope.mode = 'overview';
diff --git a/src/main/webapp/apps/frontPageApp/person.html b/src/main/webapp/apps/frontPageApp/person.html
index 8573afe..0ca5679 100755
--- a/src/main/webapp/apps/frontPageApp/person.html
+++ b/src/main/webapp/apps/frontPageApp/person.html
@@ -11,60 +11,58 @@
<li ng-class="{active: mode == 'builds'}"><a ng-click="setMode('builds')">Builds</a></li>
</ul>
- <div id="overview" ng-show="mode == 'overview'">
- <div class="row">
- <div class="span6">
- <h3>Upcoming</h3>
- <table>
- <tr ng-repeat="badge in person.badgesInProgress">
- <td style="padding-right: 1em">{{badge.name}}</td>
- <td style="width: 100%">
- <div class="progress" style="margin-bottom: 0;" title="Progress: {{badge.progress}} of {{badge.goal}}">
- <div class="bar" style="width: {{badge.progress / badge.goal * 100}}%;"></div>
- </div>
- </td>
- </tr>
- </table>
+ <div id="overview" ng-show="mode == 'overview'" class="row">
+ <div class="span6">
+ <h3>Upcoming</h3>
+ <table>
+ <tr ng-repeat="badge in person.badgesInProgress">
+ <td style="padding-right: 1em">{{badge.name}}</td>
+ <td style="width: 100%">
+ <div class="progress" style="margin-bottom: 0;" title="Progress: {{badge.progress}} of {{badge.goal}}">
+ <div class="bar" style="width: {{badge.progress / badge.goal * 100}}%;"></div>
+ </div>
+ </td>
+ </tr>
+ </table>
- <h3>Badges</h3>
- <ul class="unstyled">
- <li ng-repeat="badge in person.badges">
-<!--
- <span class="badge-level-{{badge.level}} badge">{{badge.name}}</span>
--->
- <strong>{{badge.name}}</strong>
-<!--
- <i class="icon-user ng-class: {{{1: 'badge-level-1', 2: 'badge-level-2', 3: 'badge-level-3'}[badge.level]}}"></i>
--->
- <span class="badge-level-{{badge.level}} badge">
- <i class="icon-user"></i>
- </span>
+ <h3>Badges</h3>
+ <ul class="unstyled">
+ <li ng-repeat="badge in person.badges">
+ <!--
+ <span class="badge-level-{{badge.level}} badge">{{badge.name}}</span>
+ -->
+ <strong>{{badge.name}}</strong>
+ <!--
+ <i class="icon-user ng-class: {{{1: 'badge-level-1', 2: 'badge-level-2', 3: 'badge-level-3'}[badge.level]}}"></i>
+ -->
+ <span class="badge-level-{{badge.level}} badge">
+ <i class="icon-user"></i>
+ </span>
- {{badge.createdDate | date:'medium'}}
- </li>
- </ul>
- </div>
- <div class="span6">
- <h3>Recent builds</h3>
- <table class="table">
- <thead>
-<!--
- <tr>
- <th>Date</th>
- <th>Success</th>
- <th></th>
- </tr>
--->
- </thead>
- <tbody>
- <tr ng-repeat="build in recentBuilds" class="{{{true: 'success', false: 'error'}[build.success]}}">
- <td>{{build.timestamp | date:'medium'}}</td>
- <td>{{{true: 'Success', false: 'Failure'}[build.success]}}</td>
- <td><a href="/build/{{build.uuid}}">Details</a></td>
- </tr>
- </tbody>
- </table>
- </div>
+ {{badge.createdDate | date:'medium'}}
+ </li>
+ </ul>
+ </div>
+ <div class="span6">
+ <h3>Recent builds</h3>
+ <table class="table">
+ <thead>
+ <!--
+ <tr>
+ <th>Date</th>
+ <th>Success</th>
+ <th></th>
+ </tr>
+ -->
+ </thead>
+ <tbody>
+ <tr ng-repeat="build in recentBuilds" class="{{{true: 'success', false: 'error'}[build.success]}}">
+ <td>{{build.timestamp | date:'medium'}}</td>
+ <td>{{{true: 'Success', false: 'Failure'}[build.success]}}</td>
+ <td><a href="/build/{{build.uuid}}">Details</a></td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
diff --git a/src/main/webapp/apps/frontPageApp/personList.html b/src/main/webapp/apps/frontPageApp/personList.html
new file mode 100755
index 0000000..a4f48c1
--- /dev/null
+++ b/src/main/webapp/apps/frontPageApp/personList.html
@@ -0,0 +1,35 @@
+<div class="container">
+
+ <navbar/>
+
+ <div class="page-header">
+ <h1>People</h1>
+ </div>
+
+ <div class="row">
+ <div class="span12">
+ <table class="table">
+ <tbody>
+ <tr ng-repeat="person in persons.rows">
+ <td><a href="/#/person/{{person.person.uuid}}">{{person.person.name}}</a></td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="2">
+ <ul class="pager">
+ <!--ng-class="{disabled: persons.startIndex == 0}"-->
+ <li class="previous" ng-hide="persons.startIndex == 0">
+ <a ng-click="persons.prev()">&larr; Prev</a>
+ </li>
+ <li class="next">
+ <a ng-click="persons.next()">Next &rarr;</a>
+ </li>
+ </ul>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </div>
+ </div>
+</div>