diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 1b6841f3ea0..b76f1cd9601 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -172,7 +172,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ } }, on_managed_error: function(error) { - openerp.web.dialog($('
' + QWeb.render('CrashManagerWarning', {error: error}) + '
'), { + openerp.web.dialog($('
' + QWeb.render('CrashManager.warning', {error: error}) + '
'), { title: "OpenERP " + _.str.capitalize(error.type), buttons: [ {text: _t("Ok"), click: function() { $(this).dialog("close"); }} @@ -213,7 +213,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ min_height: '600px', buttons: buttons }).open(); - dialog.$element.html(QWeb.render('CrashManagerError', {session: openerp.connection, error: error})); + dialog.$element.html(QWeb.render('CrashManager.error', {session: openerp.connection, error: error})); } }); @@ -277,7 +277,7 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin }); openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Database# */{ - template: "DatabaseManager", + template: "Database", /** * @constructs openerp.web.Database * @extends openerp.web.OldWidget @@ -408,7 +408,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab }, do_drop: function() { var self = this; - self.$option_id.html(QWeb.render("DropDB", self)); + self.$option_id.html(QWeb.render("Database.DropDB", self)); self.$option_id.find("form[name=drop_db_form]").validate({ submitHandler: function (form) { var $form = $(form), @@ -437,7 +437,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab do_backup: function() { var self = this; self.$option_id - .html(QWeb.render("BackupDB", self)) + .html(QWeb.render("Database.BackupDB", self)) .find("form[name=backup_db_form]").validate({ submitHandler: function (form) { self.blockUI(); @@ -457,7 +457,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab }, do_restore: function() { var self = this; - self.$option_id.html(QWeb.render("RestoreDB", self)); + self.$option_id.html(QWeb.render("Database.RestoreDB", self)); self.$option_id.find("form[name=restore_db_form]").validate({ submitHandler: function (form) { @@ -496,7 +496,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab }, do_change_password: function() { var self = this; - self.$option_id.html(QWeb.render("Change_DB_Pwd", self)); + self.$option_id.html(QWeb.render("Database.Change_DB_Pwd", self)); self.$option_id.find("form[name=change_pwd_form]").validate({ messages: { @@ -571,7 +571,7 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# }, set_db_list: function (list) { this.$element.find("[name=db]").replaceWith( - openerp.web.qweb.render('Login_dblist', { + openerp.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db})) }, on_submit: function(ev) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 894f7353c1a..947cbb4016b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -43,6 +43,113 @@ + + + + + + + +
+

+ + var message = d.message ? d.message : d.error.data.fault_code; + d.html_error = context.engine.tools.html_escape(message) + .replace(/\n/g, '
'); +
+ +

+
+
+ + + Your version of OpenERP is unsupported. Support & maintenance services are available here: OpenERP Entreprise. + + +
+
+
OpenERP Enterprise Contract.
+

Your report will be sent to the OpenERP Enterprise team.

+
+
+ +


+
+
+ +


+
+
+ +
+
+

+
+
+
+
+
+
+
+ + +
+
+ +
+ +
+
+ Database: + +
+
    +
  • Username
  • +
  • +
  • Password
  • +
  • +
  • +
+
+ +
+
+
+ + + + + +
+
+ + + +
    +
  • Create
  • +
  • Drop
  • +
  • Backup
  • +
  • Restore
  • +
  • Password
  • +
  • Back to Login
  • +
+
+
+
+
@@ -91,7 +198,7 @@
- +
@@ -123,7 +230,7 @@
- +
@@ -157,7 +264,7 @@
- +
@@ -186,7 +293,7 @@
- +
@@ -218,113 +325,6 @@ - -
- - - - -
-

- - var message = d.message ? d.message : d.error.data.fault_code; - d.html_error = context.engine.tools.html_escape(message) - .replace(/\n/g, '
'); -
- -

-
- - - - Your version of OpenERP is unsupported. Support & maintenance services are available here: OpenERP Entreprise. - - -
-
-
OpenERP Enterprise Contract.
-

Your report will be sent to the OpenERP Enterprise team.

-
-
- -


-
-
- -


-
-
- -
-
-

-
-
-
-
-
-
-
- - - - - - - - - -
-
- - - -
    -
  • Create
  • -
  • Drop
  • -
  • Backup
  • -
  • Restore
  • -
  • Password
  • -
  • Back to Login
  • -
-
-
-
-
-
  • @@ -502,6 +502,24 @@ + + + + + + + + + + - -
      - - -
    • - -
    • -
      -
    -