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

[MERGE] Merge parents 

bzr revid: rim@openerp.com-20131106161211-gr2x8uh7wkzc6opv
This commit is contained in:
Richard Mathot (OpenERP) 2013-11-06 17:12:11 +01:00
parent 51edfc8a4b 5ce5a2d877
commit 3290b04e55
9 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/data/website_data.xml
View File

@ -16,12 +16,14 @@
<field name="name">Homepage</field>
<field name="url">/</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">10</field>
</record>
<record id="menu_contactus" model="website.menu">
<field name="name">Contact us</field>
<field name="url">/page/website.contactus</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">20</field>
</record>
<record id="public_user" model="res.users">

9
addons/website/static/src/css/editor.css
View File

@ -1,4 +1,3 @@
@charset "utf-8";
/* ---- CKEditor Minimal Reset ---- */
.navbar.navbar-inverse .cke_chrome {
border: none;
@ -239,6 +238,14 @@ ul.oe_menu_editor li.mjs-nestedSortable-expanded > div > .disclose > span:before
margin-bottom: 0.5em;
}
.modal.nosave .modal-footer button.save {
display: none;
}
.modal.nosave .modal-footer button.wait {
display: inline-block !important;
visibility: visible !important;
}
.cke_widget_wrapper {
position: static !important;
}

7
addons/website/static/src/css/editor.sass
View File

@ -219,6 +219,13 @@ ul.oe_menu_editor
.modal .image-preview
margin-bottom: 0.5em
.modal.nosave .modal-footer
button.save
display: none
button.wait
display: inline-block !important
visibility: visible !important
// wrapper positioned relatively for drag&drop widget which is disabled below.
// Breaks completely horribly crazy products listing page, so take it out.
.cke_widget_wrapper

3
addons/website/static/src/js/website.editor.js
View File

@ -1030,6 +1030,7 @@
}),
start: function () {
this.$('.modal-footer [disabled]').text("Uploading…");
var $options = this.$('.image-style').children();
this.image_styles = $options.map(function () { return this.value; }).get();
@ -1065,6 +1066,7 @@
},
file_selection: function () {
this.$el.addClass('nosave');
this.$('button.filepicker').removeClass('btn-danger btn-success');
var self = this;
@ -1087,6 +1089,7 @@
this.set_image(url);
},
preview_image: function () {
this.$el.removeClass('nosave');
var image = this.$('input.url').val();
if (!image) { return; }

1
addons/website/static/src/xml/website.editor.xml
View File

@ -24,6 +24,7 @@
<div class="modal-body"><t t-raw="__content__"/></div>
<div class="modal-footer">
<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
<button type="button" class="btn hidden wait" disabled="disabled"/>
<button type="button" class="btn btn-primary save">Save Changes</button>
</div>
</div>

1
addons/website_blog/data/website_blog_data.xml
View File

@ -5,6 +5,7 @@
<field name="name">News</field>
<field name="url">/blog</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">50</field>
</record>
</data>

1
addons/website_event/data/event_data.xml
View File

@ -6,6 +6,7 @@
<field name="name">Events</field>
<field name="url">/event</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">40</field>
</record>
<record id="action_open_website" model="ir.actions.act_url">
<field name="name">Website Home</field>

1
addons/website_hr_recruitment/data/website_hr_recruitment_data.xml
View File

@ -5,6 +5,7 @@
<field name="name">Jobs</field>
<field name="url">/jobs</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">60</field>
</record>
<record id="action_open_website" model="ir.actions.act_url">
<field name="name">Website Recruitment Form</field>

1
addons/website_sale/website_sale_data.xml
View File

@ -6,6 +6,7 @@
<field name="name">Shop</field>
<field name="url">/shop</field>
<field name="parent_id" ref="website.main_menu"/>
<field name="sequence" type="int">30</field>
</record>
<record id="action_open_website" model="ir.actions.act_url">
<field name="name">Website Shop</field>