diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
| commit | 54e5bbdf3531ecfee84fb6aae627d346c2425c30 (patch) | |
| tree | 2920139e3f9b019371cb2f332a53e0ab5ff8d142 /addons/website | |
| parent | 198c080b3512e8b7fbcd9ab47d15746776d5d1a6 (diff) | |
| parent | 897b9b8fc0548c5165d30b7f20b47aa00e918f1d (diff) | |
[MERGE] forward port branch saas-10 up to 897b9b8
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/models/website.py | 3 | ||||
| -rw-r--r-- | addons/website/static/src/less/website.ui.components.less | 2 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 2a22bc673c4..fd3904406ce 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -667,6 +667,9 @@ class res_partner(osv.osv): 'zoom': zoom, 'sensor': 'false', } + google_maps_api_key = self.pool['ir.config_parameter'].get_param(cr, openerp.SUPERUSER_ID, 'google_maps_api_key', context=context) + if google_maps_api_key: + params['key'] = google_maps_api_key return urlplus('//maps.googleapis.com/maps/api/staticmap' , params) def google_map_link(self, cr, uid, ids, zoom=10, context=None): diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less index 09f536e6453..9fdc7b6a477 100644 --- a/addons/website/static/src/less/website.ui.components.less +++ b/addons/website/static/src/less/website.ui.components.less @@ -244,7 +244,7 @@ body .modal { } // LOGIN FORM -.oe_login_form { +.oe_login_form, .oe_signup_form { max-width: 300px; position: relative; margin: 50px auto; diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 73008844b7c..343fcf1e648 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -911,7 +911,14 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/> </address> <!-- FORWARD-PORT UP TO SAAS-12 --> - <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a> + <t t-if="'key=' in res_company.google_map_img()"> + <a t-att-href="res_company.google_map_link()" target="_BLANK"> + <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" /> + </a> + </t> + <t t-if="'key=' not in res_company.google_map_img()"> + <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a> + </t> </template> <template id="contactus" name="Contact us" page="True"> |