odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] website: move hearder and footer in layout 

bzr revid: chm@openerp.com-20130812093255-3cbehw7nx0h57qca
This commit is contained in:
Christophe Matthieu 2013-08-12 11:32:55 +02:00
parent 2abdcf99bc
commit 3f86396b4e
5 changed files with 99 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
addons/website/views/views.xml
View File

@ -3,19 +3,6 @@
-->
<openerp>
<data>
<template id="header">
<div class="container">
<a href='/page/website.homepage' class='brand'>
<em>Open</em><b>ERP</b>
<!--<img t-att-alt="res_company.name" src='/web/binary/company_logo'/></a>-->
</a>
<ul class="nav pull-right" id="top_menu">
<li><a href="/page/website.contactus">Contact us</a></li>
<li><a href="/admin">Sign in</a></li>
</ul>
</div>
</template>
<!--
Files used in the generic theme, mostly bootstrap and a few OpenERP tags
-->
@ -31,7 +18,52 @@
</xpath>
</template>
<template id="footer" name="Footer">
<template id="layout">
&lt;!DOCTYPE html&gt;
<html>
<head>
<title><t t-esc="title or res_company.name"/></title>
<script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.2/ckeditor.js"></script>
<script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
<script type="text/javascript">
CKEDITOR.disableAutoInline = true;
CKEDITOR.dtd.$editable.li = 1;
</script>
<t t-if="editable">
<t t-raw="css"/>
<t t-raw="script"/>
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script>
</t>
<t t-raw="head or ''"/>
<t t-call="website.theme"/>
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
<link rel='stylesheet' href='/website/static/lib/bootstrap/css/bootstrap-responsive.css'/>
</head>
<body>
<header class='navbar navbar-static-top'>
<div class='navbar-inner'>
<div class="container">
<a href='/page/website.homepage' class='brand'>
<em>Open</em><b>ERP</b>
<!--<img t-att-alt="res_company.name" src='/web/binary/company_logo'/></a>-->
</a>
<ul class="nav pull-right" id="top_menu">
<li><a href="/page/website.contactus">Contact us</a></li>
<li><a href="/admin">Sign in</a></li>
</ul>
</div>
</div>
</header>
<div t-raw="0" id="wrap">
<div class="container">
<h1>Main Layout</h1>
</div>
</div>
<footer>
<div class="container" id="footer_container">
<div class="row">
<div class="span3" name="product">
@ -79,52 +111,6 @@
Copyright &amp;copy; <span t-field="res_company.name">Company name</span> - <a href="/sitemap">Sitemap</a>
</div>
</div>
</template>
<template id="footer_custom" inherit_option_id="website.footer" name="Custom Footer">
<xpath expr="//div[@id='footer_container']" position="attributes">
<attribute name="style">display: none</attribute>
</xpath>
</template>
<template id="layout">
&lt;!DOCTYPE html&gt;
<html>
<head>
<title><t t-esc="title or res_company.name"/></title>
<script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.2/ckeditor.js"></script>
<script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
<script type="text/javascript">
CKEDITOR.disableAutoInline = true;
CKEDITOR.dtd.$editable.li = 1;
</script>
<t t-if="editable">
<t t-raw="css"/>
<t t-raw="script"/>
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<script type="text/javascript" src="/website/static/src/js/website_bootstrap.js"></script>
</t>
<t t-raw="head or ''"/>
<t t-call="website.theme"/>
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
<link rel='stylesheet' href='/website/static/lib/bootstrap/css/bootstrap-responsive.css'/>
</head>
<body>
<header class='navbar navbar-static-top'>
<div class='navbar-inner'>
<t t-call="website.header"/>
</div>
</header>
<div t-raw="0" id="wrap">
<div class="container">
<h1>Main Layout</h1>
</div>
</div>
<footer>
<t t-call="website.footer"/>
</footer>
<div class='oe_snippet_editor' style="display: none;">
@ -232,6 +218,12 @@
</html>
</template>
<template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
<xpath expr="body/footer//div[@id='footer_container']" position="attributes">
<attribute name="style">display: none</attribute>
</xpath>
</template>
<template id="homepage">
<t t-call="website.layout">

22
addons/website_event/views/website_event.xml
View File

@ -4,28 +4,14 @@
<!-- Layout add nav and footer -->
<record id="header_website_event" model="ir.ui.view">
<field name="name">header_website_event</field>
<field name="inherit_id" ref="website.header"/>
<field name="arch" type="xml">
<data>
<xpath expr="//ul[@id='top_menu']/li" position="after">
<template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
<xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
<li><a href="/event">Events</a></li>
</xpath>
</data>
</field>
</record>
<record id="footer_website_event" model="ir.ui.view">
<field name="name">footer_website_event</field>
<field name="inherit_id" ref="website.footer"/>
<field name="arch" type="xml">
<data>
<xpath expr="//a[@href='/page/website.contactus']" position="after">
<xpath expr="//body/footer//a[@href='/page/website.contactus']" position="after">
<li><a href="/event">Events</a></li>
</xpath>
</data>
</field>
</record>
</template>
<!-- Page -->

12
addons/website_hr/views/website_hr.xml
View File

@ -12,17 +12,11 @@
<!-- Layout add nav and footer -->
<record id="footer_website_hr" model="ir.ui.view">
<field name="name">footer_website_hr</field>
<field name="inherit_id" ref="website.footer"/>
<field name="arch" type="xml">
<data>
<xpath expr="//a[@href='/page/website.aboutus']" position="after">
<template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
<xpath expr="//body/footer//a[@href='/page/website.aboutus']" position="after">
<li><a href="/blog/%(website_hr.website_mail_job)d/">Jobs</a></li>
</xpath>
</data>
</field>
</record>
</template>
<!-- Page -->

22
addons/website_mail/views/website_mail.xml
View File

@ -12,30 +12,16 @@
<!-- Layout add nav and footer -->
<record id="header_website_mail" model="ir.ui.view">
<field name="name">header_website_mail</field>
<field name="inherit_id" ref="website.header"/>
<field name="arch" type="xml">
<data>
<xpath expr="//ul[@id='top_menu']/li" position="after">
<template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
<xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
<li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
</xpath>
</data>
</field>
</record>
<record id="footer_website_mail" model="ir.ui.view">
<field name="name">footer_website_mail</field>
<field name="inherit_id" ref="website.footer"/>
<field name="arch" type="xml">
<data>
<xpath expr="//h5[@name='info_title']" position="after">
<xpath expr="//body/footer//h5[@name='info_title']" position="after">
<ul class='unstyled'>
<li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
</ul>
</xpath>
</data>
</field>
</record>
</template>
<!-- Page -->

16
addons/website_sale/views/website_sale.xml
View File

@ -15,15 +15,9 @@
<!-- Layout add nav and footer -->
<record id="header_ecommerce" model="ir.ui.view">
<field name="name">header_ecommerce</field>
<field name="inherit_id" ref="website.header"/>
<field name="arch" type="xml">
<data>
<xpath expr="//ul[@id='top_menu']/li" position="before">
<li>
<a href="/shop/">Shop</a>
</li>
<template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
<xpath expr="//body/header//ul[@id='top_menu']/li" position="before">
<li><a href="/shop/">Shop</a></li>
<li>
<a href="/shop/mycart/">
<i class="icon-shopping-cart"></i>
@ -33,9 +27,7 @@
</a>
</li>
</xpath>
</data>
</field>
</record>
</template>
<record id="product_normal_form_view" model="ir.ui.view">
<field name="name">product.normal.form.inherit</field>