pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website: clean up client side templates

Browse Source 
bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
This commit is contained in:
Frédéric van der Essen
2013-08-23 12:00:22 +02:00
parent d59a47f79c
commit b4ca228747
2 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.js
+2 -2
View File
@@ -39,7 +39,7 @@
/* ----- TOP EDITOR BAR FOR ADMIN ---- */
website.EditorBar = openerp.Widget.extend({
template: 'Website.EditorBar',
template: 'website.editorbar',
events: {
'click button[data-action=edit]': 'edit',
'click button[data-action=save]': 'save',
@@ -293,7 +293,7 @@
if($button.hasClass("js_add")) {
var cycle = $c.find(".carousel-inner .item").size();
$c.find(".carousel-inner").append(QWeb.render("Website.Snipped.carousel"));
$c.find(".carousel-inner").append(QWeb.render("website.carousel"));
$c.carousel(cycle);
}
else {
addons/website/static/src/xml/website.xml
+53 -59
View File
@@ -2,71 +2,65 @@
<!-- vim:fdl=1:
-->
<templates id="template" xml:space="preserve">
<t t-name="Website.EditorBar">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner" id="website-top-view">
<form class="navbar-form pull-left">
<button data-action="edit" class="btn btn-primary">Edit</button>
</form>
<ul class="nav pull-right">
<li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
<li class="divider-vertical"></li>
<li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
<li><a href="#">Translate</a></li>
<li class="dropdown">
<a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
<div class="dropdown-menu">
<ul class="nav nav-list" id="customize-menu">
<!-- filled in JS -->
</ul>
</div>
</li>
<li>
<a href="/admin#action=website.action_module_website">Apps</a>
</li>
</ul>
</div>
<div class="navbar-inner" id="website-top-edit">
<form class="navbar-form pull-left">
<button data-action="save" class="btn btn-primary">Save</button>
<button data-action="cancel" class="btn">Cancel</button>
</form>
<ul class="nav pull-right">
<li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
</ul>
</div>
</div>
<t t-name="website.editorbar">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner" id="website-top-view">
<form class="navbar-form pull-left">
<button data-action="edit" class="btn btn-primary">Edit</button>
</form>
<ul class="nav pull-right">
<li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
<li class="divider-vertical"></li>
<li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
<li><a href="#">Translate</a></li>
<li class="dropdown">
<a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
<div class="dropdown-menu">
<ul class="nav nav-list" id="customize-menu">
<!-- filled in JS -->
</ul>
</div>
</li>
<li>
<a href="/admin#action=website.action_module_website">Apps</a>
</li>
</ul>
</div>
<div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
<div class="modal-header oe_mobile_preview_header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="mobile-preview-title">Preview</h3>
</div>
<div class="modal-body">
<div class="oe_mobile_preview">
<iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
<div class="navbar-inner" id="website-top-edit">
<form class="navbar-form pull-left">
<button data-action="save" class="btn btn-primary">Save</button>
<button data-action="cancel" class="btn">Cancel</button>
</form>
<ul class="nav pull-right">
<li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
</ul>
</div>
</div>
</div>
</t>
<t t-name="Website.ActionGroup">
<div class="dropdown">
<button type="button" class="oe_button_list dropdown-toggle">
<t t-esc="widget.name"/>
</button>
<ul class="dropdown-menu" role="menu"/>
</div>
</t>
<t t-name="Website.Snipped.carousel">
<div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
<div class='container'>
<h1 class='mt64'>Your New Banner Slide</h1>
<h2>With another convincing subtitle</h2>
<div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
<div class="modal-header oe_mobile_preview_header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="mobile-preview-title">Preview</h3>
</div>
<div class="modal-body">
<div class="oe_mobile_preview">
<iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
</div>
</div>
</div>
</div>
</t>
</t>
<t t-name="website.carousel">
<div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
<div class='container'>
<h1 class='mt64'>Your New Banner Slide</h1>
<h2>With another convincing subtitle</h2>
</div>
</div>
</t>
<t t-name="website.snippets">
<div class='oe_snippets oe_hidden'>