Merge pull request #35 from marcelloc/patch-28

gui improvements and bug fixes

1 files changed, 30 insertions, 22 deletions

diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index 89a48e56..a1d40503 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -41,7 +41,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>varnishbackends</name>
-	<version>0.0.2</version>
+	<version>0.0.4</version>
 	<title>Varnish: Backends</title>
 	<include_file>/usr/local/pkg/varnish.inc</include_file>
    	<additional_files_needed>
@@ -186,68 +186,76 @@
 		<field>
 			<fielddescr>Probe URL</fielddescr>
 			<fieldname>probe_url</fieldname>
-			<description><![CDATA[Enter the URL that varnish will use to ensure that this backend is healthy.<BR>It can be a url like "/", "/teste.htm" or a request "http://www.pfsense.org/"]]></description>
+			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the URL that varnish will use to ensure that this backend is healthy.</a><BR>It can be a url like "/", "/teste.htm" or a request "http://www.mysite.com/index.htm"]]></description>
 			<type>input</type>
 			<size>40</size> 
 		</field>
 		<field>
 			<fielddescr>Probe Interval</fielddescr>
 			<fieldname>probe_interval</fieldname>
-			<description>Enter the frequency in seconds that varnish will check the probe url.</description>
+			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the frequency in seconds that varnish will check the probe url.</a>]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Probe Timeout</fielddescr>
 			<fieldname>probe_timeout</fieldname>
-			<description>Enter the frequency in seconds that varnish will wait for a backend probe response.</description>
+			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the frequency in seconds that varnish will wait for a backend probe response.</a>]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Probe Window</fielddescr>
 			<fieldname>probe_window</fieldname>
-			<description>Enter the value of how many of the latest polls that should be examined.</description>
+			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the value of how many of the latest polls that should be examined.</a>]]></description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Probe Threshold</fielddescr>
 			<fieldname>probe_threshold</fieldname>
-			<description>Enter the value of how many of those must have succeeded for us to consider the backend healthy.</description>
+			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the value of how many of those must have succeeded for us to consider the backend healthy.</a>]]></description>
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>URL Mappings</fielddescr>
-			<fieldname>URL Mappings</fieldname>
+			<fielddescr>Mappings</fielddescr>
+			<fieldname>Mappings</fieldname>
 			<type>listtopic</type>
-			<name>If you plan to load balance to this backend then visit the LB Directors tab and do not add any mappings below.</name>
+			<name>Backend Mappings</name>
 		</field>
 		<field>
-			<fielddescr>Map URLs</fielddescr>
+			<fielddescr><![CDATA[<a href="https://www.varnish-cache.org/docs/master/tutorial/advanced_backend_servers.html">Leave empty if you plan to include this server in Load Balance (LB Directors)</a>]]></fielddescr>
 			<fieldname>MapURLs</fieldname>
 		    <type>rowhelper</type>
 		    <rowhelper>
 				<rowhelperfield>
-				    <fielddescr>Match type</fielddescr>
-				    <fieldname>fieldtype</fieldname>
+				    <fielddescr>Map</fielddescr>
+				    <fieldname>maptype</fieldname>
 				    <description>Select the field type that you would like to use in matching the URL.</description>
 					<type>select</type>
 					<options>
-						<option>
-							<name>Equals</name>
-							<value>==</value>
-						</option>
-						<option>
-							<name>Regex</name>
-							<value>~</value>
-						</option>
+						<option><name>Host</name><value>http.host</value></option>
+						<option><name>URL</name><value>url</value></option>
+					</options>
+				</rowhelperfield>
+				<rowhelperfield>
+				    <fielddescr>Match</fielddescr>
+				    <fieldname>fieldtype</fieldname>
+					<type>select</type>
+					<options>
+						<option><name>Equals</name><value>==</value></option>
+						<option><name>Regex</name><value>~</value></option>
 					</options>
 				</rowhelperfield>
 				<rowhelperfield>
-				    <fielddescr>URL</fielddescr>
+				    <fielddescr>expression</fielddescr>
 				    <fieldname>urlmapping</fieldname>
-				    <description>Enter the URL that will be mapped to this backend.</description>
 				    <type>input</type>
 					<size>30</size>
 				</rowhelperfield>
+				<rowhelperfield>
+				    <fielddescr><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/VCLExampleGrace">grace</a>]]></fielddescr>
+				    <fieldname>grace</fieldname>
+				    <type>input</type>
+					<size>5</size>
+				</rowhelperfield>
 			</rowhelper>
 		</field>
 	</fields>