Merge

diff --combined addons/website/views/website_templates.xml
index df3a429,f6f9c47..e5c1bfc
--- 1/addons/website/views/website_templates.xml
--- 2/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@@ -136,65 -136,7 +136,7 @@@
                      <t t-raw="0"/>
                  </main>
                  <footer>
-                     <div class="container hidden-print" id="footer_container">
-                         <div class="row">
-                             <div class="col-md-3">
-                                 <h4>Our products &amp; Services</h4>
-                                 <ul class="list-unstyled" name="products">
-                                     <li><a href="/">Home</a></li>
-                                 </ul>
-                             </div>
-                             <div class="col-md-3" name="info">
-                                 <h4>Connect with us</h4>
-                                 <ul class="list-unstyled">
-                                     <li><a href="/page/website.contactus">Contact us</a></li>
-                                 </ul>
-                                 <ul class="list-unstyled">
-                                     <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
-                                     <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
-                                 </ul>
-                                 <h2>
-                                     <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
-                                     <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
-                                     <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
-                                     <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
-                                     <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
-                                     <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
-                                 </h2>
-                             </div>
-                             <div class="col-md-5 col-lg-offset-1">
-                                 <div>
-                                     <h4>
-                                         <span t-field="res_company.name">Your Company</span>
-                                         <small> - <a href="/page/website.aboutus">About us</a></small>
-                                     </h4>
-                                     <p>
-                                         We are a team of passionate people whose goal is to improve everyone's
-                                         life through disruptive products. We build great products to solve your
-                                         business problems.
-                                     </p>
-                                     <p>
-                                         Our products are designed for small to medium size companies willing to optimize
-                                         their performance.
-                                     </p>
-                                 </div>
-                                 <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
-                                     <li t-foreach="languages" t-as="lg">
-                                         <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
-                                            t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
-                                             <t t-esc="lg[1].split('/').pop()"/>
-                                         </a>
-                                     </li>
-                                     <li groups="base.group_website_publisher">
-                                         <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
-                                         <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
-                                             <i class="fa fa-plus-circle"/>
-                                             Add a language...
-                                         </a>
-                                     </li>
-                                 </ul>
-                             </div>
-                         </div>
+                     <div id="footer_container">
                      </div>
                      <div class="container mt16 mb8">
                          <div class="pull-right" t-ignore="true" t-if="not editable">
@@@ -214,8 -156,7 +156,8 @@@
                      e=o.createElement(i);r=o.getElementsByTagName(i)[0];
                      e.src='//www.google-analytics.com/analytics.js';
                      r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
 -                    ga('create','<t t-esc="website.google_analytics_key"/>');ga('send','pageview');
 +                    ga('create',_.str.trim('<t t-esc="website.google_analytics_key"/>'));
 +                    ga('send','pageview');
                  </script>
              </t>
          </body>
@@@ -331,8 -272,8 +273,8 @@@
      </xpath>
  </template>
  
- <template id="footer_custom" inherit_id="website.layout" optional="disabled" name="Custom Footer">
-     <xpath expr="//div[@id='footer_container']" position="before">
+ <template id="footer_custom" inherit_id="website.layout" name="Footer">
+     <xpath expr="//div[@id='footer_container']" position="replace">
          <div class="oe_structure">
              <section data-snippet-id='three-columns' class="mt16 mb16">
                  <div class="container">
@@@ -360,8 -301,69 +302,69 @@@
              </section>
          </div>
      </xpath>
-     <xpath expr="//div[@id='footer_container']" position="attributes">
-         <attribute name="style">display: none</attribute>
+ </template>
+ 
+ <template id="footer_default" inherit_id="website.footer_custom" optional="enabled" name="Automatic Footer">
+     <xpath expr="//div[@class='oe_structure']" position="replace">
+         <div class="container hidden-print">
+             <div class="row">
+                 <div class="col-md-3">
+                     <h4>Our products &amp; Services</h4>
+                     <ul class="list-unstyled" id="products">
+                         <li><a href="/">Home</a></li>
+                     </ul>
+                 </div>
+                 <div class="col-md-3" id="info">
+                     <h4>Connect with us</h4>
+                     <ul class="list-unstyled">
+                         <li><a href="/page/website.contactus">Contact us</a></li>
+                     </ul>
+                     <ul class="list-unstyled">
+                         <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                         <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
+                     </ul>
+                     <h2>
+                         <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                         <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                         <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                         <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                         <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                         <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+                     </h2>
+                 </div>
+                 <div class="col-md-5 col-lg-offset-1">
+                     <div>
+                         <h4>
+                             <span t-field="res_company.name" />
+                             <small> - <a href="/page/website.aboutus">About us</a></small>
+                         </h4>
+                         <p>
+                             We are a team of passionate people whose goal is to improve everyone's
+                             life through disruptive products. We build great products to solve your
+                             business problems.
+                         </p>
+                         <p>
+                             Our products are designed for small to medium size companies willing to optimize
+                             their performance.
+                         </p>
+                     </div>
+                     <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
+                         <li t-foreach="languages" t-as="lg">
+                             <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
+                              t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
+                              <t t-esc="lg[1].split('/').pop()"/></a>
+                         </li>
+                         <li groups="base.group_website_publisher">
+                             <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
+                             <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
+                             <i class="fa fa-plus-circle"/>
+                             Add a language...
+                             </a>
+                         </li>
+                     </ul>
+                 </div>
+             </div>
+         </div>
      </xpath>
  </template>
  

diff --combined openerp-wsgi.py
index f4c3a75,0fc2295..bf646dd
--- 1/openerp-wsgi.py
--- 2/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@@ -26,7 -26,7 +26,7 @@@ conf = openerp.tools.confi
  # Path to the OpenERP Addons repository (comma-separated for
  # multiple locations)
  
 -conf['addons_path'] = '/opt/odoo/odoo.git/addons'
 +conf['addons_path'] = '/opt/odoo/odoo.git/addons,/opt/odoo/custom.git'
  
  # Optional database config if not using local socket
  #conf['db_name'] = 'mycompany'
@@@ -46,10 -46,10 +46,10 @@@ openerp.service.server.load_server_wide
  # Gunicorn
  #----------------------------------------------------------
  # Standard OpenERP XML-RPC port is 8069
- bind = '127.0.0.1:8069'
- pidfile = '.gunicorn.pid'
- workers = 4
- timeout = 240
- max_requests = 2000
+ #bind = '127.0.0.1:8069'
+ #pidfile = '.gunicorn.pid'
+ #workers = 4
+ #timeout = 240
+ #max_requests = 2000
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: