diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-04 23:42:17 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-04 23:42:17 +0100 |
commit | b895e15d3c9bd4c7a1d420c99af9d1f2efca8a0b (patch) | |
tree | 6b2baa5593f7d621ab8319ae00b35f0b766acda8 /src/main/webapp | |
parent | 1902b2c1dfff62c0225a170db38a4882df9143e6 (diff) | |
download | esper-testing-b895e15d3c9bd4c7a1d420c99af9d1f2efca8a0b.tar.gz esper-testing-b895e15d3c9bd4c7a1d420c99af9d1f2efca8a0b.tar.bz2 esper-testing-b895e15d3c9bd4c7a1d420c99af9d1f2efca8a0b.tar.xz esper-testing-b895e15d3c9bd4c7a1d420c99af9d1f2efca8a0b.zip |
o Showing recent badges on the front page.
Diffstat (limited to 'src/main/webapp')
-rw-r--r-- | src/main/webapp/apps/core/CoreResources.js | 6 | ||||
-rwxr-xr-x | src/main/webapp/apps/frontPageApp/frontPage.html | 15 | ||||
-rwxr-xr-x | src/main/webapp/apps/frontPageApp/frontPageApp.js | 5 |
3 files changed, 21 insertions, 5 deletions
diff --git a/src/main/webapp/apps/core/CoreResources.js b/src/main/webapp/apps/core/CoreResources.js index 74ac184..aec6a15 100644 --- a/src/main/webapp/apps/core/CoreResources.js +++ b/src/main/webapp/apps/core/CoreResources.js @@ -17,3 +17,9 @@ function BuildParticipant($resource) { } angular.module('buildParticipant', ['ngResource']).factory('BuildParticipant', BuildParticipant); + +function Badge($resource) { + return $resource('/resource/core/badge'); +} + +angular.module('badge', ['ngResource']).factory('Badge', Badge); diff --git a/src/main/webapp/apps/frontPageApp/frontPage.html b/src/main/webapp/apps/frontPageApp/frontPage.html index 3c433ee..8e067e1 100755 --- a/src/main/webapp/apps/frontPageApp/frontPage.html +++ b/src/main/webapp/apps/frontPageApp/frontPage.html @@ -1,10 +1,19 @@ <div class="container"> <navbar/> -<!-- <ng-include src="'/apps/core/navbar.html'" /> --> <div class="page-header"> - <h1>Newcomers</h1> + <h1>Recent</h1> </div> + + <h3>Badges</h3> + <div> + <span ng-repeat="b in recentBadges"> + <a href="/person/{{b.person.uuid}}/"> {{b.person.name}} </a> + <span class="badge-level-{{badge.level}} badge">{{b.badge.name}}</span> + </span> + </div> + + <h3>Newcomers</h3> <table class="table"> <thead> <tr> @@ -14,7 +23,7 @@ </thead> <tbody> <tr ng-repeat="person in persons.rows"> - <td><a href="/person/{{person.uuid}}/">{{person.name}}</a></td> + <td><a href="/person/{{person.person.uuid}}/">{{person.person.name}}</a></td> <td>{{person.badges.length}}</td> </tr> </tbody> diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/webapp/apps/frontPageApp/frontPageApp.js index 624c484..d5af99f 100755 --- a/src/main/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/webapp/apps/frontPageApp/frontPageApp.js @@ -1,10 +1,11 @@ 'use strict'; -var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'pagingTableService', 'core.directives']).config(function ($routeProvider, $locationProvider) { +var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'pagingTableService', 'core.directives']).config(function ($routeProvider, $locationProvider) { $routeProvider. when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}); }); -function FrontPageCtrl($scope, Person, PagingTableService) { +function FrontPageCtrl($scope, Person, Badge, PagingTableService) { $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person)); + $scope.recentBadges = Badge.query(); } |