Anandkumar (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-web_calendar-pan into
lp:~openerp-dev/openerp-web/trunk-improve-web-issues-ps-w45.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-web_calendar-pan/+merge/133903
Hello Sir,
improved code for calendar month picker widget when user changes the month
then only 'month' tab is visible other two tabs [day,week] are hidden behind
the month tab.
Thanks & Regards,
Anand
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-web_calendar-pan/+merge/133903
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-web_calendar-pan into
lp:~openerp-dev/openerp-web/trunk-improve-web-issues-ps-w45.
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-11-09 13:49:58 +0000
+++ addons/web/static/src/js/view_form.js 2012-11-12 11:50:29 +0000
@@ -4961,10 +4961,17 @@
});
},
on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
- this.internal_set_value(file_base64);
- this.binary_value = true;
- this.render_value();
- this.set_filename(name);
+ var self = this;
+ var ext = self.filename.split('.').pop().toLowerCase();
+ if($.inArray(ext, ['gif','png','jpg','jpeg','bmp','dds','psd','tga','thm','tif','tiff','yuv']) == -1) {
+ self.$el.find('img').attr('src',self.placeholder);
+ instance.webclient.notification.warn(_t("Image"), _t("Please Select the proper image"));
+ } else {
+ this.internal_set_value(file_base64);
+ this.binary_value = true;
+ this.render_value();
+ this.set_filename(name);
+ }
},
on_clear: function() {
this._super.apply(this, arguments);
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
--- addons/web_calendar/static/src/css/web_calendar.css 2012-10-29 10:53:03 +0000
+++ addons/web_calendar/static/src/css/web_calendar.css 2012-11-12 11:50:29 +0000
@@ -33,3 +33,12 @@
.openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
padding-right: 5px;
}
+.openerp .oe_calendar .oe_day_tab {
+ right: 204px;
+}
+.openerp .oe_calendar .oe_week_tab {
+ right: 140px;
+}
+.openerp .oe_calendar .oe_month_tab {
+ right: 76px;
+}
=== modified file 'addons/web_calendar/static/src/css/web_calendar.sass'
--- addons/web_calendar/static/src/css/web_calendar.sass 2012-10-29 10:53:03 +0000
+++ addons/web_calendar/static/src/css/web_calendar.sass 2012-11-12 11:50:29 +0000
@@ -36,5 +36,14 @@
table tr td:last-child div.dhx_month_body
padding-right: 5px
+ .oe_day_tab
+ right: 204px
+
+ .oe_week_tab
+ right: 140px
+
+ .oe_month_tab
+ right: 76px
+
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js 2012-11-05 20:17:17 +0000
+++ addons/web_calendar/static/src/js/calendar.js 2012-11-12 11:50:29 +0000
@@ -52,7 +52,11 @@
// mode, one of month, week or day
this.mode = this.fields_view.arch.attrs.mode;
-
+ this.$el.find('.dhx_cal_prev_button, .dhx_cal_next_button').on('click',function(){
+ $('div[name=day_tab]').addClass('oe_day_tab');
+ $('div[name=week_tab]').addClass('oe_week_tab');
+ $('div[name=month_tab]').addClass('oe_month_tab');
+ });
// date_start is mandatory, date_delay and date_stop are optional
this.date_start = this.fields_view.arch.attrs.date_start;
this.date_delay = this.fields_view.arch.attrs.date_delay;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
