summaryrefslogtreecommitdiff
path: root/addons/website_google_map/views
diff options
context:
space:
mode:
authorRichard Mathot <rim@openerp.com>2014-06-03 16:34:30 +0200
committerRichard Mathot <rim@openerp.com>2014-06-03 16:34:30 +0200
commitf04e6de2e729c8d638f6589f77abdfa4535b110e (patch)
tree378d9d126eb95938c63f03fc539256e6924cbc3c /addons/website_google_map/views
parentc1ae43c80764fafd154f09bbff4c12543e881609 (diff)
[FIX][IMP] Make partner maps work properly
[FIX] website*: unfuck buggy controllers [IMP] website*: display GoogleMap in a human-usable interface [IMP] website_google_map: large module cleaning - There is now only one controller, data is sent once for all! - Map is now fully resizable in its hosting template - HTML/CSS cleaning - JavaScript is now human-readable ;-)
Diffstat (limited to 'addons/website_google_map/views')
-rw-r--r--addons/website_google_map/views/google_map.xml55
1 files changed, 19 insertions, 36 deletions
diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map.xml
index d9a9d2740e8..e68b9f9e7c1 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map.xml
@@ -1,42 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
- <template id="google_map">
-
+<data>
+<template id="google_map">
&lt;!DOCTYPE html&gt;
<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>World wide map</title>
-
- <style type="text/css">
- body {
- margin: 0;
- padding: 0;
- font-family: Helvetica, Arial, sans-serif !important;
- }
- .marker {
- font-size: 12px !important;
- }
- .marker b {
- font-weight: 500;
- }
- .marker pre {
- font-size: 10px !important;
- }
- </style>
- <script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
- <script src="//maps.google.com/maps/api/js?sensor=false"></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="//code.jquery.com/jquery-1.6.1.min.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>
- </body>
+ <head>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+ <title>World Map</title>
+ <link rel="stylesheet" type="text/css" href="/website_google_map/static/src/css/google-map.css" />
+ </head>
+ <body t-att-data-partner-url="partner_url or ''">
+ <script>
+ var odoo_partner_data = <t t-raw="partner_data"/>;
+ </script>
+ <div id="odoo-google-map"></div>
+ <script src="//maps.google.com/maps/api/js?sensor=false"></script>
+ <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
+ <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
+ </body>
</html>
-
- </template>
- </data>
+</template>
+</data>
</openerp>