# HG changeset patch # User Katia Saurfelt # Date 1236778586 -3600 # Node ID f6aaab4d51e30e3cdedc6d214d6cbd460e55d83b # Parent fe26a0cda180207087939f9259f44ffe89797bd9# Parent 7c21ca28327ff1f0ef7cfc9b79ab3ff65bb1eefd merge diff -r 7c21ca28327f -r f6aaab4d51e3 doc/book/en/B1090-internationalization.en.txt --- a/doc/book/en/B1090-internationalization.en.txt Tue Mar 10 17:37:39 2009 +0100 +++ b/doc/book/en/B1090-internationalization.en.txt Wed Mar 11 14:36:26 2009 +0100 @@ -96,5 +96,5 @@ 1. `cubicweb-ctl i18nupdate ` 2. Edit the /xxx.po files and add missing translations (empty `msgstr`) 3. `hg ci -m "updated i18n catalogs"` -4. `cubicweb-ctl i18n compile ` +4. `cubicweb-ctl i18ncompile ` diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.ajax.js --- a/web/data/cubicweb.ajax.js Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.ajax.js Wed Mar 11 14:36:26 2009 +0100 @@ -31,6 +31,7 @@ // cubicweb loadxhtml plugin to make jquery handle xhtml response jQuery.fn.loadxhtml = function(url, data, reqtype, mode) { + var ajax = null; if (reqtype == 'post') { ajax = jQuery.post; @@ -47,6 +48,7 @@ delete data.callback; } var node = this.get(0); // only consider the first element + ajax = jQuery.post; ajax(url, data, function(response) { var domnode = getDomFromResponse(response); if (mode == 'swap') { diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.calendar.css --- a/web/data/cubicweb.calendar.css Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.calendar.css Wed Mar 11 14:36:26 2009 +0100 @@ -73,10 +73,6 @@ text-align: right; } -table.omcalendar tr td div.calCellTitle div.stopper { - /* clear:pos; # FIXME : pos is not a clear value*/ -} - table.omcalendar tr td { padding: 3px 0.5em 1em; } diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.css --- a/web/data/cubicweb.css Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.css Wed Mar 11 14:36:26 2009 +0100 @@ -200,13 +200,10 @@ visibility: hidden; } - -/* FIXME need to be moved to cubicweb.forms.css */ li.invisible { list-style: none; background: none; padding: 0px 0px 1px 1px; } -/* FIXME Should use span in html insteed */ -li.invisible div { +li.invisible div{ display: inline; } @@ -498,10 +495,7 @@ padding:0px 5px; } -/* FIXME rqlboxsubmit2 still necessary ? */ - -input.rqlsubmit, -input#rqlboxsubmit2 { +input.rqlsubmit{ background: #fffff8 url("go.png") 50% 50% no-repeat; width: 20px; height: 20px; @@ -553,7 +547,6 @@ text-decoration: none; } -/* FIXME seems to be not used in cubicweb framework */ div.prevnext { width: 100%; margin-bottom: 1em; @@ -563,7 +556,6 @@ color: #000; } - /***************************************/ /* entity views */ /***************************************/ @@ -718,6 +710,25 @@ cursor: pointer; } +table.listing tr th { + border: 1px solid #dfdfdf; + border-right:none; + font-size: 8pt; + padding: 4px; +} + +table.listing tr .header { + border-right: 1px solid #dfdfdf; + cursor: pointer; +} + +table.listing td { + color: #3D3D3D; + padding: 4px; + background-color: #FFF; + vertical-align: top; +} + table.listing th, table.listing td { padding: 3px 0px 3px 5px; @@ -750,44 +761,6 @@ top: -1px; } -/***************************************/ -/* drag and drop zone */ -/* (XXX only used in seo for now) */ -/***************************************/ - -div.droppable { - border: 1px dashed black; - margin: 2px; - padding: 2px; - height: 15px; -} - -div.drophover { - background: #f4f5ed; -} - -/****************************************/ -/* filter box FIXME is not used anymore*/ -/****************************************/ - -/* -#filter_box input { - width: 180px; -} -#filter_box label { - float: left; -} -#filter_box select.radio { - width: 47px; - float: right; -} -#filter_box select { - width: 185px; -} -#filter_box option.disabled { - background: lightgray; -} -*/ /***************************************/ /* error view (views/management.py) */ @@ -875,3 +848,10 @@ font-size: large; font-weight: bold; } + +input.validateButton { + margin: 1em 1em 0px 0px; + border: 1px solid #edecd2; + border-color:#edecd2 #cfceb7 #cfceb7 #edecd2; + background: #fffff8 url("button.png") bottom left repeat-x; +} \ No newline at end of file diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.form.css --- a/web/data/cubicweb.form.css Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.form.css Wed Mar 11 14:36:26 2009 +0100 @@ -179,8 +179,11 @@ } /*FIXME inlineedit not used ?*/ +/* div.inlineedit { - display: none;} + display: none; +} +*/ div.editableField { display: inline; diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.formfilter.js --- a/web/data/cubicweb.formfilter.js Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.formfilter.js Wed Mar 11 14:36:26 2009 +0100 @@ -104,6 +104,7 @@ var SELECTED_IMG = baseuri()+"data/black-check.png"; var UNSELECTED_IMG = baseuri()+"data/no-check-no-border.png"; +var UNSELECTED_BORDER_IMG = baseuri()+"data/black-unchecked.png"; function initFacetBoxEvents(root) { // facetargs : (divid, vid, paginate, extraargs) @@ -116,7 +117,7 @@ var facetargs = form.attr('cubicweb:facetargs'); if (facetargs !== undefined) { form.submit(function() { - buildRQL.apply(null, evalJSON(form.attr('cubicweb:facetargs'))); + buildRQL.apply(null, evalJSON(form.attr('cubicweb:facetargs'))); return false; }); form.find('div.facet').each(function() { @@ -128,7 +129,14 @@ var $this = jQuery(this); if ($this.hasClass('facetValueSelected')) { $this.removeClass('facetValueSelected'); - $this.find('img').attr('src', UNSELECTED_IMG); + $this.find('img').each(function (i){ + if (this.getAttribute('cubicweb:unselimg')){ + this.setAttribute('src', UNSELECTED_BORDER_IMG); + } + else{ + this.setAttribute('src', UNSELECTED_IMG); + } + }); var index = parseInt($this.attr('cubicweb:idx')); var shift = jQuery.grep(facet.find('.facetValueSelected'), function (n) { var nindex = parseInt(n.getAttribute('cubicweb:idx')); @@ -148,7 +156,7 @@ jQuery(this).addClass('facetValueSelected'); jQuery(this).find('img').attr('src', SELECTED_IMG); } - buildRQL.apply(null, evalJSON(form.attr('cubicweb:facetargs'))); + buildRQL.apply(null, evalJSON(form.attr('cubicweb:facetargs'))); facet.find('.facetBody').animate({scrollTop: 0}, ''); }); facet.find('select.facetOperator').change(function() { diff -r 7c21ca28327f -r f6aaab4d51e3 web/data/cubicweb.tablesorter.css --- a/web/data/cubicweb.tablesorter.css Tue Mar 10 17:37:39 2009 +0100 +++ b/web/data/cubicweb.tablesorter.css Wed Mar 11 14:36:26 2009 +0100 @@ -8,24 +8,6 @@ text-align: left; } */ -table.listing tr th { - border: 1px solid #FFF; - font-size: 8pt; - padding: 4px; -} - -table.listing tr .header { - cursor: pointer; -} - -table.listing td { - color: #3D3D3D; - padding: 4px; - background-color: #FFF; - vertical-align: top; -} - - table.listing tr .headerSortUp { background-image: url(asc.gif); }