Author: vmassol Date: 2009-11-12 16:53:19 +0100 (Thu, 12 Nov 2009) New Revision: 25034 Modified: platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources.properties platform/skins/trunk/colibri/src/main/resources/colibri/global.vm Log: XSCOLIBRI-140: Search input box should use a LABEL element to follow WCAG guidelines * Use the same text for label and text displayed in the field Modified: platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources.properties =================================================================== --- platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources.properties 2009-11-12 15:45:29 UTC (rev 25033) +++ platform/core/trunk/xwiki-core/src/main/resources/ ApplicationResources.properties 2009-11-12 15:53:19 UTC (rev 25034) @@ -923,8 +923,7 @@ panels.translation.existingTranslations=Existing translations: panels.search.title=Search -panels.search.inputLabel=Search -panels.search.inputText=search... +panels.search.inputText=Search

panels.search.submit=Go panels.search.advanced=Advanced search Modified: platform/skins/trunk/colibri/src/main/resources/colibri/ global.vm =================================================================== --- platform/skins/trunk/colibri/src/main/resources/colibri/ global.vm 2009-11-12 15:45:29 UTC (rev 25033) +++ platform/skins/trunk/colibri/src/main/resources/colibri/ global.vm 2009-11-12 15:53:19 UTC (rev 25034) @@ -28,7 +28,7 @@ <div id="globallinks"> <form action="$xwiki.getURL('Main.WebSearch')"> <div id="globalsearch"> - <label class="accessibility" for="globalsearchinput"> $msg.get('panels.search.inputLabel')</label><input id="globalsearchinput" type="text" name="text" value="$msg.get('panels.search.inputText')" size="15" class="withTip"/><input class="button" type="image" value="$msg.get('panels.search.submit')" alt="$msg.get('panels.search.submit')" src="$xwiki.getSkinFile('icons/xwiki/search.png')"/> + <label class="accessibility" for="globalsearchinput"> $msg.get('panels.search.inputText')</label><input id="globalsearchinput" type="text" name="text" value="$msg.get('panels.search.inputText')" size="15" class="withTip"/><input class="button" type="image" value="$msg.get('panels.search.submit')" alt="$msg.get('panels.search.submit')" src="$xwiki.getSkinFile('icons/xwiki/search.png')"/> </div> </form> #if($xwiki.isMultiLingual())