[IMP] rename website_google_map; add demo for event
bzr revid: chm@openerp.com-20130830134026-88luqb16o6ny6voy
This commit is contained in:
Christophe Matthieu
parent
8b0f006398
commit
dec8c40c11
|
|
@ -7,6 +7,8 @@
|
|||
<field eval="(DateTime.now() + timedelta(20)).strftime('%Y-%m-%d 16:00:00')" name="date_end"/>
|
||||
<field name="type" ref="event.event_type_4"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="address_id" ref="base.res_partner_2"/>
|
||||
<field name="organizer_id" ref="base.res_partner_address_4"/>
|
||||
</record>
|
||||
|
||||
<record id="event_product" model="product.product">
|
||||
|
|
@ -14,8 +16,6 @@
|
|||
<field name="event_ok">True</field>
|
||||
<field name="event_type_id" ref="event.event_type_4"/>
|
||||
<field name="categ_id" ref="product.product_category_1"/>
|
||||
<field name="address_id" ref="base.res_partner_2"/>
|
||||
<field name="organizer_id" ref="base.res_partner_address_4"/>
|
||||
<field name="type">service</field>
|
||||
<field name="list_price">2500.0</field>
|
||||
<field name="standard_price">1000.0</field>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ OpenERP Blog
|
|||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'sale', 'website_worldmap'],
|
||||
'depends': ['website', 'sale', 'website_google_map'],
|
||||
'data': [
|
||||
'views/website_contract.xml',
|
||||
],
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class website_contract(http.Controller):
|
|||
|
||||
# public partner profile
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
|
||||
worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
google_map_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
|
||||
if request.uid != website.get_public_user().id:
|
||||
# search without website_published
|
||||
|
|
@ -53,7 +53,7 @@ class website_contract(http.Controller):
|
|||
values = website.get_rendering_context({
|
||||
'countries': countries,
|
||||
'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids),
|
||||
'worldmap_partner_ids': worldmap_partner_ids,
|
||||
'google_map_partner_ids': google_map_partner_ids,
|
||||
'pager': pager,
|
||||
'searches': post,
|
||||
'search_path': "?%s" % urllib.urlencode(post),
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<div class="col-md-4">
|
||||
<ul class="nav nav-pills nav-stacked">
|
||||
<li class="nav-header">World Map</li>
|
||||
<iframe t-attf-src="/worldmap/?width=320&height=240&partner_ids=#{ worldmap_partner_ids }&partner_url=/references/"
|
||||
<iframe t-attf-src="/google_map/?width=320&height=240&partner_ids=#{ google_map_partner_ids }&partner_url=/references/"
|
||||
style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@ class contactus(http.Controller):
|
|||
})
|
||||
return website.render("website_crm.thanks", values)
|
||||
|
||||
@http.route(['/crm/worldmap/'], type='http', auth="admin")
|
||||
def worldmap(self, *arg, **post):
|
||||
@http.route(['/crm/google_map/'], type='http', auth="admin")
|
||||
def google_map(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
values = website.get_rendering_context()
|
||||
values['partner_ids'] = post.get('partner_ids', "")
|
||||
return website.render("website_crm.worldmap", values)
|
||||
return website.render("website_crm.google_map", values)
|
||||
|
||||
@http.route(['/crm/worldmap/partners.json'], type='http', auth="admin")
|
||||
def worldmap_data(self, *arg, **post):
|
||||
@http.route(['/crm/google_map/partners.json'], type='http', auth="admin")
|
||||
def google_map_data(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ OpenERP Blog
|
|||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'website_worldmap'],
|
||||
'depends': ['website', 'website_google_map'],
|
||||
'data': [
|
||||
'views/website_crm_partner_assign.xml',
|
||||
],
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class website_crm_partner_assign(http.Controller):
|
|||
|
||||
# public partner profile
|
||||
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, dom_without(False) )
|
||||
worldmap_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
google_map_partner_ids = ",".join([str(p) for p in partner_ids])
|
||||
|
||||
|
||||
# group by country
|
||||
|
|
@ -59,7 +59,7 @@ class website_crm_partner_assign(http.Controller):
|
|||
'countries': countries,
|
||||
'grades': grades,
|
||||
'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids),
|
||||
'worldmap_partner_ids': worldmap_partner_ids,
|
||||
'google_map_partner_ids': google_map_partner_ids,
|
||||
'pager': pager,
|
||||
'searches': post,
|
||||
'search_path': "?%s" % urllib.urlencode(post),
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@
|
|||
<div class="col-md-4">
|
||||
<ul class="nav">
|
||||
<li class="navbar-header">World Map</li>
|
||||
<iframe t-attf-src="/worldmap/?width=320&height=240&partner_ids=#{ worldmap_partner_ids }&partner_url=/partners/"
|
||||
<iframe t-attf-src="/google_map/?width=320&height=240&partner_ids=#{ google_map_partner_ids }&partner_url=/partners/"
|
||||
style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="event_sale.event_technical_training" model="event.event">
|
||||
<field name="website_published">True</field>
|
||||
<field name="description_website"><![CDATA[
|
||||
<center><strong>OpenERP v.7 Technical Training in English (5 days)</strong></center>
|
||||
<p> </p>
|
||||
<p><strong>Course summary:</strong></p>
|
||||
<p>This course is dedicated to partners, integrators and developers who need to grasp knowledge of the OpenERP development process. This course is for new developers or for IT professionals eager to learn more about the OpenERP technical aspects.</p>
|
||||
<p> </p>
|
||||
<p><strong>Objectives:</strong></p>
|
||||
<p>Having attended this course, participants should be able to:</p>
|
||||
<ul>
|
||||
<li>Understand the development concepts and architecture;</li>
|
||||
<li>Install and administer OpenERP;</li>
|
||||
<li>Develop a new OpenERP module.</li>
|
||||
</ul>
|
||||
<p> </p>
|
||||
<p><strong>Our prices include:</strong></p>
|
||||
<ul>
|
||||
<li>drinks and lunch;</li>
|
||||
<li>training material.</li>
|
||||
</ul>
|
||||
<p> </p>
|
||||
<p><strong>Requirements:</strong></p>
|
||||
<ul>
|
||||
<li>Bring your own laptop.</li>
|
||||
<li>Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended.</li>
|
||||
<li>Participants preferably have a functional knowledge of the OpenERP software (see Functional Training).</li>
|
||||
</ul>
|
||||
<p> </p>
|
||||
<p>For more information on the program, please explore <a href="http://www.openerp.com/services/technical-training">http://www.openerp.com/services/technical-training</a>.</p>
|
||||
<p>If you have a question<strong> concerning the content of the training</strong>, please contact <a href="mailto:training@openerp.com">training@openerp.com</a>.</p>
|
||||
<p> </p>
|
||||
<p><strong>Where to find us:</strong></p>
|
||||
<p>Chaussée de Namur 40, 1367 Ramillies (Belgium)</p>
|
||||
<p>More information about our Headquarter office (directions, transports, parking, hotels, ...), please have a look at <a href="http://bit.ly/VD8J67">http://bit.ly/VD8J67.</a></p>
|
||||
<p> </p>
|
||||
<p><strong>Cancellation Policy: </strong></p>
|
||||
<p>The organization of the training session has related costs. Due to these costs, cancellations made less than 2 weeks (14 calendar days) prior to the start of the training session is a subject to a fee. This fee can be up to a maximum of 1000€ per cancellation request.</p>
|
||||
<p>We strongly recommend to book your flight tickets and/or hotel reservations 2 weeks prior to the training. If the training is cancelled 2 weeks in advance, you'll be notified by email.</p>
|
||||
<div> </div>
|
||||
<p>For any additional information, please contact us at <a href="mailto:events@openerp.com">events@openerp.com</a>.</p>
|
||||
<p> </p>
|
||||
<p>Best regards,</p>
|
||||
<p>Miss Charline Louis, OpenERP Junior Event Manager</p>
|
||||
<p> </p>
|
||||
<p align="RIGHT"><em>(OpenERP reserves the right to cancel, re-name or re-locate<br/>the event or change the dates on which it is held.)</em></p>
|
||||
]]></field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
import controllers
|
||||
import website_google_map
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
{
|
||||
'name': 'Website Worldmap',
|
||||
'name': 'Website Google Map',
|
||||
'category': 'Website',
|
||||
'summary': '',
|
||||
'version': '1.0',
|
||||
'description': """
|
||||
OpenERP Website Worldmap
|
||||
OpenERP Website Google Map
|
||||
========================
|
||||
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['website', 'crm_partner_assign'],
|
||||
'data': [
|
||||
'views/worldmap.xml',
|
||||
'views/google_map.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
|
|
@ -7,20 +7,20 @@ import simplejson
|
|||
import werkzeug.wrappers
|
||||
from datetime import datetime
|
||||
|
||||
class contactus(http.Controller):
|
||||
class google_map(http.Controller):
|
||||
|
||||
@http.route(['/worldmap/'], type='http', auth="admin")
|
||||
def worldmap(self, *arg, **post):
|
||||
@http.route(['/google_map/'], type='http', auth="admin")
|
||||
def google_map(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
values = website.get_rendering_context()
|
||||
values['partner_ids'] = post.get('partner_ids', "")
|
||||
values['width'] = post.get('width', 900)
|
||||
values['height'] = post.get('height', 460)
|
||||
values['partner_url'] = post.get('partner_url')
|
||||
return website.render("website_worldmap.worldmap", values)
|
||||
return website.render("website_google_map.google_map", values)
|
||||
|
||||
@http.route(['/worldmap/partners.json'], type='http', auth="admin")
|
||||
def worldmap_data(self, *arg, **post):
|
||||
@http.route(['/google_map/partners.json'], type='http', auth="admin")
|
||||
def google_map_data(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
|
|
@ -48,8 +48,8 @@ class contactus(http.Controller):
|
|||
body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {"))
|
||||
return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))])
|
||||
|
||||
@http.route(['/worldmap/set_partner_position/'], type='http', auth="admin")
|
||||
def worldmap_set_partner_position(self, *arg, **post):
|
||||
@http.route(['/google_map/set_partner_position/'], type='http', auth="admin")
|
||||
def google_map_set_partner_position(self, *arg, **post):
|
||||
website = request.registry['website']
|
||||
partner_obj = request.registry['res.partner']
|
||||
|
||||
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
|
@ -14,7 +14,7 @@ function initialize(pt) {
|
|||
infoWindow.close();
|
||||
});
|
||||
|
||||
var partners = new google.maps.MarkerImage("/website_worldmap/static/src/img/partners.png",new google.maps.Size(25, 25));
|
||||
var partners = new google.maps.MarkerImage("/website_google_map/static/src/img/partners.png",new google.maps.Size(25, 25));
|
||||
|
||||
var markers = [];
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ function initialize(pt) {
|
|||
if (status == google.maps.GeocoderStatus.OK) {
|
||||
var location = results[0].geometry.location;
|
||||
|
||||
$.post("/worldmap/set_partner_position/", {
|
||||
$.post("/google_map/set_partner_position/", {
|
||||
'partner_id': partner.id,
|
||||
'latitude': location.ob,
|
||||
'longitude': location.pb
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<template id="worldmap">
|
||||
<template id="google_map">
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
</style>
|
||||
<script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
|
||||
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
|
||||
<script type="text/javascript" t-attf-src="/worldmap/partners.json?partner_ids=#{ partner_ids }"></script>
|
||||
<script type="text/javascript" src="/website_worldmap/static/src/js/markerclusterer_compiled.js"></script>
|
||||
<script type="text/javascript" t-attf-src="/google_map/partners.json?partner_ids=#{ partner_ids }"></script>
|
||||
<script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
|
||||
<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
|
||||
<script type="text/javascript" src="/website_worldmap/static/src/js/worldmap.js"></script>
|
||||
<script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" t-attf-style="width: #{ width }px; height: #{ height }px"></div>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
import controllers
|
||||
import website_worldmap
|
||||
Loading…
Reference in New Issue