From b9bd4da714ebd3f54ad3777fc078156916f882a8 Mon Sep 17 00:00:00 2001 From: smurf-U Date: Sun, 4 Jun 2017 21:27:43 +0530 Subject: [PATCH] [10.0][MIG]migrate web_widget_image_webcam v10 --- web_widget_image_webcam/README.rst | 12 +----------- .../{__openerp__.py => __manifest__.py} | 5 +++-- .../static/src/css/web_widget_image_webcam.css | 8 +++++--- .../static/src/js/webcam_widget.js | 4 ++-- .../static/src/xml/web_widget_image_webcam.xml | 10 +++++----- 5 files changed, 16 insertions(+), 23 deletions(-) rename web_widget_image_webcam/{__openerp__.py => __manifest__.py} (83%) diff --git a/web_widget_image_webcam/README.rst b/web_widget_image_webcam/README.rst index 66c63878..f893fef7 100644 --- a/web_widget_image_webcam/README.rst +++ b/web_widget_image_webcam/README.rst @@ -25,17 +25,6 @@ Set the configuration parameter ``web_widget_image_webcam.flash_fallback_mode`` Its done! Now this module also work with websites without SSL / HTTPS. -Usage -===== - -To use this module, you need to: - -#. Go to ... - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/162/9.0 - Bug Tracker =========== @@ -51,6 +40,7 @@ Contributors ------------ * Siddharth Bhalgami +* Kaushal Prajapati Maintainer ---------- diff --git a/web_widget_image_webcam/__openerp__.py b/web_widget_image_webcam/__manifest__.py similarity index 83% rename from web_widget_image_webcam/__openerp__.py rename to web_widget_image_webcam/__manifest__.py index 1149b470..240415d1 100644 --- a/web_widget_image_webcam/__openerp__.py +++ b/web_widget_image_webcam/__manifest__.py @@ -4,11 +4,12 @@ { "name": "Web Widget - Image WebCam", "summary": "Allows to take image with WebCam", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "category": "web", "website": "https://www.techreceptives.com", "author": "Tech Receptives, " - "Odoo Community Association (OCA)", + "Odoo Community Association (OCA), " + "Kaushal Prajapati", "license": "LGPL-3", "data": [ "views/assets.xml", diff --git a/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css b/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css index 20e95c4f..5f4ce0be 100644 --- a/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css +++ b/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css @@ -2,11 +2,13 @@ Copyright 2016 Siddharth Bhalgami License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ -.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls -.oe_form_binary_file_web_cam { +.o_form_view.o_form_editable .o_form_field_image .o_form_image_controls +.o_form_binary_file_web_cam { color: inherit; } - +.o_form_view .o_form_field_image .o_form_image_controls > .fa{ + margin:3px; +} .live_webcam_outer_div, .webcam_result_outer_div { padding-left: 20px; } diff --git a/web_widget_image_webcam/static/src/js/webcam_widget.js b/web_widget_image_webcam/static/src/js/webcam_widget.js index c11139b5..db35c343 100644 --- a/web_widget_image_webcam/static/src/js/webcam_widget.js +++ b/web_widget_image_webcam/static/src/js/webcam_widget.js @@ -35,7 +35,7 @@ odoo.define('web_widget_image_webcam.webcam_widget', function(require) { swfURL: '/web_widget_image_webcam/static/src/js/webcam.swf', }); - self.$el.find('.oe_form_binary_file_clear').removeClass('col-md-offset-5'); + self.$el.find('.o_form_binary_file_web_cam').removeClass('col-md-offset-5'); new Model('ir.config_parameter').call('get_param', ['web_widget_image_webcam.flash_fallback_mode', false]). then(function(default_flash_fallback_mode) { @@ -50,7 +50,7 @@ odoo.define('web_widget_image_webcam.webcam_widget', function(require) { } }); - self.$el.find('.oe_form_binary_file_web_cam').off().on('click', function(){ + self.$el.find('.o_form_binary_file_web_cam').off().on('click', function(){ // Init Webcam new Dialog(self, { size: 'large', diff --git a/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml b/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml index 1f4297b4..7360a471 100644 --- a/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml +++ b/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml @@ -4,8 +4,8 @@