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

[MERGE]MErge lp:~openerp-dev/openobject-addons/trunk-website-al.

Browse Source 
bzr revid: bth@tinyerp.com-20130926045756-mn4jzb3p21v6wjue
This commit is contained in:
bth-openerp
2013-09-26 10:27:56 +05:30
parent 09ae27017f e7a469f8bc
commit d4209a320f
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.ace.js
+2 -2
View File
@@ -18,7 +18,7 @@
if (globalEditor) {
globalEditor.open();
} else {
globalEditor = new website.ace.ViewEditor(this);
globalEditor = new website.ace.ViewEditor();
globalEditor.appendTo($(document.body));
}
}
@@ -111,7 +111,7 @@
method: 'read',
args: [[viewId], ['arch'], website.get_context()],
}).then(function(result) {
var editingSession = self.buffers[viewId] = new ace.EditSession(result[0].arch);;
var editingSession = self.buffers[viewId] = new ace.EditSession(result[0].arch);
editingSession.setMode("ace/mode/xml");
editingSession.setUndoManager(new ace.UndoManager());
editingSession.on("change", function () {
addons/website/static/src/js/website.seo.js
+1 -1
View File
@@ -327,7 +327,7 @@
self.suggestImprovements();
self.imageList = new website.seo.ImageList(self, { page: htmlPage });
if (htmlPage.images().length === 0) {
$modal.find('.js_image_section').remove()
$modal.find('.js_image_section').remove();
} else {
self.imageList.appendTo($modal.find('.js_seo_image_list'));
}
addons/website/views/views.xml
+9 -6
View File
@@ -21,6 +21,15 @@
<meta name="openerp.company" t-att-value="res_company.name" />
<meta name="description" value="" />
<meta name="keywords" value="" />
<!-- Load stylesheets before scripts to avoid blocking -->
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
<t t-if="editable">
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<link rel='stylesheet' href='/website/static/src/css/editor.css'/>
</t>
<t t-call="website.theme"/>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
@@ -32,9 +41,6 @@
<script type="text/javascript" src="/website/static/src/js/website.js"></script>
<t t-if="editable">
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<link rel='stylesheet' href='/website/static/src/css/editor.css'/>
<script type="text/javascript" src="/website/static/lib/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
<script type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
@@ -52,9 +58,6 @@
</t>
<t t-raw="head or ''"/>
<t t-call="website.theme"/>
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
</head>
<body>
<div id="wrapwrap">
addons/website_mail/views/website_mail.xml
+4 -1
View File
@@ -12,8 +12,11 @@
</template>
<template id="website.layout" inherit_id="website.layout" inherit_option_id="website.layout">
<xpath expr="//head" position="inside">
<!-- Load stylesheets before scripts to avoid blocking -->
<xpath expr="//head/link" position="after">
<link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
</xpath>
<xpath expr="//head" position="inside">
<script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
</xpath>
</template>