Backport Skip-Button support

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

diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm
index 0b22701..9a23e53 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/libs/cbi/luasrc/view/cbi/simpleform.htm
@@ -12,14 +12,15 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-
-<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>">
+<% if not self.embedded then %>
+<form method="post" action="<%=REQUEST_URI%>">
        <div>
                <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
                <input type="hidden" name="cbi.submit" value="1" />
        </div>
+<% end %>
        <div class="cbi-map" id="cbi-<%=self.config%>">
-               <h1><%=self.title%></h1>
+               <h2><a id="content" name="content"><%=self.title%></a></h2>
                <div class="cbi-map-descr"><%=self.description%></div>
                <% self:render_children() %>
                <br />
@@ -30,17 +31,22 @@ $Id$
 <%- if self.errmessage then %>
        <div class="error"><%=self.errmessage%></div>
 <%- end %>     
+<% if not self.embedded then %>
        <div>
+<%- if self.flow.skip then %>
+       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:skip Skip%>" />
+<% end %>
 <%- if self.submit ~= false then %>
                <input class="cbi-button-save" type="submit" value="
-       <%- if not self.submit then -%><%-:submit-%><%-else-%><%=self.submit%><%end%>
+       <%- if not self.submit then -%><%-:submit-%><%-else-%><%=self.submit%><%end-%>
        " />
 <% end %>
 <%- if self.reset ~= false then %>
                <input class="cbi-button-reset" type="reset" value="
-       <%- if not self.reset then -%><%-:reset-%><%-else-%><%=self.reset%><%end%>
+       <%- if not self.reset then -%><%-:reset-%><%-else-%><%=self.reset%><%end-%>
        " />
 <% end %>
-               <script type="text/javascript">cbi_d_init();</script>
+               <script type="text/javascript">cbi_d_update();</script>
        </div>
 </form>
+<% end %>