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

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
=== modified file 'addons/openerp/static/css/listgrid.css'
--- addons/openerp/static/css/listgrid.css 2011-04-28 10:34:19 +0000
+++ addons/openerp/static/css/listgrid.css 2011-12-19 17:20:29 +0000
@@ -40,7 +40,7 @@
4040
41.grid-cell.selector {41.grid-cell.selector {
42 width: 1%;42 width: 1%;
43 max-width: 8px;43 max-width: 12px;
44 min-width: 8px;44 min-width: 8px;
45 text-align: center;45 text-align: center;
46 vertical-align: middle;46 vertical-align: middle;
4747
=== modified file 'addons/openerp/static/images/iconset-b-remove.gif'
48Binary 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 differ48Binary 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
=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2011-08-23 16:21:49 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2011-12-19 17:20:29 +0000
@@ -19,9 +19,6 @@
19 ${editors[field].display()}19 ${editors[field].display()}
20 % endfor20 % endfor
21 <!-- end of hidden fields -->21 <!-- end of hidden fields -->
22 <img alt="save record" src="/openerp/static/images/listgrid/save_inline.gif"
23 class="listImage editors" border="0" title="${_('Update')}"
24 onclick="${object}.save(${(data and data['id']) or 'null'})"/>
25 </td>22 </td>
26 % for i, (field, field_attrs) in enumerate(headers):23 % for i, (field, field_attrs) in enumerate(headers):
27 % if field == 'button':24 % if field == 'button':
@@ -37,9 +34,9 @@
37 % endif34 % endif
38 % endfor35 % endfor
39 <td class="grid-cell selector" style="text-align: center; padding: 0;">36 <td class="grid-cell selector" style="text-align: center; padding: 0;">
40 <img alt="delete record" src="/openerp/static/images/iconset-b-remove.gif"37 <img alt="save record" src="/openerp/static/images/listgrid/save_inline.gif"
41 class="listImage editors" border="0" title="${_('Cancel')}"38 class="listImage editors" border="0" title="${_('Update')}"
42 onclick="new ListView('${name}').reload()"/>39 onclick="${object}.save(${(data and data['id']) or 'null'})"/>
43 </td>40 </td>
44 </tr>41 </tr>
45 % endif42 % endif

Subscribers

People subscribed via source and target branches

to all changes: