Merge lp:~openerp-dev/openerp-web/7.0-serachview-facets-bth into lp:openerp-web/7.0

Proposed by Bhumi Thakkar (Open ERP)
Status: Rejected
Rejected by: Xavier (Open ERP)
Proposed branch: lp:~openerp-dev/openerp-web/7.0-serachview-facets-bth
Merge into: lp:openerp-web/7.0
Diff against target: 126 lines (+24/-6)
2 files modified
addons/web/static/src/css/base.css (+12/-3)
addons/web/static/src/css/base.sass (+12/-3)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-serachview-facets-bth
Reviewer Review Type Date Requested Status
Bhumi Thakkar (Open ERP) (community) Needs Resubmitting
Xavier (Open ERP) (community) Disapprove
Review via email: mp+144280@code.launchpad.net

Description of the change

Hello,

   In searchview when text are long or many texts are there at that time close of searchview-facets and values's close both r merged. search view is not looking good when we have particular lenght of text to search https://docs.google.com/file/d/0BzK8IdwLAVd9OTNtZHAtbnV4cWc/edit?pli=1

Fixed issue in searchview when long text is enetered, text is going out of searchview and serachview looks not proper (look like https://docs.google.com/document/d/1yOwUSP9BI1d9E2cD-uwxoxvuY0F0tD3gCV3LuGg9-6Q/edit)

Thanks.

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

> Fixed issue in searchview when long text is enetered, text is going out of searchview and serachview looks not proper (look like https://docs.google.com/document/d/1yOwUSP9BI1d9E2cD-uwxoxvuY0F0tD3gCV3LuGg9-6Q/edit)

Sorry, can't bring me to care about garbage input, please fix the other part *only* and I'll review that.

review: Disapprove
Revision history for this message
Bhumi Thakkar (Open ERP) (bth-openerp) wrote :

Fixed

Revision history for this message
Bhumi Thakkar (Open ERP) (bth-openerp) :
review: Needs Resubmitting

Unmerged revisions

3710. By Bhumi Thakkar (Open ERP)

[FIX] remove code for search drawer.

3709. By Bhumi Thakkar (Open ERP)

[FIX] when long text is enetered, text is going out of searchview.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2013-01-09 13:18:48 +0000
3+++ addons/web/static/src/css/base.css 2013-01-22 11:20:25 +0000
4@@ -1631,7 +1631,7 @@
5 float: right;
6 padding: 1px 0;
7 line-height: 18px;
8- width: 400px;
9+ width: 500px;
10 border: 1px solid #ababab;
11 background: white;
12 -moz-border-radius: 13px;
13@@ -1715,6 +1715,10 @@
14 .openerp .oe_searchview .oe_searchview_facets {
15 min-height: 22px;
16 margin-left: 15px;
17+ width: 450px;
18+ overflow-y: auto;
19+ overflow-x: hidden;
20+ max-height: 60px;
21 }
22 .openerp .oe_searchview .oe_searchview_facets * {
23 vertical-align: top;
24@@ -1732,8 +1736,10 @@
25 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {
26 padding: 0 0 0 6px;
27 font-size: 12px;
28- height: 16px;
29+ height: auto;
30 margin-top: 3px;
31+ max-width: 11em;
32+ word-wrap: break-word;
33 }
34 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus {
35 outline: none;
36@@ -1755,9 +1761,9 @@
37 -moz-border-radius: 0 3px 3px 0;
38 -webkit-border-radius: 0 3px 3px 0;
39 border-radius: 0 3px 3px 0;
40+ display: inline-block;
41 }
42 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
43- height: 18px;
44 padding: 0 4px;
45 }
46 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {
47@@ -1771,6 +1777,8 @@
48 border-left: 1px solid #afafb6;
49 text-shadow: 0 1px 1px white;
50 color: #4c4c4c;
51+ max-width: 11em;
52+ word-wrap: break-word;
53 }
54 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child {
55 padding-right: 16px;
56@@ -3125,6 +3133,7 @@
57 }
58 .ui-menu .ui-menu-item a {
59 padding: 1px 16px;
60+ word-wrap: break-word;
61 }
62 .ui-menu .ui-menu-item a.ui-corner-all {
63 -moz-border-radius: 0;
64
65=== modified file 'addons/web/static/src/css/base.sass'
66--- addons/web/static/src/css/base.sass 2013-01-09 13:18:48 +0000
67+++ addons/web/static/src/css/base.sass 2013-01-22 11:20:25 +0000
68@@ -1308,7 +1308,7 @@
69 float: right
70 padding: 1px 0
71 line-height: 18px
72- width: 400px
73+ width: 500px
74 border: 1px solid #ababab
75 background: white
76 @include radius(13px)
77@@ -1367,6 +1367,10 @@
78 .oe_searchview_facets
79 min-height: 22px
80 margin-left: 15px
81+ width: 450px
82+ overflow-y: auto
83+ overflow-x: hidden
84+ max-height: 60px
85 *
86 vertical-align: top
87 display: inline-block
88@@ -1380,8 +1384,10 @@
89 .oe_searchview_input
90 padding: 0 0 0 6px
91 font-size: 12px
92- height: 16px
93+ height: auto
94 margin-top: 3px
95+ max-width: 11em
96+ word-wrap: break-word
97 &:focus
98 outline: none
99 .oe_searchview_facet
100@@ -1396,8 +1402,8 @@
101 .oe_facet_values
102 background: #f0f0fa
103 @include radius(0 3px 3px 0)
104+ display: inline-block
105 .oe_facet_category, .oe_facet_value
106- height: 18px
107 padding: 0 4px
108 .oe_facet_category
109 color: white
110@@ -1408,6 +1414,8 @@
111 border-left: 1px solid $tag-border
112 text-shadow: 0 1px 1px white
113 color: #4C4C4C
114+ max-width: 11em
115+ word-wrap: break-word
116 &:last-child
117 padding-right: 16px
118 .oe_facet_remove
119@@ -2467,6 +2475,7 @@
120 padding: 0
121 a
122 padding: 1px 16px
123+ word-wrap: break-word
124 a.ui-corner-all
125 @include radius(0)
126 a.ui-state-active