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

[IMP] merge mit 

bzr revid: fp@tinyerp.com-20120809144524-t2in8vgwfvtbypj7
This commit is contained in:
Fabien Pinckaers 2012-08-09 16:45:24 +02:00
parent a59933de2c 93f47bb836
commit 966d48ae02
10 changed files with 291 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
@charset "utf-8";
@charset "UTF-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@ -156,7 +156,7 @@
.openerp h4 {
margin: 4px 0;
}
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] {
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
display: inline-block;
border: 1px solid #ababab;
color: #404040;
@ -181,7 +181,7 @@
-webkit-font-smoothing: antialiased;
outline: none;
}
.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover {
.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
background-color: #f6f6f6;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@ -190,9 +190,11 @@
background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3);
background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
cursor: pointer;
background-position: 0;
}
.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus {
.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
border: 1px solid #80bfff;
background-position: 0;
background-color: #f6f6f6;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@ -204,7 +206,7 @@
-webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
}
.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
background-color: #e3e3e3;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@ -230,6 +232,9 @@
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
font-size: 13px;
}
.openerp .ui-widget-content a {
color: #8a89ba;
}
.openerp .ui-menu .ui-menu-item {
margin: 0 8px 0 0;
padding: 0 0 0 12px;
@ -238,11 +243,6 @@
.openerp .ui-menu .ui-menu-item a.ui-state-active {
background: #f0f0fa;
}
.openerp div.ui-widget-overlay {
background: black;
filter: alpha(opacity=30);
opacity: 0.3;
}
.openerp.ui-dialog {
display: none;
padding: 6px;
@ -302,6 +302,9 @@
.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left;
}
.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
margin-right: 4px;
}
.openerp.ui-dialog .ui-dialog-titlebar-close {
padding: 0;
}
@ -337,6 +340,9 @@
.openerp.ui-dialog .oe_about a:hover {
text-decoration: underline;
}
.openerp.ui-dialog .oe_about a:focus {
outline: none;
}
.openerp.ui-dialog .oe_about .oe_logo {
margin-left: -6px;
}
@ -492,9 +498,6 @@
.openerp .oe_button_box button {
margin: 4px;
}
.openerp .oe_avatar {
margin: 0 6px 15px 0;
}
.openerp .oe_avatar > img {
height: 90px;
max-width: 100px;
@ -563,17 +566,19 @@
color: gold;
}
.openerp .oe_tag {
border-radius: 2px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #9daccc;
background: #e2e6f0;
color: black !important;
padding: 0px 3px 0px 3px;
border: 1px solid #afafb6;
font-size: 11px;
padding: 2px 4px;
margin: 0 2px 2px 0;
height: 16px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background: #f0f0fa;
color: #4c4c4c;
}
.openerp .oe_tag_dark {
background: #8786b7;
color: #eeeeee;
}
.openerp .oe_tags .text-wrap {
width: 100% !important;
@ -1208,16 +1213,9 @@
}
.openerp .oe_secondary_submenu .oe_menu_counter {
float: right;
background: #8a89ba;
color: #eeeeee;
font-size: 10px;
border: 1px solid lightgray;
padding: 2px 4px;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
margin: 0px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
padding: 1px 4px;
}
.openerp .oe_secondary_submenu .oe_active {
background: #8a89ba;
@ -1560,25 +1558,27 @@
display: inline-block;
line-height: 17px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input, .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
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 {
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
outline: none;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {
padding: 0 0 0 6px;
font-size: 12px;
height: 16px;
margin-top: 3px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input:focus {
outline: none;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
position: relative;
cursor: pointer;
border: 1px solid #afafb6;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background: #8786b7;
padding: 0;
-webkit-font-smoothing: auto;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet:focus {
@ -1607,6 +1607,7 @@
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value {
border-left: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
color: #4c4c4c;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value:last-child {
padding-right: 16px;
@ -1619,6 +1620,7 @@
line-height: 8px;
width: 12px;
height: 12px;
padding-top: 1px;
text-align: center;
font-weight: bold;
cursor: pointer;
@ -1918,7 +1920,7 @@
width: auto;
}
.openerp .oe_form_nosheet {
margin: 20px;
margin: 8px;
}
.openerp .oe_form_nosheet > header {
margin-top: -20px;
@ -2345,20 +2347,14 @@
.openerp .oe_form_editable .oe_form .oe_form_field_datetime {
width: 11.5em !important;
}
.openerp .oe_hidden_input_file {
overflow: hidden;
position: relative;
display: inline-block;
width: 45px;
height: 30px;
}
.openerp .oe_hidden_input_file input.oe_form_binary_file {
z-index: 0;
line-height: 0;
font-size: 12px;
position: absolute;
top: 1px;
right: 10px;
left: 0;
right: 0;
opacity: 0;
filter: alpha(opacity=0);
-ms-filter: "alpha(opacity=0)";
@ -2374,15 +2370,16 @@
}
.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
position: absolute;
white-space: nowrap;
top: 1px;
padding: 3px 0 0 0;
margin: 0 1px;
padding: 4px;
width: 100%;
display: none;
width: 99%;
text-align: center;
background: url(/web/static/src/img/form_sheetbg.png);
border-bottom: 1px dotted black;
color: #eeeeee;
background: rgba(37, 37, 37, 0.9);
-moz-border-radius: 3px 3px 0 0;
-webkit-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
@ -2737,3 +2734,9 @@
.kitten-mode-activated > * {
opacity: 0.7;
}
div.ui-widget-overlay {
background: black;
filter: alpha(opacity=30);
opacity: 0.3;
}

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

@ -2,10 +2,12 @@
// Variables {{{
$section-title-color: #8786b7
$facets-border: #afafb6
$facets-border-selected: #a6a6fe
$tag-bg-light: #f0f0fa
$tag-bg-dark: #8786b7
$tag-border: #afafb6
$tag-border-selected: #a6a6fe
$hover-background: #f0f0fa
$colour4: #8a89ba
$link-color: #8a89ba
$sheet-max-width: 860px
// }}}
// Mixins {{{
@ -190,7 +192,7 @@ $sheet-max-width: 860px
margin: 4px 0
// }}}
// Button style {{{
a.button:link, a.button:visited, button, input[type='submit']
a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
display: inline-block
border: 1px solid #ababab
color: #404040
@ -205,16 +207,18 @@ $sheet-max-width: 860px
-webkit-font-smoothing: antialiased
outline: none
a.button:hover, button:hover, input[type='submit']:hover
a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
@include vertical-gradient(#f6f6f6, #e3e3e3)
cursor: pointer
background-position: 0
a.button:focus, button:focus, input[type='submit']:focus
a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
border: 1px solid #80bfff
background-position: 0
@include vertical-gradient(#f6f6f6, #e3e3e3)
@include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active
a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
@include vertical-gradient(#e3e3e3, #f6f6f6)
@include box-shadow(none)
@ -230,6 +234,8 @@ $sheet-max-width: 860px
.ui-widget
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
font-size: 13px
.ui-widget-content a
color: $link-color
.ui-menu
.ui-menu-item
margin: 0 8px 0 0
@ -237,9 +243,7 @@ $sheet-max-width: 860px
width: auto
a.ui-state-active
background: #f0f0fa
div.ui-widget-overlay
background: black
@include opacity(0.3)
// Modal box
&.ui-dialog
display: none
@ -276,6 +280,8 @@ $sheet-max-width: 860px
margin: 0
.ui-dialog-buttonset
float: left
.ui-button
margin-right: 4px
.ui-dialog-titlebar-close
padding: 0
.ui-icon-closethick
@ -299,9 +305,11 @@ $sheet-max-width: 860px
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
@include radius(0 0 2px 2px)
a
color: #8A89BA
color: $link-color
&:hover
text-decoration: underline
&:focus
outline: none
.oe_logo
margin-left: -6px
.oe_bottom
@ -399,7 +407,6 @@ $sheet-max-width: 860px
button
margin: 4px
.oe_avatar
margin: 0 6px 15px 0
> img
height: 90px
max-width: 100px
@ -420,7 +427,7 @@ $sheet-max-width: 860px
display: none
span
@include reset()
color: #8A89BA
color: $link-color
font-weight: bold
&:hover
text-decoration: underline
@ -438,15 +445,17 @@ $sheet-max-width: 860px
// }}}
// Tags (for many2many tags, among others) {{{
.oe_tag
border-radius: 2px
@include box-sizing(border)
border: 1px solid #9DACCC
background: #E2E6F0
color: black !important
padding: 0px 3px 0px 3px
border: 1px solid $tag-border
font-size: 11px
padding: 2px 4px
margin: 0 2px 2px 0
height: 16px
// font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
@include radius(3px)
background: $tag-bg-light
color: #4C4C4C
.oe_tag_dark
background: $tag-bg-dark
color: #eee
.oe_tags
.text-wrap
width: 100% !important
@ -899,7 +908,7 @@ $sheet-max-width: 860px
.oe_secondary_menu_section
font-weight: bold
margin-left: 8px
color: $colour4
color: $link-color
.oe_secondary_submenu
padding: 2px 0 8px 0
margin: 0
@ -917,7 +926,7 @@ $sheet-max-width: 860px
top: 1px
right: 1px
font-size: 10px
background: $colour4
background: $link-color
color: white
padding: 2px 4px
margin: 1px 6px 0 0
@ -927,16 +936,11 @@ $sheet-max-width: 860px
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter
float: right
background: #8a89ba
color: #eee
font-size: 10px
border: 1px solid lightgray
padding: 2px 4px
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
margin: 0px
@include radius(4px)
padding: 1px 4px
.oe_active
background: $colour4
background: $link-color
border-top: 1px solid lightGray
border-bottom: 1px solid lightGray
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@ -945,12 +949,12 @@ $sheet-max-width: 860px
color: white
.oe_menu_label
background: #eee
color: $colour4
color: $link-color
text-shadow: 0 1px 1px white
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter
background: #eee
color: #8a89ba
color: $link-color
.oe_menu_toggler:before
width: 0
height: 0
@ -977,7 +981,7 @@ $sheet-max-width: 860px
.oe_application
width: 100%
a
color: $colour4
color: $link-color
&:hover
text-decoration: underline
> div
@ -1011,7 +1015,7 @@ $sheet-max-width: 860px
margin: 0
float: left
a
color: $colour4
color: $link-color
.oe_button_group
display: inline-block
border: 1px solid #ababab
@ -1148,8 +1152,8 @@ $sheet-max-width: 860px
font-size: 12px
line-height: 18px
&.oe_focused
border-color: $facets-border-selected
@include box-shadow(0 1px 2px $facets-border-selected inset)
border-color: $tag-border-selected
@include box-shadow(0 1px 2px $tag-border-selected inset)
.oe_searchview_clear
cursor: pointer
position: absolute
@ -1200,7 +1204,7 @@ $sheet-max-width: 860px
vertical-align: top
display: inline-block
line-height: 17px
.oe_searchview_input, .oe_searchview_facet
.oe_searchview_facet
height: 18px
margin: 1px 0
font-size: 11px
@ -1208,17 +1212,20 @@ $sheet-max-width: 860px
outline: none
.oe_searchview_input
padding: 0 0 0 6px
font-size: 12px
height: 16px
margin-top: 3px
&:focus
outline: none
.oe_searchview_facet
position: relative
cursor: pointer
border: 1px solid $facets-border
@include radius(3px)
background: #8786b7
padding: 0
-webkit-font-smoothing: auto
// spacing for opera, FF
&:focus
border-color: $facets-border-selected
@include box-shadow(0 0 3px 1px $facets-border-selected)
border-color: $tag-border-selected
@include box-shadow(0 0 3px 1px $tag-border-selected)
.oe_facet_values
background: #f0f0fa
@include radius(0 3px 3px 0)
@ -1231,8 +1238,9 @@ $sheet-max-width: 860px
.oe_facet_category.oe_i
font-size: 16px
.oe_facet_value
border-left: 1px solid $facets-border
border-left: 1px solid $tag-border
text-shadow: 0 1px 1px white
color: #4C4C4C
&:last-child
padding-right: 16px
.oe_facet_remove
@ -1243,6 +1251,7 @@ $sheet-max-width: 860px
line-height: 8px
width: 12px
height: 12px
padding-top: 1px
text-align: center
font-weight: bold
cursor: pointer
@ -1473,7 +1482,7 @@ $sheet-max-width: 860px
.oe_form .oe_form_field_date
width: auto
.oe_form_nosheet
margin: 20px
margin: 8px
.oe_form_nosheet > header
margin-top: -20px
margin-left: -20px
@ -1825,19 +1834,14 @@ $sheet-max-width: 860px
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
*/
.oe_hidden_input_file
overflow: hidden
position: relative
display: inline-block
width: 45px
height: 30px
input.oe_form_binary_file
z-index: 0
line-height: 0
font-size: 12px
position: absolute
// Should be adjusted for all browsers
top: 1px
right: 10px
left: 0
right: 0
opacity: 0
filter: alpha(opacity = 0)
-ms-filter: "alpha(opacity=0)"
@ -1852,15 +1856,14 @@ $sheet-max-width: 860px
vertical-align: top
.oe_form_field_image_controls
position: absolute
white-space: nowrap
top: 1px
padding: 3px 0 0 0
margin: 0 1px
padding: 4px
width: 100%
display: none
width: 99%
text-align: center
background: url(/web/static/src/img/form_sheetbg.png)
border-bottom: 1px dotted black
color: #eee
background: rgba(37,37,37,0.9)
@include radius(3px 3px 0 0)
@include box-sizing(border)
&:hover .oe_form_field_image_controls
display: block
@ -2160,6 +2163,10 @@ $sheet-max-width: 860px
// }}}
// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!!
div.ui-widget-overlay
background: black
@include opacity(0.3)
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

2
addons/web/static/src/js/chrome.js
View File

@ -901,7 +901,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
window.location.href, 'debug');
});
instance.web.dialog($help, {autoOpen: true,
modal: true, width: 580, height: 290, resizable: false, title: _t("About")});
modal: true, width: 507, height: 290, resizable: false, title: _t("About")});
});
},
});

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

@ -342,7 +342,7 @@
t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''">
<t t-esc="menu.name"/>
<t t-if="menu.needaction_enabled and menu.needaction_counter">
<div class="oe_menu_counter">
<div class="oe_tag oe_tag_dark oe_menu_counter">
<t t-esc="menu.needaction_counter"/>
</div>
</t>
@ -1058,13 +1058,8 @@
<div class="oe_form_field_image_controls oe_edit_only">
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
<button class="oe_button" type="button" title="Set Image">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
</button>
Edit
</t>
<button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
</button>
<div class="oe_form_binary_progress" style="display: none">
<img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
<b>Uploading ...</b>
@ -1284,7 +1279,7 @@
contenteditable="true"/>
<!-- tabindex: makes div focusable -->
<div t-name="SearchView.FacetView"
class="oe_searchview_facet"
class="oe_tag oe_tag_dark oe_searchview_facet"
tabindex="0"
><span class="oe_facet_remove">x</span
><span class="oe_facet_category oe_i" t-if="widget.model.has('icon')">

356
addons/web_dashboard/static/src/css/dashboard.css
View File

@ -1,309 +1,73 @@
.openerp table.oe_dashboard {
width: 100%;
}
.openerp .oe_dashboard_links {
text-align: right;
margin: 0 4px 6px 0;
text-align: right;
margin: 0 4px 6px 0;
}
.openerp .oe_dashboard_action {
margin: 0 0.5em 0.5em 0;
padding: 0px;
background-color: white;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
.openerp .oe_dashboard {
width: 100%;
}
.openerp .oe_dashboard_action .oe_dashboard_action_header {
font-size: 85%;
font-weight: bold;
text-transform: uppercase;
text-indent: 10px;
vertical-align: middle;
border-bottom: 1px solid #e5e5e5;
background: white url("/web/static/src/img/box-a-header-a.gif") 0% 0% repeat-x;
.openerp .oe_dashboard .oe_action {
margin: 0 8px 8px 0;
background-color: white;
border: 1px solid;
border-color: #e5e5e5 #dbdbdb #d2d2d2;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
}
.openerp h2.oe_dashboard_action_header {
margin: 0;
padding:4px 4px;
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
border-top-left-radius: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px;
}
.openerp h2.oe_dashboard_action_header_empty {
padding-top: 0;
padding-bottom: 2px;
}
.openerp .oe_dashboard_button_create {
margin-left: 4px;
padding: 0 4px 0 4px;
height: 16px !important;
}
.openerp a.oe_dashboard_action_rename {
float: left;
padding-right: 4px;
position: relative;
top: 1px;
}
.openerp .oe_dashboard_action_input {
height: 16px;
position: relative;
top: 2px;
}
.openerp .oe_dashboard_action .oe_dashboard_action_header:hover {
cursor: move;
}
.openerp .oe_dashboard_action .ui-icon {
cursor: pointer;
}
.openerp .oe_dashboard_action .ui-icon:hover {
background-color: #ccc;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
.openerp .oe_dashboard_action .oe_dashboard_action_header .ui-icon {
float: right;
}
.openerp .oe_dashboard .ui-sortable-placeholder {
border: 1px dotted black;
visibility: visible !important;
height: 50px !important;
}
.openerp .oe_dashboard .ui-sortable-placeholder * {
visibility: hidden;
}
/* Base overwriting */
.openerp .oe_dashboard .oe_list_content, .openerp .oe_dashboard .ui-widget-header {
border-right:none !important;
padding:0 3px;
}
/* Layouts */
.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
width: 100%;
}
.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1,
.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
display: none;
}
.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
width: 50%;
}
.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
display: none;
}
.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
width: 33%;
}
.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
width: 70%;
}
.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
width: 30%;
}
.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
display: none;
}
.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
width: 30%;
}
.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
width: 70%;
}
.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
display: none;
}
.openerp .oe_dashboard_layout_selector {
overflow: auto;
padding: 10px;
}
.openerp .oe_dashboard_layout_selector ul {
margin: 0;
padding: 0;
}
.openerp .oe_dashboard_layout_selector ul li {
position: relative;
float: left;
height: 51px;
list-style-type: none;
margin: 5px;
padding: 0;
width: 82px;
cursor: pointer;
border: 1px solid white;
}
.openerp .oe_dashboard_layout_selector ul li:hover {
border: 1px solid #090;
}
.openerp .oe_dashboard_layout_selector ul li img.oe_dashboard_selected_layout {
position: absolute;
top: 0px;
right: 0px;
}
.openerp .oe_dashboard_home_tile {
text-align: center;
margin: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
-webkit-box-shadow: 3px 3px 5px 3px #DADDDD;
-moz-box-shadow: 3px 3px 5px 3px #DADDDD;
box-shadow: 3px 3px 5px 3px #DADDDD;
}
.openerp .oe_dashboard_home_tile span {
display: block;
padding: 0 0 15px;
font-weight: bold;
text-transform: uppercase;
color: #555;
white-space: nowrap;
}
.openerp .oe_dashboard_home_tile_icon {
height: 100px;
}
.openerp .oe_dashboard_home_tile_icon img {
display: block;
margin: 0 auto;
}
.openerp .oe_dashboard_home_tile_icon img.hover {
display: none;
}
.openerp .oe_dashboard_home_tile:hover {
background-color: #fafafa;
-webkit-box-shadow: 3px 3px 5px 3px #979797;
-moz-box-shadow: 3px 3px 5px 3px #979797;
box-shadow: 3px 3px 5px 3px #979797;
}
.openerp .oe_dashboard_home_tile:hover img {
display: none;
}
.openerp .oe_dashboard_home_tile:hover img.hover {
display: block;
}
.openerp .oe_dashboard_home_tile:hover span {
color: black;
}
.openerp .oe_dashboard_action .view-manager-main-content {
padding: 2px;
}
.openerp .oe_app_tiles h1, .openerp .oe_app_tiles h3 {
margin: 16px 24px;
}
.openerp .oe_app_tiles {
padding: 0 10px;
}
.openerp .oe_app_tiles li {
float: left;
list-style: none;
}
.openerp .oe_app_tiles li img {
display: block;
margin: 0 auto;
height: 100px;
width: 100px;
}
.openerp .oe_app_tiles li img.hover {
display: none;
}
.openerp .oe_app_tiles li:hover img {
display: none;
}
.openerp .oe_app_tiles li:hover img.hover {
display: block;
}
.openerp .oe_app_tiles li a {
display: block;
height: 120px;
width: 194px;
color: #4C4C4C;
border: 1px solid #f4f2f2;
margin: 6px;
.openerp .oe_dashboard .oe_action .oe_header {
font-size: 16px;
vertical-align: middle;
margin: 0;
padding: 12px;
text-align: center;
text-transform: uppercase;
-moz-border-radius: 3px 3px 0 0;
-webkit-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
}
.openerp .oe_dashboard .oe_action .oe_header:hover {
cursor: move;
}
.openerp .oe_dashboard .oe_action .oe_header .oe_icon {
float: right;
cursor: pointer;
color: #b3b3b3;
}
.openerp .oe_dashboard .oe_action .oe_header .oe_icon:hover {
color: #666666;
text-decoration: none;
font-size: 12px;
font-weight: 800;
background: white;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
-ms-border-radius: 6px;
border-radius: 6px;
-moz-box-shadow: 0 1px 2px #bbb;
-webkit-box-shadow: 0 1px 2px #bbb;
-o-box-shadow: 0 1px 2px #bbb;
box-shadow: 0 1px 2px #bbb;
}
/* changing icon for the change layout button */
.openerp .oe_dashboard_link_change_layout, .openerp .oe_dashboard_link_reset {
padding-top: 1px;
height: 22px;
.openerp .oe_dashboard .oe_action .oe_header .oe_close:after {
content: "×";
margin-left: 4px;
}
.openerp .oe_dashboard_link_change_layout > *, .openerp .oe_dashboard_link_reset > *{
vertical-align: middle;
.openerp .oe_dashboard .oe_action .oe_header .oe_minimize:after {
content: "-";
margin-left: 4px;
}
.openerp .oe_welcome_message {
display:none;
.openerp .oe_dashboard .oe_action .oe_header .oe_maximize:after {
content: "+";
margin-left: 4px;
}
.openerp .oe_initial_welcome_message {
width:30%;
text-align:center;
margin:10px 35% 0 35%;
padding: 5px 10px;
border: 1px solid #ccc;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
background: #eeeded;
box-shadow: 0 1px 0 #fff;
-moz-box-shadow: 0 1px 0 #fff;
-webkit-box-shadow: 0 1px 0 #fff;
color: #8c8c8c;
font-size: 90%;
text-transform: uppercase;
font-weight: bold;
text-shadow: #fff 0 1px 0;
.openerp .oe_dashboard .oe_action .oe_header_empty {
padding-top: 0;
padding-bottom: 2px;
}
.openerp .oe_initial_welcome_message ul{
padding:10px 0 0 0;
margin:0;
list-style-type: none;
padding: 7px 0 5px 5px;
background-position: 0 50%;
background-repeat: no-repeat;
cursor: pointer;
.openerp .oe_dashboard .oe_action .oe_button_create {
margin-left: 4px;
padding: 0 4px 0 4px;
height: 16px !important;
}
.openerp .oe_initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus {
color:#222;
text-decoration:none;
.openerp .oe_dashboard .oe_action .oe_content {
padding: 0 12px 12px 12px;
}
.openerp .oe_dashboard .oe_action .oe_content .oe_view_manager_header {
display: none;
}
.openerp .oe_dashboard .oe_action .oe_content .oe_list_content > thead {
border-bottom: 1px;
}
.openerp .oe_dashboard .oe_action .oe_content .oe_list_content > tbody tr:nth-child(odd) {
background: transparent;
}

83
addons/web_dashboard/static/src/css/dashboard.sass Normal file
View File

@ -0,0 +1,83 @@
@mixin radius($radius: 5px)
-moz-border-radius: $radius
-webkit-border-radius: $radius
border-radius: $radius
@mixin box-shadow($bsval: 0px 1px 4px #777)
-moz-box-shadow: $bsval
-webkit-box-shadow: $bsval
box-shadow: $bsval
.openerp
.oe_dashboard_links
text-align: right
margin: 0 4px 6px 0
.oe_dashboard
width: 100%
.oe_action
margin: 0 8px 8px 0
background-color: white
border: 1px solid
border-color: #e5e5e5 #dbdbdb #d2d2d2
@include radius(3px)
@include box-shadow(0 0 2px rgba(0,0,0,0.2))
.oe_header
font-size: 16px
vertical-align: middle
margin: 0
padding: 12px
@include radius(3px 3px 0 0)
//border-bottom: 1px dotted #dbdbdb
//@include radius(2px 2px 0 0)
//@include vertical-gradient(#FCFCFC, #DEDEDE)
&:hover
cursor: move
.oe_icon
float: right
cursor: pointer
color: #b3b3b3
&:hover
color: #666
text-decoration: none
.oe_close:after
content: "×"
margin-left: 4px
.oe_minimize:after
content: "-"
margin-left: 4px
.oe_maximize:after
content: "+"
margin-left: 4px
.oe_header_empty
padding-top: 0
padding-bottom: 2px
.oe_button_create
margin-left: 4px
padding: 0 4px 0 4px
height: 16px !important
//.oe_rename
//float: left
//padding-right: 4px
//position: relative
//top: 1px
//.oe_input
//height: 16px;
//position: relative;
//top: 2px;
//.ui-sortable-placeholder
//border: 1px dotted black;
//visibility: visible !important;
//height: 50px !important;
//*
//visibility: hidden;
.oe_content
padding: 0 12px 12px 12px
.oe_view_manager_header
display: none
.oe_list_content
> thead
border-bottom: 1px
> tbody
tr:nth-child(odd)
background: transparent

20
addons/web_dashboard/static/src/js/dashboard.js
View File

@ -20,7 +20,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
this.$element.find('.oe_dashboard_column').sortable({
connectWith: '.oe_dashboard_column',
handle: '.oe_dashboard_action_header',
handle: '.oe_header',
scroll: false
}).disableSelection().bind('sortstop', self.do_save_dashboard);
@ -28,8 +28,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
this.$element.find('.oe_dashboard_link_reset').click(this.on_reset);
this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
this.$element.delegate('.oe_dashboard_column .oe_dashboard_fold', 'click', this.on_fold_action);
this.$element.delegate('.oe_dashboard_column .ui-icon-closethick', 'click', this.on_close_action);
this.$element.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
this.$element.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
// Init actions
_.each(this.node.children, function(column, column_index) {
@ -80,7 +80,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
var $last_column = $();
$dashboard.find('.oe_dashboard_column').each(function(k, v) {
if (k >= nlayout) {
$(v).find('.oe_dashboard_action').appendTo($last_column);
$(v).find('.oe_action').appendTo($last_column);
} else {
$last_column = $(v);
}
@ -93,20 +93,20 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
},
on_fold_action: function(e) {
var $e = $(e.currentTarget),
$action = $e.parents('.oe_dashboard_action:first'),
$action = $e.parents('.oe_action:first'),
id = parseInt($action.attr('data-id'), 10);
if ($e.is('.ui-icon-minusthick')) {
if ($e.is('.oe_minimize')) {
$action.data('action_attrs').fold = '1';
} else {
delete($action.data('action_attrs').fold);
}
$e.toggleClass('ui-icon-minusthick ui-icon-plusthick');
$action.find('.oe_dashboard_action_content').toggle();
$e.toggleClass('oe_minimize oe_maximize');
$action.find('.oe_content').toggle();
this.do_save_dashboard();
},
on_close_action: function(e) {
if (confirm(_t("Are you sure you want to remove this item ?"))) {
$(e.currentTarget).parents('.oe_dashboard_action:first').remove();
$(e.currentTarget).parents('.oe_action:first').remove();
this.do_save_dashboard();
}
},
@ -119,7 +119,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
};
this.$element.find('.oe_dashboard_column').each(function() {
var actions = [];
$(this).find('.oe_dashboard_action').each(function() {
$(this).find('.oe_action').each(function() {
var action_id = $(this).attr('data-id'),
new_attrs = _.clone($(this).data('action_attrs'));
if (new_attrs.domain) {

14
addons/web_dashboard/static/src/xml/web_dashboard.xml
View File

@ -21,16 +21,16 @@
</table>
</t>
<t t-name="DashBoard.action">
<div t-att-data-id="action.attrs.name" class="oe_dashboard_action">
<h2 t-attf-class="oe_dashboard_action_header #{action.attrs.string ? '' : 'oe_dashboard_action_header_empty'}">
<div t-att-data-id="action.attrs.name" class="oe_action">
<h2 t-attf-class="oe_header #{action.attrs.string ? '' : 'oe_header_empty'}">
<t t-esc="action.attrs.string"/>
<t t-if="!action.attrs.string">&amp;nbsp;</t>
<button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_dashboard_button_create">Create</button>
<span class='ui-icon ui-icon-closethick'></span>
<span class='ui-icon ui-icon-minusthick oe_dashboard_fold' t-if="!action.attrs.fold"></span>
<span class='ui-icon ui-icon-plusthick oe_dashboard_fold' t-if="action.attrs.fold"></span>
<button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_button_create">Create</button>
<span class='oe_icon oe_close'></span>
<span class='oe_icon oe_minimize oe_fold' t-if="!action.attrs.fold"></span>
<span class='oe_icon oe_maximize oe_fold' t-if="action.attrs.fold"></span>
</h2>
<div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_dashboard_action_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
<div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
</div>
</t>
<t t-name="DashBoard.layouts">

5
addons/web_kanban/static/src/css/kanban.css
View File

@ -1,4 +1,3 @@
@charset "utf-8";
.openerp .oe_kanban_view {
height: inherit;
}
@ -175,6 +174,10 @@
.openerp .oe_kanban_view .oe_kanban_details h4 {
margin: 0 0 4px 0;
}
.openerp .oe_kanban_view .oe_kanban_details .oe_tag {
display: inline-block;
margin: 0 0 2px 0;
}
.openerp .oe_kanban_view .oe_kanban_record {
position: relative;
display: block;

3
addons/web_kanban/static/src/css/kanban.sass
View File

@ -180,6 +180,9 @@
color: #4c4c4c
h4
margin: 0 0 4px 0
.oe_tag
display: inline-block
margin: 0 0 2px 0
.oe_kanban_record
position: relative
display: block