summaryrefslogtreecommitdiff
path: root/addons/web_process/static/src
diff options
context:
space:
mode:
authorJiten (OpenERP) <jra@tinyerp.com>2012-07-09 15:08:40 +0530
committerJiten (OpenERP) <jra@tinyerp.com>2012-07-09 15:08:40 +0530
commit92b565c5273ea0a0b29086cd979d4d7460cec0a4 (patch)
treedcb422900f2cefed368dcfe89fbc1509684b70d0 /addons/web_process/static/src
parent5e5daf4fef58b19ece9761ce84e32c9ba4380162 (diff)
parent4d2255a2b3390653f58a17502f7be37b5ec15089 (diff)
[MERGE] Merged from openerp-web.
bzr revid: jra@tinyerp.com-20120627075415-jjv0peuni15e8xir bzr revid: jra@tinyerp.com-20120627130608-6raligtmfyvreyt1 bzr revid: jra@tinyerp.com-20120629051154-g7aawxf2nhqhavnp bzr revid: jra@tinyerp.com-20120703094655-d2pf4noqzx6iqrpf bzr revid: jra@tinyerp.com-20120709093840-3to71dn8fohvh98z
Diffstat (limited to 'addons/web_process/static/src')
-rw-r--r--addons/web_process/static/src/css/process.css2
-rw-r--r--addons/web_process/static/src/js/process.js2
-rw-r--r--addons/web_process/static/src/xml/web_process.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css
index 728450fb921..dde01f26ea5 100644
--- a/addons/web_process/static/src/css/process.css
+++ b/addons/web_process/static/src/css/process.css
@@ -50,7 +50,7 @@ a.cta-a strong {
display: table-cell;
}
-.oe-process-view {
+.oe_process {
height: 20px;
margin-top:8px;
padding: 0;
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index 272513919b4..2a2e13ca196 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -14,7 +14,7 @@ openerp.web_process = function (instance) {
var self = this,
grandparent = this.getParent() && this.getParent().getParent(),
view = this.views[this.views_src[0].view_type],
- $process_view = this.$element.find('.oe-process-view');
+ $process_view = this.$element.find('.oe_process');
if (!(grandparent instanceof instance.web.WebClient) ||
!(view.view_type === this.views_src[0].view_type
&& view.view_id === this.views_src[0].view_id)) {
diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml
index d6d2e73715b..7bf2ba1d93b 100644
--- a/addons/web_process/static/src/xml/web_process.xml
+++ b/addons/web_process/static/src/xml/web_process.xml
@@ -3,7 +3,7 @@
-->
<t t-extend="ViewManager" t-name="ViewManagerAction">
<t t-jquery=".oe-view-manager-header" t-operation="append">
- <a t-if="self.flags.display_title !== false" class="oe-process-view" title="Process View" href="javascript: void(0)"></a>
+ <a t-if="self.flags.display_title !== false" class="oe_process" title="Process View" href="javascript: void(0)"></a>
</t>
</t>
<t t-name="ProcessView">