Skip to content

Commit

Permalink
tweaked texts of labels and messages
Browse files Browse the repository at this point in the history
Change-Id: I3d9123dc35b2707e584db3af0bdd72d79361234b
Reviewed-on: http://review.northscale.com/3203
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Sean Lynch <seanl@literati.org>
  • Loading branch information
Aliaksey Kandratsenka authored and Sean Lynch committed Oct 11, 2010
1 parent 385e1b8 commit b026a33
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions deps/menelaus/priv/public/index.html
Expand Up @@ -952,8 +952,6 @@ <h2>Access Control</h2>
<label class="for-ascii"><input type="radio" name="authType" value="none"><span>Dedicated port (supports ASCII protocol and is auth-less)</span></label> <label class="for-ascii"><input type="radio" name="authType" value="none"><span>Dedicated port (supports ASCII protocol and is auth-less)</span></label>
<label class="for-proxy-port"><span>Protocol Port:</span><input name="proxyPort"><span class="error-container err-proxyPort"></span></label> <label class="for-proxy-port"><span>Protocol Port:</span><input name="proxyPort"><span class="error-container err-proxyPort"></span></label>
<h2>Memory Size</h2> <h2>Memory Size</h2>
<strong class="when-non-persistent clearfix" style="font-weight:normal;">Please note: Memcached buckets are configured with a per-node amount of
memory. Total bucket memory will change as nodes are added/removed.</strong>
<div class="size-gauge for-ram"> <div class="size-gauge for-ram">
<div class="t">Cluster quota (<span class="total">192 Gb</span>)</div> <div class="t">Cluster quota (<span class="total">192 Gb</span>)</div>
<div class="gauge"> <div class="gauge">
Expand All @@ -969,7 +967,7 @@ <h2>Memory Size</h2>
</tr></table> </tr></table>
</div> </div>


<label class="for-ram-quota"><span><em class="when-non-persistent">Per Node RAM Quota:</em><em class="when-persistent">Dynamic RAM Quota:</em></span><input name="ramQuotaMB" value="30"><abbr>MB</abbr></label> <label class="for-ram-quota"><span><em class="when-non-persistent">Per Node RAM Quota:</em><em class="when-persistent">Per Node RAM Quota:</em></span><input name="ramQuotaMB" value="30"><abbr>MB</abbr></label>
<div class="error-container err-ramQuotaMB"></div> <div class="error-container err-ramQuotaMB"></div>
<em class="memcached-summary when-non-persistent"></em> <em class="memcached-summary when-non-persistent"></em>
<div class="persistent-only"> <div class="persistent-only">
Expand Down Expand Up @@ -1504,8 +1502,6 @@ <h2>Bucket Settings</h2>
<label><input type="radio" name="bucketType" value="membase"> Membase</label> <label><input type="radio" name="bucketType" value="membase"> Membase</label>
</div> </div>
<h2>Memory Size</h2> <h2>Memory Size</h2>
<strong class="when-non-persistent clearfix" style="font-weight:normal;">Please note: Memcached buckets are configured with a per-node amount of
memory. Total bucket memory will change as nodes are added/removed.</strong>
<div class="size-gauge for-ram"> <div class="size-gauge for-ram">
<div class="t">Cluster quota (<span class="total">192 Gb</span>)</div> <div class="t">Cluster quota (<span class="total">192 Gb</span>)</div>
<div class="gauge"> <div class="gauge">
Expand All @@ -1520,7 +1516,7 @@ <h2>Memory Size</h2>
<td>Free (<span class="free">12 Gb</span>)</td> <td>Free (<span class="free">12 Gb</span>)</td>
</tr></table> </tr></table>
</div> </div>
<label class="for-ram-quota"><span><em class="when-non-persistent">Per Node RAM Quota:</em><em class="when-persistent">Dynamic RAM Quota:</em></span><input name="ramQuotaMB" value="30"><abbr>MB</abbr></label> <label class="for-ram-quota"><span><em class="when-non-persistent">Per Node RAM Quota:</em><em class="when-persistent">Per Node RAM Quota:</em></span><input name="ramQuotaMB" value="30"><abbr>MB</abbr></label>
<div class="error-container err-ramQuotaMB"></div> <div class="error-container err-ramQuotaMB"></div>
<em class="memcached-summary when-non-persistent"></em> <em class="memcached-summary when-non-persistent"></em>
<div class="persistent-only"> <div class="persistent-only">
Expand Down
2 changes: 1 addition & 1 deletion deps/menelaus/src/menelaus_web_buckets.erl
Expand Up @@ -287,7 +287,7 @@ perform_warnings_validation(ParsedProps, Errors) ->
ActiveCount = length(ns_cluster_membership:active_nodes()), ActiveCount = length(ns_cluster_membership:active_nodes()),
if if
ActiveCount =< X -> ActiveCount =< X ->
Msg = <<"Warning, you do not have enough servers to support this number of replicas. If you continue, a warning message will be displayed until you add enough servers to support this number of replicas.">>, Msg = <<"Warning, you do not have enough servers to support this number of replicas.">>,
[{replicaNumber, Msg}]; [{replicaNumber, Msg}];
true -> true ->
[] []
Expand Down

0 comments on commit b026a33

Please sign in to comment.