From 4875cbfabd2ed3e0f93ce68e27df910fcfcc4636 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Dec 2010 15:20:46 -0800
Subject: [PATCH] bug 7466: account page - user tab - add state field.

---
 ui/jsp/account.jsp               | 28 +++++++++++++++++++---------
 ui/scripts/cloud.core.account.js |  1 +
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 8b13e27e924..379785e4fdd 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -207,8 +207,18 @@
             <div class="row_celltitles" id="username">
             </div>
         </div>
-    </div>    
+    </div>   
     <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                State:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="state">
+            </div>
+        </div>
+    </div>    
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 API Key:</div>
@@ -218,7 +228,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows odd">
+    <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Secret Key:</div>
@@ -228,7 +238,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows even">
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Account:</div>
@@ -238,7 +248,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows odd">
+    <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Role:</div>
@@ -248,7 +258,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows even">
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Domain:</div>
@@ -258,7 +268,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows odd">
+    <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Email:</div>
@@ -268,7 +278,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows even">
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 First Name:</div>
@@ -278,7 +288,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows odd">
+    <div class="grid_rows even">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Last Name:</div>
@@ -288,7 +298,7 @@
             </div>
         </div>
     </div>
-    <div class="grid_rows even">
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 Timezone:</div>
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index c2adf2f3b2f..8072b35694c 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -485,6 +485,7 @@ function accountUserJSONToTemplate(jsonObj, $template) {
     $template.find("#grid_header_title").text(fromdb(jsonObj.username));			   
     $template.find("#id").text(fromdb(jsonObj.id));
     $template.find("#username").text(fromdb(jsonObj.username));	    
+    $template.find("#state").text(fromdb(jsonObj.state));	
     $template.find("#apikey").text(fromdb(jsonObj.apikey));
     $template.find("#secretkey").text(fromdb(jsonObj.secretkey));    
     $template.find("#account").text(fromdb(jsonObj.account));