luci-compat: add btn class to all button inputs

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/modules/luci-compat/luasrc/view/cbi/button.htm b/modules/luci-compat/luasrc/view/cbi/button.htm
index 6ccba58f23d465cfc90bb489dd56844879b07290..1f9d16424085c62aed29743c559fa032ac2db5dd 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/button.htm
+++ b/modules/luci-compat/luasrc/view/cbi/button.htm
@@ -1,6 +1,6 @@
 <%+cbi/valueheader%>
        <% if self:cfgvalue(section) ~= false then %>
-               <input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
+               <input class="btn cbi-button cbi-button-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
        <% else %>
                -
        <% end %>

diff --git a/modules/luci-compat/luasrc/view/cbi/delegator.htm b/modules/luci-compat/luasrc/view/cbi/delegator.htm
index 4fd19265d83a511f4ffe9f4c0921975cffb8e62a..2606e7f6d7292fd750fbe46fd45e4889ddc41dfe 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/delegator.htm
+++ b/modules/luci-compat/luasrc/view/cbi/delegator.htm
@@ -6,18 +6,18 @@
 <% end %>
 <% if not self.disallow_pageactions then %>
 <% if self.allow_finish and not self:get_next(self.current) then %>
-       <input class="cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
+       <input class="btn cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
 <% elseif self:get_next(self.current) then %>
-               <input class="cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
+               <input class="btn cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
 <% end %>
 <% if self.allow_cancel then %>
-               <input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
+               <input class="btn cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
 <% end %>
 <% if self.allow_reset then %>
-               <input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
+               <input class="btn cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
 <% end %>
 <% if self.allow_back and self:get_prev(self.current) then %>
-               <input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
+               <input class="btn cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
 <% end %>
 <% end %>
                <script type="text/javascript">cbi_d_update();</script>

diff --git a/modules/luci-compat/luasrc/view/cbi/error.htm b/modules/luci-compat/luasrc/view/cbi/error.htm
index 75ec1082aaf478935b677112c268cc29766b363e..9d63f66763db43b6e4e97a54dcc734ef76972ac7 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/error.htm
+++ b/modules/luci-compat/luasrc/view/cbi/error.htm
@@ -14,6 +14,6 @@
        </p>
 
        <div class="cbi-page-actions">
-               <input class="cbi-button cbi-button-apply" type="submit" name="cbi.save" value="<%:Save%>" />
+               <input class="btn cbi-button cbi-button-apply" type="submit" name="cbi.save" value="<%:Save%>" />
        </div>
 </div>

diff --git a/modules/luci-compat/luasrc/view/cbi/ipaddr.htm b/modules/luci-compat/luasrc/view/cbi/ipaddr.htm
index 1c924e15446adc34c60804c717b6d907fa3feba1..d34d8d9865909ade6af45fe4ac4aac180698fe95 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/ipaddr.htm
+++ b/modules/luci-compat/luasrc/view/cbi/ipaddr.htm
@@ -23,5 +23,5 @@
                ifattr(self.combobox_manual, "data-manual", self.combobox_manual) ..
                ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
        %> /><!--
-       --><button class="cbi-button cbi-button-neutral" title="<%:Switch to CIDR list notation%>" aria-label="<%:Switch to CIDR list notation%>" onclick="switchToCIDRList(event)">…</button>
+       --><button class="btn cbi-button cbi-button-neutral" title="<%:Switch to CIDR list notation%>" aria-label="<%:Switch to CIDR list notation%>" onclick="switchToCIDRList(event)">…</button>
 <%+cbi/valuefooter%>

diff --git a/modules/luci-compat/luasrc/view/cbi/nsection.htm b/modules/luci-compat/luasrc/view/cbi/nsection.htm
index 14232e3d944ae3992699b96013c16c7fec4d45cb..faceffeedf95ec0afeb353ec00994034cb79ae20 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/nsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/nsection.htm
@@ -8,7 +8,7 @@
                <%- end %>
                <% if self.addremove then -%>
                        <div class="cbi-section-remove right">
-                               <input type="submit" class="cbi-button" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:Delete%>" />
+                               <input type="submit" class="btn cbi-button" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:Delete%>" />
                        </div>
                <%- end %>
                <div class="cbi-section-node<% if self.tabs then %> cbi-section-node-tabbed<% end %>" id="cbi-<%=self.config%>-<%=section%>">
@@ -22,7 +22,7 @@
                        <legend><%=self.title%></legend>
                <%- end %>
                <div class="cbi-section-descr"><%=self.description%></div>
-               <input type="submit" class="cbi-button cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:Add%>" />
+               <input type="submit" class="btn cbi-button cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:Add%>" />
        </div>
        <%- end %>
 <% end %>

diff --git a/modules/luci-compat/luasrc/view/cbi/simpleform.htm b/modules/luci-compat/luasrc/view/cbi/simpleform.htm
index 3e10724ec551b1529a148b1e05579b3e179119b5..9e1514546e6ab11d7f783c79285efa18c43d772a 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/simpleform.htm
+++ b/modules/luci-compat/luasrc/view/cbi/simpleform.htm
@@ -45,26 +45,26 @@
                        %><div class="cbi-page-actions"><%
 
                        if display_back then
-                               %><input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" /> <%
+                               %><input class="btn cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" /> <%
                        end
 
                        if display_cancel then
                                local label = pcdata(self.cancel or translate("Cancel"))
-                               %><input class="cbi-button cbi-button-link" type="button" value="<%=label%>" onclick="cbi_submit(this, 'cbi.cancel')" /> <%
+                               %><input class="btn cbi-button cbi-button-link" type="button" value="<%=label%>" onclick="cbi_submit(this, 'cbi.cancel')" /> <%
                        end
 
                        if display_skip then
-                               %><input class="cbi-button cbi-button-neutral" type="button" value="<%:Skip%>" onclick="cbi_submit(this, 'cbi.skip')" /> <%
+                               %><input class="btn cbi-button cbi-button-neutral" type="button" value="<%:Skip%>" onclick="cbi_submit(this, 'cbi.skip')" /> <%
                        end
 
                        if display_submit then
                                local label = pcdata(self.submit or translate("Submit"))
-                               %><input class="cbi-button cbi-button-save" type="submit" value="<%=label%>" /> <%
+                               %><input class="btn cbi-button cbi-button-save" type="submit" value="<%=label%>" /> <%
                        end
 
                        if display_reset then
                                local label = pcdata(self.reset or translate("Reset"))
-                               %><input class="cbi-button cbi-button-reset" type="reset" value="<%=label%>" /> <%
+                               %><input class="btn cbi-button cbi-button-reset" type="reset" value="<%=label%>" /> <%
                        end
 
                        %></div><%

diff --git a/modules/luci-compat/luasrc/view/cbi/tblsection.htm b/modules/luci-compat/luasrc/view/cbi/tblsection.htm
index 1e067edf38e785b11513575ba6da2a7aef717a47..c60915a6a689842288fb4b013b2903f309b22505 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/tblsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tblsection.htm
@@ -148,10 +148,10 @@ end
                                <div class="td cbi-section-table-cell nowrap cbi-section-actions">
                                        <div>
                                                <%- if self.sortable then -%>
-                                                       <input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move up%>" />
-                                                       <input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move down%>" />
+                                                       <input class="btn cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move up%>" />
+                                                       <input class="btn cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move down%>" />
                                                <% end; if self.extedit then -%>
-                                                       <input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
+                                                       <input class="btn cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
                                                        <%- if type(self.extedit) == "string" then
                                                        %> onclick="location.href='<%=self.extedit:format(section)%>'"
                                                        <%- elseif type(self.extedit) == "function" then
@@ -159,7 +159,7 @@ end
                                                        <%- end
                                                        %> alt="<%:Edit%>" title="<%:Edit%>" />
                                                <% end; if self.addremove then %>
-                                                       <input class="cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
+                                                       <input class="btn cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
                                                <%- end -%>
                                        </div>
                                </div>
@@ -186,7 +186,7 @@ end
                <% if self.template_addremove then include(self.template_addremove) else -%>
                <div class="cbi-section-create cbi-tblsection-create">
                        <% if self.anonymous then %>
-                               <input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
+                               <input class="btn cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
                        <% else %>
                                <% if self.invalid_cts then -%>
                                        <div class="cbi-section-error"><%:Invalid%></div>
@@ -194,7 +194,7 @@ end
                                <div>
                                        <input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" data-type="uciname" data-optional="true" />
                                </div>
-                               <input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
+                               <input class="btn cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
                        <% end %>
                </div>
                <%- end %>

diff --git a/modules/luci-compat/luasrc/view/cbi/tsection.htm b/modules/luci-compat/luasrc/view/cbi/tsection.htm
index 8f3b7f0ffb599d65cbc59ac5eece89561bd2e92c..b7718fa0f3cdbc280accb8a9c501fc94856e0f3d 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/tsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tsection.htm
@@ -13,7 +13,7 @@
        <% local isempty = true for i, k in ipairs(self:cfgsections()) do -%>
                <% if self.addremove then -%>
                        <div class="cbi-section-remove right">
-                               <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" onclick="this.form.cbi_state='del-section'; return true" value="<%:Delete%>" class="cbi-button" />
+                               <input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" onclick="this.form.cbi_state='del-section'; return true" value="<%:Delete%>" class="btn cbi-button" />
                        </div>
                <%- end %>
 
@@ -36,7 +36,7 @@
                <% if self.template_addremove then include(self.template_addremove) else -%>
                <div class="cbi-section-create">
                        <% if self.anonymous then -%>
-                               <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+                               <input type="submit" class="btn cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
                        <%- else -%>
                                <% if self.invalid_cts then -%>
                                        <div class="cbi-section-error"><%:Invalid%></div>
@@ -44,7 +44,7 @@
                                <div>
                                        <input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>." name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>." data-type="uciname" data-optional="true" />
                                </div>
-                               <input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
+                               <input class="btn cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
                        <%- end %>
                </div>
                <%- end %>

diff --git a/modules/luci-compat/luasrc/view/cbi/ucisection.htm b/modules/luci-compat/luasrc/view/cbi/ucisection.htm
index 8fa11d68f8313abd97c1bdd9749fb2158611d607..930d41583e531f3d32c2b5b00ac40985deb70275 100644 (file)
--- a/modules/luci-compat/luasrc/view/cbi/ucisection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/ucisection.htm
@@ -51,6 +51,6 @@
                                <%- end %>
                        </select>
                <%- end -%>
-               <input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" />
+               <input type="submit" class="btn cbi-button cbi-button-fieldadd" value="<%:Add%>" />
        </div>
 <% end %>