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

[REV] revert unneeded changes in website layout

This commit is contained in:
Simon Lejeune 2014-06-26 17:04:16 +02:00
parent 03aaf7af1e
commit b8cea9e60f
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/website/views/website_templates.xml
View File

@ -109,7 +109,7 @@
<a class="navbar-brand" href="/" t-field="res_company.name"/>
</div>
<div class="collapse navbar-collapse navbar-top-collapse">
<ul class="nav navbar-nav navbar-right" id="top_menu" t-if="website">
<ul class="nav navbar-nav navbar-right" id="top_menu">
<t t-foreach="website.menu_id.child_id" t-as="submenu">
<t t-call="website.submenu"/>
</t>
@ -154,24 +154,12 @@
<li t-ignore="true"><i class="fa fa-envelope"></i> <span t-field="res_company.email"></span></li>
</ul>
<h2>
<t t-if="website and website.social_facebook">
<a t-att-href="website.social_facebook"><i class="fa fa-facebook-square"/></a>
</t>
<t t-if="website and website.social_twitter">
<a t-att-href="website.social_twitter"><i class="fa fa-twitter"/></a>
</t>
<t t-if="website and website.social_linkedin">
<a t-att-href="website.social_linkedin"><i class="fa fa-linkedin"/></a>
</t>
<t t-if="website and website.social_youtube">
<a t-att-href="website.social_youtube"><i class="fa fa-youtube-play"/></a>
</t>
<t t-if="website and website.social_googleplus">
<a t-att-href="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
</t>
<t t-if="website and website.social_github">
<a t-att-href="website.social_github"><i class="fa fa-github"/></a>
</t>
<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">
@ -190,16 +178,16 @@
their performance.
</p>
</div>
<ul class="list-inline js_language_selector mt16" t-if="(request and request.website_multilang and len(languages) &gt; 1) or (website and editable)">
<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 website and lg[0] == website.default_lang_code else None">
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 if website else ''}&amp;url_return=#{url_return}">
<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>