[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130405110900-wkj2vnkdbyjoqol4
This commit is contained in:
Thibault Delavallée 2013-04-05 13:09:00 +02:00
commit 6bdd041c61
5 changed files with 197 additions and 8 deletions

View File

@ -3179,6 +3179,14 @@
.kitten-mode-activated > * {
opacity: 0.7;
}
.loading-kitten {
-moz-border-radius: 15px;
-webkit-border-radius: 15px;
border-radius: 15px;
-moz-box-shadow: 0 0 5px 5px #999999;
-webkit-box-shadow: 0 0 5px 5px #999999;
box-shadow: 0 0 5px 5px #999999;
}
div.ui-widget-overlay {
background: black;

View File

@ -2504,6 +2504,9 @@ $sheet-padding: 16px
background-attachment: fixed
>*
opacity: 0.70
.loading-kitten
@include radius(15px)
@include box-shadow(0 0 5px 5px #999)
// }}}
// jQueryUI top level {{{

View File

@ -1257,7 +1257,8 @@ instance.web.WebClient = instance.web.Client.extend({
$("body").addClass("kitten-mode-activated");
$("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")");
if ($.blockUI) {
$.blockUI.defaults.message = '<img src="http://www.amigrave.com/kitten.gif">';
var imgkit = Math.floor(Math.random() * 2 + 1);
$.blockUI.defaults.message = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">';
}
}
if (!self.session.session_is_valid()) {

View File

@ -662,13 +662,6 @@ instance.web.ViewManager = instance.web.Widget.extend({
},
add_breadcrumb: function(options) {
var options = options || {};
// 7.0 backward compatibility
if (typeof options == 'function') {
options = {
on_reverse_breadcrumb: options
};
}
// end of 7.0 backward compatibility
var self = this;
var views = [this.active_view || this.views_src[0].view_type];
this.on('switch_mode', self, function(mode) {

View File

@ -0,0 +1,184 @@
# Finnish translation for openerp-web
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openerp-web package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
"PO-Revision-Date: 2013-04-04 13:18+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-04-05 05:42+0000\n"
"X-Generator: Launchpad (build 16550)\n"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:164
#, python-format
msgid "The following fields are invalid :"
msgstr "Seuraavat kentät ovat epäkelpoja:"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:63
#, python-format
msgid "Create"
msgstr "Luo"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:986
#, python-format
msgid "New Field"
msgstr "Uusi kenttä"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:386
#, python-format
msgid "Do you really wants to create an inherited view here?"
msgstr "Haluatko todella luoda periytyvän näkymän tähän?"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:396
#, python-format
msgid "Preview"
msgstr "Esikatselu"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:183
#, python-format
msgid "Do you really want to remove this view?"
msgstr "Haluatko varmasti poistaa tämän näkymän?"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:90
#, python-format
msgid "Save"
msgstr "Tallenna"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:393
#, python-format
msgid "Select an element"
msgstr "Valitse elementti"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:828
#: code:addons/web_view_editor/static/src/js/view_editor.js:954
#, python-format
msgid "Update"
msgstr "Päivitä"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:263
#, python-format
msgid "Please select view in list :"
msgstr "Valitse näkymä listasta:"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:37
#, python-format
msgid "Manage Views (%s)"
msgstr "Hallitse näkymiä (%s)"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:13
#, python-format
msgid "Manage Views"
msgstr "Hallitse näkymiä"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:825
#: code:addons/web_view_editor/static/src/js/view_editor.js:951
#, python-format
msgid "Properties"
msgstr "Ominaisuudet"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:64
#, python-format
msgid "Edit"
msgstr "Muokkaa"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:14
#, python-format
msgid "Could not find current view declaration"
msgstr "Ei löydy nykyistä näkymämäärittelyä"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:382
#, python-format
msgid "Inherited View"
msgstr "Peritty näkymä"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:65
#, python-format
msgid "Remove"
msgstr "Poista"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:516
#, python-format
msgid "Do you really want to remove this node?"
msgstr "Haluatko poistaa tämän liitoksen?"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:390
#, python-format
msgid "Can't Update View"
msgstr "Näkymää ei voida päivittää"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:379
#, python-format
msgid "View Editor %d - %s"
msgstr "Näkymä editori %d - %s"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:112
#: code:addons/web_view_editor/static/src/js/view_editor.js:846
#: code:addons/web_view_editor/static/src/js/view_editor.js:974
#, python-format
msgid "Cancel"
msgstr "Peruuta"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:66
#: code:addons/web_view_editor/static/src/js/view_editor.js:413
#, python-format
msgid "Close"
msgstr "Sulje"
#. module: web_view_editor
#. openerp-web
#: code:addons/web_view_editor/static/src/js/view_editor.js:88
#, python-format
msgid "Create a view (%s)"
msgstr "Luo näkymä (%s)"