Skip to content

Commit

Permalink
bug 1459 - fixed label to be Disk Quota
Browse files Browse the repository at this point in the history
Change-Id: I8b37235bd83d3841e878f25f376875a02d9ebed0
Reviewed-on: http://review.northscale.com:8080/806
Tested-by: Matt Ingenthron <matt@northscale.com>
Reviewed-by: Matt Ingenthron <matt@northscale.com>
  • Loading branch information
steveyen authored and Matt Ingenthron committed Jun 22, 2010
1 parent 3a9cee3 commit 42c2ea8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions deps/menelaus/priv/public/css/screen.css
Expand Up @@ -471,7 +471,7 @@ div.resource_panel td#pad-left {color:#444245; font-size:10pt; font-family:Verda
div.resource_panel td#pad-left input {border:2px solid #e0e4e6; font-size:10pt; height:25px; width:95px;}
div.resource_panel div.ssd_resource_container, div.resource_panel div.hdd_resource_container, div.resource_panel td.dynamic-ram-quota div {color:#444245;font-family:Verdana,Helvetica,Sans-Serif; font-size:10pt; margin-left:25px;}
div.resource_panel div.ssd_resource_container div.resource-row div, div.resource_panel div.hdd_resource_container div.resource-row div {margin-bottom:15px; margin-right:10px;}
div.resource_panel div.ssd_resource_container div.resource-row div label, div.resource_panel div.hdd_resource_container div.resource-row div label {display:block; float:left; height:25px; line-height:25px; margin-right:5px; text-align:right; width:195px;}
div.resource_panel div.ssd_resource_container div.resource-row div label, div.resource_panel div.hdd_resource_container div.resource-row div label {display:block; float:left; height:25px; line-height:25px; margin-right:5px; text-align:right; width:140px;}
div.resource_panel div.ssd_resource_container div.resource-row div input, div.resource_panel div.hdd_resource_container div.resource-row div input {border:1px solid #ccd3d7; color:#7e7e80; font-size:10pt; height:25px; margin-left:5px; padding-left:5px;width:95px;}
div.resource_panel div.ssd_resource_container div.resource-row div input.path-box, div.resource_panel div.hdd_resource_container div.resource-row div input.path-box {width:420px;}

Expand Down Expand Up @@ -970,4 +970,4 @@ ul.tabs .tab_left a.current:hover, ul.tabs .tab_right a.current:hover {text-shad

.footer_bg {background-color:#cbcfd2; padding-top:10px; padding-bottom:10px;}

.fixed {position:fixed !important;}
.fixed {position:fixed !important;}
12 changes: 6 additions & 6 deletions deps/menelaus/priv/public/index.html
Expand Up @@ -1971,7 +1971,7 @@ <h1>Congratulations</h1>
<!-- screen S.3 -->
<div class="config-top">
<h1>Configure Server</h1>
<h2>Step <span class="current-step">1</span> of 3</h2>
<h2>Step <span class="current-step">1</span> of 3</h2>
</div>
<div class="alert_red" id="init_resources_failed_message" style="display:none;">
<div class="al_text">
Expand Down Expand Up @@ -2099,7 +2099,7 @@ <h2 class="title">Secure this Server</h2>
$('div.config-bottom button#step-3-back').click(function (e) {
e.preventDefault();
showInitDialog("cluster");
});
});
});
</script>
</div>
Expand Down Expand Up @@ -2197,7 +2197,7 @@ <h3>
<col width="230" />
<col width="300" />
<tr>
<td class="label"><label>Disk One Memory Allocated:</label></td>
<td class="label"><label>Disk One Quota:</label></td>
<td>
<span class="float_right">Total: 300Gb</span>
<input type="text" name="fl_one" class="inp inp_size_1"> GB
Expand All @@ -2211,7 +2211,7 @@ <h3>
</td>
</tr>
<tr>
<td class="label"><label>Disk Two Memory Allocated:</label></td>
<td class="label"><label>Disk Two Quota:</label></td>
<td>
<span class="float_right">Total: 300Gb</span>
<input type="text" name="fl_one" class="inp inp_size_1"> GB
Expand Down Expand Up @@ -2313,7 +2313,7 @@ <h2>Solid State Storage</h2>
<!-- {% $.each(storage['hdd'], function () { %} -->
<div class="resource-row">
<div>
<label>Disk One Memory Allocated:</label>
<label>Disk One Quota:</label>
<input type="text" name="" value="{%= h(this.quotaMb != 'none' ? ((this.quotaMb * 1024) + ' MB') : 'unlimited') %}" disabled />
<span style="color:#7e7e80; font-size:10pt;">MB</span>
<span style="color:#7e7e80; font-size:10pt; margin-left:50px;">
Expand Down Expand Up @@ -2465,7 +2465,7 @@ <h2 class="header_2">NorthScale Message</h2>
</div></div></div><div class="bottom"><div><div>&nbsp;</div></div></div></div>
</div>
<div class="popup_2">

</div>
</body>
</html>

0 comments on commit 42c2ea8

Please sign in to comment.