Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-28 15:29:52 -07:00
commit 213a2eb6a2
1 changed files with 19 additions and 20 deletions

View File

@ -36,20 +36,27 @@
</div>
<div class="grid_container">
<div class="grid_header">
<div class="grid_header_cell" style="width:25%;">
<div class="grid_header_cell" style="width:25%; border:none;">
<div class="grid_header_title">Name</div>
</div>
<div class="grid_header_cell" style="width:20%;">
<div class="grid_header_cell" style="width:18%; border:none;">
<div class="grid_header_title">Value</div>
</div>
<div class="grid_header_cell" style="width:24%;">
<div class="grid_header_cell" style="width:22%; border:none;">
<div class="grid_header_title">Description</div>
</div>
<div class="grid_header_cell" style="width:20%;">
<div class="grid_header_cell" style="width:20%; border:none;">
<div class="grid_header_title">Category</div>
</div>
<div class="grid_header_cell" style="width:10%;">
<div class="grid_header_title"></div>
<div class="grid_header_cell" style="width:15%; border:none;">
<div id="action_link" class="grid_actionbox" id="account_action_link">
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
<li><%=t.t("no.available.actions")%></li>
<li id="edit_button">Edit</a></li>
</ul>
</div>
</div>
</div>
</div>
@ -57,13 +64,13 @@
<div class="grid_row_cell" style="width: 25%;">
<div class="row_celltitles" id="name"></div>
</div>
<div class="grid_row_cell" style="width: 20%;">
<div class="grid_row_cell" style="width: 18%;">
<div class="row_celltitles" id="value">
</div>
<input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
<div id="value_edit_errormsg" style="display:none"></div>
</div>
<div class="grid_row_cell" style="width: 24%;">
<div class="grid_row_cell" style="width: 22%;">
<div class="row_celltitles" id="description">
</div>
</div>
@ -71,11 +78,7 @@
<div class="row_celltitles" id="category">
</div>
</div>
<div class="grid_row_cell" style="width: 10%;">
<div class="row_celltitles">
<a id="edit_button" href="#">Edit</a>
</div>
</div>
</div>
@ -83,13 +86,13 @@
<div class="grid_row_cell" style="width: 25%;">
<div class="row_celltitles" id="name"></div>
</div>
<div class="grid_row_cell" style="width: 20%;">
<div class="grid_row_cell" style="width: 18%;">
<div class="row_celltitles" id="value">
</div>
<input class="text" id="value_edit" style="width: 200px; display: none;" type="text" />
<div id="value_edit_errormsg" style="display:none"></div>
</div>
<div class="grid_row_cell" style="width: 24%;">
<div class="grid_row_cell" style="width: 22%;">
<div class="row_celltitles" id="description">
</div>
</div>
@ -97,11 +100,7 @@
<div class="row_celltitles" id="category">
</div>
</div>
<div class="grid_row_cell" style="width: 10%;">
<div class="row_celltitles">
<a href="#">Edit</a>
</div>
</div>
</div>