[IMP] base.xml cleanups
bzr revid: al@openerp.com-20120402122645-ao4lxxbyj5kdz3q8
This commit is contained in:
Antony Lesuisse
parent
4d1d43fde3
commit
d75c1206e5
|
|
@ -172,7 +172,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
|
|||
}
|
||||
},
|
||||
on_managed_error: function(error) {
|
||||
openerp.web.dialog($('<div>' + QWeb.render('CrashManagerWarning', {error: error}) + '</div>'), {
|
||||
openerp.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
|
||||
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) {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,113 @@
|
|||
</div>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="CrashManager.warning">
|
||||
<table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
|
||||
<tr>
|
||||
<td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td>
|
||||
<td>
|
||||
<p>
|
||||
<t t-js="d">
|
||||
var message = d.message ? d.message : d.error.data.fault_code;
|
||||
d.html_error = context.engine.tools.html_escape(message)
|
||||
.replace(/\n/g, '<br/>');
|
||||
</t>
|
||||
<t t-raw="html_error"/>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</t>
|
||||
<t t-name="CrashManager.error">
|
||||
<t t-if="!session.openerp_entreprise">
|
||||
<span>Your version of OpenERP is unsupported. Support & maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span>
|
||||
</t>
|
||||
<t t-if="session.openerp_entreprise">
|
||||
<div class="oe_error_send">
|
||||
<div>
|
||||
<div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div>
|
||||
<div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/>
|
||||
<div>
|
||||
<label>Summary:</label><br/>
|
||||
<input id="issuename" type="text" class="oe_fielddiv"/>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>Description:</label><br/>
|
||||
<textarea id="explanation" rows="6"></textarea>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>What you did:</label><br/>
|
||||
<textarea id="remark" rows="6" ></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div><br/>
|
||||
</t>
|
||||
<div class="oe_error_detail">
|
||||
<pre><t t-esc="error.message"/></pre>
|
||||
<hr/>
|
||||
<pre><t t-esc="error.data.debug"/></pre>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="Login">
|
||||
<div class="login">
|
||||
<div class="bottom"> </div>
|
||||
<div class="login_error_message">Invalid username or password</div>
|
||||
<div class="pane">
|
||||
<div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
|
||||
<form action="" method="post">
|
||||
<div class="dbpane" >
|
||||
Database:
|
||||
<input name="db" t-att-value="widget.selected_db || ''"/>
|
||||
</div>
|
||||
<ul>
|
||||
<li>Username</li>
|
||||
<li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
|
||||
<li>Password</li>
|
||||
<li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
|
||||
<li><button name="submit">Log in</button></li>
|
||||
</ul>
|
||||
</form>
|
||||
<div class="footer">
|
||||
<a href="#" id="oe-db-config">Manage Databases</a> |
|
||||
<a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
<t t-name="Login.dblist">
|
||||
<select name="db">
|
||||
<t t-foreach="db_list" t-as="db">
|
||||
<t t-if="selected_db === db">
|
||||
<option t-att-value="db" selected="true">
|
||||
<t t-esc="db"/></option>
|
||||
</t>
|
||||
<t t-if="selected_db !== db">
|
||||
<option t-att-value="db"><t t-esc="db"/></option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</t>
|
||||
|
||||
<t t-name="Database">
|
||||
<div class="oe-database-manager">
|
||||
<div class="database">
|
||||
<a class="company_logo_link" href="/?">
|
||||
<div class="company_logo"></div>
|
||||
</a>
|
||||
<ul class="db_options">
|
||||
<li id="db-create">Create</li>
|
||||
<li id="db-drop">Drop</li>
|
||||
<li id="db-backup">Backup</li>
|
||||
<li id="db-restore">Restore</li>
|
||||
<li id="db-change-password">Password</li>
|
||||
<li id="back-to-login">Back to Login</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="oe_db_options" class="oe_db_options"></div>
|
||||
</div>
|
||||
</t>
|
||||
<t t-name="Database.CreateDB">
|
||||
<form name="create_db_form" class="oe_forms" method="POST">
|
||||
<table width="100%">
|
||||
|
|
@ -91,7 +198,7 @@
|
|||
</table>
|
||||
</form>
|
||||
</t>
|
||||
<t t-name="DropDB">
|
||||
<t t-name="Database.DropDB">
|
||||
<form name="drop_db_form" class="oe_forms" method="POST">
|
||||
<table width="100%">
|
||||
<tr>
|
||||
|
|
@ -123,7 +230,7 @@
|
|||
</table>
|
||||
</form>
|
||||
</t>
|
||||
<t t-name="BackupDB">
|
||||
<t t-name="Database.BackupDB">
|
||||
<form name="backup_db_form" class="oe_forms" method="POST" target="backup-target"
|
||||
action="/web/database/backup">
|
||||
<input type="hidden" name="token"/>
|
||||
|
|
@ -157,7 +264,7 @@
|
|||
</table>
|
||||
</form>
|
||||
</t>
|
||||
<t t-name="RestoreDB">
|
||||
<t t-name="Database.RestoreDB">
|
||||
<form name="restore_db_form" class="oe_forms" method="POST">
|
||||
<table width="100%">
|
||||
<tr>
|
||||
|
|
@ -186,7 +293,7 @@
|
|||
</table>
|
||||
</form>
|
||||
</t>
|
||||
<t t-name="Change_DB_Pwd">
|
||||
<t t-name="Database.Change_DB_Pwd">
|
||||
<form name="change_pwd_form" class="oe_forms" method="POST">
|
||||
<table width="100%">
|
||||
<tr>
|
||||
|
|
@ -218,113 +325,6 @@
|
|||
</form>
|
||||
</t>
|
||||
|
||||
<t t-name="CrashManagerWarning">
|
||||
<table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
|
||||
<tr>
|
||||
<td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td>
|
||||
<td>
|
||||
<p>
|
||||
<t t-js="d">
|
||||
var message = d.message ? d.message : d.error.data.fault_code;
|
||||
d.html_error = context.engine.tools.html_escape(message)
|
||||
.replace(/\n/g, '<br/>');
|
||||
</t>
|
||||
<t t-raw="html_error"/>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</t>
|
||||
<t t-name="CrashManagerError">
|
||||
<t t-if="!session.openerp_entreprise">
|
||||
<span>Your version of OpenERP is unsupported. Support & maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span>
|
||||
</t>
|
||||
<t t-if="session.openerp_entreprise">
|
||||
<div class="oe_error_send">
|
||||
<div>
|
||||
<div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div>
|
||||
<div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/>
|
||||
<div>
|
||||
<label>Summary:</label><br/>
|
||||
<input id="issuename" type="text" class="oe_fielddiv"/>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>Description:</label><br/>
|
||||
<textarea id="explanation" rows="6"></textarea>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>What you did:</label><br/>
|
||||
<textarea id="remark" rows="6" ></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div><br/>
|
||||
</t>
|
||||
<div class="oe_error_detail">
|
||||
<pre><t t-esc="error.message"/></pre>
|
||||
<hr/>
|
||||
<pre><t t-esc="error.data.debug"/></pre>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="Login_dblist">
|
||||
<select name="db">
|
||||
<t t-foreach="db_list" t-as="db">
|
||||
<t t-if="selected_db === db">
|
||||
<option t-att-value="db" selected="true">
|
||||
<t t-esc="db"/></option>
|
||||
</t>
|
||||
<t t-if="selected_db !== db">
|
||||
<option t-att-value="db"><t t-esc="db"/></option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</t>
|
||||
|
||||
<t t-name="Login">
|
||||
<div class="login">
|
||||
<div class="bottom"> </div>
|
||||
<div class="login_error_message">Invalid username or password</div>
|
||||
<div class="pane">
|
||||
<div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
|
||||
<form action="" method="post">
|
||||
<div class="dbpane" >
|
||||
Database:
|
||||
<input name="db" t-att-value="widget.selected_db || ''"/>
|
||||
</div>
|
||||
<ul>
|
||||
<li>Username</li>
|
||||
<li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
|
||||
<li>Password</li>
|
||||
<li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
|
||||
<li><button name="submit">Log in</button></li>
|
||||
</ul>
|
||||
</form>
|
||||
<div class="footer">
|
||||
<a href="#" id="oe-db-config">Manage Databases</a> |
|
||||
<a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
<t t-name="DatabaseManager">
|
||||
<div class="oe-database-manager">
|
||||
<div class="database">
|
||||
<a class="company_logo_link" href="/?">
|
||||
<div class="company_logo"></div>
|
||||
</a>
|
||||
<ul class="db_options">
|
||||
<li id="db-create">Create</li>
|
||||
<li id="db-drop">Drop</li>
|
||||
<li id="db-backup">Backup</li>
|
||||
<li id="db-restore">Restore</li>
|
||||
<li id="db-change-password">Password</li>
|
||||
<li id="back-to-login">Back to Login</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="oe_db_options" class="oe_db_options"></div>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="Menu">
|
||||
<ul class="oe_menu" t-if="widget.data">
|
||||
<li t-foreach="widget.data.data.children" t-as="menu">
|
||||
|
|
@ -502,6 +502,24 @@
|
|||
</t>
|
||||
</t>
|
||||
|
||||
<t t-name="ViewPager">
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="first">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
|
||||
</button>
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
|
||||
</button>
|
||||
|
||||
<t t-raw="__content__"/>
|
||||
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="next">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
|
||||
</button>
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="last">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
|
||||
</button>
|
||||
</t>
|
||||
|
||||
<t t-name="Sidebar">
|
||||
<a class="toggle-sidebar"></a>
|
||||
<div class="sidebar-content">
|
||||
|
|
@ -585,24 +603,6 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<t t-name="ViewPager">
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="first">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_first.png"'/>
|
||||
</button>
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="previous">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_previous.png"'/>
|
||||
</button>
|
||||
|
||||
<t t-raw="__content__"/>
|
||||
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="next">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_next.png"'/>
|
||||
</button>
|
||||
<button class="oe_button oe_button_pager" type="button" data-pager-action="last">
|
||||
<img t-att-src='_s + "/web/static/src/img/pager_last.png"'/>
|
||||
</button>
|
||||
</t>
|
||||
|
||||
<table t-name="ListView" class="oe-listview-content">
|
||||
<t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0) + (options.isClarkGable ? 1 : 0)"/>
|
||||
<thead class="ui-widget-header">
|
||||
|
|
@ -1210,6 +1210,16 @@
|
|||
</tr>
|
||||
</table>
|
||||
</t>
|
||||
<t t-name="FieldStatus.content">
|
||||
<ul class="oe-arrow-list">
|
||||
<t t-set="size" t-value="widget.to_show.length"/>
|
||||
<t t-foreach="_.range(size)" t-as="i">
|
||||
<li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
|
||||
<span class="oe-arrow-list-before" t-if="i > 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i < size - 1"></span>
|
||||
</li>
|
||||
</t>
|
||||
</ul>
|
||||
</t>
|
||||
<t t-name="WidgetButton">
|
||||
<button type="button" class="oe_button">
|
||||
<img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
|
||||
|
|
@ -1807,16 +1817,6 @@
|
|||
</p>
|
||||
</div>
|
||||
</t>
|
||||
<t t-name="FieldStatus.content">
|
||||
<ul class="oe-arrow-list">
|
||||
<t t-set="size" t-value="widget.to_show.length"/>
|
||||
<t t-foreach="_.range(size)" t-as="i">
|
||||
<li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
|
||||
<span class="oe-arrow-list-before" t-if="i > 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i < size - 1"></span>
|
||||
</li>
|
||||
</t>
|
||||
</ul>
|
||||
</t>
|
||||
<t t-name="EmptyComponent">
|
||||
<div></div>
|
||||
</t>
|
||||
|
|
|
|||
Loading…
Reference in New Issue