Rebased from upstream / out of band repository.
[librecmc/librecmc.git] / package / luci / applications / luci-app-firewall / luasrc / view / firewall / cbi_addrule.htm
index 463b2e05f4990e57afdb77ec58115332076057a7..e0092a7a56e4f8e36682f6ae8a0e2f07e4d0d1a8 100644 (file)
 <%
        local fw = require "luci.model.firewall".init()
-       local wz = fw:get_zone("wan")
-       local lz = fw:get_zone("lan")
+       local zones = fw:get_zones()
 %>
 
-<div class="cbi-section-create cbi-tblsection-create">
-       <% if wz and lz then %>
-               <br />
-               <table class="cbi-section-table" style="margin-left:5px">
-                       <tr class="cbi-section-table-titles">
-                               <th class="cbi-section-table-cell left" colspan="4"><%:Open ports on router%>:</th>
-                       </tr>
-                       <tr class="cbi-section-table-descr">
-                               <th class="cbi-section-table-cell"><%:Name%></th>
-                               <th class="cbi-section-table-cell"><%:Protocol%></th>
-                               <th class="cbi-section-table-cell"><%:External port%></th>
-                               <th class="cbi-section-table-cell"></th>
-                       </tr>
-                       <tr class="cbi-section-table-row">
-                               <td class="cbi-section-table-cell" style="width:130px">
-                                       <input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
-                               </td>
-                               <td class="cbi-section-table-cell" style="width:110px">
-                                       <select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
-                                               <option value="tcp udp">TCP+UDP</option>
-                                               <option value="tcp">TCP</option>
-                                               <option value="udp">UDP</option>
-                                               <option value="other"><%:Other...%></option>
-                                       </select>
-                               </td>
-                               <td class="cbi-section-table-cell" style="width:110px">
-                                       <input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
-                               </td>
-                               <td class="cbi-section-table-cell left">
-                                       <input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
-                               </td>
-                       </tr>
-               </table>
+<% if #zones > 0 then %>
+       <h4><%:Open ports on router%></h4>
+       <div class="table">
+               <div class="tr cbi-section-table-titles">
+                       <div class="th"><%:Name%></div>
+                       <div class="th"><%:Protocol%></div>
+                       <div class="th"><%:External port%></div>
+                       <div class="th"></div>
+               </div>
+               <div class="tr">
+                       <div class="td">
+                               <input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
+                       </div>
+                       <div class="td">
+                               <select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
+                                       <option value="tcp udp">TCP+UDP</option>
+                                       <option value="tcp">TCP</option>
+                                       <option value="udp">UDP</option>
+                                       <option value="other"><%:Other...%></option>
+                               </select>
+                       </div>
+                       <div class="td">
+                               <input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
+                       </div>
+                       <div class="td bottom">
+                               <input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
+                       </div>
+               </div>
+       </div>
+<% end %>
+<% if #zones > 1 then %>
+       <h4><%:New forward rule%></h4>
+       <div class="table">
+               <div class="tr cbi-section-table-titles">
+                       <div class="th"><%:Name%></div>
+                       <div class="th"><%:Source zone%></div>
+                       <div class="th"><%:Destination zone%></div>
+                       <div class="th"></div>
+               </div>
+               <div class="tr">
+                       <div class="td">
+                               <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
+                       </div>
+                       <div class="td">
+                               <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
+                                       <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+                                               <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+                                       <%- end %>
+                               </select>
+                       </div>
+                       <div class="td">
+                               <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
+                                       <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+                                               <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+                                       <%- end %>
+                               </select>
+                       </div>
+                       <div class="td bottom">
+                               <input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
+                       </div>
+               </div>
+       </div>
+<% else %>
+       <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+<% end %>
 
-               <table class="cbi-section-table" style="margin-left:5px">
-                       <tr class="cbi-section-table-titles">
-                               <th class="cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</th>
-                       </tr>
-                       <tr class="cbi-section-table-descr">
-                               <th class="cbi-section-table-cell"><%:Name%></th>
-                               <th class="cbi-section-table-cell"><%:Source zone%></th>
-                               <th class="cbi-section-table-cell"><%:Destination zone%></th>
-                               <th class="cbi-section-table-cell"></th>
-                       </tr>
-                       <tr class="cbi-section-table-row">
-                               <td class="cbi-section-table-cell" style="width:130px">
-                                       <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
-                               </td>
-                               <td class="cbi-section-table-cell" style="width:110px">
-                                       <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
-                                               <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-                                                       <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-                                               <%- end %>
-                                       </select>
-                               </td>
-                               <td class="cbi-section-table-cell" style="width:110px">
-                                       <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
-                                               <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-                                                       <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-                                               <%- end %>
-                                       </select>
-                               </td>
-                               <td class="cbi-section-table-cell left">
-                                       <input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
-                               </td>
-                       </tr>
-               </table>
+<% if #zones > 0 then %>
+       <script type="text/javascript">//<![CDATA[
+               cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
+               document.getElementById('_newopen.extport').addEventListener('blur',
+                       function() {
+                               var n = document.getElementById('_newopen.name');
+                               var p = document.getElementById('_newopen.proto');
 
-               <script type="text/javascript">//<![CDATA[
-                       cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
-                       cbi_bind(document.getElementById('_newopen.extport'), 'blur',
-                               function() {
-                                       var n = document.getElementById('_newopen.name');
-                                       var p = document.getElementById('_newopen.proto');
-                                       var hints = {
-                                       /*  port    name     0=both, 1=tcp, 2=udp, 3=other */
-                                               22:   [ 'SSH',   1 ],
-                                               53:   [ 'DNS',   0 ],
-                                               80:   [ 'HTTP',  1 ],
-                                               443:  [ 'HTTPS', 1 ],
-                                       };
-
-                                       if (!this.className.match(/invalid/))
+                               if (!this.className.match(/invalid/))
+                               {
+                                       if (!n.value && this.value)
                                        {
-                                               var hint = hints[this.value || 0];
-                                               if (hint)
-                                               {
-                                                       p.selectedIndex = hint[1];
-
-                                                       if (!n.value)
-                                                               n.value = hint[0];
-                                               }
-                                               else if (!n.value && this.value)
-                                               {
-                                                       n.value = 'Open' + this.value;
-                                               }
+                                               n.value = 'Open' + this.value;
                                        }
-                               });
-
-
-                       cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');
-               //]]></script>
-       <% else %>
-               <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-       <% end %>
-</div>
+                               }
+                       });
+       //]]></script>
+<% end %>