etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7466: account page - user tab - add state field.

This commit is contained in:
Jessica Wang 2010-12-15 15:20:46 -08:00
parent d083783288
commit 4875cbfabd
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/jsp/account.jsp
View File

@ -209,6 +209,16 @@
</div> </div>
</div> </div>
<div class="grid_rows even"> <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="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
API Key:</div> API Key:</div>
@ -218,7 +228,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows odd"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Secret Key:</div> Secret Key:</div>
@ -228,7 +238,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Account:</div> Account:</div>
@ -238,7 +248,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows odd"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Role:</div> Role:</div>
@ -248,7 +258,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Domain:</div> Domain:</div>
@ -258,7 +268,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows odd"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Email:</div> Email:</div>
@ -268,7 +278,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
First Name:</div> First Name:</div>
@ -278,7 +288,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows odd"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Last Name:</div> Last Name:</div>
@ -288,7 +298,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
Timezone:</div> Timezone:</div>

1
ui/scripts/cloud.core.account.js
View File

@ -485,6 +485,7 @@ function accountUserJSONToTemplate(jsonObj, $template) {
$template.find("#grid_header_title").text(fromdb(jsonObj.username)); $template.find("#grid_header_title").text(fromdb(jsonObj.username));
$template.find("#id").text(fromdb(jsonObj.id)); $template.find("#id").text(fromdb(jsonObj.id));
$template.find("#username").text(fromdb(jsonObj.username)); $template.find("#username").text(fromdb(jsonObj.username));
$template.find("#state").text(fromdb(jsonObj.state));
$template.find("#apikey").text(fromdb(jsonObj.apikey)); $template.find("#apikey").text(fromdb(jsonObj.apikey));
$template.find("#secretkey").text(fromdb(jsonObj.secretkey)); $template.find("#secretkey").text(fromdb(jsonObj.secretkey));
$template.find("#account").text(fromdb(jsonObj.account)); $template.find("#account").text(fromdb(jsonObj.account));