From 267e832fa16029f0ecd1cdaca699d661ddc556e8 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 21 Jan 2013 14:33:53 +0100
Subject: o Improved paging with a "view" state that's either 'loading', 'data'
 or 'error'.

---
 .../webapp/apps/frontPageApp/personList.html          | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/main/resources/webapp/apps/frontPageApp')

diff --git a/src/main/resources/webapp/apps/frontPageApp/personList.html b/src/main/resources/webapp/apps/frontPageApp/personList.html
index d229659..f36aba7 100755
--- a/src/main/resources/webapp/apps/frontPageApp/personList.html
+++ b/src/main/resources/webapp/apps/frontPageApp/personList.html
@@ -33,7 +33,7 @@
 
   <div class="row">
     <div class="span12">
-      <div class="row" ng-show="persons.showSpinner()">
+      <div class="row" ng-show="persons.viewState() == 'loading'">
         <div class="span12">
           <div style="height: 100px">
             <div spinner spinner-class="wat" spinner-left="564px" spinner-top="50%"></div>
@@ -41,19 +41,28 @@
         </div>
       </div>
 
-      <div class="row" ng-repeat="group in personGroups" ng-show="persons.showResults()">
+      <div class="row" ng-repeat="group in personGroups" ng-show="persons.viewState() == 'data'">
         <div class="span3" ng-repeat="person in group" style="padding-bottom: 1em">
           <div class="row">
             <avatar-xl person="person.person"></avatar-xl>
             <a href="/#/person/{{person.person.uuid}}">{{person.person.name}}</a>
             <br/>
-            <span ng-repeat="level in person.badges | countBadgeByLevel | gz">
-              <span class="badge-inverse badge-level-{{$index + 1}} badge"><i class="icon-user"></i> x {{level}}</span>
-            </span>
+              <span ng-repeat="level in person.badges | countBadgeByLevel | gz">
+                <span class="badge-inverse badge-level-{{$index + 1}} badge"><i class="icon-user"></i> x {{level}}</span>
+              </span>
           </div>
         </div>
       </div>
 
+      <div class="row" ng-show="persons.viewState() == 'error'">
+        <div class="span12">
+          <p>An error occurred when loading the data...</p>
+          <p ng-show="persons.error">
+            Error: {{persons.error.message}}
+          </p>
+        </div>
+      </div>
+
       <ul class="pager">
         <li ng-show="persons.showPrev()" class="previous {{{true: 'disabled', false: ''}[persons.prevDisabled()]}}">
           <a ng-click="persons.prev()">&larr; Prev</a>
-- 
cgit v1.2.3