Skip to content

Commit a9af9e1

Browse files
committed
Move form to use json_forms_and_tables function
Pages created before settings/dhcp.html used a hand-crafted method for fetching the form and setting up the ajax submit routine. This patch updates those pages to use the common json_forms_and_tables function. The only page that still uses hand-crafted code is the network/wan page because it has a special type of form on it. Signed-off-by: Vernon Mauery <[email protected]>
1 parent 5323c4b commit a9af9e1

File tree

10 files changed

+15
-100
lines changed

10 files changed

+15
-100
lines changed

html/js/json/forms/dns_settings

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
form:
22
name: dns_settings
3+
id: dns-settings-form
34
action: none
45
class: ajax json
56
elements:

html/js/json/forms/firewall_settings

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
form:
22
name: firewall_settings
3+
id: firewall-settings-form
34
action: none
45
class: ajax json
56
elements:

html/js/json/forms/main_settings

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
form:
22
name: main_settings
3+
id: main-settings-form
34
action: none
45
class: ajax json
56
elements:

html/js/json/forms/network_lan

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
form:
22
name: network_lan
3+
id: network-lan-form
34
action: none
45
class: ajax json
56
elements:

html/js/json/forms/network_wireless

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
form:
22
name: network_wireless
3+
id: network-wireless-form
34
action: none
45
class: ajax json
56
elements:

html/pages/firewall/index.html

+2-20
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
<script type="text/javascript">
1515
(function($) {$(function() {
1616

17-
var url = "/config/?json&debug";
18-
$.postJSON(url, {firewall_settings: "form"}, function(data) {
19-
var rform = $.render_form(data.firewall_settings.form, data.firewall_settings.values);
20-
$('#firewall-settings-form').html(rform);
21-
22-
});
23-
24-
var firewall_settings_form_options = {
25-
url: "/config/?json&form_submit=firewall_settings&debug",
26-
type: "POST",
27-
dataType: "json",
28-
success: function() {
29-
$.msgbox("The settings were saved.");
30-
},
31-
};
32-
$('#firewall-settings-form').submit(function() {
33-
$(this).ajaxSubmit(firewall_settings_form_options);
34-
return false;
35-
});
17+
$.json_forms_and_tables(['firewall_settings'], []);
3618

3719
}); })(jQuery);
3820
</script>
@@ -98,7 +80,7 @@ <h2>Change Status</h2>
9880

9981

10082
<h1>Firewall</h1>
101-
<div id="firewall-settings-form">
83+
<div id="firewall-settings-form-wrapper">
10284
</div>
10385

10486

html/pages/network/lan.html

+2-20
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
<script type="text/javascript">
1515
(function($) {$(function() {
1616

17-
var url = "/config/?json&debug";
18-
$.postJSON(url, {network_lan: "form"}, function(data) {
19-
var rform = $.render_form(data.network_lan.form, data.network_lan.values);
20-
$('#network-lan-form').html(rform);
21-
22-
});
23-
24-
var network_lan_form_options = {
25-
url: "/config/?json&form_submit=network_lan&debug",
26-
type: "POST",
27-
dataType: "json",
28-
success: function() {
29-
$.msgbox("The settings were saved.");
30-
},
31-
};
32-
$('#network-lan-form').submit(function() {
33-
$(this).ajaxSubmit(network_lan_form_options);
34-
return false;
35-
});
17+
$.json_forms_and_tables(['network_lan'],[]);
3618

3719
}); })(jQuery);
3820
</script>
@@ -101,7 +83,7 @@ <h2>Change Status</h2>
10183
<h1>LAN</h1>
10284

10385

104-
<div id="network-lan-form">
86+
<div id="network-lan-form-wrapper">
10587
</div>
10688

10789

html/pages/network/wireless.html

+2-20
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
<script type="text/javascript">
1515
(function($) {$(function() {
1616

17-
var url = "/config/?json&debug";
18-
$.postJSON(url, {network_wireless: "form"}, function(data) {
19-
var rform = $.render_form(data.network_wireless.form, data.network_wireless.values);
20-
$('#network-wireless-form').html(rform);
21-
22-
});
23-
24-
var network_wireless_form_options = {
25-
url: "/config/?json&form_submit=network_wireless&debug",
26-
type: "POST",
27-
dataType: "json",
28-
success: function() {
29-
$.msgbox("The settings were saved.");
30-
},
31-
};
32-
$('#network-wireless-form').submit(function() {
33-
$(this).ajaxSubmit(network_wireless_form_options);
34-
return false;
35-
});
17+
$.json_forms_and_tables(['network_wireless'], []);
3618

3719
}); })(jQuery);
3820
</script>
@@ -98,7 +80,7 @@ <h2>Change Status</h2>
9880

9981

10082
<h1>Wireless</h1>
101-
<div id="network-wireless-form">
83+
<div id="network-wireless-form-wrapper">
10284
</div>
10385

10486

html/pages/settings/dns.html

+2-20
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
<script type="text/javascript">
1515
(function($) {$(function() {
1616

17-
var url = "/config/?json&debug";
18-
$.postJSON(url, {dns_settings: "form"}, function(data) {
19-
var rform = $.render_form(data.dns_settings.form, data.dns_settings.values);
20-
$('#dns-settings-form').html(rform);
21-
22-
});
23-
24-
var dns_settings_form_options = {
25-
url: "/config/?json&form_submit=dns_settings&debug",
26-
type: "POST",
27-
dataType: "json",
28-
success: function() {
29-
alert("Settings saved");
30-
},
31-
};
32-
$('#dns-settings-form').submit(function() {
33-
$(this).ajaxSubmit(dns_settings_form_options);
34-
return false;
35-
});
17+
$.json_forms_and_tables(['dns_settings'], []);
3618

3719
}); })(jQuery);
3820
</script>
@@ -99,7 +81,7 @@ <h2>Change Status</h2>
9981

10082

10183
<h1>DNS</h1>
102-
<div id="dns-settings-form">
84+
<div id="dns-settings-form-wrapper">
10385
</div>
10486

10587

html/pages/settings/index.html

+2-20
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
<script type="text/javascript">
1515
(function($) {$(function() {
1616

17-
var url = "/config/?json&debug";
18-
$.postJSON(url, {main_settings: "form"}, function(data) {
19-
var rform = $.render_form(data.main_settings.form, data.main_settings.values);
20-
$('#main-settings-form').html(rform);
21-
22-
});
23-
24-
var main_settings_form_options = {
25-
url: "/config/?json&form_submit=main_settings&debug",
26-
type: "POST",
27-
dataType: "json",
28-
success: function() {
29-
$.msgbox("The settings were saved.");
30-
},
31-
};
32-
$('#main-settings-form').submit(function() {
33-
$(this).ajaxSubmit(main_settings_form_options);
34-
return false;
35-
});
17+
$.json_forms_and_tables(['main_settings'], []);
3618

3719
}); })(jQuery);
3820
</script>
@@ -99,7 +81,7 @@ <h2>Change Status</h2>
9981

10082

10183
<h1>Settings</h1>
102-
<div id="main-settings-form">
84+
<div id="main-settings-form-wrapper">
10385
</div>
10486

10587

0 commit comments

Comments
 (0)