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

[MERGE] trunk-mit 

bzr revid: al@openerp.com-20120725074244-q871un3r8qh17gpa
This commit is contained in:
Antony Lesuisse 2012-07-25 09:42:44 +02:00
parent 930dd711ed 1d766a2bc6
commit 0b2ccd00e0
7 changed files with 118 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,6 +267,45 @@
color: black;
text-decoration: none;
}
.openerp.ui-dialog .oe_about {
background-color: white;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp.ui-dialog .oe_about a {
color: #8a89ba;
}
.openerp.ui-dialog .oe_about a:hover {
text-decoration: underline;
}
.openerp.ui-dialog .oe_about .oe_logo {
margin-left: -6px;
}
.openerp.ui-dialog .oe_about .oe_bottom {
position: absolute;
top: 50%;
left: 0;
right: 0;
bottom: 0;
text-shadow: 0 1px 1px #999999;
background-color: #b41616;
background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
background-image: -webkit-linear-gradient(top, #b41616, #600606);
background-image: -moz-linear-gradient(top, #b41616, #600606);
background-image: -ms-linear-gradient(top, #b41616, #600606);
background-image: -o-linear-gradient(top, #b41616, #600606);
background-image: linear-gradient(to bottom, #b41616, #600606);
color: #eeeeee;
padding: 0 16px;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px;
}
.openerp.ui-dialog .oe_about .oe_bottom a {
color: #eeeeee;
}
.openerp.ui-dialog.oe_act_window .ui-dialog-content {
padding: 0px;
}
@ -584,7 +623,7 @@
z-index: 1;
border: 1px solid #afafb6;
background: white;
padding: 6px 0;
padding: 4px 0;
min-width: 140px;
text-align: left;
-moz-border-radius: 3px;
@ -599,6 +638,7 @@
float: none;
display: block;
position: relative;
padding: 2px 8px;
}
.openerp .oe_dropdown_menu > li:hover {
background-color: #f0f0fa;
@ -615,7 +655,6 @@
.openerp .oe_dropdown_menu > li > a {
white-space: nowrap;
display: block;
padding: 4px 15px;
color: #4c4c4c;
text-decoration: none;
}
@ -711,7 +750,7 @@
z-index: 1050;
}
.openerp .oe_login {
background: url("/web/static/src/img/pattern.png") repeat;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
text-align: center;
font-size: 14px;
height: 100%;
@ -945,11 +984,12 @@
}
.openerp .oe_topbar .oe_dropdown_menu li {
float: none;
padding: 3px 12px;
}
.openerp .oe_topbar .oe_dropdown_menu li a {
color: #eeeeee;
}
.openerp .oe_topbar .oe_dropdown_menu li a:hover {
.openerp .oe_topbar .oe_dropdown_menu li:hover {
background-color: #292929;
background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
background-image: -webkit-linear-gradient(top, #292929, #191919);
@ -1448,7 +1488,7 @@
outline: none;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_input {
padding: 0 3px;
padding: 0 0 0 6px;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
position: relative;
@ -1611,14 +1651,14 @@
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li:hover {
background-color: #f0f0fa;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form {
.openerp .oe_searchview .oe_searchview_drawer form {
margin-left: 12px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form p {
.openerp .oe_searchview .oe_searchview_drawer form p {
margin: 4px 0;
line-height: 18px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form button {
.openerp .oe_searchview .oe_searchview_drawer form button {
margin: 0 0 8px 0;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom {

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

@ -255,6 +255,29 @@ $sheet-max-width: 860px
&:hover
color: black
text-decoration: none
.oe_about
background-color: white
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
@include radius(0 0 2px 2px)
a
color: #8A89BA
&:hover
text-decoration: underline
.oe_logo
margin-left: -6px
.oe_bottom
position: absolute
top: 50%
left: 0
right: 0
bottom: 0
text-shadow: 0 1px 1px #999999
@include vertical-gradient(#b41616, #600606)
color: #eee
padding: 0 16px
@include radius(0 0 2px 2px)
a
color: #eee
&.ui-dialog.oe_act_window
.ui-dialog-content
@ -469,7 +492,7 @@ $sheet-max-width: 860px
z-index: 1
border: 1px solid #afafb6
background: white
padding: 6px 0
padding: 4px 0
min-width: 140px
text-align: left
@include radius(3px)
@ -482,10 +505,10 @@ $sheet-max-width: 860px
float: none
display: block
position: relative
padding: 2px 8px
> a
white-space: nowrap
display: block
padding: 4px 15px
color: #4c4c4c
text-decoration: none
&:hover
@ -566,7 +589,7 @@ $sheet-max-width: 860px
// }}}
// Login {{{
.oe_login
background: url("/web/static/src/img/pattern.png") repeat
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
text-align: center
font-size: 14px
height: 100%
@ -734,11 +757,12 @@ $sheet-max-width: 860px
@include background-clip()
li
float: none
padding: 3px 12px
a
color: #eee
&:hover
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
&:hover
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
// }}}
// Webclient.leftbar {{{
@ -1126,7 +1150,7 @@ $sheet-max-width: 860px
&:focus
outline: none
.oe_searchview_input
padding: 0 3px
padding: 0 0 0 6px
.oe_searchview_facet
position: relative
cursor: pointer
@ -1248,13 +1272,13 @@ $sheet-max-width: 860px
// after oe_selected so background color is not overridden
&:hover
background-color: $hover-background
form
margin-left: 12px
p
margin: 4px 0
line-height: 18px
button
margin: 0 0 8px 0
form
margin-left: 12px
p
margin: 4px 0
line-height: 18px
button
margin: 0 0 8px 0
.oe_searchview_custom
padding: 0 8px 8px 8px
form

BIN
addons/web/static/src/img/pattern.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 B

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

@ -864,7 +864,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
window.location.href, 'debug');
});
instance.web.dialog($help, {autoOpen: true,
modal: true, width: 960, title: _t("About")});
modal: true, width: 580, height: 290, resizable: false, title: _t("About")});
});
},
});
@ -903,7 +903,7 @@ instance.web.Client = instance.web.Widget.extend({
var doc_width = $(document).width();
var offset = $menu.offset();
var menu_width = $menu.width();
var x = doc_width - offset.left - menu_width - 15;
var x = doc_width - offset.left - menu_width - 2;
if (x < 0) {
$menu.offset({ left: offset.left + x }).width(menu_width);
}

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

@ -329,21 +329,20 @@
</span>
</t>
<t t-name="UserMenu.about">
<div>
<a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developer mode</a>
<h1 style="margin:0;">OpenERP</h1>
<h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3>
<p>
Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.
</p>
<p>
Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a>
</p>
<p>
For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a>
</p>
<div class="oe_about">
<a class="oe_activate_debug_mode oe_right" href="?debug">Activate the developer mode</a>
<img class="oe_logo" src="/web/static/src/img/logo2.png"/>
<h3>Version <t t-esc="version_info.version"/></h3>
<div class="oe_bottom">
<p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.</p>
<p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p>
<p>For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a></p>
</div>
</div>
</t>
<t t-name="UserMenu.password">
<form name="change_password_form" method="POST">
@ -1409,8 +1408,8 @@
<div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard">
<h4>Add to Dashboard</h4>
<form>
<input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/>
<button class="oe_apply" type="submit">save</button>
<p><input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/></p>
<button class="oe_apply" type="submit">Save</button>
</form>
</div>
<t t-name="SearchView.addtodashboard.selection">

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

@ -359,6 +359,9 @@
.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban {
margin-top: 4px;
}
.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li {
float: left;
}
.openerp .oe_kanban_view .oe_kanban_star {
float: left;
position: inline-block;
@ -401,9 +404,6 @@
position: relative;
top: 2px;
}
.openerp .oe_kanban_view .oe_kanban_project_times li {
float: left;
}
.openerp .oe_kanban_view .oe_kanban_status {
position: relative;
top: 4px;
@ -471,30 +471,25 @@
visibility: hidden;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker {
padding: 3px 6px;
white-space: nowrap;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li {
float: left;
margin: 0;
padding: 0;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li a {
display: inline-block;
width: 18px;
height: 18px;
width: 16px;
height: 16px;
border: 1px solid white;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li a:hover {
border: 1px solid gray !important;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a {
margin-top: 1px;
height: 16px;
border: 1px solid #cccccc;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a:hover {
margin-top: 0px;
height: 18px;
}
.openerp .oe_kanban_view .oe_kanban_color_0 {
background-color: white;
}

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

@ -307,6 +307,10 @@
text-decoration: none
.oe_dropdown_kanban
margin-top: 4px
.oe_kanban_project_times
li
float: left
.oe_kanban_star
float: left
position: inline-block
@ -337,9 +341,6 @@
position: relative
top: 2px
.oe_kanban_project_times li
float: left
.oe_kanban_status
position: relative
top: 4px
@ -387,24 +388,20 @@
// }}}
// KanbanColorPicker {{{
.oe_kanban_colorpicker
padding: 3px 6px
white-space: nowrap
.oe_kanban_colorpicker li
float: left
margin: 0
padding: 0
a
display: inline-block
width: 18px
height: 18px
width: 16px
height: 16px
border: 1px solid white
a:hover
border: 1px solid gray !important
.oe_kanban_colorpicker li:first-child a
margin-top: 1px
height: 16px
border: 1px solid #ccc
&:hover
margin-top: 0px
height: 18px
// }}}
// KanbanColors {{{
.oe_kanban_color_0