Merge lp:~openerp-dev/openerp-web/trunk-web_pdf_reports_inbuilt-pga into lp:openerp-web

[Parth Gajjar(Open ERP)]

Hello,
Added inbuilt pdf view feature.
Thanks,
PGA

[Mantavya Gajjar (Open ERP) (mga)]

Make a good text on module description and change the text on settings menu

Replace (View Report -> Enable this for open PDF reports in browser.)

With (View Report -> Enable this to have inline pdf report viewer.)

or some good text

review: Needs Information

[lp:~openerp-dev/openerp-web/trunk-web_pdf_reports_inbuilt-pga]

3789. By Parth Gajjar(Open ERP) on 2013-08-07

merged with trunk-web

3790. By Parth Gajjar(Open ERP) on 2013-08-07

[ADD] inbuilt pdf view feature in core.js (due to conflict)

3791. By Parth Gajjar(Open ERP) on 2013-09-30

merged with trunk-web

Unmerged revisions

3791. By Parth Gajjar(Open ERP) on 2013-09-30

merged with trunk-web

3790. By Parth Gajjar(Open ERP) on 2013-08-07

[ADD] inbuilt pdf view feature in core.js (due to conflict)

3789. By Parth Gajjar(Open ERP) on 2013-08-07

merged with trunk-web

3788. By Parth Gajjar(Open ERP) on 2013-08-06

merged with latest trunk

3787. By Parth Gajjar(Open ERP) on 2013-07-30

[IMP] improved code

3786. By Parth Gajjar(Open ERP) on 2013-07-30

[IMP] improved code

3785. By Parth Gajjar(Open ERP) on 2013-07-26

[ADD] Added inbuilt pdf view feature

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2013-09-24 15:19:13 +0000
+++ addons/web/controllers/main.py	2013-09-30 10:53:14 +0000
@@ -1723,12 +1723,14 @@
             else:
                 file_name = action['report_name']
         file_name = '%s.%s' % (file_name, report_struct['format'])
-
+        headers=[
+            ('Content-Disposition', content_disposition(file_name)),
+            ('Content-Type', report_mimetype),
+            ('Content-Length', len(report))]
+        if action.get('inbuilt_pdf',False):
+            del headers[0]
         return request.make_response(report,
-             headers=[
-                 ('Content-Disposition', content_disposition(file_name)),
-                 ('Content-Type', report_mimetype),
-                 ('Content-Length', len(report))],
-             cookies={'fileToken': token})
+            headers = headers,
+            cookies = {'fileToken': token})
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-09-04 13:24:30 +0000
+++ addons/web/static/src/css/base.css	2013-09-30 10:53:14 +0000
@@ -3430,6 +3430,49 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
 }
 
+.openerp div.close_print{
+    display: block;
+    text-shadow: 1px 1px 5px #050505;
+    filter: dropshadow(color=#050505, offx=1, offy=1);
+    line-height:50px;
+    width:50px;
+    position:fixed;
+    right:2em;
+    top:7em;
+    color:#C3C3C3;
+    background: #3f3f3f; /* Old browsers */
+    background: -moz-linear-gradient(top,  #3f3f3f 0%, #0e0e0e 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3f3f3f), color-stop(100%,#0e0e0e)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top,  #3f3f3f 0%,#0e0e0e 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top,  #3f3f3f 0%,#0e0e0e 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top,  #3f3f3f 0%,#0e0e0e 100%); /* IE10+ */
+    background: linear-gradient(to bottom,  #3f3f3f 0%,#0e0e0e 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3f3f3f', endColorstr='#0e0e0e',GradientType=0 ); /* IE6-9 */
+  -webkit-border-radius: 100px 100px 100px 100px;
+  border-radius: 100px 100px 100px 100px;
+}
+
+.openerp div.close_print div{
+     text-align:center;
+    -webkit-transition: font-size 0.1s;
+    -moz-transition: font-size 0.1s;
+    -ms-transition: font-size 0.1s;
+    -o-transition: font-size 0.1s;
+    transition: font-size 0.1s;
+}
+.openerp div.close_print div div{
+    visibility:visible;
+    font-family: "entypoRegular";
+    font-size: 4em;
+    padding-top:0px;
+}
+
+.openerp div.close_print:hover div div{
+    text-align:center;
+    font-size: 6em;
+}
+
+
 @media print {
   .openerp {
     text-shadow: none;

=== modified file 'addons/web/static/src/js/core.js'
--- addons/web/static/src/js/core.js	2013-08-07 09:22:32 +0000
+++ addons/web/static/src/js/core.js	2013-09-30 10:53:14 +0000
@@ -459,6 +459,8 @@
 
         // iOS devices doesn't allow iframe use the way we do it,
         // opening a new window seems the best way to workaround
+        action = JSON.parse(options.data.action)
+        var inbuilt_pdf = action.inbuilt_pdf;
         if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) {
             var params = _.extend({}, options.data || {}, {token: token});
             var url = this.url(options.url, params);
@@ -470,39 +472,74 @@
 
         var complete = function () {
             if (options.complete) { options.complete(); }
-            clearTimeout(timer);
-            $form_data.remove();
-            $target.remove();
-            if (remove_form && $form) { $form.remove(); }
+            if (!inbuilt_pdf){                
+                clearTimeout(timer);
+                $form_data.remove();
+                $target.remove();
+                if (remove_form && $form) { $form.remove(); }
+            }
         };
-        var $target = $('<iframe style="display: none;">')
-            .attr({id: id, name: id})
-            .appendTo(document.body)
-            .load(function () {
-                try {
-                   if (options.error) {
-                         if (!this.contentDocument.body.childNodes[1]) {
-                            options.error(this.contentDocument.body.childNodes);
-                        }
-                        else {
-                            options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent));
-                        }
-                   }
-                } finally {
-                    complete();
-                }
-            });
-
-        if (options.form) {
-            $form = $(options.form);
-        } else {
-            remove_form = true;
-            $form = $('<form>', {
-                action: options.url,
-                method: 'POST'
-            }).appendTo(document.body);
-        }
-
+        if (!inbuilt_pdf){  
+            var $target = $('<iframe style="display: none;">')
+                .attr({id: id, name: id})
+                .appendTo(document.body)
+                .load(function () {
+                    try {
+                       if (options.error) {
+                             if (!this.contentDocument.body.childNodes[1]) {
+                                options.error(this.contentDocument.body.childNodes);
+                            }
+                            else {
+                                options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent));
+                            }
+                       }
+                    } finally {
+                        complete();
+                    }
+                });
+    
+            if (options.form) {
+                $form = $(options.form);
+            } else {
+                remove_form = true;
+                $form = $('<form>', {
+                    action: options.url,
+                    method: 'POST'
+                }).appendTo(document.body);
+            }
+        }
+        else{
+            $('.oe_view_manager.oe_view_manager_current').children().hide();
+            var height_window = ($(window).height()) - 32;
+            var $target = $('<iframe style="top:100px;left:1px;z-index:500;width:100%;height:' + height_window + 'px;">')
+                .attr({id: id, name: id})
+                .prependTo(".oe_view_manager.oe_view_manager_current")
+                .load(function () {
+                    $('<a><div class="close_print"><div><div>X</div><i>Close</i></div></div></a>')
+                        .attr({ id: 'close_print'})
+                        .prependTo(".oe_view_manager.oe_view_manager_current");
+                    $("#close_print")
+                        .click(function () {
+                            clearTimeout(timer);
+                            $form_data.remove();
+                            $target.remove();
+                            if (remove_form && $form) {
+                                $form.remove();
+                            }
+                            $("#close_print").remove();
+                            $('.oe_view_manager.oe_view_manager_current').children().show();
+                        });
+                });
+            if (options.form) {
+                $form = $(options.form);
+            } else {
+                remove_form = true;
+                $form = $('<form>', {
+                    action: options.url,
+                    method: 'GET'
+                }).appendTo(document.body);
+            }
+        }
         var hparams = _.extend({}, options.data || {}, {token: token});
         if (this.override_session)
             hparams.session_id = this.session_id;