Unifield Web

Merge lp:~unifield-team/unifield-web/uf_548_549_icons into lp:unifield-web

  1. uf_548_549_icons
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4586
Proposed branch: lp:~unifield-team/unifield-web/uf_548_549_icons
Merge into: lp:unifield-web
Diff against target: 41 lines (+4/-7)
2 files modified
addons/openerp/static/css/listgrid.css (+1/-1)
addons/openerp/widgets/templates/listgrid/listgrid.mako (+3/-6)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf_548_549_icons
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+86273@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/static/css/listgrid.css'
2--- addons/openerp/static/css/listgrid.css 2011-04-28 10:34:19 +0000
3+++ addons/openerp/static/css/listgrid.css 2011-12-19 17:20:29 +0000
4@@ -40,7 +40,7 @@
5
6 .grid-cell.selector {
7 width: 1%;
8- max-width: 8px;
9+ max-width: 12px;
10 min-width: 8px;
11 text-align: center;
12 vertical-align: middle;
13
14=== modified file 'addons/openerp/static/images/iconset-b-remove.gif'
15Binary files addons/openerp/static/images/iconset-b-remove.gif 2010-03-23 11:36:05 +0000 and addons/openerp/static/images/iconset-b-remove.gif 2011-12-19 17:20:29 +0000 differ
16=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
17--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2011-08-23 16:21:49 +0000
18+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2011-12-19 17:20:29 +0000
19@@ -19,9 +19,6 @@
20 ${editors[field].display()}
21 % endfor
22 <!-- end of hidden fields -->
23- <img alt="save record" src="/openerp/static/images/listgrid/save_inline.gif"
24- class="listImage editors" border="0" title="${_('Update')}"
25- onclick="${object}.save(${(data and data['id']) or 'null'})"/>
26 </td>
27 % for i, (field, field_attrs) in enumerate(headers):
28 % if field == 'button':
29@@ -37,9 +34,9 @@
30 % endif
31 % endfor
32 <td class="grid-cell selector" style="text-align: center; padding: 0;">
33- <img alt="delete record" src="/openerp/static/images/iconset-b-remove.gif"
34- class="listImage editors" border="0" title="${_('Cancel')}"
35- onclick="new ListView('${name}').reload()"/>
36+ <img alt="save record" src="/openerp/static/images/listgrid/save_inline.gif"
37+ class="listImage editors" border="0" title="${_('Update')}"
38+ onclick="${object}.save(${(data and data['id']) or 'null'})"/>
39 </td>
40 </tr>
41 % endif

Subscribers

People subscribed via source and target branches

to all changes: