- Fixed column sorting

- cleaned up some javascript

Author: Marius Cramer

interface/web/admin/templates/directive_snippets_edit.htm

@@ -35,7 +35,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/directive_snippets_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/directive_snippets_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
 <script language="JavaScript" type="text/javascript">

interface/web/admin/templates/directive_snippets_list.htm

@@ -13,10 +13,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th class="tiny-col"><tmpl_var name="active_txt"></th>
-                        <th><tmpl_var name="name_txt"></th>
-                        <th><tmpl_var name="type_txt"></th>
-						<th><tmpl_var name="customer_viewable_txt"></th>
+                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+                        <th data-column="name"><tmpl_var name="name_txt"></th>
+                        <th data-column="type"><tmpl_var name="type_txt"></th>
+						<th data-column="customer_viewable"><tmpl_var name="customer_viewable_txt"></th>
                         <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
@@ -25,7 +25,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                         <td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
 						<td><select class="form-control" name="search_customer_viewable">{tmpl_var name='search_customer_viewable'}</select></td>
                         <td class="text-right">
-                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span class="icon icon-filter"></span></button>
+                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/directive_snippets_list.php"><span class="icon icon-filter"></span></button>
                         </td>
                     </tr>
                 </thead>

interface/web/admin/templates/firewall_edit.htm

@@ -28,6 +28,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/firewall_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/firewall_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>

interface/web/admin/templates/firewall_list.htm

@@ -16,10 +16,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th class="tiny-col"><tmpl_var name="active_txt"></th>
-                        <th><tmpl_var name="server_id_txt"></th>
-                        <th><tmpl_var name="tcp_port_txt"></th>
-                        <th><tmpl_var name="udp_port_txt"></th>
+                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+                        <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+                        <th data-column="tcp_port"><tmpl_var name="tcp_port_txt"></th>
+                        <th data-column="udp_port"><tmpl_var name="udp_port_txt"></th>
                         <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
@@ -28,7 +28,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                         <td><input class="form-control" type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
                         <td><input class="form-control" type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
                         <td class="text-right">
-                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');"><span class="icon icon-filter"></span></button>
+                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/firewall_list.php"><span class="icon icon-filter"></span></button>
                         </td>
                     </tr>
                 </thead>

interface/web/admin/templates/groups_edit.htm

@@ -17,6 +17,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/groups_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/groups_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/groups_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>

interface/web/admin/templates/groups_list.htm

@@ -17,15 +17,15 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th><tmpl_var name="name_txt"></th>
-                        <th><tmpl_var name="description_txt"></th>
+                        <th data-column="name"><tmpl_var name="name_txt"></th>
+                        <th data-column="description"><tmpl_var name="description_txt"></th>
                         <th class="text-right">&nbsp;</th>
                     </tr>
                     <tr>
                         <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td><input class="form-control" type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
                         <td class="text-right">
-                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');"><span class="icon icon-filter"></span></button>
+                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/groups_list.php"><span class="icon icon-filter"></span></button>
                         </td>
                     </tr>
                 </thead>

interface/web/admin/templates/iptables_edit.htm

@@ -52,6 +52,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/iptables_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/iptables_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>

interface/web/admin/templates/iptables_list.htm

@@ -15,14 +15,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th class="tiny-col"><tmpl_var name="active_txt"></th>
-                        <th><tmpl_var name="server_id_txt"></th>
-                        <th><tmpl_var name="table_txt"></th>
-                        <th><tmpl_var name="protocol_txt"></th>
-                        <th><tmpl_var name="singleport_txt"></th>
-                        <th><tmpl_var name="multiport_txt"></th>
-                        <th><tmpl_var name="state_txt"></th>
-                        <th><tmpl_var name="target_txt"></th>
+                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+                        <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+                        <th data-column="table"><tmpl_var name="table_txt"></th>
+                        <th data-column="protocol"><tmpl_var name="protocol_txt"></th>
+                        <th data-column="singleport"><tmpl_var name="singleport_txt"></th>
+                        <th data-column="multiport"><tmpl_var name="multiport_txt"></th>
+                        <th data-column="state"><tmpl_var name="state_txt"></th>
+                        <th data-column="target"><tmpl_var name="target_txt"></th>
                         <th class="text-right">&nbsp;</th>
                     </tr>
                     <tr>
@@ -35,7 +35,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                         <td></td>
                         <td><select class="form-control" name="search_target">{tmpl_var name='search_target'}</select></td>
                         <td class="text-right">
-                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');"><span class="icon icon-filter"></span></button>
+                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/iptables_list.php"><span class="icon icon-filter"></span></button>
                         </td>
                     </tr>
                 </thead>

interface/web/admin/templates/language_add.htm

@@ -20,6 +20,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_add.php');">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>

interface/web/admin/templates/language_complete.htm

@@ -21,7 +21,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 </select></div>
             </div>
 			<div class="clear"><div class="right">
-				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');">{tmpl_var name='btn_save_txt'}</button>
+				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
 				<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
 			</div></div>