# HG changeset patch # User Aurelien Campeas # Date 1387273757 -3600 # Node ID b0b1148b696357c9eb6e5b890b2961184a48a9f8 # Parent 4a668dcfa0a082f2cca76074b248c5d6807bd133 [css] replace old rounded corners hack by css rules Closes #3381426. diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.calendar.css --- a/web/data/cubicweb.calendar.css Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.calendar.css Tue Dec 17 10:49:17 2013 +0100 @@ -231,6 +231,8 @@ font-weight:bold; padding-bottom:0.2em; background: %(incontextBoxBodyBgColor)s; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } .calendar th.month a{ diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.css --- a/web/data/cubicweb.css Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.css Tue Dec 17 10:49:17 2013 +0100 @@ -361,10 +361,14 @@ background: %(incontextBoxBodyBg)s; display: block; font-weight: bold; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } div.sideBox { margin-bottom: 1em; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } ul.sideBox, @@ -399,6 +403,8 @@ div.boxTitle { overflow: hidden; font-weight: bold; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } div.boxTitle span { diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.facets.css --- a/web/data/cubicweb.facets.css Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.facets.css Tue Dec 17 10:49:17 2013 +0100 @@ -8,6 +8,8 @@ background: #fff; padding: %(facet_Padding)s; margin-bottom: %(facet_MarginBottom)s; + border-top-left-radius: 5px; + border-bottom-right-radius: 7px; } .facetGroup { diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.facets.js --- a/web/data/cubicweb.facets.js Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.facets.js Tue Dec 17 10:49:17 2013 +0100 @@ -169,7 +169,6 @@ if ($('#'+divid).length) { var $loadingDiv = $(DIV({id:'facetLoading'}, facetLoadingMsg)); - $loadingDiv.corner(); $($('#'+divid).get(0).parentNode).append($loadingDiv); } form.find('div.facet').each(function() { @@ -327,7 +326,6 @@ if ($('div.facetBody').length) { var $loadingDiv = $(DIV({id:'facetLoading'}, facetLoadingMsg)); - $loadingDiv.corner(); $('body').append($loadingDiv); } }); diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.htmlhelpers.js --- a/web/data/cubicweb.htmlhelpers.js Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.htmlhelpers.js Tue Dec 17 10:49:17 2013 +0100 @@ -195,19 +195,4 @@ } } } -//============= page loading events ==========================================// -cw.rounded = [['div.sideBoxBody', 'bottom 6px'], - ['div.boxTitle, div.sideBoxTitle, th.month', 'top 6px']]; -function roundedCorners(node) { - if (jQuery.fn.corner !== undefined) { - node = jQuery(node); - for (var r = 0; r < cw.rounded.length; r++) { - node.find(cw.rounded[r][0]).corner(cw.rounded[r][1]); - } - } -} - -jQuery(document).ready(function() { - roundedCorners(this.body); -}); diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/cubicweb.old.css --- a/web/data/cubicweb.old.css Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/cubicweb.old.css Tue Dec 17 10:49:17 2013 +0100 @@ -418,6 +418,8 @@ background: #cfceb7; display: block; font: bold 100% Georgia; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } div.sideBox { @@ -434,6 +436,8 @@ div.sideBoxBody { padding: 0.2em 5px; background: #eeedd9; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; } div.sideBoxBody a { @@ -457,6 +461,8 @@ div.boxTitle { overflow: hidden; font-weight: bold; + border-top-left-radius: 6px; + border-top-right-radius: 6px; } div.boxTitle span { diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/jquery.corner.js --- a/web/data/jquery.corner.js Mon Nov 04 16:06:06 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ -/*! - * jQuery corner plugin: simple corner rounding - * Examples and documentation at: http://jquery.malsup.com/corner/ - * version 2.11 (15-JUN-2010) - * Requires jQuery v1.3.2 or later - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * Authors: Dave Methvin and Mike Alsup - */ - -/** - * corner() takes a single string argument: $('#myDiv').corner("effect corners width") - * - * effect: name of the effect to apply, such as round, bevel, notch, bite, etc (default is round). - * corners: one or more of: top, bottom, tr, tl, br, or bl. (default is all corners) - * width: width of the effect; in the case of rounded corners this is the radius. - * specify this value using the px suffix such as 10px (yes, it must be pixels). - */ -;(function($) { - -var style = document.createElement('div').style, - moz = style['MozBorderRadius'] !== undefined, - webkit = style['WebkitBorderRadius'] !== undefined, - radius = style['borderRadius'] !== undefined || style['BorderRadius'] !== undefined, - mode = document.documentMode || 0, - noBottomFold = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8), - - expr = $.browser.msie && (function() { - var div = document.createElement('div'); - try { div.style.setExpression('width','0+0'); div.style.removeExpression('width'); } - catch(e) { return false; } - return true; - })(); - -$.support = $.support || {}; -$.support.borderRadius = moz || webkit || radius; // so you can do: if (!$.support.borderRadius) $('#myDiv').corner(); - -function sz(el, p) { - return parseInt($.css(el,p))||0; -}; -function hex2(s) { - var s = parseInt(s).toString(16); - return ( s.length < 2 ) ? '0'+s : s; -}; -function gpc(node) { - while(node) { - var v = $.css(node,'backgroundColor'), rgb; - if (v && v != 'transparent' && v != 'rgba(0, 0, 0, 0)') { - if (v.indexOf('rgb') >= 0) { - rgb = v.match(/\d+/g); - return '#'+ hex2(rgb[0]) + hex2(rgb[1]) + hex2(rgb[2]); - } - return v; - } - if (node.nodeName.toLowerCase() == 'html') - break; - node = node.parentNode; // keep walking if transparent - } - return '#ffffff'; -}; - -function getWidth(fx, i, width) { - switch(fx) { - case 'round': return Math.round(width*(1-Math.cos(Math.asin(i/width)))); - case 'cool': return Math.round(width*(1+Math.cos(Math.asin(i/width)))); - case 'sharp': return Math.round(width*(1-Math.cos(Math.acos(i/width)))); - case 'bite': return Math.round(width*(Math.cos(Math.asin((width-i-1)/width)))); - case 'slide': return Math.round(width*(Math.atan2(i,width/i))); - case 'jut': return Math.round(width*(Math.atan2(width,(width-i-1)))); - case 'curl': return Math.round(width*(Math.atan(i))); - case 'tear': return Math.round(width*(Math.cos(i))); - case 'wicked': return Math.round(width*(Math.tan(i))); - case 'long': return Math.round(width*(Math.sqrt(i))); - case 'sculpt': return Math.round(width*(Math.log((width-i-1),width))); - case 'dogfold': - case 'dog': return (i&1) ? (i+1) : width; - case 'dog2': return (i&2) ? (i+1) : width; - case 'dog3': return (i&3) ? (i+1) : width; - case 'fray': return (i%2)*width; - case 'notch': return width; - case 'bevelfold': - case 'bevel': return i+1; - } -}; - -$.fn.corner = function(options) { - // in 1.3+ we can fix mistakes with the ready state - if (this.length == 0) { - if (!$.isReady && this.selector) { - var s = this.selector, c = this.context; - $(function() { - $(s,c).corner(options); - }); - } - return this; - } - - return this.each(function(index){ - var $this = $(this), - // meta values override options - o = [$this.attr($.fn.corner.defaults.metaAttr) || '', options || ''].join(' ').toLowerCase(), - keep = /keep/.test(o), // keep borders? - cc = ((o.match(/cc:(#[0-9a-f]+)/)||[])[1]), // corner color - sc = ((o.match(/sc:(#[0-9a-f]+)/)||[])[1]), // strip color - width = parseInt((o.match(/(\d+)px/)||[])[1]) || 10, // corner width - re = /round|bevelfold|bevel|notch|bite|cool|sharp|slide|jut|curl|tear|fray|wicked|sculpt|long|dog3|dog2|dogfold|dog/, - fx = ((o.match(re)||['round'])[0]), - fold = /dogfold|bevelfold/.test(o), - edges = { T:0, B:1 }, - opts = { - TL: /top|tl|left/.test(o), TR: /top|tr|right/.test(o), - BL: /bottom|bl|left/.test(o), BR: /bottom|br|right/.test(o) - }, - // vars used in func later - strip, pad, cssHeight, j, bot, d, ds, bw, i, w, e, c, common, $horz; - - if ( !opts.TL && !opts.TR && !opts.BL && !opts.BR ) - opts = { TL:1, TR:1, BL:1, BR:1 }; - - // support native rounding - if ($.fn.corner.defaults.useNative && fx == 'round' && (radius || moz || webkit) && !cc && !sc) { - if (opts.TL) - $this.css(radius ? 'border-top-left-radius' : moz ? '-moz-border-radius-topleft' : '-webkit-border-top-left-radius', width + 'px'); - if (opts.TR) - $this.css(radius ? 'border-top-right-radius' : moz ? '-moz-border-radius-topright' : '-webkit-border-top-right-radius', width + 'px'); - if (opts.BL) - $this.css(radius ? 'border-bottom-left-radius' : moz ? '-moz-border-radius-bottomleft' : '-webkit-border-bottom-left-radius', width + 'px'); - if (opts.BR) - $this.css(radius ? 'border-bottom-right-radius' : moz ? '-moz-border-radius-bottomright' : '-webkit-border-bottom-right-radius', width + 'px'); - return; - } - - strip = document.createElement('div'); - $(strip).css({ - overflow: 'hidden', - height: '1px', - minHeight: '1px', - fontSize: '1px', - backgroundColor: sc || 'transparent', - borderStyle: 'solid' - }); - - pad = { - T: parseInt($.css(this,'paddingTop'))||0, R: parseInt($.css(this,'paddingRight'))||0, - B: parseInt($.css(this,'paddingBottom'))||0, L: parseInt($.css(this,'paddingLeft'))||0 - }; - - if (typeof this.style.zoom != undefined) this.style.zoom = 1; // force 'hasLayout' in IE - if (!keep) this.style.border = 'none'; - strip.style.borderColor = cc || gpc(this.parentNode); - cssHeight = $(this).outerHeight(); - - for (j in edges) { - bot = edges[j]; - // only add stips if needed - if ((bot && (opts.BL || opts.BR)) || (!bot && (opts.TL || opts.TR))) { - strip.style.borderStyle = 'none '+(opts[j+'R']?'solid':'none')+' none '+(opts[j+'L']?'solid':'none'); - d = document.createElement('div'); - $(d).addClass('jquery-corner'); - ds = d.style; - - bot ? this.appendChild(d) : this.insertBefore(d, this.firstChild); - - if (bot && cssHeight != 'auto') { - if ($.css(this,'position') == 'static') - this.style.position = 'relative'; - ds.position = 'absolute'; - ds.bottom = ds.left = ds.padding = ds.margin = '0'; - if (expr) - ds.setExpression('width', 'this.parentNode.offsetWidth'); - else - ds.width = '100%'; - } - else if (!bot && $.browser.msie) { - if ($.css(this,'position') == 'static') - this.style.position = 'relative'; - ds.position = 'absolute'; - ds.top = ds.left = ds.right = ds.padding = ds.margin = '0'; - - // fix ie6 problem when blocked element has a border width - if (expr) { - bw = sz(this,'borderLeftWidth') + sz(this,'borderRightWidth'); - ds.setExpression('width', 'this.parentNode.offsetWidth - '+bw+'+ "px"'); - } - else - ds.width = '100%'; - } - else { - ds.position = 'relative'; - ds.margin = !bot ? '-'+pad.T+'px -'+pad.R+'px '+(pad.T-width)+'px -'+pad.L+'px' : - (pad.B-width)+'px -'+pad.R+'px -'+pad.B+'px -'+pad.L+'px'; - } - - for (i=0; i < width; i++) { - w = Math.max(0,getWidth(fx,i, width)); - e = strip.cloneNode(false); - e.style.borderWidth = '0 '+(opts[j+'R']?w:0)+'px 0 '+(opts[j+'L']?w:0)+'px'; - bot ? d.appendChild(e) : d.insertBefore(e, d.firstChild); - } - - if (fold && $.support.boxModel) { - if (bot && noBottomFold) continue; - for (c in opts) { - if (!opts[c]) continue; - if (bot && (c == 'TL' || c == 'TR')) continue; - if (!bot && (c == 'BL' || c == 'BR')) continue; - - common = { position: 'absolute', border: 'none', margin: 0, padding: 0, overflow: 'hidden', backgroundColor: strip.style.borderColor }; - $horz = $('
').css(common).css({ width: width + 'px', height: '1px' }); - switch(c) { - case 'TL': $horz.css({ bottom: 0, left: 0 }); break; - case 'TR': $horz.css({ bottom: 0, right: 0 }); break; - case 'BL': $horz.css({ top: 0, left: 0 }); break; - case 'BR': $horz.css({ top: 0, right: 0 }); break; - } - d.appendChild($horz[0]); - - var $vert = $('
').css(common).css({ top: 0, bottom: 0, width: '1px', height: width + 'px' }); - switch(c) { - case 'TL': $vert.css({ left: width }); break; - case 'TR': $vert.css({ right: width }); break; - case 'BL': $vert.css({ left: width }); break; - case 'BR': $vert.css({ right: width }); break; - } - d.appendChild($vert[0]); - } - } - } - } - }); -}; - -$.fn.uncorner = function() { - if (radius || moz || webkit) - this.css(radius ? 'border-radius' : moz ? '-moz-border-radius' : '-webkit-border-radius', 0); - $('div.jquery-corner', this).remove(); - return this; -}; - -// expose options -$.fn.corner.defaults = { - useNative: true, // true if plugin should attempt to use native browser support for border radius rounding - metaAttr: 'data-corner' // name of meta attribute to use for options -}; - -})(jQuery); diff -r 4a668dcfa0a0 -r b0b1148b6963 web/data/uiprops.py --- a/web/data/uiprops.py Mon Nov 04 16:06:06 2013 +0100 +++ b/web/data/uiprops.py Tue Dec 17 10:49:17 2013 +0100 @@ -9,7 +9,6 @@ # Javascripts files to include systematically in HTML headers JAVASCRIPTS = [data('jquery.js'), - data('jquery.corner.js'), data('jquery.json.js'), data('cubicweb.js'), data('cubicweb.compat.js'), diff -r 4a668dcfa0a0 -r b0b1148b6963 web/views/facets.py --- a/web/views/facets.py Mon Nov 04 16:06:06 2013 +0100 +++ b/web/views/facets.py Tue Dec 17 10:49:17 2013 +0100 @@ -128,7 +128,6 @@ needs_js = ['cubicweb.ajax.js', 'cubicweb.facets.js'] needs_css = ['cubicweb.facets.css'] - roundcorners = True def generate_form(self, w, rset, divid, vid, vidargs=None, mainvar=None, paginate=False, cssclass='', hiddens=None, **kwargs): @@ -164,9 +163,6 @@ self._cw.add_css(self.needs_css) self._cw.html_headers.define_var('facetLoadingMsg', self._cw._('facet-loading-msg')) - if self.roundcorners: - self._cw.html_headers.add_onload( - 'jQuery(".facet").corner("tl br 10px");') if vidargs is not None: warn("[3.14] vidargs is deprecated. Maybe you're using some TableView?", DeprecationWarning, stacklevel=2)