Index: webapp/cms/skins/odf/resources/css/services/odf-search.css =================================================================== --- webapp/cms/skins/odf/resources/css/services/odf-search.css (revision 33553) +++ webapp/cms/skins/odf/resources/css/services/odf-search.css (working copy) @@ -59,3 +59,32 @@ padding: 0 !important; vertical-align: middle; } + +.search-odf .field .input .field.checkbox +{ + margin-bottom: 0; +} + +.search-odf .field .input .field.checkbox .input +{ + display: inline-block; + float: left; + width: auto; + min-width: 0; + max-width: none; +} +.search-odf .field .input .field.checkbox .input span.jqTransformCheckboxWrapper +{ + margin-top: 0; +} + +.search-odf .field .input .field.checkbox .input.label-after +{ + margin-right: 6px; +} + +.search-odf .field .input .field.checkbox .label +{ + float: none; + display: inline; +} Index: webapp/cms/skins/odf/resources/js/jquery.jqtransform.js =================================================================== --- webapp/cms/skins/odf/resources/js/jquery.jqtransform.js (revision 33553) +++ webapp/cms/skins/odf/resources/js/jquery.jqtransform.js (working copy) @@ -119,7 +119,7 @@ /* If this is safari we need to add an extra class */ // Buggy on webkit recent version : $.browser.safari && $wrapper.addClass('jqTransformSafari'); - // Buggy on webkit recent version : $.browser.safari && $input.css('width',$wrapper.width()+16); + // Buggy on webkit reCcent version : $.browser.safari && $input.css('width',$wrapper.width()+16); this.wrapper = $wrapper; }); @@ -136,8 +136,9 @@ var inputSelf = this; //set the click on the label - var oLabel=jqTransformGetLabel($input); - oLabel && oLabel.click(function(){aLink.trigger('click');}); + // AMETYS - The 2 lines below are commented out : On change event fired twice if the label is clicked. +// var oLabel=jqTransformGetLabel($input); +// oLabel && oLabel.click(function(){aLink.trigger('click');}); var aLink = $('<a href="#" class="jqTransformCheckbox"></a>'); //wrap and add the link Index: webapp/cms/skins/odf/services/odf-web/pages/services/search/search-criteria/search-criteria-multiple.xsl =================================================================== --- webapp/cms/skins/odf/services/odf-web/pages/services/search/search-criteria/search-criteria-multiple.xsl (revision 0) +++ webapp/cms/skins/odf/services/odf-web/pages/services/search/search-criteria/search-criteria-multiple.xsl (revision 0) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2012 Anyware Services + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:i18n="http://apache.org/cocoon/i18n/2.1" + xmlns:math="java.lang.Math" + xmlns:resolver="org.ametys.cms.transformation.xslt.ResolveURIComponent" + xmlns:ametys="org.ametys.web.transformation.xslt.AmetysXSLTHelper" + extension-element-prefixes="math ametys resolver"> + + <xsl:import href="plugin:odf-web://pages/services/search/search-criteria/search-criteria-multiple.xsl"/> + +</xsl:stylesheet> Index: webapp/cms/skins/odf/services/odf-web/pages/services/search/search-multicriteria.xsl =================================================================== --- webapp/cms/skins/odf/services/odf-web/pages/services/search/search-multicriteria.xsl (revision 0) +++ webapp/cms/skins/odf/services/odf-web/pages/services/search/search-multicriteria.xsl (revision 0) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2015 Anyware Services + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<xsl:stylesheet version="1.0" + xmlns:i18n="http://apache.org/cocoon/i18n/2.1" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:import href="plugin:odf-web://pages/services/search/search-multicriteria.xsl"/> + +</xsl:stylesheet>