From 7bd5b32049afaeb7291fbaddb5e95fbcfe10e38b Mon Sep 17 00:00:00 2001 From: Colin Fleming Date: Fri, 4 Apr 2014 17:47:44 +0100 Subject: Tidy up "services_dnsmasq" XHTML Add "closehead" variable and manually close HEAD Add CDATA sections to scripts Add SUMMARY to tables Update HTML Boolean operators Close INPUT Move TFOOT between THEAD and TBODY (quirk of HTML) Move NOWRAP into class statement Close IMG and add ALT Deprecate ampersand Add table row, but don't display it Remove duplicate opening and closing TR tags Add missing closing BODY tag and closing HTML tag --- usr/local/www/services_dnsmasq.php | 136 ++++++++++----------- .../www/services_dnsmasq_domainoverride_edit.php | 16 +-- usr/local/www/services_dnsmasq_edit.php | 20 +-- 3 files changed, 89 insertions(+), 83 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index e485d74..82258a4 100644 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -143,6 +143,7 @@ if ($_GET['act'] == "del") { } } +$closehead = false; $pgtitle = array(gettext("Services"),gettext("DNS forwarder")); $shortcut_section = "resolver"; include("head.inc"); @@ -150,7 +151,7 @@ include("head.inc"); ?> - +
-

+
" . gettext("You must apply the changes in order for them to take effect."));?>
- +
@@ -267,7 +268,7 @@ function show_advanced_dns() { ?>

- -

- onClick="enable_change(false)"> + onclick="enable_change(false)" />

- > + />

- > + />

- > + />

- > + />
System - General Setup - DNS Servers), ". @@ -231,7 +232,7 @@ function show_advanced_dns() {

- > + />

- > + />

- > + />

- > + />
@@ -295,21 +296,20 @@ function show_advanced_dns() {

+

> - " /> - + " /> -
>


-

- " onclick="enable_change(true)"> + " onclick="enable_change(true)" />
@@ -329,7 +329,7 @@ function show_advanced_dns() {

 
- +
@@ -340,7 +340,7 @@ function show_advanced_dns() {
- +
@@ -348,15 +348,28 @@ function show_advanced_dns() { + + + + + + @@ -372,11 +385,11 @@ function show_advanced_dns() { -
- +
- +
add
+ + + + + +
add
+
  - + @@ -395,56 +408,55 @@ function show_advanced_dns() { - + - - - - - -
+ - - + +
')">edit')">delete
  - + + edit
- - - - - -
-

- +
- - - +

- +
+ + + + + + @@ -457,30 +469,18 @@ function show_advanced_dns() { - + + - - - - - -
- +
- - + +
add
+ + + + + +
add
+
  -  ')"> edit +  ')">delete
- - - - - -
-
diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php index e74d396..135400f 100644 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -126,44 +126,46 @@ include("head.inc");
- +
- +

mycompany.localdomain 1.168.192.in-addr.arpa
- +

192.168.100.100
- +

- +
  - "> " onclick="history.back()"> + " /> " onclick="history.back()" /> - +
+ + diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php index 5916b1c..3991886 100644 --- a/usr/local/www/services_dnsmasq_edit.php +++ b/usr/local/www/services_dnsmasq_edit.php @@ -177,6 +177,7 @@ include("head.inc");
- +
@@ -205,28 +207,28 @@ include("head.inc");
- +

- +

- +

192.168.100.100 fd00:abcd::1
- +
- +
-- cgit v1.1
@@ -273,19 +275,21 @@ include("head.inc"); " />
  - "> " onclick="history.back()"> + " /> " onclick="history.back()" /> - +