odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[merge] 

bzr revid: nicolas.vanhoren@openerp.com-20110822151908-y5jukt4e85hlll0r
This commit is contained in:
niv-openerp 2011-08-22 17:19:08 +02:00
parent 9d6e0dcc9c f9462c5d48
commit 10b5771fb1
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/base/static/src/css/base.css
View File

@ -1146,10 +1146,12 @@ label.error {
}
.openerp .oe-m2o {
padding-right: 16px;
padding-right: 20px;
white-space: nowrap;
}
.openerp .oe_forms .oe-m2o input[type="text"] {
padding-right: 20px;
}
.openerp .oe-m2o-drop-down-button {
margin-left: -23px;
}
@ -1158,6 +1160,9 @@ label.error {
margin-bottom: -4px;
cursor: pointer;
}
.openerp .oe-m2o-cm-button img {
margin-left: 4px;
}
.openerp .oe-m2o-disabled-cm {
color: grey;
}

6
addons/base/static/src/js/form.js
View File

@ -427,10 +427,10 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi
this.notification.notify("Cancelling form");
},
reload: function() {
if (this.datarecord.id) {
this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
} else {
if (this.dataset.index == null || this.dataset.index < 0) {
this.on_button_new();
} else {
this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
}
},
get_fields_values: function() {

7
addons/base_dashboard/static/src/js/dashboard.js
View File

@ -285,6 +285,7 @@ if (!openerp.base_dashboard) {
openerp.base_dashboard = {};
}
openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
template: 'ConfigOverview',
init: function (parent, element_id) {
this._super(parent, element_id);
this.dataset = new openerp.base.DataSetSearch(
@ -312,7 +313,7 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
})
.groupBy(function (record) {return record.category})
.value();
this.$element.html(QWeb.render('ConfigOverview', {
this.$element.html(QWeb.render('ConfigOverview.content', {
completion: 100 * progress.done / progress.total,
groups: grouped_todos
}));
@ -347,6 +348,7 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
openerp.base.client_actions.add(
'board.home.applications', 'openerp.base_dashboard.ApplicationTiles');
openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
template: 'ApplicationTiles',
start: function () {
var self = this;
return new openerp.base.DataSetSearch(
@ -359,7 +361,7 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
}
self.$element
.append(QWeb.render(
'ApplicationTiles', {rows: rows}))
'ApplicationTiles.content', {rows: rows}))
.find('.oe-dashboard-home-tile')
.click(function () {
var $this = $(this);
@ -372,6 +374,7 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({
openerp.base.client_actions.add(
'board.home.widgets', 'openerp.base_dashboard.Widgets');
openerp.base_dashboard.Widgets = openerp.base.View.extend({
template: 'HomeWidgets',
start: function () {
return new openerp.base.DataSetSearch(
this, 'res.widget.user', null,

49
addons/base_dashboard/static/src/xml/base_dashboard.xml
View File

@ -64,7 +64,8 @@
</board>
</form>
</t>
<div t-name="ConfigOverview" class="oe-dashboard-config-overview">
<div t-name="ConfigOverview" class="oe-dashboard-config-overview"/>
<t t-name="ConfigOverview.content">
<div class="oe-config-progress">
<h6 class="oe-config-progress-title">
progress: <t t-esc="Math.round(completion)"/>%
@ -88,30 +89,28 @@
</t>
</dl>
</div>
<div t-name="ApplicationTiles" class="oe-dashboard-home-tiles">
<table width="100%">
<tr t-foreach="rows" t-as="row">
<td t-foreach="row" t-as="application" width="33.3%">
<div class="oe-dashboard-home-tile"
t-att-data-menuid="application.id">
<div class="oe-dashboard-home-tile-icon">
<img t-if="application.web_icon_data"
t-att-src="'data:image/png;base64,' + application.web_icon_data"
/><img t-if="application.web_icon_hover_data" class="hover"
t-att-src="'data:image/png;base64,' + application.web_icon_hover_data"/>
</div>
<span><t t-esc="application.name"/></span>
</t>
<div t-name="ApplicationTiles" class="oe-dashboard-home-tiles"/>
<table t-name="ApplicationTiles.content" width="100%">
<tr t-foreach="rows" t-as="row">
<td t-foreach="row" t-as="application" width="33.3%">
<div class="oe-dashboard-home-tile"
t-att-data-menuid="application.id">
<div class="oe-dashboard-home-tile-icon">
<img t-if="application.web_icon_data"
t-att-src="'data:image/png;base64,' + application.web_icon_data"
/><img t-if="application.web_icon_hover_data" class="hover"
t-att-src="'data:image/png;base64,' + application.web_icon_hover_data"/>
</div>
</td>
</tr>
</table>
</div>
<div t-name="HomeWidgets" class="oe-dashboard-home-widgets">
<div class="oe-dashboard-home-widgets-widget"
t-foreach="widgets" t-as="widget">
<h3><t t-esc="widget.title"/></h3>
<iframe width="100%" frameborder="0" t-att-src="url + widget.id"/>
</div>
<span><t t-esc="application.name"/></span>
</div>
</td>
</tr>
</table>
<div t-name="HomeWidgets" class="oe-dashboard-home-widgets"/>
<div t-name="HomeWidgets.content" class="oe-dashboard-home-widgets-widget"
t-foreach="widgets" t-as="widget">
<h3><t t-esc="widget.title"/></h3>
<iframe width="100%" frameborder="0" t-att-src="url + widget.id"/>
</div>
</template>