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
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2013-01-09 13:18:48 +0000
+++ addons/web/static/src/css/base.css 2013-01-22 11:20:25 +0000
@@ -1631,7 +1631,7 @@
1631 float: right;1631 float: right;
1632 padding: 1px 0;1632 padding: 1px 0;
1633 line-height: 18px;1633 line-height: 18px;
1634 width: 400px;1634 width: 500px;
1635 border: 1px solid #ababab;1635 border: 1px solid #ababab;
1636 background: white;1636 background: white;
1637 -moz-border-radius: 13px;1637 -moz-border-radius: 13px;
@@ -1715,6 +1715,10 @@
1715.openerp .oe_searchview .oe_searchview_facets {1715.openerp .oe_searchview .oe_searchview_facets {
1716 min-height: 22px;1716 min-height: 22px;
1717 margin-left: 15px;1717 margin-left: 15px;
1718 width: 450px;
1719 overflow-y: auto;
1720 overflow-x: hidden;
1721 max-height: 60px;
1718}1722}
1719.openerp .oe_searchview .oe_searchview_facets * {1723.openerp .oe_searchview .oe_searchview_facets * {
1720 vertical-align: top;1724 vertical-align: top;
@@ -1732,8 +1736,10 @@
1732.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {1736.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {
1733 padding: 0 0 0 6px;1737 padding: 0 0 0 6px;
1734 font-size: 12px;1738 font-size: 12px;
1735 height: 16px;1739 height: auto;
1736 margin-top: 3px;1740 margin-top: 3px;
1741 max-width: 11em;
1742 word-wrap: break-word;
1737}1743}
1738.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus {1744.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus {
1739 outline: none;1745 outline: none;
@@ -1755,9 +1761,9 @@
1755 -moz-border-radius: 0 3px 3px 0;1761 -moz-border-radius: 0 3px 3px 0;
1756 -webkit-border-radius: 0 3px 3px 0;1762 -webkit-border-radius: 0 3px 3px 0;
1757 border-radius: 0 3px 3px 0;1763 border-radius: 0 3px 3px 0;
1764 display: inline-block;
1758}1765}
1759.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {1766.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
1760 height: 18px;
1761 padding: 0 4px;1767 padding: 0 4px;
1762}1768}
1763.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {1769.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {
@@ -1771,6 +1777,8 @@
1771 border-left: 1px solid #afafb6;1777 border-left: 1px solid #afafb6;
1772 text-shadow: 0 1px 1px white;1778 text-shadow: 0 1px 1px white;
1773 color: #4c4c4c;1779 color: #4c4c4c;
1780 max-width: 11em;
1781 word-wrap: break-word;
1774}1782}
1775.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child {1783.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child {
1776 padding-right: 16px;1784 padding-right: 16px;
@@ -3125,6 +3133,7 @@
3125}3133}
3126.ui-menu .ui-menu-item a {3134.ui-menu .ui-menu-item a {
3127 padding: 1px 16px;3135 padding: 1px 16px;
3136 word-wrap: break-word;
3128}3137}
3129.ui-menu .ui-menu-item a.ui-corner-all {3138.ui-menu .ui-menu-item a.ui-corner-all {
3130 -moz-border-radius: 0;3139 -moz-border-radius: 0;
31313140
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2013-01-09 13:18:48 +0000
+++ addons/web/static/src/css/base.sass 2013-01-22 11:20:25 +0000
@@ -1308,7 +1308,7 @@
1308 float: right1308 float: right
1309 padding: 1px 01309 padding: 1px 0
1310 line-height: 18px1310 line-height: 18px
1311 width: 400px1311 width: 500px
1312 border: 1px solid #ababab1312 border: 1px solid #ababab
1313 background: white1313 background: white
1314 @include radius(13px)1314 @include radius(13px)
@@ -1367,6 +1367,10 @@
1367 .oe_searchview_facets1367 .oe_searchview_facets
1368 min-height: 22px1368 min-height: 22px
1369 margin-left: 15px1369 margin-left: 15px
1370 width: 450px
1371 overflow-y: auto
1372 overflow-x: hidden
1373 max-height: 60px
1370 *1374 *
1371 vertical-align: top1375 vertical-align: top
1372 display: inline-block1376 display: inline-block
@@ -1380,8 +1384,10 @@
1380 .oe_searchview_input1384 .oe_searchview_input
1381 padding: 0 0 0 6px1385 padding: 0 0 0 6px
1382 font-size: 12px1386 font-size: 12px
1383 height: 16px1387 height: auto
1384 margin-top: 3px1388 margin-top: 3px
1389 max-width: 11em
1390 word-wrap: break-word
1385 &:focus1391 &:focus
1386 outline: none1392 outline: none
1387 .oe_searchview_facet1393 .oe_searchview_facet
@@ -1396,8 +1402,8 @@
1396 .oe_facet_values1402 .oe_facet_values
1397 background: #f0f0fa1403 background: #f0f0fa
1398 @include radius(0 3px 3px 0)1404 @include radius(0 3px 3px 0)
1405 display: inline-block
1399 .oe_facet_category, .oe_facet_value1406 .oe_facet_category, .oe_facet_value
1400 height: 18px
1401 padding: 0 4px1407 padding: 0 4px
1402 .oe_facet_category1408 .oe_facet_category
1403 color: white1409 color: white
@@ -1408,6 +1414,8 @@
1408 border-left: 1px solid $tag-border1414 border-left: 1px solid $tag-border
1409 text-shadow: 0 1px 1px white1415 text-shadow: 0 1px 1px white
1410 color: #4C4C4C1416 color: #4C4C4C
1417 max-width: 11em
1418 word-wrap: break-word
1411 &:last-child1419 &:last-child
1412 padding-right: 16px1420 padding-right: 16px
1413 .oe_facet_remove1421 .oe_facet_remove
@@ -2467,6 +2475,7 @@
2467 padding: 02475 padding: 0
2468 a2476 a
2469 padding: 1px 16px2477 padding: 1px 16px
2478 word-wrap: break-word
2470 a.ui-corner-all2479 a.ui-corner-all
2471 @include radius(0)2480 @include radius(0)
2472 a.ui-state-active2481 a.ui-state-active