Permalink
Browse files

tweaked texts of labels and messages

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...
1 parent 385e1b8 commit b026a332545408eebd4f57805314308552ddcaaf Aliaksey Kandratsenka committed with seanlynch Oct 11, 2010
Showing with 3 additions and 7 deletions.
  1. +2 −6 deps/menelaus/priv/public/index.html
  2. +1 −1 deps/menelaus/src/menelaus_web_buckets.erl
@@ -952,8 +952,6 @@ <h2 class="form_section_title">Alert me when there are...</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-proxy-port"><span>Protocol Port:</span><input name="proxyPort"><span class="error-container err-proxyPort"></span></label>
<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="t">Cluster quota (<span class="total">192 Gb</span>)</div>
<div class="gauge">
@@ -969,7 +967,7 @@ <h2 class="form_section_title">Alert me when there are...</h2>
</tr></table>
</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>
<em class="memcached-summary when-non-persistent"></em>
<div class="persistent-only">
@@ -1504,8 +1502,6 @@ <h2 class="title">Secure this Server</h2>
<label><input type="radio" name="bucketType" value="membase"> Membase</label>
</div>
<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="t">Cluster quota (<span class="total">192 Gb</span>)</div>
<div class="gauge">
@@ -1520,7 +1516,7 @@ <h2 class="title">Secure this Server</h2>
<td>Free (<span class="free">12 Gb</span>)</td>
</tr></table>
</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>
<em class="memcached-summary when-non-persistent"></em>
<div class="persistent-only">
@@ -287,7 +287,7 @@ perform_warnings_validation(ParsedProps, Errors) ->
ActiveCount = length(ns_cluster_membership:active_nodes()),
if
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}];
true ->
[]

0 comments on commit b026a33

Please sign in to comment.