odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Partial relooking of the searchview 

bzr revid: mit@openerp.com-20120524181648-vdvbu7mxodp07uk5
This commit is contained in:
Minh Tran 2012-05-24 20:16:48 +02:00
parent df3d343eb0
commit 91090f506f
4 changed files with 213 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
addons/web/static/src/css/base.css
View File

@ -98,6 +98,16 @@
.openerp li {
list-style-type: none;
}
.openerp input, .openerp textarea {
height: 14px;
padding: 3px;
font-size: 11px;
line-height: 18px;
border: 1px solid #cccccc;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_i {
font-family: "mnmliconsRegular" !important;
font-size: 21px;
@ -1163,13 +1173,14 @@
cursor: text;
position: relative;
float: right;
padding-right: 20px;
width: 410px;
padding: 1px 0;
line-height: 18px;
width: 480px;
border: 1px solid #ababab;
background: white;
-moz-border-radius: 1em;
-webkit-border-radius: 1em;
border-radius: 1em;
-moz-border-radius: 13px;
-webkit-border-radius: 13px;
border-radius: 13px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
@ -1184,17 +1195,16 @@
cursor: pointer;
position: absolute;
top: 0;
right: 22px;
right: 18px;
width: 15px;
height: 100%;
background: url(../img/attachments-close.png) center center no-repeat;
background: url(../img/search_reset.gif) center center no-repeat;
}
.openerp .oe_searchview .oe_searchview_unfold_drawer {
position: absolute;
top: 0;
right: 0;
height: 100%;
line-height: 2.5em;
padding: 0 7px 0 4px;
color: #cccccc;
cursor: pointer;
@ -1203,23 +1213,44 @@
color: #999999;
}
.openerp .oe_searchview .oe_searchview_unfold_drawer:before {
content: "◀";
position: absolute;
top: 10px;
right: 7px;
width: 0;
height: 0;
display: inline-block;
content: "";
vertical-align: top;
border-top: 5px solid #4c4c4c;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
filter: alpha(opacity=50);
opacity: 0.5;
}
.openerp .oe_searchview .oe_searchview_facets {
min-height: 22px;
}
.openerp .oe_searchview .oe_searchview_facets:before {
color: #cccccc;
font-family: "mnmliconsRegular";
content: "r";
font-size: 150%;
padding: 0 1px 0 3px;
font-size: 130%;
display: inline;
position: relative;
left: 6px;
top: 2px;
color: #a3a3a3;
padding-right: 4px;
}
.openerp .oe_searchview .oe_searchview_facets * {
vertical-align: top;
display: inline-block;
line-height: 26px;
line-height: 17px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
height: 26px;
height: 18px;
margin: 1px 0;
font-size: 11px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
outline: none;
@ -1236,8 +1267,6 @@
border-radius: 3px;
background: #8786b7;
-webkit-font-smoothing: auto;
padding-left: 1.1em;
margin: 1px 0;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
border-color: #a6a6fe;
@ -1252,50 +1281,69 @@
border-radius: 0 3px 3px 0;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
height: 24px;
padding: 1px 0.1em;
height: 18px;
padding: 0 4px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category {
color: white;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category.oe_i {
font-size: 16px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
border-left: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child {
padding-right: 16px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove {
position: absolute;
top: 0;
left: 2px;
color: white;
top: 3px;
right: 3px;
color: #8786b7;
line-height: 8px;
width: 12px;
height: 12px;
text-align: center;
font-weight: bold;
cursor: pointer;
text-shadow: 0 1px 1px white;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_remove:hover {
color: #cccccc;
color: white;
background: #8786b7;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
}
.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
display: block;
}
.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_unfold_drawer:before {
content: "▼";
}
.openerp .oe_searchview .oe_searchview_drawer {
position: absolute;
z-index: 1;
margin-top: 3px;
margin-top: 4px;
top: 100%;
right: 0;
right: -1px;
background-color: white;
min-width: 100%;
display: none;
border: 1px solid #cccccc;
border: 1px solid #afafb6;
text-align: left;
padding-bottom: 0.5em;
-moz-border-radius: 1em;
-webkit-border-radius: 1em;
border-radius: 1em;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
}
.openerp .oe_searchview .oe_searchview_drawer > div {
border-top: 1px solid #cccccc;
margin: 3px 0;
margin: 0;
padding: 8px;
}
.openerp .oe_searchview .oe_searchview_drawer > div:first-child {
border-top: none;
@ -1304,11 +1352,20 @@
.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
margin: 0;
cursor: pointer;
font-weight: normal;
display: inline-block;
}
.openerp .oe_searchview .oe_searchview_drawer h4:hover, .openerp .oe_searchview .oe_searchview_drawer h4 *:hover {
background-color: #f0f0fa;
}
.openerp .oe_searchview .oe_searchview_drawer h4:before {
content: "▸ ";
color: #a3a3a3;
}
.openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button {
.openerp .oe_searchview .oe_searchview_drawer button {
margin: 4px 0;
}
.openerp .oe_searchview .oe_searchview_drawer .button {
border: none;
background: transparent;
padding: 0 2px;
@ -1331,23 +1388,32 @@
width: 50%;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters h3 {
margin: 2px 4px 2px 8px;
margin: 8px 4px 4px 12px;
color: #8786b7;
font-size: 13px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters ul {
margin: 0 12px 3px;
margin: 0 8px 8px;
padding: 0;
list-style: none;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li {
list-style: none;
padding: 3px 6px 3px 18px;
padding: 2px 4px 2px 20px;
line-height: 14px;
color: inherit;
cursor: pointer;
position: relative;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected {
background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat;
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected:before {
content: "W";
font-family: "entypoRegular" !important;
font-size: 24px;
font-weight: 300 !important;
color: #a3a3a3;
position: absolute;
left: 4px;
top: -2px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
background-color: #f0f0fa;
@ -1355,17 +1421,6 @@
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form {
display: none;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button {
font-size: 1px;
letter-spacing: -1px;
color: transparent;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button:before {
font-family: "mnmliconsRegular";
content: "S";
font-size: 20px;
color: #404040;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li {
cursor: pointer;
position: relative;
@ -1387,10 +1442,11 @@
display: none;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before {
content: "⊞ ";
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_apply:before {
content: "⚡ ";
content: "Z";
font-family: "entypoRegular" !important;
font-size: 24px;
font-weight: 300 !important;
margin-right: 4px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul {
list-style: none;
@ -1403,6 +1459,8 @@
}
.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
content: "▾ ";
position: relative;
top: -1px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
display: block;

169
addons/web/static/src/css/base.sass
View File

@ -139,6 +139,14 @@ $colour4: #8a89ba
padding: 0
li
list-style-type: none
input, textarea
height: 14px
padding: 3px
font-size: 11px
line-height: 18px
border: 1px solid #ccc
@include radius(3px)
// }}}
// Generic classes {{{
.oe_i
@ -917,67 +925,78 @@ $colour4: #8a89ba
.oe_sidebar
white-space: nowrap
// }}}
// SearchView xmo {{{
// SearchView {{{
.oe_searchview
cursor: text
position: relative
float: right
padding-right: 20px
width: 410px
padding: 1px 0
line-height: 18px
width: 480px
border: 1px solid #ababab
background: white
@include radius(1em)
@include radius(13px)
@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
&.oe_focused
border-color: $facets-border-selected
@include box-shadow(0 1px 2px $facets-border-selected inset)
.oe_searchview_clear
cursor: pointer
position: absolute
top: 0
right: 22px
right: 18px
width: 15px
height: 100%
background: url(../img/attachments-close.png) center center no-repeat
background: url(../img/search_reset.gif) center center no-repeat
.oe_searchview_unfold_drawer
position: absolute
top: 0
right: 0
height: 100%
line-height: 2.5em
padding: 0 7px 0 4px
color: #ccc
cursor: pointer
&:hover
color: #999
&:before
content: "◀"
position: absolute
top: 10px
right: 7px
width: 0
height: 0
display: inline-block
content: ""
vertical-align: top
border-top: 5px solid #4C4C4C
border-left: 5px solid transparent
border-right: 5px solid transparent
@include opacity()
.oe_searchview_facets
min-height: 22px
&:before
color: #ccc
font-family: "mnmliconsRegular"
content: "r"
font-size: 150%
padding: 0 1px 0 3px
font-size: 130%
display: inline
position: relative
left: 6px
top: 2px
color: #a3a3a3
padding-right: 4px
*
vertical-align: top
display: inline-block
line-height: 26px
line-height: 17px
.oe_searchview_input, .oe_searchview_facet
height: 26px
height: 18px
margin: 1px 0
font-size: 11px
&:focus
outline: none
.oe_searchview_input
padding: 0 3px
.oe_searchview_facet
position: relative
cursor: pointer
@ -985,145 +1004,148 @@ $colour4: #8a89ba
@include radius(3px)
background: #8786b7
-webkit-font-smoothing: auto
padding-left: 1.1em
// spacing for opera, FF
margin: 1px 0
&:focus
border-color: $facets-border-selected
@include box-shadow(0 0 3px 1px $facets-border-selected)
.oe_facet_values
background: #f0f0fa
@include radius(0 3px 3px 0)
.oe_facet_category, .oe_facet_value
height: 24px
padding: 1px 0.1em
height: 18px
padding: 0 4px
.oe_facet_category
color: white
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
.oe_facet_category.oe_i
font-size: 16px
.oe_facet_value
border-left: 1px solid $facets-border
text-shadow: 0 1px 1px white
&:last-child
padding-right: 16px
.oe_facet_remove
position: absolute
top: 0
left: 2px
color: white
top: 3px
right: 3px
color: #8786b7
line-height: 8px
width: 12px
height: 12px
text-align: center
font-weight: bold
cursor: pointer
text-shadow: 0 1px 1px white
&:hover
color: #ccc
color: white
background: #8786b7
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
@include radius(2px)
&.oe_searchview_open_drawer
.oe_searchview_drawer
display: block
.oe_searchview_unfold_drawer:before
content: "▼"
.oe_searchview_drawer
position: absolute
z-index: 1
// detach drawer from field slightly
margin-top: 3px
margin-top: 4px
top: 100%
right: 0
right: -1px
background-color: white
min-width: 100%
display: none
border: 1px solid #ccc
border: 1px solid #afafb6
text-align: left
padding-bottom: 0.5em
@include radius(1em)
@include radius(4px)
@include box-shadow(0 1px 4px rgba(0,0,0,0.3))
> div
border-top: 1px solid #ccc
margin: 3px 0
margin: 0
padding: 8px
> div:first-child
border-top: none
margin: 0
h4, h4 *
margin: 0
cursor: pointer
font-weight: normal
display: inline-block
&:hover
background-color: $hover-background
h4:before
content: "▸ "
button, .button
color: #a3a3a3
button
margin: 4px 0
.button
border: none
background: transparent
padding: 0 2px
@include box-shadow(none)
@include radius(0)
.oe_searchview_filters
display: table
width: 100%
> div
@include unscrew-box
display: table-cell
width: 50%
h3
margin: 2px 4px 2px 8px
margin: 8px 4px 4px 12px
color: $section-title-color
font-size: 13px
ul
margin: 0 12px 3px
margin: 0 8px 8px
padding: 0
list-style: none
li
list-style: none
padding: 3px 6px 3px 18px
padding: 2px 4px 2px 20px
line-height: 14px
color: inherit
cursor: pointer
position: relative
&.oe_selected:before
content: "W"
font-family: "entypoRegular" !important
font-size: 24px
font-weight: 300 !important
color: #a3a3a3
position: absolute
left: 4px
top: -2px
&.oe_selected
background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat
//background: url(/web/static/src/img/icons/gtk-apply.png) no-repeat
// after oe_selected so background color is not overridden
&:hover
background-color: $hover-background
.oe_searchview_custom
form
display: none
button
@include text-to-icon("S")
li
cursor: pointer
position: relative
line-height: 1.2em
padding: 2px 20px 2px 25px
&.oe_searchview_custom_private
background: url(/web/static/src/img/icons/terp-locked.png) 5px center no-repeat
&:hover
background-color: $hover-background
button
position: absolute
top: 0
right: 5px
.oe_searchview_advanced
form
display: none
button.oe_add_condition:before
content: "⊞ "
button.oe_apply:before
content: "⚡ "
content: "Z"
font-family: "entypoRegular" !important
font-size: 24px
font-weight: 300 !important
margin-right: 4px
ul
list-style: none
padding: 0
@ -1131,10 +1153,11 @@ $colour4: #8a89ba
list-style: none
margin: 0
white-space: nowrap
.oe_opened
h4:before
content: "▾ "
position: relative
top: -1px
form
display: block

BIN
addons/web/static/src/img/search_reset.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

12
addons/web/static/src/xml/base.xml
View File

@ -1310,7 +1310,7 @@
<div t-name="SearchView.FacetView"
class="oe_searchview_facet"
tabindex="0"
><span class="oe_facet_remove">✖</span
><span class="oe_facet_remove">x</span
><span class="oe_facet_category oe_i" t-if="widget.model.has('icon')">
<t t-esc="widget.model.get('icon')"/>
</span
@ -1483,10 +1483,10 @@
<h4 class="oe_searchview_custom_title">
<label for="oe_searchview_custom_input">Save search</label></h4>
<form>
<input id="oe_searchview_custom_input"/>
<button>Save</button><br/>
<input id="oe_searchview_custom_input" placeholder="Search name"/>
<label for="oe_searchview_custom_public">Share with all users:</label>
<input id="oe_searchview_custom_public" type="checkbox"/>
<input id="oe_searchview_custom_public" type="checkbox"/><br/>
<button>Save</button><br/>
</form>
</div>
<div t-name="SearchView.advanced" class="oe_searchview_advanced">
@ -1495,7 +1495,7 @@
<ul>
</ul>
<button class="oe_add_condition" type="button">Add a condition</button>
<button class="oe_add_condition button" type="button">Add a condition</button><br/>
<button class="oe_apply" type="submit">Apply</button>
</form>
</div>
@ -1512,7 +1512,7 @@
</select>
<select class="searchview_extended_prop_op"/>
<span class="searchview_extended_prop_value"/>
<button type="button" class="searchview_extended_delete_prop">Delete</button>
<button type="button" class="searchview_extended_delete_prop button">Delete</button>
</li>
</t>
<t t-name="SearchView.extended_search.proposition.char">