luci-0.11: merge outstanding trunk changes

[project/luci.git] / libs / web / luasrc / view / cbi / apply_xhr.htm

diff --git a/libs/web/luasrc/view/cbi/apply_xhr.htm b/libs/web/luasrc/view/cbi/apply_xhr.htm
index d519a5f59c39300e71772ce9bad894d9ea34ac45..1814c9393b8cba50bbc0732dae8ed9e636789f10 100644 (file)
--- a/libs/web/luasrc/view/cbi/apply_xhr.htm
+++ b/libs/web/luasrc/view/cbi/apply_xhr.htm
@@ -1,21 +1,7 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-
 <% export("cbi_apply_xhr", function(id, configs, redirect) -%>
 <fieldset class="cbi-section" id="cbi-apply-<%=id%>">
        <legend><%:Applying changes%></legend>
-       <script type="text/javascript"><![CDATA[
+       <script type="text/javascript">//<![CDATA[
                var apply_xhr = new XHR();
 
                apply_xhr.get('<%=luci.dispatcher.build_url("servicectl", "restart", table.concat(configs, ","))%>', null,
@@ -49,9 +35,9 @@ $Id$
                                window.setTimeout(checkfinish, 1000);
                        }
                );
-       ]]></script>
+       //]]></script>
 
        <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-       <span id="cbi-apply-<%=id%>-status"><%:Waiting for router...%></span>
+       <span id="cbi-apply-<%=id%>-status"><%:Waiting for changes to be applied...%></span>
 </fieldset>
 <%-    end) %>