diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-12-29 11:42:50 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-12-29 11:42:50 +0530 |
| commit | 4c9bc83fee816b349a8ab16f3dae4990141e9cac (patch) | |
| tree | ce45441a4279f9d32dcc8e73e9f85329869b1477 /addons/web_process/static/src | |
| parent | 269b796aab6195fa74bc977ba111259a34f6327a (diff) | |
| parent | 1c74a545c06501d00015e072de2af1d2543d9228 (diff) | |
[MERGE] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20111229061250-55j0zt220km5fml6
Diffstat (limited to 'addons/web_process/static/src')
| -rw-r--r-- | addons/web_process/static/src/css/process.css | 4 | ||||
| -rw-r--r-- | addons/web_process/static/src/js/process.js | 16 | ||||
| -rw-r--r-- | addons/web_process/static/src/xml/web_process.xml | 14 |
3 files changed, 17 insertions, 17 deletions
diff --git a/addons/web_process/static/src/css/process.css b/addons/web_process/static/src/css/process.css index cebc6b1e91f..728450fb921 100644 --- a/addons/web_process/static/src/css/process.css +++ b/addons/web_process/static/src/css/process.css @@ -52,12 +52,12 @@ a.cta-a strong { .oe-process-view { height: 20px; - margin-top:4px; + margin-top:8px; padding: 0; width: 24px; cursor: pointer; display: block; - background: url(/web/static/src/img/icons/gtk-help.png) no-repeat center center; + background: url(/web/static/src/img/iconset-a-help.png) no-repeat center center; float: left; } diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 9bf814aa4f4..8d4396ba403 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -1,5 +1,6 @@ openerp.web_process = function (openerp) { - var QWeb = openerp.web.qweb; + var QWeb = openerp.web.qweb, + _t = openerp.web._t; openerp.web.ViewManager.include({ start: function() { this._super(); @@ -274,20 +275,17 @@ openerp.web_process = function (openerp) { var action_manager = new openerp.web.ActionManager(this); var dialog = new openerp.web.Dialog(this, { width: 800, - height: 600, - buttons : { - Cancel : function() { - $(this).dialog('destroy'); - }, - Save : function() { + buttons : [ + {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }}, + {text: _t("Save"), click: function() { var form_view = action_manager.inner_viewmanager.views.form.controller; form_view.do_save(function() { self.initialize_process_view(); }); $(this).dialog('destroy'); - } - } + }} + ] }).start().open(); action_manager.appendTo(dialog.$element); diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml index 727bdad9d25..4361b02164a 100644 --- a/addons/web_process/static/src/xml/web_process.xml +++ b/addons/web_process/static/src/xml/web_process.xml @@ -1,7 +1,9 @@ <template> +<!-- vim:fdl=1: +--> <t t-extend="ViewManager" t-name="ViewManagerAction"> <t t-jquery=".oe-view-manager-header" t-operation="append"> - <a class="oe-process-view" title="Process View" href="javascript: void(0)"></a> + <a t-if="self.flags.display_title !== false" class="oe-process-view" title="Process View" href="javascript: void(0)"></a> </t> </t> <t t-name="ProcessView"> @@ -32,7 +34,7 @@ </a> <a class="cta-a" target="_blank" href="http://www.openerp.com/services/subscribe-onsite"> <span> - <strong>Support / Publisher Warranty</strong> + <strong>Support / OpenERP Enterprise</strong> Get the OpenERP Warranty </span> </a> @@ -93,7 +95,7 @@ </option> </t> </select> - <button id="change_process">Select</button> + <button class="oe_button" id="change_process">Select</button> </fieldset> </td> </tr> @@ -104,8 +106,8 @@ </tr> <tr t-if="process_id"> <td> - <button id="edit_process">Edit Process</button> - <button class="toggle_fields"> + <button class="oe_button" id="edit_process">Edit Process</button> + <button class="oe_button toggle_fields"> <span>Show Fields</span> <span>Hide Fields</span> </button> @@ -140,4 +142,4 @@ </tr> </table> </t> -</template>
\ No newline at end of file +</template> |