pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged with web/trunk.

Browse Source 
bzr revid: tde@openerp.com-20120710123433-5a9721r0yag21ybh
bzr revid: tde@openerp.com-20120711075641-izq3ulv658gmb2v7
This commit is contained in:
Thibault Delavallée
2012-07-11 09:56:41 +02:00
parent b1f09441cd d34ba5f4a8
commit 83c041fe9d
7 changed files with 142 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/css/base.css
+34 -20
View File
@@ -386,8 +386,11 @@
visibility: hidden;
}
.openerp .oe_button_box {
width: 200px;
text-align: center;
width: 38%;
text-align: right;
}
.openerp .oe_button_box button {
margin: 4px;
}
.openerp .oe_avatar {
margin: 0 16px 0 0;
@@ -536,7 +539,7 @@
cursor: pointer;
}
.openerp .oe_dropdown_toggle {
color: #888888;
color: #404040;
font-weight: normal;
}
.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
@@ -545,7 +548,8 @@
.openerp .oe_dropdown_menu {
display: none;
position: absolute;
top: 32px;
top: 26px;
left: 0;
z-index: 1;
border: 1px solid #afafb6;
background: white;
@@ -1857,7 +1861,7 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
min-width: 120px;
min-width: 110px;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px;
@@ -1929,9 +1933,10 @@
}
.openerp .oe_form .oe_form_field_char input,
.openerp .oe_form .oe_form_field_url input,
.openerp .oe_form .oe_form_field_email input,
.openerp .oe_form .oe_form_field_text textarea,
.openerp .oe_form .oe_form_field_selection select {
width: inherit;
width: 100%;
}
.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
width: 500px;
@@ -2001,15 +2006,6 @@
-webkit-border-radius: 0px;
border-radius: 0px;
}
.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
border-right: none;
-webkit-border-top-right-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-topright: 0px;
-moz-border-radius-bottomright: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
.openerp .oe_form .oe_form_field_url button img {
vertical-align: top;
}
@@ -2073,10 +2069,19 @@
right: 5px;
top: 3px;
}
.openerp .oe_form .oe_form_field_with_button input {
width: 100%;
.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
display: none;
}
.openerp .oe_form .oe_form_field_with_button > .oe_button {
.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
border-right: none;
-webkit-border-top-right-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-topright: 0px;
-moz-border-radius-bottomright: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
float: right;
-moz-border-radius: 0;
-webkit-border-radius: 0;
@@ -2084,6 +2089,9 @@
border-bottom-left-radius: 0px;
height: 22px;
}
.openerp .oe_form .oe_form_field_with_button input {
width: 100%;
}
.openerp .oe_form .oe_form_field_with_button > div {
position: relative;
overflow: hidden;
@@ -2138,8 +2146,8 @@
}
.openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
position: absolute;
top: 3px;
right: 2px;
top: 1px;
right: 0px;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
@@ -2353,3 +2361,9 @@
.kitten-mode-activated > * {
opacity: 0.7;
}
div.ui-widget-overlay {
background: black;
filter: alpha(opacity=30);
opacity: 0.3;
}
addons/web/static/src/css/base.sass
+28 -18
View File
@@ -330,8 +330,10 @@ $sheet-max-width: 860px
clear: both
visibility: hidden
.oe_button_box
width: 200px
text-align: center
width: 38%
text-align: right
button
margin: 4px
.oe_avatar
margin: 0 16px 0 0
img
@@ -432,14 +434,15 @@ $sheet-max-width: 860px
position: relative
cursor: pointer
.oe_dropdown_toggle
color: #888
color: #404040
font-weight: normal
.oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
display: block
.oe_dropdown_menu
display: none
position: absolute
top: 32px
top: 26px
left: 0
z-index: 1
border: 1px solid #afafb6
background: white
@@ -1449,7 +1452,7 @@ $sheet-max-width: 860px
label
line-height: 18px
display: block
min-width: 120px
min-width: 110px
td.oe_form_group_cell + .oe_form_group_cell
padding-left: 6px
.oe_form_group
@@ -1512,9 +1515,10 @@ $sheet-max-width: 860px
width: 100%
.oe_form_field_char input,
.oe_form_field_url input,
.oe_form_field_email input,
.oe_form_field_text textarea,
.oe_form_field_selection select
width: inherit
width: 100%
.oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
width: 500px
.oe_form_field_float input
@@ -1560,14 +1564,6 @@ $sheet-max-width: 860px
padding-left: 8px
@include box-shadow(none)
@include radius(0px)
.oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
border-right: none
-webkit-border-top-right-radius: 0px
-webkit-border-bottom-right-radius: 0px
-moz-border-radius-topright: 0px
-moz-border-radius-bottomright: 0px
border-top-right-radius: 0px
border-bottom-right-radius: 0px
.oe_form_field_url button img
vertical-align: top
.oe_form_field_date,
@@ -1618,14 +1614,25 @@ $sheet-max-width: 860px
filter: alpha(opacity=50)
right: 5px
top: 3px
.oe_form_field_with_button
.oe_form_field_with_button.oe_no_button > .oe_button
display: none
.oe_form_field_with_button:not(.oe_no_button)
input
width: 100%
border-right: none
-webkit-border-top-right-radius: 0px
-webkit-border-bottom-right-radius: 0px
-moz-border-radius-topright: 0px
-moz-border-radius-bottomright: 0px
border-top-right-radius: 0px
border-bottom-right-radius: 0px
> .oe_button
float: right
@include radius(0)
border-bottom-left-radius: 0px
height: 22px
.oe_form_field_with_button
input
width: 100%
> div
position: relative
overflow: hidden
@@ -1680,8 +1687,8 @@ $sheet-max-width: 860px
position: relative
span.oe_m2o_drop_down_button
position: absolute
top: 3px
right: 2px
top: 1px
right: 0px
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
@@ -1855,5 +1862,8 @@ $sheet-max-width: 860px
opacity: 0.70
// }}}
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:
addons/web/static/src/js/view_form.js
+2 -1
View File
@@ -2667,11 +2667,12 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
});
// some behavior for input
this.$input.keyup(function() {
this.$input.keydown(function() {
if (self.current_display !== self.$input.val()) {
self.current_display = self.$input.val();
if (self.$input.val() === "") {
self.set({value: false});
self.floating = false;
} else {
self.floating = true;
}
addons/web/static/src/js/views.js
+2 -2
View File
@@ -146,7 +146,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.dialog.dialog_title = action.name;
this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action);
this.dialog_viewmanager.appendTo(this.dialog.$element);
this.dialog_viewmanager.$element.addClass("oe_view_manager_" + action.target);
this.dialog_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
this.dialog.open();
} else {
this.dialog_stop();
@@ -159,7 +159,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.inner_action = action;
this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
this.inner_viewmanager.appendTo(this.$element);
this.inner_viewmanager.$element.addClass("oe_view_manager_" + action.target);
this.inner_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
}
},
ir_actions_act_window_close: function (action, on_closed) {
addons/web/static/src/xml/base.xml
+16 -20
View File
@@ -863,7 +863,7 @@
</ul>
</t>
<t t-name="FieldChar">
<span t-att-class="'oe_form_field '+widget.widget_class">
<span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style">
<t t-if="!widget.get('effective_readonly')">
<input t-att-type="widget.password ? 'password' : 'text'"
t-att-id="widget.id_for_label"
@@ -875,7 +875,7 @@
</span>
</t>
<t t-name="FieldEmail">
<span class="oe_form_field oe_form_field_email oe_form_field_with_button">
<span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
<t t-if="!widget.get('effective_readonly')">
<div>
@@ -893,14 +893,9 @@
<t t-jquery="span:first">
this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
</t>
<t t-jquery="button.oe_button" t-operation="replace">
<button class="oe_button" tabindex="-1" type="button" title="Open this resource">
<img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
</button>
</t>
</t>
<t t-name="FieldText">
<div class="oe_form_field oe_form_field_text">
<div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
<textarea rows="6"
t-att-name="widget.name"
class="field_text"
@@ -925,13 +920,13 @@
</span>
</t>
<t t-name="FieldDate">
<span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
<span class="oe_form_field oe_datepicker_root oe_form_field_date" t-att-style="widget.node.attrs.style"/>
</t>
<t t-name="FieldDatetime">
<span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
<span class="oe_form_field oe_datepicker_root oe_form_field_datetime" t-att-style="widget.node.attrs.style"/>
</t>
<t t-name="FieldSelection">
<span class="oe_form_field oe_form_field_selection">
<span class="oe_form_field oe_form_field_selection" t-att-style="widget.node.attrs.style">
<select t-if="!widget.get('effective_readonly')"
t-att-name="widget.name"
t-att-tabindex="widget.node.attrs.tabindex"
@@ -944,7 +939,7 @@
</span>
</t>
<t t-name="FieldMany2One">
<span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
<span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
<t t-if="!widget.get('effective_readonly')">
<button class="oe_button oe_m2o_cm_button" title="Open Resource">
@@ -965,7 +960,7 @@
</span>
</t>
<t t-name="FieldMany2ManyTags">
<div class="oe_form_field oe_form_field_many2manytags">
<div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style">
<t t-if="! widget.get('effective_readonly')">
<textarea rows="1" style="width: 100%"
t-att-placeholder="widget.node.attrs.placeholder"></textarea>
@@ -982,7 +977,7 @@
</t>
</t>
<t t-name="FieldReference">
<table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0">
<table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0" t-att-style="widget.node.attrs.style">
<tr>
<td t-attf-class="oe_form_frame_cell oe_form_selection">
<span t-attf-class="oe_form_view_reference_selection"/>
@@ -994,7 +989,7 @@
</table>
</t>
<t t-name="FieldBoolean">
<span class="oe_form_field oe_form_field_boolean">
<span class="oe_form_field oe_form_field_boolean" t-att-style="widget.node.attrs.style">
<input type="checkbox"
t-att-id="widget.id_for_label"
t-att-name="widget.name"
@@ -1004,12 +999,12 @@
</span>
</t>
<t t-name="FieldProgressBar">
<span class="oe_form_field oe_form_field_progressbar" t-opentag="true">
<span class="oe_form_field oe_form_field_progressbar" t-att-style="widget.node.attrs.style">
<span></span>
</span>
</t>
<t t-name="FieldStatus">
<ul class="oe_form_steps"/>
<ul class="oe_form_steps" t-att-style="widget.node.attrs.style"/>
</t>
<t t-name="FieldStatus.content">
<t t-set="size" t-value="widget.to_show.length"/>
@@ -1021,7 +1016,7 @@
</t>
</t>
<t t-name="FieldBinaryImage">
<span class="oe_form_field oe_form_field_image">
<span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
<div class="oe_form_field_image_controls oe_edit_only">
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
@@ -1049,7 +1044,7 @@
</t>
<t t-name="FieldBinaryFile">
<t t-if="!widget.get('effective_readonly')">
<table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0">
<table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0" t-att-style="widget.node.attrs.style">
<tr>
<td>
<input type="text" size="1" readonly="readonly"
@@ -1097,7 +1092,7 @@
</table>
</t>
<t t-if="widget.get('effective_readonly')">
<span>
<span t-att-style="widget.node.attrs.style">
<a href="javascript:void(0)" class="oe_form_uri"/>
</span>
</t>
@@ -1116,6 +1111,7 @@
</t>
<t t-name="WidgetButton">
<button type="button" class="oe_button oe_form_button"
t-att-style="widget.node.attrs.style"
t-att-tabindex="widget.node.attrs.tabindex"
t-att-autofocus="widget.node.attrs.autofocus">
<img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
addons/web_kanban/static/src/css/kanban.css
+33 -2
View File
@@ -29,7 +29,7 @@
color: gold;
}
.openerp .oe_kanban_view .oe_kanban_content div:first-child {
margin-right: 12px;
margin-right: 16px;
}
.openerp .oe_kanban_view .oe_kanban_button_new {
color: white;
@@ -49,6 +49,7 @@
.openerp .oe_kanban_view .oe_kanban_group_title {
font-size: 16px;
font-weight: bold;
min-height: 30px;
color: #333333;
text-shadow: 0 1px 0 white;
}
@@ -58,7 +59,7 @@
}
.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
vertical-align: top;
padding: 6px 7px 0 6px;
padding: 6px 6px 6px 5px;
}
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
background: #f0eeee;
@@ -374,6 +375,35 @@
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.openerp .oe_kanban_view .oe_kanban_footer_left {
margin-top: 2px;
}
.openerp .oe_kanban_view .oe_kanban_footer_left > span {
margin-top: 2px;
display: inline-block;
background: #e6e6e6;
border: 1px solid #b9b9b9;
color: #666666;
padding: 0 2px;
line-height: 16px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
line-height: 12px;
font-size: 22px;
}
.openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
line-height: 18px;
position: relative;
top: -1px;
}
.openerp .oe_kanban_view .oe_kanban_bottom_right {
float: right;
position: relative;
top: 2px;
}
.openerp .oe_kanban_view .oe_kanban_status {
display: inline-block;
height: 12px;
@@ -426,6 +456,7 @@
}
.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
left: 0;
top: 28px;
min-width: 160px;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker {
addons/web_kanban/static/src/css/kanban.sass
+27 -4
View File
@@ -44,7 +44,7 @@
.oe_star_on
color: gold
div:first-child
margin-right: 12px
margin-right: 16px
.oe_kanban_button_new
color: white
background: #DC5F59
@@ -63,6 +63,7 @@
.oe_kanban_group_title
font-size: 16px
font-weight: bold
min-height: 30px
color: #333333
text-shadow: 0 1px 0 white
> span
@@ -71,7 +72,7 @@
.oe_kanban_column, .oe_kanban_group_header
vertical-align: top
padding: 6px 7px 0 6px
padding: 6px 6px 6px 5px
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
background: #f0eeee
@@ -317,8 +318,29 @@
.oe_kanban_avatar
@include radius(3px)
@include box-shadow(0 1px 2px rgba(0,0,0,0.2))
//.oe_kanban_footer_left
// float: left
.oe_kanban_footer_left
margin-top: 2px
> span
margin-top: 2px
display: inline-block
background: #E6E6E6
border: 1px solid #B9B9B9
color: #666
padding: 0 2px
line-height: 16px
@include radius(3px)
.oe_e
line-height: 12px
font-size: 22px
.oe_kanban_mail_new
line-height: 18px
position: relative
top: -1px
.oe_kanban_bottom_right
float: right
position: relative
top: 2px
.oe_kanban_status
display: inline-block
height: 12px
@@ -352,6 +374,7 @@
text-decoration: none
.oe_dropdown_menu
left: 0
top: 28px
min-width: 160px
// }}}
// KanbanColorPicker {{{