Commit 4d1c12d3 authored by Jody Garnett's avatar Jody Garnett
Browse files

Disable clicking on labels/whitespace to toggle checkboxes [GEOS-6948]

Fix provided by @eshon:

* Disabling clicking on labels and far-right whitespace to toggle checkboxes
* Removing closing input tags because input tags do not have closing tags

For https://jira.codehaus.org/browse/GEOS-6948
parent 60471614
......@@ -6,15 +6,15 @@
<ul>
<li>
<input id="verbose" class="field checkbox" type="checkbox" wicket:id="verbose" />
<label for="verbose" class="choice"><wicket:message key="verboseMessaging">Enable Verbose Messaging</wicket:message></label>
<label class="choice"><wicket:message key="verboseMessaging">Enable Verbose Messaging</wicket:message></label>
</li>
<li>
<input id="verboseExceptions" class="field checkbox" type="checkbox" wicket:id="verboseExceptions" />
<label for="verboseExceptions" class="choice"><wicket:message key="verboseExceptions">Enable Verbose Exceptions</wicket:message></label>
<label class="choice"><wicket:message key="verboseExceptions">Enable Verbose Exceptions</wicket:message></label>
</li>
<li>
<input id="globalServices" class="field checkbox" type="checkbox" wicket:id="globalServices" />
<label for="globalServices" class="choice"><wicket:message key="globalServices">Enable Global Services</wicket:message></label>
<label class="choice"><wicket:message key="globalServices">Enable Global Services</wicket:message></label>
</li>
<li>
<label for="charset"><wicket:message key="resourceErrorHandling">Resource Error Handling</wicket:message></label>
......@@ -38,7 +38,7 @@
</li>
<li>
<input id="stdOutLogging" class="field checkbox" type="checkbox" wicket:id="stdOutLogging" />
<label for="stdOutLogging" class="choice"><wicket:message key="stdOutLogging">Enable logging to STDOUT</wicket:message></label>
<label class="choice"><wicket:message key="stdOutLogging">Enable logging to STDOUT</wicket:message></label>
</li>
<li>
<label for="loggingLocation"><wicket:message key="loggingLocation">Logfile</wicket:message></label>
......@@ -49,10 +49,10 @@
<input id="xmlPostRequestLogBufferSize"class="field text" type="text" wicket:id="xmlPostRequestLogBufferSize" />
</li>
<li>
<label for="xmlExternalEntitiesEnabled"><wicket:message key="xmlExternalEntities">XML Entities</wicket:message></label>
<label for="xmlExternalEntitiesEnabled"><wicket:message key="xmlExternalEntities">XML Entities</wicket:message></label>
<input id="xmlExternalEntitiesEnabled" class="field checkbox" type="checkbox" wicket:id="xmlExternalEntitiesEnabled" />
<label for="xmlExternalEntitiesEnabled" class="choice"><wicket:message key="xmlExternalEntitiesEnabled">Evaluate XML Entities</wicket:message></label>
</li>
<label class="choice"><wicket:message key="xmlExternalEntitiesEnabled">Evaluate XML Entities</wicket:message></label>
</li>
<li>
<label for="featureTypeCacheSize"><wicket:message key="featureTypeCacheSize">Feature Type Cache Size</wicket:message></label>
<input id="featureTypeCacheSize"class="field text" type="text" wicket:id="featureTypeCacheSize" />
......
......@@ -22,11 +22,11 @@
</li>
<li>
<input id="recycling" class="field checkbox" type="checkbox" wicket:id="recycling" />
<label for="recycling" class="choice"><wicket:message key="recycling">recycling</wicket:message></label>
<label class="choice"><wicket:message key="recycling">recycling</wicket:message></label>
</li>
<li>
<input id="jpegAcceleration" class="field checkbox" type="checkbox" wicket:id="jpegAcceleration" />
<label for="jpegAcceleration" class="choice"><wicket:message key="jpegAcceleration">jpegAcceleration</wicket:message></label>
<label class="choice"><wicket:message key="jpegAcceleration">jpegAcceleration</wicket:message></label>
</li>
<li>
<label for="pngEncoderType"><wicket:message key="pngEncoderType">pngEncoderType</wicket:message></label>
......@@ -34,7 +34,7 @@
</li>
<li>
<input id="allowNativeMosaic" class="field checkbox" type="checkbox" wicket:id="allowNativeMosaic" />
<label for="allowNativeMosaic" class="choice"><wicket:message key="allowNativeMosaic">allowNativeMosaic</wicket:message></label>
<label class="choice"><wicket:message key="allowNativeMosaic">allowNativeMosaic</wicket:message></label>
</li>
<li>
<input id="allowNativeWarp" class="field checkbox" type="checkbox" wicket:id="allowNativeWarp" />
......
......@@ -9,13 +9,12 @@
<ul>
<li><label for="name"><wicket:message key="name">name</wicket:message></label> <input
id="name" class="text" type="text" wicket:id="name"></input></li>
id="name" class="text" type="text" wicket:id="name"/></li>
<li><label for="binding"><wicket:message key="type">type</wicket:message></label> <select
id="binding" wicket:id="binding"></select></li>
<li><input type="checkbox" id="nullable" wicket:id="nullable"> <label
for="nullable" class="choice"><wicket:message key="nullable">nullable</wicket:message></label></li>
<li><input type="checkbox" id="nullable" wicket:id="nullable"/> <label class="choice"><wicket:message key="nullable">nullable</wicket:message></label></li>
<li wicket:id="sizeContainer"><label for="size"><wicket:message key="size">size</wicket:message></label>
<input id="size" class="text" type="text" wicket:id="size"></input></li>
<input id="size" class="text" type="text" wicket:id="size"/></li>
<li wicket:id="crsContainer"><label for="crs"><wicket:message key="crs">cRS</wicket:message></label>
<span wicket:id="crs"></span></li>
</ul>
......
......@@ -18,7 +18,7 @@
<wicket:fragment wicket:id="newPage">
<div>
<wicket:message key="chooseNativeName">Layer name </wicket:message> <input type="text" wicket:id="nativeName"></input>
<wicket:message key="chooseNativeName">Layer name </wicket:message> <input type="text" wicket:id="nativeName"/>
</div>
<div>
<wicket:message key="selectStoredQuery">Select Stored Query </wicket:message> <select wicket:id="storedQueriesDropDown"></select>
......@@ -33,7 +33,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="parameterMappingValue">
<input type="text" wicket:id="text"></input>
<input type="text" wicket:id="text"/>
</wicket:fragment>
</wicket:extend>
......
......@@ -9,7 +9,7 @@
<ul>
<li><label for="name"><wicket:message key="name">name</wicket:message></label>
<input type="text" wicket:id="name"></input>
<input type="text" wicket:id="name"/>
</li>
<li>
<ul>
......
......@@ -54,7 +54,7 @@
</tr>
<tr>
<td>
<input type="text" wicket:id="definition"></input>
<input type="text" wicket:id="definition"/>
</td>
</tr>
</table>
......@@ -78,8 +78,8 @@
</tr>
-->
</table>
</li>
</ul>
</li>
</ul>
</wicket:panel>
</body>
</html>
\ No newline at end of file
......@@ -9,7 +9,7 @@
<ul>
<li><label for="name"><wicket:message key="name">Name</wicket:message></label> <input
id="name" class="text" type="text" wicket:id="name"></input></li>
id="name" class="text" type="text" wicket:id="name"/></li>
<li>
<label for="attributes"><wicket:message key="attributes">atts</wicket:message></label>
<div wicket:id="attributes"></div>
......
......@@ -9,7 +9,7 @@
<ul>
<li><label for="name"><wicket:message key="name">name</wicket:message></label>
<input type="text" wicket:id="name"></input>
<input type="text" wicket:id="name"/>
</li>
<li><label for="sqlDefinition"><wicket:message key="sqlDefinition">sql definition</wicket:message></label>
<textarea rows="60" cols="20" wicket:id="sql"></textarea>
......@@ -19,11 +19,11 @@
<a href="#" wicket:id="addNewParam"><wicket:message key="addNewParam">add new</wicket:message></a>&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#" wicket:id="removeParam"><wicket:message key="removeSelected">remove selected</wicket:message></a>
<div wicket:id="parameters"></div>
<input type="checkbox" wicket:id="escapeSql"><wicket:message key="escapeSql">Escape special characters</wicket:message></input>
<input type="checkbox" wicket:id="escapeSql"/><wicket:message key="escapeSql">Escape special characters</wicket:message>
</li>
<li><label for="attributes"><wicket:message key="attributes">attributes</wicket:message></label>
<a href="#" wicket:id="refresh"><wicket:message key="refresh">refresh</wicket:message></a>&nbsp;&nbsp;&nbsp;
<span wicket:message="title:guessGeometrySridWarning"><input type="checkbox" wicket:id="guessGeometrySrid"><wicket:message key="guessGeometrySrid">Guess geometry type and srid</wicket:message></input></span>
<span wicket:message="title:guessGeometrySridWarning"><input type="checkbox" wicket:id="guessGeometrySrid"/><wicket:message key="guessGeometrySrid">Guess geometry type and srid</wicket:message></span>
<div wicket:id="attributes"></div>
</li>
</ul>
......@@ -34,7 +34,7 @@
</form>
<wicket:fragment wicket:id="checkbox">
<input type="checkbox" wicket:id="identifier"></input>
<input type="checkbox" wicket:id="identifier"/>
</wicket:fragment>
<wicket:fragment wicket:id="geometry">
......@@ -42,9 +42,9 @@
</wicket:fragment>
<wicket:fragment wicket:id="text">
<input type="text""wicket:id="text"></input>
</wicket:fragment>
<input type="text""wicket:id="text"/>
</wicket:fragment>
</wicket:extend>
......
......@@ -5,11 +5,11 @@
<ul>
<li>
<label for="name"><wicket:message key="name">Name</wicket:message></label>
<input wicket:id="name" id="name" class="text"></input>
<input wicket:id="name" id="name" class="text"/>
</li>
<li>
<label for="title"><wicket:message key="layerGroupTitle">Title</wicket:message></label>
<input wicket:id="title" id="title" class="text"></input>
<input wicket:id="title" id="title" class="text"/>
</li>
<li>
<label for="abstract"><wicket:message key="abstract">Abstract</wicket:message></label>
......@@ -24,7 +24,7 @@
<div wicket:id="bounds" class="selfclear"></div>
</li>
<li>
<input wicket:id="generateBounds" type="submit" wicket:message="value:generateBounds"></input>
<input wicket:id="generateBounds" type="submit" wicket:message="value:generateBounds"/>
</li>
<li>
<label for="mode"><wicket:message key="mode">Mode</wicket:message></label>
......@@ -32,7 +32,7 @@
</li>
<li wicket:id="rootLayerContainer">
<div wicket:id="rootLayer"></div>
</li>
</li>
<li>
<div wicket:id="layers"></div>
</li>
......@@ -44,8 +44,8 @@
</li>
<li class="button-group selfclear">
<a href="#" wicket:id="save"><wicket:message key="save">Save</wicket:message></a>
<a href="#" wicket:id="cancel"><wicket:message key="cancel">Cancel</wicket:message></a>
</li>
<a href="#" wicket:id="cancel"><wicket:message key="cancel">Cancel</wicket:message></a>
</li>
</ul>
</form>
</wicket:extend>
......
......@@ -4,11 +4,11 @@
<ul>
<li><label><wicket:message key="rootLayer">Root Layer</wicket:message></label></li>
<li><a class="add-link" wicket:id="add"><wicket:message key="setRootLayer">Set Root Layer...</wicket:message></a></li>
<li><input wicket:id="rootLayer" id="rootLayer" class="text"></input></li>
<li><input wicket:id="rootLayer" id="rootLayer" class="text"/></li>
<li><label for="rootLayerStyle"><wicket:message key="rootLayerStyle">Root Layer Style</wicket:message></label></li>
<li><select wicket:id="rootLayerStyle"></select></li>
</ul>
<div wicket:id="popup"></div>
</wicket:panel>
</wicket:panel>
</body>
</html>
\ No newline at end of file
......@@ -13,19 +13,19 @@
<ul>
<li>
<label for="name"><wicket:message key="name">Name</wicket:message></label>
<input id="name" class="text" type="text" wicket:id="name"></input>
<input id="name" class="text" type="text" wicket:id="name"/>
</li>
<li>
<input id="basic-enabled" class="field checkbox" wicket:id="enabled" type="checkbox"></input>
<label for="basic-enabled" class="choice"><wicket:message key="enabled">Enabled</wicket:message></label>
<input id="basic-enabled" class="field checkbox" wicket:id="enabled" type="checkbox"/>
<label class="choice"><wicket:message key="enabled">Enabled</wicket:message></label>
</li>
<li>
<input id="basic-advertised" class="field checkbox" wicket:id="advertised" type="checkbox"></input>
<label for="basic-advertised" class="choice"><wicket:message key="advertised">Advertised</wicket:message></label>
<input id="basic-advertised" class="field checkbox" wicket:id="advertised" type="checkbox"/>
<label class="choice"><wicket:message key="advertised">Advertised</wicket:message></label>
</li>
<li>
<label for="title"><wicket:message key="titleMsg">Title</wicket:message></label>
<input id="title" class="text" type="text" wicket:id="title"></input>
<input id="title" class="text" type="text" wicket:id="title"/>
</li>
<li>
<label for="abstract"><wicket:message key="abstract">Abstract</wicket:message></label>
......@@ -46,7 +46,7 @@
<ul>
<li>
<div wicket:id="metadataLinks"></div>
</li>
</li>
</ul>
</fieldset>
</li>
......@@ -56,7 +56,7 @@
<ul>
<li>
<div wicket:id="dataLinks"></div>
</li>
</li>
</ul>
</fieldset>
</li>
......@@ -76,7 +76,7 @@
<li>
<label for="srsHandling"><wicket:message key="srsHandling">SRS handling</wicket:message></label>
<select id="srsHandling" wicket:id="srsHandling"></select>
</li>
</li>
</ul>
</fieldset>
</li>
......@@ -102,8 +102,8 @@
</wicket:panel>
<ul>
<li class="button-group selfclear">
<input class="btnTxt" wicket:id="submit" type="submit"><wicket:message key="submit"/></input>
<input class="btnTxt" wicket:id="cancel" type="submit"><wicket:message key="cancel"/></input>
<input class="btnTxt" wicket:id="submit" type="submit"/><wicket:message key="submit"/>
<input class="btnTxt" wicket:id="cancel" type="submit"/><wicket:message key="cancel"/>
</li>
</ul>
</form>
......
......@@ -10,8 +10,8 @@
<th></th>
</tr>
<tr wicket:id="links">
<td><input wicket:id="format" type="text" class="text"></input></td>
<td><span wicket:id="urlBorder"><input wicket:id="dataLinkURL" type="text" class="text"></input></span></td>
<td><input wicket:id="format" type="text" class="text"/></td>
<td><span wicket:id="urlBorder"><input wicket:id="dataLinkURL" type="text" class="text"/></span></td>
<td><a href="#" wicket:id="removeLink"><wicket:message key="remove">Remove</wicket:message></a></td>
</tr>
</table>
......
......@@ -4,8 +4,8 @@
<wicket:panel>
<ul>
<li><input type="checkbox" id="enabled" wicket:id="enabled">
<wicket:message key="enabled">enabled</wicket:message></input>
<li><input type="checkbox" id="enabled" wicket:id="enabled"/>
<wicket:message key="enabled">enabled</wicket:message>
&nbsp;&nbsp;<em><span wicket:id="noAttributeMsg"></span></em></li>
<li wicket:id="configContainer">
<ul wicket:id="configs">
......@@ -13,7 +13,7 @@
<label for="attribute">
<wicket:message key="attribute">attribute</wicket:message>
</label>
<select id="attribute" wicket:id="attribute"></select>
<select id="attribute" wicket:id="attribute"></select>
<label for="endAttribute">
<wicket:message key="endAttribute">endAttribute</wicket:message>
</label>
......@@ -42,7 +42,7 @@
<label for="strategy">
<wicket:message key="defaultValueStrategy">defaultValue</wicket:message>
</label>
<select id="strategy" wicket:id="strategy"></select>
<select id="strategy" wicket:id="strategy"></select>
<div wicket:id="referenceValueContainer">
<label for="referenceValue">
<wicket:message key="referenceValue">referenceValue</wicket:message>
......
......@@ -6,7 +6,7 @@
<fieldset><legend><span><wicket:message key="curves">curves</wicket:message></span></legend>
<ul>
<li>
<input id="linestrings-are-curves" class="field checkbox" wicket:id="circularArcPresent" type="checkbox"></input>
<input id="linestrings-are-curves" class="field checkbox" wicket:id="circularArcPresent" type="checkbox"/>
<label for="linestrings-are-curves" class="choice"><wicket:message key="linestrings-are-curves">Enabled</wicket:message></label>
</li>
<li>
......
......@@ -12,8 +12,8 @@
</tr>
<tr wicket:id="links">
<td><select wicket:id="type"></select></td>
<td><input wicket:id="format" type="text" class="text"></input></td>
<td><span wicket:id="urlBorder"><input wicket:id="metadataLinkURL" type="text" class="text"></input></span></td>
<td><input wicket:id="format" type="text" class="text"/></td>
<td><span wicket:id="urlBorder"><input wicket:id="metadataLinkURL" type="text" class="text"/></span></td>
<td><a href="#" wicket:id="removeLink"><wicket:message key="remove">Remove</wicket:message></a></td>
</tr>
</table>
......
......@@ -15,8 +15,8 @@
<p class="instruct"><wicket:message key="setURIasNamespace">Set a valid URI (Universal Resource Identifier) as namespace.</wicket:message></p>
</li>
<li class="button-group selfclear">
<input class="btnTxt" wicket:id="submit" type="submit"><wicket:message key="submit"/></input>
<input class="btnTxt" wicket:id="cancel" type="submit"><wicket:message key="cancel"/></input>
<input class="btnTxt" wicket:id="submit" type="submit"><wicket:message key="submit"/>
<input class="btnTxt" wicket:id="cancel" type="submit"><wicket:message key="cancel"/>
</li>
</ul>
<div wicket:id="feedback"></div>
......
......@@ -16,8 +16,8 @@
<!-- [FIXME] this should be updated to use the submit pattern we're using elsewhere (<input> tags for submit and cancel. Basically, the following (I've stripped the trailing colon after "wicket" to avoid errors
<ul>
<li class="button-group selfclear">
<input class="btnTxt" wicketid="submit" type="submit"><wicketmessage key="submit"/></input>
<input class="btnTxt" wicketid="cancel" type="submit"><wicketmessage key="cancel"/></input>
<input class="btnTxt" wicketid="submit" type="submit"><wicketmessage key="submit"/>
<input class="btnTxt" wicketid="cancel" type="submit"><wicketmessage key="cancel"/>
</li>
</ul>
-->
......
......@@ -3,7 +3,7 @@
<wicket:panel>
<ul>
<li wicket:id="services" class="nav-administer-service">
<input type="checkbox" wicket:id="enabled" style="float:left; margin-right: 1em;"></input>
<input type="checkbox" wicket:id="enabled" style="float:left; margin-right: 1em;"/>
<a wicket:id="link">
<img src="#" wicket:id="link.icon"/><span wicket:id="link.label"></span>
</a>
......
......@@ -4,7 +4,7 @@
<ul>
<li>
<label for="enabled"><wicket:message key="enabled">Enabled</wicket:message></label>
<input name="enabled" type="checkbox" wicket:id="enabled"></input>
<input name="enabled" type="checkbox" wicket:id="enabled"/>
</li>
<div wicket:id="settingsContainer">
<li>
......@@ -13,15 +13,15 @@
<div wicket:id="otherSettings">
<li>
<input id="verbose" class="field checkbox" type="checkbox" wicket:id="verbose" />
<label for="verbose" class="choice"><wicket:message key="verboseMessaging">Enable Verbose Messaging</wicket:message></label>
<label class="choice"><wicket:message key="verboseMessaging">Enable Verbose Messaging</wicket:message></label>
</li>
<li>
<input id="verboseExceptions" class="field checkbox" type="checkbox" wicket:id="verboseExceptions" />
<label for="verboseExceptions" class="choice"><wicket:message key="verboseExceptions">Enable Verbose Exceptions</wicket:message></label>
<label class="choice"><wicket:message key="verboseExceptions">Enable Verbose Exceptions</wicket:message></label>
</li>
<li>
<input id="localWorkspaceIncludesPrefix" class="field checkbox" type="checkbox" wicket:id="localWorkspaceIncludesPrefix" />
<label for="localWorkspaceIncludesPrefix" class="choice"><wicket:message key="localWorkspaceIncludesPrefix">Remove Layer Prefix from Local Workspace Capabilities</wicket:message></label>
<label class="choice"><wicket:message key="localWorkspaceIncludesPrefix">Remove Layer Prefix from Local Workspace Capabilities</wicket:message></label>
</li>
<li>
<label for="numDecimals"><wicket:message key="numDecimals">Number of Decimals</wicket:message></label>
......
......@@ -4,24 +4,24 @@
<form>
<wicket:panel>
<ul>
<li>
<li>
<fieldset>
<legend><span><wicket:message key="httpSettings">HTTP Settings</wicket:message></span></legend>
<ul>
<li>
<input id="cachingEnabled" class="field checkbox" wicket:id="cachingEnabled" type="checkbox"></input>
<input id="cachingEnabled" class="field checkbox" wicket:id="cachingEnabled" type="checkbox">
<label for="cachingEnabled" class="choice"><wicket:message key="cacheResponses">Cache Responses</wicket:message></label>
</li>
<li>
<label for="cacheAgeMax"><wicket:message key="cacheTime">Cache Time (seconds)</wicket:message></label>
<input id="cacheAgeMax" class="text" type="text" wicket:id="cacheAgeMax"></input>
<label for="cacheAgeMax"><wicket:message key="cacheTime">Cache Time (seconds)</wicket:message></label>
<input id="cacheAgeMax" class="text" type="text" wicket:id="cacheAgeMax">
</li>
</ul>
</fieldset>
</li>
</ul>
</wicket:panel>
<input type="submit" value="Save Changes"></input>
<input type="submit" value="Save Changes">
</form>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment