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

[CHG] Ashes to ashes, dashes to underscores. 

bzr revid: fme@openerp.com-20120627141352-7a6d23iebv03rcv3
This commit is contained in:
Fabien Meghazi 2012-06-27 16:13:52 +02:00
parent ce7fb5bb37
commit cd4c3b6c91
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/point_of_sale/static/src/js/pos.js
View File

@ -884,7 +884,7 @@ openerp.point_of_sale = function(db) {
*/ */
var CategoryWidget = db.web.OldWidget.extend({ var CategoryWidget = db.web.OldWidget.extend({
start: function() { start: function() {
this.$element.find(".oe-pos-categories-list a").click(_.bind(this.changeCategory, this)); this.$element.find(".oe_pos_categories_list a").click(_.bind(this.changeCategory, this));
}, },
template_fct: qweb_template('pos-category-template'), template_fct: qweb_template('pos-category-template'),
renderElement: function() { renderElement: function() {
@ -1009,7 +1009,7 @@ openerp.point_of_sale = function(db) {
}, },
start: function() { start: function() {
$('button#validate-order', this.$element).click(_.bind(this.validateCurrentOrder, this)); $('button#validate-order', this.$element).click(_.bind(this.validateCurrentOrder, this));
$('.oe-back-to-products', this.$element).click(_.bind(this.back, this)); $('.oe_back_to_products', this.$element).click(_.bind(this.back, this));
}, },
back: function() { back: function() {
this.shop.get('selectedOrder').set({"step": "products"}); this.shop.get('selectedOrder').set({"step": "products"});

8
addons/point_of_sale/static/src/xml/pos.xml
View File

@ -120,7 +120,7 @@
</table> </table>
</div> </div>
<div class="pos-payment-buttons"> <div class="pos-payment-buttons">
<button class="oe-back-to-products"> <button class="oe_back_to_products">
<img src="/web/static/src/img/icons/gtk-go-back.png"></img> <img src="/web/static/src/img/icons/gtk-go-back.png"></img>
Back to Products</button> Back to Products</button>
<button id="validate-order"> <button id="validate-order">
@ -147,13 +147,13 @@
<t t-name="pos-category-template"> <t t-name="pos-category-template">
<header> <header>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="oe-pos-categories-list"> <li class="oe_pos_categories_list">
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<img src="/point_of_sale/static/src/img/home.png" class="homeimg" /> <img src="/point_of_sale/static/src/img/home.png" class="homeimg" />
</a> </a>
</li> </li>
<t t-foreach="breadcrumb" t-as="category"> <t t-foreach="breadcrumb" t-as="category">
<li class="oe-pos-categories-list"> <li class="oe_pos_categories_list">
<img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" /> <img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" />
<a href="javascript:void(0)" t-att-data-category-id="category.id"> <a href="javascript:void(0)" t-att-data-category-id="category.id">
<t t-esc="category.name"/> <t t-esc="category.name"/>
@ -169,7 +169,7 @@
<div id="categories"> <div id="categories">
<ol> <ol>
<t t-foreach="categories" t-as="category"> <t t-foreach="categories" t-as="category">
<li class="oe-pos-categories-list"> <li class="oe_pos_categories_list">
<a href="javascript:void(0)" t-att-data-category-id="category.id" class="button"> <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button">
<t t-esc="category.name"/> <t t-esc="category.name"/>
</a> </a>

4
addons/share/static/src/css/share.css
View File

@ -1,7 +1,7 @@
button.oe-share-mail { button.oe_share_mail {
display: none; display: none;
} }
a.oe-share_link, a.oe-share { a.oe_share_link, a.oe_share {
display: none; display: none;
} }

18
addons/share/static/src/js/share.js
View File

@ -58,7 +58,7 @@ openerp.share = function(session) {
self.add_items('other', [{ self.add_items('other', [{
label: 'Share', label: 'Share',
callback: self.on_sidebar_click_share, callback: self.on_sidebar_click_share,
classname: 'oe-share', classname: 'oe_share',
}]); }]);
}); });
}, },
@ -72,7 +72,7 @@ openerp.share = function(session) {
start: function() { start: function() {
start_res = this._super.apply(this, arguments); start_res = this._super.apply(this, arguments);
if (has_action_id) { if (has_action_id) {
this.$element.find('button.oe-share-mail').show(); this.$element.find('button.oe_share_mail').show();
} }
return start_res; return start_res;
} }
@ -83,12 +83,12 @@ openerp.share = function(session) {
var self = this; var self = this;
this.check_if_action_is_defined(); this.check_if_action_is_defined();
has_share(function() { has_share(function() {
self.$element.find('a.oe-share_link').click(self.on_click_share_link); self.$element.find('a.oe_share_link').click(self.on_click_share_link);
self.$element.find('a.oe-share').click(self.on_click_share); self.$element.find('a.oe_share').click(self.on_click_share);
self.$element.delegate('button.oe-share-mail', 'click', self.on_click_share_mail); self.$element.delegate('button.oe_share_mail', 'click', self.on_click_share_mail);
}, function() { }, function() {
self.$element.find('a.oe-share_link').remove(); self.$element.find('a.oe_share_link').remove();
self.$element.find('a.oe-share').remove(); self.$element.find('a.oe_share').remove();
}); });
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
@ -96,8 +96,8 @@ openerp.share = function(session) {
check_if_action_is_defined: function() { check_if_action_is_defined: function() {
if (this.action && this.action.id) { if (this.action && this.action.id) {
has_action_id = true; has_action_id = true;
this.$element.find('a.oe-share_link').show(); this.$element.find('a.oe_share_link').show();
this.$element.find('a.oe-share').show(); this.$element.find('a.oe_share').show();
} }
else { else {
has_action_id = false; has_action_id = false;

8
addons/share/static/src/xml/share.xml
View File

@ -4,15 +4,15 @@
<templates id="template" xml:space="preserve"> <templates id="template" xml:space="preserve">
<t t-extend="ViewManagerAction"> <t t-extend="ViewManagerAction">
<t t-jquery=".oe-shortcut-toggle" t-operation="after"> <t t-jquery=".oe_shortcuts_toggle" t-operation="after">
<a class="oe-share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> <a class="oe_share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
<a class="oe-share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> <a class="oe_share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
</t> </t>
</t> </t>
<t t-extend="RecordThread"> <t t-extend="RecordThread">
<t t-jquery="button.oe_mail_button_unfollow" t-operation="after"> <t t-jquery="button.oe_mail_button_unfollow" t-operation="after">
<button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button> <button type="button" class="oe_share_mail oe_mail_button_mouseout">Invite</button>
</t> </t>
</t> </t>

14
addons/web_shortcuts/static/src/css/web_shortcuts.css
View File

@ -2,7 +2,7 @@
.oe_systray_shortcuts { .oe_systray_shortcuts {
margin: 3px; margin: 3px;
} }
.oe-shortcut-toggle { .oe_shortcuts_toggle {
height: 20px; height: 20px;
margin-top: 3px; margin-top: 3px;
padding: 0; padding: 0;
@ -12,10 +12,10 @@
background: url(/web/static/src/img/add-shortcut.png) no-repeat center center; background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
float: left; float: left;
} }
.oe-shortcut-remove{ .oe_shortcuts_remove{
background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center; background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
} }
.oe-shortcuts { .oe_shortcuts {
position: absolute; position: absolute;
margin: 0; margin: 0;
padding: 6px 15px; padding: 6px 15px;
@ -25,7 +25,7 @@
height: 17px; height: 17px;
line-height: 1.2; line-height: 1.2;
} }
.oe-shortcuts ul { .oe_shortcuts ul {
display: block; display: block;
overflow: hidden; overflow: hidden;
list-style: none; list-style: none;
@ -33,7 +33,7 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.oe-shortcuts li { .oe_shortcuts li {
cursor: pointer; cursor: pointer;
display: -moz-inline-stack; display: -moz-inline-stack;
display: inline-block; display: inline-block;
@ -47,10 +47,10 @@
vertical-align: top; vertical-align: top;
} }
.oe-shortcuts li:hover { .oe_shortcuts li:hover {
background-color: #666; background-color: #666;
} }
.oe-shortcuts li:first-child { .oe_shortcuts li:first-child {
border-left: none; border-left: none;
padding-left: 0; padding-left: 0;
} }

8
addons/web_shortcuts/static/src/js/web_shortcuts.js
View File

@ -118,16 +118,16 @@ instance.web.ViewManagerAction.include({
var shortcuts_menu = instance.webclient.user_menu.shortcuts; var shortcuts_menu = instance.webclient.user_menu.shortcuts;
var grandparent = this.getParent() && this.getParent().getParent(); var grandparent = this.getParent() && this.getParent().getParent();
// display shortcuts if on the first view for the action // display shortcuts if on the first view for the action
var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle'); var $shortcut_toggle = this.$element.find('.oe_shortcuts_toggle');
if (!this.action.name || if (!this.action.name ||
!(view.view_type === this.views_src[0].view_type !(view.view_type === this.views_src[0].view_type
&& view.view_id === this.views_src[0].view_id)) { && view.view_id === this.views_src[0].view_id)) {
$shortcut_toggle.hide(); $shortcut_toggle.hide();
return; return;
} }
$shortcut_toggle.toggleClass('oe-shortcut-remove', shortcuts_menu.has(self.session.active_id)); $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
$shortcut_toggle.unbind("click").click(function() { $shortcut_toggle.unbind("click").click(function() {
if ($shortcut_toggle.hasClass("oe-shortcut-remove")) { if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
shortcuts_menu.trigger('remove', self.session.active_id); shortcuts_menu.trigger('remove', self.session.active_id);
} else { } else {
shortcuts_menu.trigger('add', { shortcuts_menu.trigger('add', {
@ -137,7 +137,7 @@ instance.web.ViewManagerAction.include({
'name': self.action.name 'name': self.action.name
}); });
} }
$shortcut_toggle.toggleClass("oe-shortcut-remove"); $shortcut_toggle.toggleClass("oe_shortcuts_remove");
}); });
} }
}); });

2
addons/web_shortcuts/static/src/xml/web_shortcuts.xml
View File

@ -17,7 +17,7 @@
</t> </t>
<t t-extend="ViewManagerAction"> <t t-extend="ViewManagerAction">
<t t-jquery="h2.oe_view_title" t-operation="prepend"> <t t-jquery="h2.oe_view_title" t-operation="prepend">
<a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..." <a t-if="widget.flags.display_title !== false" class="oe_shortcuts_toggle" title="Add / Remove Shortcut..."
href="javascript: void(0)"> </a> href="javascript: void(0)"> </a>
</t> </t>
</t> </t>