Merge lp:~openerp-dev/openerp-web/bth-mobile-listview into lp:~openerp-dev/openerp-web/mobile-client

Proposed by Bhumi Thakkar (Open ERP)
Status: Merged
Merged at revision: 547
Proposed branch: lp:~openerp-dev/openerp-web/bth-mobile-listview
Merge into: lp:~openerp-dev/openerp-web/mobile-client
Diff against target: 86 lines (+17/-11)
5 files modified
addons/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css (+1/-1)
addons/web_mobile/static/src/css/web_mobile.css (+5/-0)
addons/web_mobile/static/src/js/form_mobile.js (+1/-0)
addons/web_mobile/static/src/js/list_mobile.js (+1/-0)
addons/web_mobile/static/src/xml/web_mobile.xml (+9/-10)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/bth-mobile-listview
Reviewer Review Type Date Requested Status
Jiten (OpenERP) Approve
Review via email: mp+86543@code.launchpad.net

Description of the change

Hello,

     Change appearance of additional info in list view. Create new class in css and apply on element '<p>' tag which contains additional info.

Thanks & Regards,
Bhumi Thakkar

To post a comment you must log in.
Revision history for this message
Jiten (OpenERP) (jiten-openerp) wrote :

Hello Bhumi,

It looks ugly when additional information added in list record, please check your code for xml file, do not need to create more than one <a> tag for one record only.

review: Needs Fixing
548. By Bhumi Thakkar (Open ERP)

[FIX] changes regarding view for additional info in listview.

Revision history for this message
Jiten (OpenERP) (jiten-openerp) wrote :

Now its ok, Good work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css'
2--- addons/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css 2011-08-12 07:31:16 +0000
3+++ addons/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css 2011-12-22 12:15:45 +0000
4@@ -2,7 +2,7 @@
5 * jQuery Mobile Framework
6 * Copyright (c) jQuery Project
7 * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
8-* Note: Code is in draft form and is subject to change
9+* Note: Code is in draft form and is subject to change
10 */
11
12
13
14=== modified file 'addons/web_mobile/static/src/css/web_mobile.css'
15--- addons/web_mobile/static/src/css/web_mobile.css 2011-07-19 06:55:13 +0000
16+++ addons/web_mobile/static/src/css/web_mobile.css 2011-12-22 12:15:45 +0000
17@@ -22,3 +22,8 @@
18 .login_valid .login_error_message {
19 display: none;
20 }
21+.desc{
22+ margin:0em 0 0em;
23+ font-size:11px;
24+ font-weight:normal;
25+}
26
27=== modified file 'addons/web_mobile/static/src/js/form_mobile.js'
28--- addons/web_mobile/static/src/js/form_mobile.js 2011-12-07 11:03:16 +0000
29+++ addons/web_mobile/static/src/js/form_mobile.js 2011-12-22 12:15:45 +0000
30@@ -103,6 +103,7 @@
31 }
32 });
33 $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
34+ $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("a#list-id").find('span').addClass('desc');
35 }else{
36 $.mobile.changePage("#oe_list_"+relational+"_"+self.element_id, "slide", false, true);
37 }
38
39=== modified file 'addons/web_mobile/static/src/js/list_mobile.js'
40--- addons/web_mobile/static/src/js/list_mobile.js 2011-12-07 09:54:29 +0000
41+++ addons/web_mobile/static/src/js/list_mobile.js 2011-12-22 12:15:45 +0000
42@@ -51,6 +51,7 @@
43 });
44 self.$element.find("a#list-id").click(self.on_list_click);
45 $.mobile.changePage("#"+self.element_id, "slide", false, true);
46+ self.$element.find("a#list-id").find('span').addClass('desc');
47 });
48 });
49 },
50
51=== modified file 'addons/web_mobile/static/src/xml/web_mobile.xml'
52--- addons/web_mobile/static/src/xml/web_mobile.xml 2011-12-14 11:31:05 +0000
53+++ addons/web_mobile/static/src/xml/web_mobile.xml 2011-12-22 12:15:45 +0000
54@@ -132,23 +132,22 @@
55 <t t-if="!(records.length>0)">
56 There are no records to show.
57 </t>
58+
59 <t t-if="records.length>0">
60 <ul data-role="listview" data-inset="true" data-theme="d" data-filter="true">
61 <li data-theme="c" t-foreach="records" t-as="record">
62- <t t-foreach="record[1].split(',')" t-as="data1">
63- <t t-if="record[1].split(',')[0]==data1">
64- <a id="list-id" t-att-data-id="record[0]" href="#">
65- <t t-esc="data1" />
66- </a>
67- </t>
68- </t>
69- <p>
70+ <a id="list-id" t-att-data-id="record[0]" href="#">
71 <t t-foreach="record[1].split(',')" t-as="data1">
72+ <t t-if="record[1].split(',')[0]==data1">
73+ <t t-esc="data1" /><br/>
74+ </t>
75 <t t-if="record[1].split(',')[0]!=data1">
76- <t t-esc="data1" />
77+ <span>
78+ <t t-esc="data1" />
79+ </span>
80 </t>
81 </t>
82- </p>
83+ </a>
84 <t t-foreach="data" t-as="data1">
85 <t t-esc="data1[0]" />
86 </t>

Subscribers

People subscribed via source and target branches