[IMP] website: use mailto for share snippet insead of mail form

bzr revid: chm@openerp.com-20140310141947-zs9ltuzx48k5ej5x

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b155317..95c7ad8 100644 (file)
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -378,14 +378,6 @@ class Website(openerp.addons.web.controllers.main.Home):
             del response.headers['Content-Length']
 
         return response
-    
-    @http.route(['/website/current_user/'], type='json', auth="public", website=True)
-    def get_current_user(self, fields):
-        cr, uid, context = request.cr, request.uid, request.context
-        if request.registry["website"].get_public_user(cr, uid, context=context) != uid:
-            return request.registry["res.users"].read(cr, openerp.SUPERUSER_ID, [uid], fields, context=context)[0]
-        else:
-            return None
 
     #------------------------------------------------------
     # Server actions

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 173cdf3..8d7b634 100644 (file)
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -143,25 +143,10 @@
                 "https://plus.google.com/share?url="+url);
             this.$target.find("a").click(function () {
                 window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+                return false;
             });
-            
-            var $modal = this.$target.find(".oe_share_mail_modal");
-            var $from = $modal.find("input[name='from']").parent().parent();
-            this.$target.find(".oe_share_mail").off("click").click(function () {
-                // open popover
-                $modal.modal("show");
-            });
-            $modal.find("input[name='url']").attr("value", window.location.href);
-            openerp.jsonRpc('/website/current_user/', 'call', {
-                fields: ["email"]
-            }).then(function (result) {
-                if (result) $from.addClass("hidden");
-                else $from.removeClass("hidden");
-            });
-            $modal.find(".btn-primary").click(function () {
-                $modal.modal("hide");
-                console.log("valid");
-            });
+            this.$target.find(".oe_share_mail").attr("href",
+                "mailto:?body="+url+"&subject="+title).off("click");
         },
     });
 })();

diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f592286..3586133 100644 (file)
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -351,55 +351,6 @@
                 <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
                 <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
             </h3>
-
-            <!-- Modal for Mail -->
-            <div class="oe_share_mail_modal modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <form class="form-horizontal" role="form">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                <h4 class="modal-title" id="myModalLabel">Share by Email</h4>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">To</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="to"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">From</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="from"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Subject</label>
-                                    <div class="col-sm-10">
-                                        <input type="text" class="form-control" name="subject"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Summary</label>
-                                    <div class="col-sm-10">
-                                        <textarea class="form-control" rows="4" name="Summary"></textarea>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">URL</label>
-                                    <div class="col-sm-10">
-                                        <input readonly="readonly" value="" class="form-control" name="url"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-primary pull-right">Send Email</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>