From d4e7b18a553e1920548c4cd6de4faa9815c5cb02 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 26 Feb 2014 17:01:21 +0530
Subject: [PATCH 01/14] [ADD] added snippet for country event, script for
 finding coordinates from brwoser, And display events from users country

bzr revid: pga@tinyerp.com-20140226113121-vni0182v0cc2u3d4
---
 addons/website/static/src/css/website.css     |   6 ++
 addons/website/static/src/css/website.sass    |   6 ++
 .../src/img/blocks/block-country_events.png   | Bin 0 -> 790 bytes
 addons/website_event/controllers/main.py      |  22 +++++++
 .../static/src/js/website_geolocation.js      |  40 ++++++++++++
 addons/website_event/views/website_event.xml  |  58 ++++++++++++++++++
 6 files changed, 132 insertions(+)
 create mode 100644 addons/website/static/src/img/blocks/block-country_events.png
 create mode 100644 addons/website_event/static/src/js/website_geolocation.js

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e47b7a41baa..b386c3f4769 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -529,3 +529,9 @@ span[data-oe-type="monetary"] {
   width: 400px;
   margin: 40px auto;
 }
+
+.oe_website_overflow_ellipsis{
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 3cdfe37a896..9e69f85065d 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -428,3 +428,9 @@ span[data-oe-type="monetary"]
 .oe_website_login_container
     width: 400px
     margin: 40px auto
+
+.oe_website_overflow_ellipsis
+    white-space:nowrap
+    overflow:hidden
+    text-overflow:ellipsis
+
diff --git a/addons/website/static/src/img/blocks/block-country_events.png b/addons/website/static/src/img/blocks/block-country_events.png
new file mode 100644
index 0000000000000000000000000000000000000000..52254ba4c3e96f80f0aeed224a03af32d3a659d7
GIT binary patch
literal 790
zcmeAS@N?(olHy`uVBq!ia0vp^DM0Mc!3HE{I};W%FfiTqba4!+xb^n-Z~ve|iQ|R;
zUwFA3;Mu)q&Wfv1m7T6%otG}vyIiMrh3U}gn12(R($1O8Q3#*g;D7)9&8!(7v&8+{
zzo%E%B^F5Bzy7mm-ofHmEi<%Abr=;`1ROeMI(8jh^ybZ*4Y$%5PNo<Y?cePlweG%v
z|MT3Rg54WmU1hj=`}XACUf#mEylLFq+U|$me=(ueqh+dn{)7@M-SfYGeNX(O<)5yu
zU4KvEV?|8fwyjfHFNSJ}^p(uHdp9;RHg@Xy;$op+BGVi+RDv%X8?7&kOv*leqjUMh
z5G~b*Cp|q?gs!oid{%Vn?}ccw#Xnzd?c)Afo9p{0`Ek*E$LTSf%;maPonE`n_b)TE
z(f$nzKb4iHtF2VH*RxM__TfaC^9%PS=~f5!>*<|3%J#d_^^XLHT*bR>uMU0D%lNt_
zoMlBwS@`5VpMR$o7k^%F?QSmpSXjR2`kzV}@AAm_D>I{iCEj0cyx+uf>tv>b5A2m?
z!usdgOr4RX^(B1Xv5RZV^|t5Qd@Cy0@aWuTla77Urqtb7fBN*X$E;f&(isb-LMJQ4
z%|Aay!j${cgA&FhHG$cOIXM&>7?^Mp9y5z#3#CiLB&N-?vefL5Q=T<*?$oVcOHZb3
z4$_&aa`O4-O;dfmN-{m??SEly*fOuL($qrbWD3`WORshmhpR1LraIM6{&nq_i2nMT
zLlU93d@cX9D_?xwVAz|~7Q(ya<lRm0-+cKcCtVz)KG)?+@V6?n)m!&I4rr;WUR?6^
zo0o#bq&2rH)4Z-aI6d5OC+o9E|8?#AVPWT<>`mS{W8;g%%8OUIrTDyE;9*kr#PHfI
zCPg&Am@+NOU$(_M_L!{quX458{|YOWI2c(3fc`z=q_EX)2LsgOC6OhOVBr?M*Y$5N
wF#y##Ffg|0b?bEl0|%@FqK!ph^>g)u=TG?^Jp9EHnBEyYUHx3vIVCg!0K!IH$N&HU

literal 0
HcmV?d00001

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 2a6e1d134e3..132fc14ed09 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -28,6 +28,7 @@ controllers = controllers()
 
 
 from datetime import datetime, timedelta
+import time
 from dateutil.relativedelta import relativedelta
 from openerp import tools
 import werkzeug.urls
@@ -215,3 +216,24 @@ class website_event(http.Controller):
         }
         event_id = Event.create(request.cr, request.uid, vals, context=context)
         return request.redirect("/event/%s/?enable_editor=1" % event_id)
+
+    @http.route('/event/get_country_event_list/<path:country_code>', type='http', auth='public', website=True)
+    def get_country_events(self,country_code ,**post):
+        cr, uid, context = request.cr, request.uid, request.context
+        event_obj = request.registry['event.event']
+        event_ids = event_obj.search(request.cr, request.uid, [('country_id.code', '=', country_code),('state', '=', 'confirm'),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
+        events = event_obj.browse(request.cr, request.uid, event_ids, context=request.context)
+        country_obj = request.registry['res.country']
+        country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
+        country = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
+        result = {'events':[], 'country': country}
+        for event in events:
+            start_date = datetime.strptime(event.date_begin.split(' ')[0], "%Y-%m-%d")
+            end_date = datetime.strptime(event.date_end.split(' ')[0], "%Y-%m-%d")
+            if end_date == start_date:
+                result['events'].append({"date": start_date.strftime("%b")+" "+start_date.strftime("%e"), 
+                                         "event": event, 'url': event.website_url})
+            else:
+                result['events'].append({"date":start_date.strftime("%b")+" "+start_date.strftime("%e")+"-"+end_date.strftime("%e"),
+                                         "event": event, 'url': event.website_url})
+        return request.website.render("website_event.country_events_list",result)
diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
new file mode 100644
index 00000000000..3d48b042433
--- /dev/null
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -0,0 +1,40 @@
+(function() {
+    "use strict";
+    function getLocation()
+    {
+        if (navigator.geolocation)
+        {
+            navigator.geolocation.getCurrentPosition(showPosition);
+        }
+        else{alert("Geolocation is not supported by this browser.");}
+    }
+    
+    function showPosition(position)
+    {
+        var latitude = position.coords.latitude;
+        var longitude = position.coords.longitude;
+        $.ajax({
+            url:  "https://maps.googleapis.com/maps/api/geocode/json?latlng="+latitude+","+longitude+"&sensor=false",
+            type: 'GET',
+            dataType: 'json',
+            success: function(response, status, xhr, wfe){ 
+                if(response.status == 'OK'){
+                    var last_element = response.results[response.results.length - 1]
+                    if( last_element.types.indexOf( "country" ) != -1){
+                        var country_obj = last_element.address_components[0];
+                        $('img.event_country_flag').attr('src','base/static/img/country_flags/'+country_obj.short_name.toLowerCase()+'.png');
+                        $.post( "/event/get_country_event_list/"+country_obj.short_name, function( data ) {
+                            $( ".country_events_list" ).replaceWith( data );
+                        });
+                    }
+                }
+            }
+        });
+    }
+
+    $(document).ready(function () {
+        if($('.country_events').length){
+            getLocation();
+        }
+    });
+})();
\ No newline at end of file
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index d002521b021..c2d2129ecdd 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -336,5 +336,63 @@
         </div>
     </t>
 </template>
+
+<template id="event_script" name="Country Events Snippet Script" inherit_id="website.layout">
+    <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
+    </xpath>
+</template>
+
+<template id="country_events" name="Country Events" inherit_id="website.snippets">
+    <xpath expr="//div[@id='snippet_feature']" position="inside">
+        <div data-snippet-id="country_events" data-selector-children=".oe_structure, [data-oe-type=html]" class="country_events"> 
+            <div class="oe_snippet_thumbnail">
+                <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block-country_events.png" />
+                <span class="oe_snippet_thumbnail_title">Country Events</span>
+            </div>
+            <section class="oe_snippet_body country_events">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-3">
+                            <div class="country_events_list">
+                            <div class="text-muted text-center">
+                                <h1><i class="fa fa-map-marker fa-5x"></i></h1>
+                                <h3>Allow browser to use your Location.</h3>
+                            </div>
+                            </div>
+                        </div>
+                        <div class="col-md-5">
+                        </div>
+                        <div class="col-md-4">
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </xpath>
+</template>
+
+<template id="country_events_list" name="Country">
+    <t t-ignore="true">
+        <div class="mb16 country_events_list">
+            <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
+            <t t-if="events">
+                <h4><b>Events In <span t-esc="country.name"></span></b></h4>
+                <div t-foreach="events[:5]" t-as="country_event" class="oe_website_overflow_ellipsis mb8">
+                    <t t-if="not country_event['event'].website_published">
+                        <span class="label label-danger"><i class="fa fa-ban"></i></span>
+                    </t>
+                    <i class="fa fa-calendar"></i> <b><span t-esc="country_event['date']"/>: <span><a t-att-href="country_event['url']"><t t-esc="country_event['event'].name"/></a></span></b>
+                </div>
+            </t>
+            <t t-if="len(events) > 5">
+                <b class="text-center"><a t-att-href="'/event/?country='+str(country.id)">All events for <span t-esc="country.name"></span></a></b>
+            </t>
+            <t t-if="events == []">
+                <h4 ><b>No events available for <span t-esc="country.name"></span></b></h4>
+            </t>
+        </div>
+    </t>
+</template>
 </data>
 </openerp>

From 6a3a62d94c6f0eef5a7facbd3640a66b66ad2637 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 28 Feb 2014 15:11:48 +0530
Subject: [PATCH 02/14] [IMP] moved snippet to content, Get country with help
 of GeoIP module

bzr revid: pga@tinyerp.com-20140228094148-e2nr13o9e9u0vkor
---
 addons/website_event/controllers/main.py      | 46 ++++++-----
 .../static/src/js/website_geolocation.js      | 32 +-------
 addons/website_event/views/website_event.xml  | 77 +++++++++++--------
 3 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index e92db8260e7..7f3ed2c74dc 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -32,6 +32,7 @@ import time
 from dateutil.relativedelta import relativedelta
 from openerp import tools
 import werkzeug.urls
+import GeoIP
 
 class website_event(http.Controller):
     @http.route(['/event/', '/event/page/<int:page>'], type='http', auth="public", website=True, multilang=True)
@@ -205,23 +206,32 @@ class website_event(http.Controller):
         event_id = Event.create(request.cr, request.uid, vals, context=context)
         return request.redirect("/event/%s/?enable_editor=1" % event_id)
 
-    @http.route('/event/get_country_event_list/<path:country_code>', type='http', auth='public', website=True)
-    def get_country_events(self,country_code ,**post):
-        cr, uid, context = request.cr, request.uid, request.context
-        event_obj = request.registry['event.event']
-        event_ids = event_obj.search(request.cr, request.uid, [('country_id.code', '=', country_code),('state', '=', 'confirm'),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
-        events = event_obj.browse(request.cr, request.uid, event_ids, context=request.context)
+    def get_visitors_country(self):
+        GI = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', 0)
+        return {'country_code': GI.country_code_by_addr(request.httprequest.remote_addr), 'country_name': GI.country_name_by_addr(request.httprequest.remote_addr)}
+    
+    def get_formated_date(self, event):
+        start_date = datetime.strptime(event.date_begin, "%Y-%m-%d %H:%M:%S").date()
+        end_date = datetime.strptime(event.date_end, "%Y-%m-%d %H:%M:%S").date()
+        return start_date.strftime("%b")+" "+start_date.strftime("%e")+ (end_date != start_date and ("-"+end_date.strftime("%e")) or "")
+    
+    @http.route('/event/get_country_event_list', type='http', auth='public', website=True)
+    def get_country_events(self ,**post):
         country_obj = request.registry['res.country']
-        country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
-        country = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
-        result = {'events':[], 'country': country}
-        for event in events:
-            start_date = datetime.strptime(event.date_begin.split(' ')[0], "%Y-%m-%d")
-            end_date = datetime.strptime(event.date_end.split(' ')[0], "%Y-%m-%d")
-            if end_date == start_date:
-                result['events'].append({"date": start_date.strftime("%b")+" "+start_date.strftime("%e"), 
-                                         "event": event, 'url': event.website_url})
-            else:
-                result['events'].append({"date":start_date.strftime("%b")+" "+start_date.strftime("%e")+"-"+end_date.strftime("%e"),
-                                         "event": event, 'url': event.website_url})
+        event_obj = request.registry['event.event']
+        cr, uid, context,event_ids = request.cr, request.uid, request.context,[]
+        country_code = self.get_visitors_country()['country_code']
+        result = {'events':[]}
+        if country_code:
+            country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
+            result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
+            event_ids = event_obj.search(request.cr, request.uid, [('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
+        if not event_ids:
+            event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
+            result['country'] = False
+        for event in event_obj.browse(request.cr, request.uid, event_ids, context=request.context):
+            result['events'].append({
+                 "date": self.get_formated_date(event),
+                 "event": event,
+                 "url": event.website_url})
         return request.website.render("website_event.country_events_list",result)
diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
index 3d48b042433..d295f3dd04d 100644
--- a/addons/website_event/static/src/js/website_geolocation.js
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -1,33 +1,9 @@
 (function() {
     "use strict";
-    function getLocation()
-    {
-        if (navigator.geolocation)
-        {
-            navigator.geolocation.getCurrentPosition(showPosition);
-        }
-        else{alert("Geolocation is not supported by this browser.");}
-    }
-    
-    function showPosition(position)
-    {
-        var latitude = position.coords.latitude;
-        var longitude = position.coords.longitude;
-        $.ajax({
-            url:  "https://maps.googleapis.com/maps/api/geocode/json?latlng="+latitude+","+longitude+"&sensor=false",
-            type: 'GET',
-            dataType: 'json',
-            success: function(response, status, xhr, wfe){ 
-                if(response.status == 'OK'){
-                    var last_element = response.results[response.results.length - 1]
-                    if( last_element.types.indexOf( "country" ) != -1){
-                        var country_obj = last_element.address_components[0];
-                        $('img.event_country_flag').attr('src','base/static/img/country_flags/'+country_obj.short_name.toLowerCase()+'.png');
-                        $.post( "/event/get_country_event_list/"+country_obj.short_name, function( data ) {
-                            $( ".country_events_list" ).replaceWith( data );
-                        });
-                    }
-                }
+    function getLocation(){
+        $.post( "/event/get_country_event_list/", function( data ) {
+            if(data){
+                $( ".country_events_list" ).replaceWith( data );
             }
         });
     }
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index f52bcff5338..5435114236f 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -338,54 +338,71 @@
 </template>
 
 <template id="country_events" name="Country Events" inherit_id="website.snippets">
-    <xpath expr="//div[@id='snippet_feature']" position="inside">
-        <div data-snippet-id="country_events" data-selector-children=".oe_structure, [data-oe-type=html]" class="country_events"> 
+    <xpath expr="//div[@id='snippet_content']" position="inside">
+        <div data-snippet-id="country_events" data-selector-siblings="p, h2, h3, blockquote" data-selector-children=".content">
             <div class="oe_snippet_thumbnail">
                 <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block-country_events.png" />
                 <span class="oe_snippet_thumbnail_title">Country Events</span>
             </div>
-            <section class="oe_snippet_body country_events">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-3">
-                            <div class="country_events_list">
-                            <div class="text-muted text-center">
-                                <h1><i class="fa fa-map-marker fa-5x"></i></h1>
-                                <h3>Allow browser to use your Location.</h3>
-                            </div>
-                            </div>
-                        </div>
-                        <div class="col-md-5">
-                        </div>
-                        <div class="col-md-4">
-                        </div>
+            <div class="oe_snippet_body country_events">
+                <div class="country_events_list">
+                    <div class="text-muted text-center">
+                        <h1>
+                            <i class="fa fa-flag fa-5x"></i>
+                        </h1>
+                        <h1>Events from Your Country</h1>
                     </div>
                 </div>
-            </section>
+            </div>
         </div>
     </xpath>
 </template>
 
+<template id="event_right_country_event" inherit_option_id="website_event.index" name="Country Events">
+    <xpath expr="//div[@id='right_column']" position="inside">
+        <div class="row">
+            <div class="col-md-12 mb16 country_events">
+                <div class="country_events_list">
+                    <div class="text-muted text-center">
+                        <h1>
+                            <i class="fa fa-flag fa-5x"></i>
+                        </h1>
+                        <h1>Events from Your Country</h1>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+
 <template id="country_events_list" name="Country">
     <t t-ignore="true">
-        <div class="mb16 country_events_list">
-            <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
-            <t t-if="events">
-                <h4><b>Events In <span t-esc="country.name"></span></b></h4>
+        <t t-if="events">
+            <div class="mb16 country_events_list">
+                <t t-if="country">
+                    <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
+                    <h4><b>Events In <span t-esc="country.name"></span></b></h4>
+                </t>
+                <t t-if="not country">
+                    <h4><b>Upcoming Events</b></h4>
+                </t>
                 <div t-foreach="events[:5]" t-as="country_event" class="oe_website_overflow_ellipsis mb8">
                     <t t-if="not country_event['event'].website_published">
                         <span class="label label-danger"><i class="fa fa-ban"></i></span>
                     </t>
                     <i class="fa fa-calendar"></i> <b><span t-esc="country_event['date']"/>: <span><a t-att-href="country_event['url']"><t t-esc="country_event['event'].name"/></a></span></b>
                 </div>
-            </t>
-            <t t-if="len(events) > 5">
-                <b class="text-center"><a t-att-href="'/event/?country='+str(country.id)">All events for <span t-esc="country.name"></span></a></b>
-            </t>
-            <t t-if="events == []">
-                <h4 ><b>No events available for <span t-esc="country.name"></span></b></h4>
-            </t>
-        </div>
+                <t t-if="len(events) > 5">
+                    <div t-if="country" class="text-center">
+                        <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
+                    </div>
+                    <div t-if="not country" class="text-center">
+                        <b><a t-att-href="'/event/"> See All Upcoming events </a></b>
+                    </div>
+                </t>
+            </div>
+        </t>
     </t>
 </template>
 </data>

From 4268297466a7c62f9ae6138aceeede98793e55b0 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 28 Feb 2014 17:53:22 +0530
Subject: [PATCH 03/14] [IMP] improved domain for event, Hide element on edit

bzr revid: pga@tinyerp.com-20140228122322-enn6p2x7n1c2shi0
---
 addons/website_event/controllers/main.py     | 2 +-
 addons/website_event/views/website_event.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 7f3ed2c74dc..26a1e732ad8 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -225,7 +225,7 @@ class website_event(http.Controller):
         if country_code:
             country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
             result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
-            event_ids = event_obj.search(request.cr, request.uid, [('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
+            event_ids = event_obj.search(request.cr, request.uid, ['|', ('address_id', '=', None),('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
         if not event_ids:
             event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
             result['country'] = False
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 5435114236f..fc304499af0 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -379,7 +379,7 @@
 <template id="country_events_list" name="Country">
     <t t-ignore="true">
         <t t-if="events">
-            <div class="mb16 country_events_list">
+            <div class="mb16 country_events_list css_editable_mode_hidden">
                 <t t-if="country">
                     <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
                     <h4><b>Events In <span t-esc="country.name"></span></b></h4>

From 13b76036f542100b881cb606e9989111ef1e34d1 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 28 Feb 2014 18:26:53 +0530
Subject: [PATCH 04/14] [IMP] Moved Country Events in Customize Menu

bzr revid: pga@tinyerp.com-20140228125653-cpi2nrrq78mejrlj
---
 addons/website_event/views/website_event.xml | 35 ++++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index fc304499af0..84b01963fd1 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -117,6 +117,23 @@
     </xpath>
 </template>
 
+<template id="event_right_country_event" inherit_option_id="website_event.index" name="Country Events">
+    <xpath expr="//div[@id='right_column']" position="inside">
+        <div class="row">
+            <div class="col-md-12 mb16 country_events">
+                <div class="country_events_list">
+                    <div class="text-muted text-center">
+                        <h1>
+                            <i class="fa fa-flag fa-5x"></i>
+                        </h1>
+                        <h1>Events from Your Country</h1>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+
 <template id="event_left_column" inherit_option_id="website_event.index" inherit_id="website_event.index" name="Filters">
     <xpath expr="//div[@id='middle_column']" position="attributes">
         <attribute name="class">col-md-6</attribute>
@@ -358,24 +375,6 @@
     </xpath>
 </template>
 
-<template id="event_right_country_event" inherit_option_id="website_event.index" name="Country Events">
-    <xpath expr="//div[@id='right_column']" position="inside">
-        <div class="row">
-            <div class="col-md-12 mb16 country_events">
-                <div class="country_events_list">
-                    <div class="text-muted text-center">
-                        <h1>
-                            <i class="fa fa-flag fa-5x"></i>
-                        </h1>
-                        <h1>Events from Your Country</h1>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </xpath>
-</template>
-
-
 <template id="country_events_list" name="Country">
     <t t-ignore="true">
         <t t-if="events">

From a87f1ab1ff02d8e7bec7cdb7864400b1124f20d2 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Mon, 3 Mar 2014 12:33:05 +0530
Subject: [PATCH 05/14] [IMP] make event snippet not editable in edit mode

bzr revid: pga@tinyerp.com-20140303070305-3iybuo5fjsd5mbsc
---
 addons/website_event/views/website_event.xml | 48 ++++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 84b01963fd1..e3508995855 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -378,28 +378,38 @@
 <template id="country_events_list" name="Country">
     <t t-ignore="true">
         <t t-if="events">
-            <div class="mb16 country_events_list css_editable_mode_hidden">
-                <t t-if="country">
-                    <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
-                    <h4><b>Events In <span t-esc="country.name"></span></b></h4>
-                </t>
-                <t t-if="not country">
-                    <h4><b>Upcoming Events</b></h4>
-                </t>
-                <div t-foreach="events[:5]" t-as="country_event" class="oe_website_overflow_ellipsis mb8">
-                    <t t-if="not country_event['event'].website_published">
-                        <span class="label label-danger"><i class="fa fa-ban"></i></span>
+            <div class="country_events_list">
+                <div class="mb16 css_editable_mode_hidden">
+                    <t t-if="country">
+                        <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
+                        <h4><b>Events In <span t-esc="country.name"></span></b></h4>
+                    </t>
+                    <t t-if="not country">
+                        <h4><b>Upcoming Events</b></h4>
+                    </t>
+                    <div t-foreach="events[:5]" t-as="country_event" class="oe_website_overflow_ellipsis mb8">
+                        <t t-if="not country_event['event'].website_published">
+                            <span class="label label-danger"><i class="fa fa-ban"></i></span>
+                        </t>
+                        <i class="fa fa-calendar"></i> <b><span t-esc="country_event['date']"/>: <span><a t-att-href="country_event['url']"><t t-esc="country_event['event'].name"/></a></span></b>
+                    </div>
+                    <t t-if="len(events) > 5">
+                        <div t-if="country">
+                            <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
+                        </div>
+                        <div t-if="not country">
+                            <b><a t-att-href="'/event/"> See All Upcoming events </a></b>
+                        </div>
                     </t>
-                    <i class="fa fa-calendar"></i> <b><span t-esc="country_event['date']"/>: <span><a t-att-href="country_event['url']"><t t-esc="country_event['event'].name"/></a></span></b>
                 </div>
-                <t t-if="len(events) > 5">
-                    <div t-if="country" class="text-center">
-                        <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
+                <div class="css_non_editable_mode_hidden">
+                    <div class="text-muted text-center">
+                        <h1>
+                            <i class="fa fa-flag fa-5x"></i>
+                        </h1>
+                        <h1>Events from Your Country</h1>
                     </div>
-                    <div t-if="not country" class="text-center">
-                        <b><a t-att-href="'/event/"> See All Upcoming events </a></b>
-                    </div>
-                </t>
+                </div>
             </div>
         </t>
     </t>

From 35cdbec3d171a33c42f2d5cb45b6da1a74674cff Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Mon, 3 Mar 2014 14:35:39 +0530
Subject: [PATCH 06/14] [IMP] removed extra attribute

bzr revid: pga@tinyerp.com-20140303090539-yb0mtx1082lcd6m2
---
 addons/website_event/views/website_event.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index e3508995855..5c5c2fedfd3 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -398,7 +398,7 @@
                             <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
                         </div>
                         <div t-if="not country">
-                            <b><a t-att-href="'/event/"> See All Upcoming events </a></b>
+                            <b><a href="/event/"> See All Upcoming events </a></b>
                         </div>
                     </t>
                 </div>

From cc70d1d22e445e3e9c6514c0d2a0e454b9c999c9 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Tue, 4 Mar 2014 12:31:04 +0530
Subject: [PATCH 07/14] [IMP] replaced calendar icon with map and cloud, top
 and bottom margin added, domain added for confirmed events, used font-awesome
 instead of block-country_event.png

bzr revid: pga@tinyerp.com-20140304070104-3pb9hpnkgke6peu9
---
 .../src/img/blocks/block-country_events.png   | Bin 790 -> 0 bytes
 addons/website_event/controllers/main.py      |  12 +++----
 addons/website_event/views/website_event.xml  |  34 +++++++++++-------
 3 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 addons/website/static/src/img/blocks/block-country_events.png

diff --git a/addons/website/static/src/img/blocks/block-country_events.png b/addons/website/static/src/img/blocks/block-country_events.png
deleted file mode 100644
index 52254ba4c3e96f80f0aeed224a03af32d3a659d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmeAS@N?(olHy`uVBq!ia0vp^DM0Mc!3HE{I};W%FfiTqba4!+xb^n-Z~ve|iQ|R;
zUwFA3;Mu)q&Wfv1m7T6%otG}vyIiMrh3U}gn12(R($1O8Q3#*g;D7)9&8!(7v&8+{
zzo%E%B^F5Bzy7mm-ofHmEi<%Abr=;`1ROeMI(8jh^ybZ*4Y$%5PNo<Y?cePlweG%v
z|MT3Rg54WmU1hj=`}XACUf#mEylLFq+U|$me=(ueqh+dn{)7@M-SfYGeNX(O<)5yu
zU4KvEV?|8fwyjfHFNSJ}^p(uHdp9;RHg@Xy;$op+BGVi+RDv%X8?7&kOv*leqjUMh
z5G~b*Cp|q?gs!oid{%Vn?}ccw#Xnzd?c)Afo9p{0`Ek*E$LTSf%;maPonE`n_b)TE
z(f$nzKb4iHtF2VH*RxM__TfaC^9%PS=~f5!>*<|3%J#d_^^XLHT*bR>uMU0D%lNt_
zoMlBwS@`5VpMR$o7k^%F?QSmpSXjR2`kzV}@AAm_D>I{iCEj0cyx+uf>tv>b5A2m?
z!usdgOr4RX^(B1Xv5RZV^|t5Qd@Cy0@aWuTla77Urqtb7fBN*X$E;f&(isb-LMJQ4
z%|Aay!j${cgA&FhHG$cOIXM&>7?^Mp9y5z#3#CiLB&N-?vefL5Q=T<*?$oVcOHZb3
z4$_&aa`O4-O;dfmN-{m??SEly*fOuL($qrbWD3`WORshmhpR1LraIM6{&nq_i2nMT
zLlU93d@cX9D_?xwVAz|~7Q(ya<lRm0-+cKcCtVz)KG)?+@V6?n)m!&I4rr;WUR?6^
zo0o#bq&2rH)4Z-aI6d5OC+o9E|8?#AVPWT<>`mS{W8;g%%8OUIrTDyE;9*kr#PHfI
zCPg&Am@+NOU$(_M_L!{quX458{|YOWI2c(3fc`z=q_EX)2LsgOC6OhOVBr?M*Y$5N
wF#y##Ffg|0b?bEl0|%@FqK!ph^>g)u=TG?^Jp9EHnBEyYUHx3vIVCg!0K!IH$N&HU

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 26a1e732ad8..175e4dc13d9 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -221,15 +221,15 @@ class website_event(http.Controller):
         event_obj = request.registry['event.event']
         cr, uid, context,event_ids = request.cr, request.uid, request.context,[]
         country_code = self.get_visitors_country()['country_code']
-        result = {'events':[]}
+        result = {'events':[],'country':False}
         if country_code:
             country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context)
-            result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
-            event_ids = event_obj.search(request.cr, request.uid, ['|', ('address_id', '=', None),('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
+            event_ids = event_obj.search(request.cr, request.uid, ['|', ('address_id', '=', None),('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00')),('state', '=', 'confirm')], order="date_begin", context=request.context)
         if not event_ids:
-            event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context)
-            result['country'] = False
-        for event in event_obj.browse(request.cr, request.uid, event_ids, context=request.context):
+            event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00')),('state', '=', 'confirm')], order="date_begin", context=request.context)
+        for event in event_obj.browse(request.cr, request.uid, event_ids, context=request.context)[:6]:
+            if country_code and event.country_id.code == country_code:
+                result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context)
             result['events'].append({
                  "date": self.get_formated_date(event),
                  "event": event,
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 5c5c2fedfd3..74108e36937 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -120,7 +120,7 @@
 <template id="event_right_country_event" inherit_option_id="website_event.index" name="Country Events">
     <xpath expr="//div[@id='right_column']" position="inside">
         <div class="row">
-            <div class="col-md-12 mb16 country_events">
+            <div class="col-md-12 mb16 mt16 country_events">
                 <div class="country_events_list">
                     <div class="text-muted text-center">
                         <h1>
@@ -358,16 +358,18 @@
     <xpath expr="//div[@id='snippet_content']" position="inside">
         <div data-snippet-id="country_events" data-selector-siblings="p, h2, h3, blockquote" data-selector-children=".content">
             <div class="oe_snippet_thumbnail">
-                <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block-country_events.png" />
+                <div style="background: white;box-shadow:none;-webkit-box-shadow:none;" class="oe_snippet_thumbnail_img" >
+                    <i class="fa fa-flag fa-5x text-muted"></i>
+                </div>
                 <span class="oe_snippet_thumbnail_title">Country Events</span>
             </div>
-            <div class="oe_snippet_body country_events">
+            <div class="oe_snippet_body country_events mb16 mt16">
                 <div class="country_events_list">
                     <div class="text-muted text-center">
-                        <h1>
+                        <div>
                             <i class="fa fa-flag fa-5x"></i>
-                        </h1>
-                        <h1>Events from Your Country</h1>
+                        </div>
+                        <div>Events of to visitor's country</div>
                     </div>
                 </div>
             </div>
@@ -379,7 +381,7 @@
     <t t-ignore="true">
         <t t-if="events">
             <div class="country_events_list">
-                <div class="mb16 css_editable_mode_hidden">
+                <div class="css_editable_mode_hidden">
                     <t t-if="country">
                         <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
                         <h4><b>Events In <span t-esc="country.name"></span></b></h4>
@@ -387,11 +389,17 @@
                     <t t-if="not country">
                         <h4><b>Upcoming Events</b></h4>
                     </t>
-                    <div t-foreach="events[:5]" t-as="country_event" class="oe_website_overflow_ellipsis mb8">
-                        <t t-if="not country_event['event'].website_published">
+                    <div t-foreach="events[:5]" t-as="event_dict" class="oe_website_overflow_ellipsis mb8">
+                        <t t-if="not event_dict['event'].website_published">
                             <span class="label label-danger"><i class="fa fa-ban"></i></span>
                         </t>
-                        <i class="fa fa-calendar"></i> <b><span t-esc="country_event['date']"/>: <span><a t-att-href="country_event['url']"><t t-esc="country_event['event'].name"/></a></span></b>
+                        <t t-if="event_dict['event'].address_id">
+                            <i class="fa fa-map-marker"></i>
+                        </t>
+                        <t t-if="not event_dict['event'].address_id">
+                            <i class="fa fa-cloud"></i>
+                        </t>
+                        <b><span t-esc="event_dict['date']"/>: <span><a t-att-href="event_dict['url']"><t t-esc="event_dict['event'].name"/></a></span></b>
                     </div>
                     <t t-if="len(events) > 5">
                         <div t-if="country">
@@ -404,10 +412,10 @@
                 </div>
                 <div class="css_non_editable_mode_hidden">
                     <div class="text-muted text-center">
-                        <h1>
+                       <div>
                             <i class="fa fa-flag fa-5x"></i>
-                        </h1>
-                        <h1>Events from Your Country</h1>
+                        </div>
+                        <div>Events of to visitor's country</div>
                     </div>
                 </div>
             </div>

From 29d36f7dd954f2b43d41b644224f0f734654eac7 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 5 Mar 2014 18:14:00 +0530
Subject: [PATCH 08/14] [IMP] set flag image size

bzr revid: pga@tinyerp.com-20140305124400-xi1fqjuv85g0535l
---
 addons/website_event/views/website_event.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 74108e36937..78747fcad0d 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -383,7 +383,7 @@
             <div class="country_events_list">
                 <div class="css_editable_mode_hidden">
                     <t t-if="country">
-                        <img class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
+                        <img style="max-height:10em;" class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
                         <h4><b>Events In <span t-esc="country.name"></span></b></h4>
                     </t>
                     <t t-if="not country">

From acbdc81d789b2eb1e0d08de5c4a28101fd54dd32 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Fri, 7 Mar 2014 18:02:56 +0530
Subject: [PATCH 09/14] [IMP] added image if no country available

bzr revid: pga@tinyerp.com-20140307123256-9vz0xpuo97rh19jx
---
 .../website_event/static/src/img/world_map.jpg  | Bin 0 -> 12075 bytes
 addons/website_event/views/website_event.xml    |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 addons/website_event/static/src/img/world_map.jpg

diff --git a/addons/website_event/static/src/img/world_map.jpg b/addons/website_event/static/src/img/world_map.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2813f53f4c31f59f9647a28a9fc398bb26c1fc2f
GIT binary patch
literal 12075
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%0DD5n
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
F`(N<Pz`g(g

literal 0
HcmV?d00001

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 78747fcad0d..98f59136cc2 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -387,6 +387,7 @@
                         <h4><b>Events In <span t-esc="country.name"></span></b></h4>
                     </t>
                     <t t-if="not country">
+                        <img style="max-height:10em;" class="img-rounded img-responsive" src="/website_event/static/src/img/world_map.jpg"></img>
                         <h4><b>Upcoming Events</b></h4>
                     </t>
                     <div t-foreach="events[:5]" t-as="event_dict" class="oe_website_overflow_ellipsis mb8">

From ac8b0fcfc5299b5ea62543b8382cb419fed4868e Mon Sep 17 00:00:00 2001
From: "Dharmraj Jhala (OpenERP)" <dizzy.zala@gmail.com>
Date: Tue, 18 Mar 2014 18:39:03 +0530
Subject: [PATCH 10/14] [IMP] improved code as suggested

bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
---
 .../static/src/js/website_geolocation.js      | 20 ++++++++---------
 addons/website_event/views/website_event.xml  | 22 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
index d295f3dd04d..02eb977228a 100644
--- a/addons/website_event/static/src/js/website_geolocation.js
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -1,16 +1,16 @@
 (function() {
     "use strict";
-    function getLocation(){
-        $.post( "/event/get_country_event_list/", function( data ) {
-            if(data){
-                $( ".country_events_list" ).replaceWith( data );
-            }
-        });
-    }
+    var website = openerp.website;
 
-    $(document).ready(function () {
-        if($('.country_events').length){
-            getLocation();
+    website.snippet.animationRegistry.visitor = website.snippet.Animation.extend({
+        selector: ".oe_country_events",
+        start: function () {
+            var self = this;
+            $.post( "/event/get_country_event_list/", function( data ) {
+                if(data){
+                    $( ".country_events_list" ).replaceWith( data );
+                }
+            });
         }
     });
 })();
\ No newline at end of file
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 2440cf87b5d..0f04fe21ca3 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -361,14 +361,14 @@
 
 <template id="country_events" name="Country Events" inherit_id="website.snippets">
     <xpath expr="//div[@id='snippet_content']" position="inside">
-        <div data-snippet-id="country_events" data-selector-siblings="p, h2, h3, blockquote" data-selector-children=".content">
+        <div>
             <div class="oe_snippet_thumbnail">
                 <div style="background: white;box-shadow:none;-webkit-box-shadow:none;" class="oe_snippet_thumbnail_img" >
                     <i class="fa fa-flag fa-5x text-muted"></i>
                 </div>
                 <span class="oe_snippet_thumbnail_title">Country Events</span>
             </div>
-            <div class="oe_snippet_body country_events mb16 mt16">
+            <div class="oe_snippet_body oe_country_events mb16 mt16">
                 <div class="country_events_list">
                     <div class="text-muted text-center">
                         <div>
@@ -380,13 +380,21 @@
             </div>
         </div>
     </xpath>
+    <xpath expr="//div[@id='snippet_options']" position="inside">
+        <div data-snippet-option-id='content'
+            data-selector=".oe_country_events"
+            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+            data-selector-children=".content"
+           >
+        </div>
+    </xpath>
 </template>
 
 <template id="country_events_list" name="Country">
     <t t-ignore="true">
         <t t-if="events">
             <div class="country_events_list">
-                <div class="css_editable_mode_hidden">
+                <div>
                     <t t-if="country">
                         <img style="max-height:10em;" class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
                         <h4><b>Events In <span t-esc="country.name"></span></b></h4>
@@ -416,14 +424,6 @@
                         </div>
                     </t>
                 </div>
-                <div class="css_non_editable_mode_hidden">
-                    <div class="text-muted text-center">
-                       <div>
-                            <i class="fa fa-flag fa-5x"></i>
-                        </div>
-                        <div>Events of to visitor's country</div>
-                    </div>
-                </div>
             </div>
         </t>
     </t>

From 6f57d45b121bfa4cf784262df3fd1ab2b3a3fb81 Mon Sep 17 00:00:00 2001
From: "Dharmraj Jhala (OpenERP)" <dizzy.zala@gmail.com>
Date: Wed, 19 Mar 2014 16:57:37 +0530
Subject: [PATCH 11/14] [IMP] improved code as suggested

bzr revid: dizzy.zala@gmail.com-20140319112737-b6vwgwff8w9ywy9f
---
 addons/website_event/views/website_event.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 0f04fe21ca3..f06e914b1b1 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -366,15 +366,15 @@
                 <div style="background: white;box-shadow:none;-webkit-box-shadow:none;" class="oe_snippet_thumbnail_img" >
                     <i class="fa fa-flag fa-5x text-muted"></i>
                 </div>
-                <span class="oe_snippet_thumbnail_title">Country Events</span>
+                <span class="oe_snippet_thumbnail_title">Local Events</span>
             </div>
             <div class="oe_snippet_body oe_country_events mb16 mt16">
                 <div class="country_events_list">
-                    <div class="text-muted text-center">
+                    <div class="text-muted text-left">
                         <div>
-                            <i class="fa fa-flag fa-5x"></i>
+                            <img style="max-height:10em;" class="img-rounded img-responsive" src="/website_event/static/src/img/world_map.jpg"></img>
                         </div>
-                        <div>Events of to visitor's country</div>
+                        <div>Events in visitor's country</div>
                     </div>
                 </div>
             </div>

From 9f51a6d45353f3a1c87a3a95eaf29476b61fd4a6 Mon Sep 17 00:00:00 2001
From: "Dharmraj Jhala (OpenERP)" <dizzy.zala@gmail.com>
Date: Thu, 20 Mar 2014 12:07:28 +0530
Subject: [PATCH 12/14] [IMP] removed terminal slash from url and route

bzr revid: dizzy.zala@gmail.com-20140320063728-kuie1id6t7shvbc7
---
 addons/website_event/static/src/js/website_geolocation.js | 2 +-
 addons/website_event/views/website_event.xml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js
index 02eb977228a..fb00edc5e64 100644
--- a/addons/website_event/static/src/js/website_geolocation.js
+++ b/addons/website_event/static/src/js/website_geolocation.js
@@ -6,7 +6,7 @@
         selector: ".oe_country_events",
         start: function () {
             var self = this;
-            $.post( "/event/get_country_event_list/", function( data ) {
+            $.post( "/event/get_country_event_list", function( data ) {
                 if(data){
                     $( ".country_events_list" ).replaceWith( data );
                 }
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index f06e914b1b1..95723c2d3d9 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -265,7 +265,7 @@
                 <div class="container">
                     <h1 class="mt32">Event not found!</h1>
                     <p>Sorry, the requested event is not available anymore.</p>
-                    <p><a t-attf-href="/event/">Return to the event list.</a></p>
+                    <p><a t-attf-href="/event">Return to the event list.</a></p>
                 </div>
             </div>
         </div>
@@ -420,7 +420,7 @@
                             <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
                         </div>
                         <div t-if="not country">
-                            <b><a href="/event/"> See All Upcoming events </a></b>
+                            <b><a href="/event"> See All Upcoming events </a></b>
                         </div>
                     </t>
                 </div>

From e925756b7f6711685d5ec5373b770e9b9cd9a2da Mon Sep 17 00:00:00 2001
From: "Dharmraj Jhala (OpenERP)" <dizzy.zala@gmail.com>
Date: Fri, 21 Mar 2014 15:35:09 +0530
Subject: [PATCH 13/14] [IMP] improved typo

bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
---
 addons/website_event/views/website_event.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 95723c2d3d9..69fd5aa1e6b 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -397,7 +397,7 @@
                 <div>
                     <t t-if="country">
                         <img style="max-height:10em;" class="img-rounded img-responsive" t-att-src="'/website/image?model=res.country&amp;field=image&amp;id='+str(country.id)"></img>
-                        <h4><b>Events In <span t-esc="country.name"></span></b></h4>
+                        <h4><b>Events in <span t-esc="country.name"></span></b></h4>
                     </t>
                     <t t-if="not country">
                         <img style="max-height:10em;" class="img-rounded img-responsive" src="/website_event/static/src/img/world_map.jpg"></img>
@@ -417,10 +417,10 @@
                     </div>
                     <t t-if="len(events) > 5">
                         <div t-if="country">
-                            <b><a t-att-href="'/event/?country='+str(country.id)">See All events from <span t-esc="country.name"></span></a></b>
+                            <b><a t-att-href="'/event/?country='+str(country.id)">See all events from <span t-esc="country.name"></span></a></b>
                         </div>
                         <div t-if="not country">
-                            <b><a href="/event"> See All Upcoming events </a></b>
+                            <b><a href="/event"> See all upcoming events </a></b>
                         </div>
                     </t>
                 </div>

From c96f080e72e760615314f2b8bdcca02a6b7f130b Mon Sep 17 00:00:00 2001
From: "Dharmraj Jhala (OpenERP)" <dizzy.zala@gmail.com>
Date: Fri, 21 Mar 2014 17:35:50 +0530
Subject: [PATCH 14/14] [IMP] improved code

bzr revid: dizzy.zala@gmail.com-20140321120550-8p0l6lh5iv45mvf7
---
 addons/website_event/controllers/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 521bf0b25ef..25de2519045 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -211,9 +211,9 @@ class website_event(http.Controller):
         return {'country_code': GI.country_code_by_addr(request.httprequest.remote_addr), 'country_name': GI.country_name_by_addr(request.httprequest.remote_addr)}
     
     def get_formated_date(self, event):
-        start_date = datetime.strptime(event.date_begin, "%Y-%m-%d %H:%M:%S").date()
-        end_date = datetime.strptime(event.date_end, "%Y-%m-%d %H:%M:%S").date()
-        return start_date.strftime("%b")+" "+start_date.strftime("%e")+ (end_date != start_date and ("-"+end_date.strftime("%e")) or "")
+        start_date = datetime.strptime(event.date_begin, tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
+        end_date = datetime.strptime(event.date_end, tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
+        return ('%s %s%s') % (start_date.strftime("%b"), start_date.strftime("%e"), (end_date != start_date and ("-"+end_date.strftime("%e")) or ""))
     
     @http.route('/event/get_country_event_list', type='http', auth='public', website=True)
     def get_country_events(self ,**post):