diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fae87452d84..9ee91f1e573 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1438,15 +1438,15 @@ .openerp .oe_list_pager { line-height: 26px; } -.openerp .oe_list_pager .oe_pager_value { +.openerp .oe_pager_value { float: left; margin-right: 8px; } -.openerp .oe_list_pager ul.oe_pager_group { +.openerp ul.oe_pager_group { padding: 0; margin: 0; } -.openerp .oe_list_pager .oe_pager_group { +.openerp .oe_pager_group { float: left; height: 24px; line-height: 24px; @@ -1457,7 +1457,7 @@ -webkit-border-radius: 5px; border-radius: 5px; } -.openerp .oe_list_pager .oe_pager_group li { +.openerp .oe_pager_group li { height: 24px; line-height: 24px; padding: 0; @@ -1466,23 +1466,23 @@ float: left; border-right: 1px solid #ababab; } -.openerp .oe_list_pager .oe_pager_group li:last-child { +.openerp .oe_pager_group li:last-child { border: none; } -.openerp .oe_list_pager .oe_pager_group a { +.openerp .oe_pager_group a { color: #4c4c4c; padding: 0 8px; } -.openerp .oe_list_pager .oe_pager_group a:hover { +.openerp .oe_pager_group a:hover { text-decoration: none; } -.openerp .oe_list_pager .oe_pager_group .active { +.openerp .oe_pager_group .active { background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } -.openerp .oe_list_pager .oe_pager_group .active a { +.openerp .oe_pager_group .active a { color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e4481716d8d..d16c8bc29d5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1164,41 +1164,41 @@ $sheet-padding: 16px // List pager {{{ .oe_list_pager line-height: 26px - .oe_pager_value - float: left - margin-right: 8px - ul.oe_pager_group - padding: 0 - margin: 0 - .oe_pager_group - float: left + .oe_pager_value + float: left + margin-right: 8px + ul.oe_pager_group + padding: 0 + margin: 0 + .oe_pager_group + float: left + height: 24px + line-height: 24px + display: inline-block + border: 1px solid #ababab + cursor: pointer + @include radius(5px) + li height: 24px line-height: 24px - display: inline-block - border: 1px solid #ababab - cursor: pointer - @include radius(5px) - li - height: 24px - line-height: 24px - padding: 0 - margin: 0 - list-style-type: none - float: left - border-right: 1px solid #ababab - &:last-child - border: none + padding: 0 + margin: 0 + list-style-type: none + float: left + border-right: 1px solid #ababab + &:last-child + border: none + a + color: #4c4c4c + padding: 0 8px + &:hover + text-decoration: none + .active + background: #999 + @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) a - color: #4c4c4c - padding: 0 8px - &:hover - text-decoration: none - .active - background: #999 - @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) - a - color: #fff - text-shadow: 0 1px 2px rgba(0,0,0,0.4) + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) .oe_list_pager.oe_list_pager_single_page .oe_pager_group display: none // }}} diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f355322b489..7829a3e0cc7 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1094,7 +1094,7 @@ instance.web.WebClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).then(function() { - self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2)); + self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2).slice(0, -1)); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { $("body").addClass("kitten-mode-activated"); if ($.blockUI) { diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po index 6d4cf6f63a1..df062c38bfc 100644 --- a/addons/web_graph/i18n/fr.po +++ b/addons/web_graph/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-15 09:18+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-11-22 08:35+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n" -"X-Generator: Launchpad (build 16265)\n" +"X-Launchpad-Export-Date: 2012-11-23 05:13+0000\n" +"X-Generator: Launchpad (build 16293)\n" #. openerp-web #: addons/web_graph/static/src/js/graph.js:19 @@ -45,27 +45,27 @@ msgstr "" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:14 msgid "Lines" -msgstr "" +msgstr "Lignes" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:15 msgid "Areas" -msgstr "" +msgstr "Zones" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:18 msgid "Radar" -msgstr "" +msgstr "Radar" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:20 msgid "Legend" -msgstr "" +msgstr "Légende" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:24 msgid "Hidden" -msgstr "" +msgstr "Masqué" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:25 @@ -75,12 +75,12 @@ msgstr "" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:26 msgid "Top" -msgstr "" +msgstr "En haut" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:28 msgid "Actions" -msgstr "" +msgstr "Actions" #. openerp-web #: addons/web_graph/static/src/xml/web_graph.xml:32 diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po index a4e8b026287..0dc7033a64b 100644 --- a/addons/web_kanban/i18n/fr.po +++ b/addons/web_kanban/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-15 10:37+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2012-11-22 08:29+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-15 05:09+0000\n" -"X-Generator: Launchpad (build 16265)\n" +"X-Launchpad-Export-Date: 2012-11-23 05:13+0000\n" +"X-Generator: Launchpad (build 16293)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 @@ -35,7 +35,7 @@ msgstr "Voulez-vous réellement supprimer cet enregistrement?" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:839 msgid "Create: " -msgstr "" +msgstr "Créer : " #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:41 @@ -50,17 +50,17 @@ msgstr "restant)" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "Add" -msgstr "" +msgstr "Ajouter" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "or" -msgstr "" +msgstr "ou" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:72 msgid "Cancel" -msgstr "" +msgstr "Annuler" #~ msgid "Create" #~ msgstr "Créer"