Antoine(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-form-ahu into lp:openerp-web.
Requested reviews:
Aline (OpenERP) (apr-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-form-ahu/+merge/85697
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-form-ahu/+merge/85697
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-form-ahu.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2011-12-14 13:12:46 +0000
+++ addons/web/static/src/css/base.css 2011-12-14 16:35:38 +0000
@@ -18,6 +18,10 @@
padding: 0 8px 8px 8px;
}
+.openerp .oe_form_frame_cell .view-manager-main-content {
+ padding: 0;
+}
+
.oe_box {
border: 1px solid #aaf;
padding: 2px;
@@ -560,6 +564,10 @@
color: #252424;
text-shadow: white 0 1px 0;
}
+.openerp div[id^="notebook"] .oe_view_title {
+ font-size:85%;
+ padding-bottom:4px;
+}
/* View Manager */
.openerp .oe_vm_switch {
@@ -567,6 +575,7 @@
}
.openerp .oe-view-manager-header .oe_view_title {
font-size:150%;
+ padding:2px 0 0 0;
}
/* SearchView */
@@ -716,10 +725,15 @@
.openerp .oe_search-view-buttons {
padding: 10px 0 10px 0;
+ vertical-align:middle;
}
.openerp .oe_search-view-filters-management {
float: right;
}
+.openerp .oe_search-view-filters-management, .openerp .oe_search-view-custom-filter-btn {
+ float:right;
+}
+
.openerp .searchview_extended_add_proposition span {
font-size: 0.9em;
background: url(/web/static/src/img/icons/gtk-add.png) repeat-y;
@@ -822,6 +836,10 @@
border-bottom: 1px solid #E3E3E3;
}
+.openerp .oe-listview td.oe-actions {
+ border-bottom:none;
+}
+
.openerp .oe-listview .oe-record-selector {
border-bottom: 1px solid #E3E3E3;
}
@@ -868,6 +886,16 @@
color: #555;
}
+.openerp .oe-list-pager > *, .openerp .oe_form_pager *, .openerp .oe_pager_separator {
+ line-height:17px;
+ width:12px;
+ height:17px;
+ cursor: pointer;
+ color:gray;
+ font-weight:bold;
+ vertical-align:middle;
+ border:0;
+}
.openerp .oe-listview .oe-group-name {
padding-right: 1em;
}
@@ -1077,7 +1105,7 @@
}
.openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
- margin: 4px 0 0 3px;
+ margin: 3px 0 0 3px;
white-space: nowrap;
}
.openerp .oe_forms .searchview_group_content label.oe_label, .openerp .searchview_group_content .oe_forms label.oe_label_help { /* making a distinction between labels in search view and other labels */
@@ -1116,21 +1144,29 @@
.openerp .oe_form_readonly {
}
-.openerp .oe_form_readonly .field_char, .openerp .oe_form_readonly .oe_form_field_email {
- padding-top: 4px;
- background-color: white;
-}
-
-.openerp .oe_form_readonly .field_selection {
- padding-top: 2px;
- background-color: white;
+.openerp .oe_form_readonly .oe_form_frame_cell .field_text, .openerp .oe_form_readonly .field_char, .openerp .oe_form_readonly .field_int, .openerp .oe_form_readonly .field_float, .openerp .oe_form_readonly .field_email, .openerp .oe_form_readonly .field_date, .openerp .oe_form_readonly .field_selection, .openerp .oe_forms_readonly .oe_form_field_many2one{
+ padding: 3px 2px 2px 2px;
+ background-color: white;
+ height:17px;
+}
+.openerp .oe_form_readonly .field_datetime {
+ padding: 1px 2px 2px 2px;
+ background-color: white;
+ height:17px;
+}
+.openerp .oe_form_readonly .oe_form_field_many2one div {
+ background-color:white;
+ height:18px;
+ margin-bottom:1px;
+ padding: 0px 2px 5px 2px;
}
.openerp .oe_form_readonly .oe_form_field_text div.field_text {
white-space: pre-wrap;
}
-
-
+.openerp .oe_form_readonly .oe_form_frame_cell .field_text {
+ min-height:100px;
+}
/* Inputs */
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {
-moz-box-sizing: border-box;
@@ -1147,6 +1183,11 @@
min-width: 90px;
color: #1f1f1f;
}
+/* vertically recentering filter management select tag */
+.openerp select.oe_search-view-filters-management {
+ margin-top:2px;
+}
+
.openerp .oe_forms select{
padding-top: 2px;
}
@@ -1161,6 +1202,7 @@
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button {
height: 22px;
}
+
.openerp .oe_forms input.field_datetime {
min-width: 11em;
}
@@ -1303,10 +1345,17 @@
.openerp .oe-view-manager-header {
overflow: auto;
-}
+ background: url("/web/static/src/img/sep-a.gif") 0 100% repeat-x;
+ margin:6px 0 6px 2px;
+}
+.openerp .oe_form_frame_cell .oe-view-manager-header { /* Trick: remove the background when element is in a formular */
+ background: none;
+}
+
.openerp .oe-view-manager-header h2 {
float: left;
}
+
.openerp .oe_view_manager_menu_tips blockquote {
display: none;
font-size: 85%;
@@ -1320,9 +1369,12 @@
margin: 0;
padding: 6px 1px 4px;
}
+
.openerp .oe_view_manager_menu_tips blockquote div {
text-align: right;
+ margin-right:10px;
}
+
.openerp .oe_view_manager_menu_tips blockquote div button {
border: none;
background: none;
@@ -1504,6 +1556,10 @@
background: 1px 3px url(/web/static/src/img/icons/gtk-print.png) no-repeat;
}
+.openerp .oe_sidebar_print ul {
+ padding-left:8px;
+}
+
.openerp.kitten-mode-activated .main_table {
background: url(http://placekitten.com/g/1500/800) repeat;
}
@@ -1707,6 +1763,22 @@
border-color: rgba(0,0,0,0);
border-left-color: #B5B9FF;
}
+.openerp ul.oe-arrow-list li:first-child span:first-child{
+ -webkit-border-top-left-radius: 3px;
+ -moz-border-radius-topleft: 3px;
+ border-top-left-radius: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ border-bottom-left-radius: 3px;
+}
+.openerp ul.oe-arrow-list li:last-child span:last-child{
+ -webkit-border-top-right-radius: 3px;
+ -moz-border-radius-topright: 3px;
+ border-top-right-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
+ -moz-border-radius-bottomright: 3px;
+ border-bottom-right-radius: 3px;
+}
.openerp .oe_view_editor {
border-collapse: collapse;
padding: 0;
@@ -1734,3 +1806,101 @@
.openerp .oe_view_editor_tree_grid a {
display: block;
}
+
+.openerp .oe_vm_switch {
+ margin:2px 0 0 0;
+}
+
+.openerp .oe_vm_switch button {
+ background: url("/web/static/src/img/views-icons-a.png") repeat-x scroll left top transparent;
+ overflow: hidden;
+ width: 22px;
+ height: 21px;
+ border: none;
+}
+
+.openerp .oe_vm_switch button {
+ background-position:0px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="list"] {
+ background-position:0px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="list"]:active,
+.openerp .oe_vm_switch button[data-view-type="list"]:hover,
+.openerp .oe_vm_switch button[data-view-type="list"]:focus,
+.openerp .oe_vm_switch button[data-view-type="list"][disabled="disabled"] {
+ background-position:0px -21px;
+}
+.openerp .oe_vm_switch button[data-view-type="form"] {
+ background-position:-22px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="form"]:active,
+.openerp .oe_vm_switch button[data-view-type="form"]:hover,
+.openerp .oe_vm_switch button[data-view-type="form"]:focus,
+.openerp .oe_vm_switch button[data-view-type="form"][disabled="disabled"] {
+ background-position:-22px -21px;
+}
+.openerp .oe_vm_switch button[data-view-type="graph"] {
+ background-position:-44px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="graph"]:active,
+.openerp .oe_vm_switch button[data-view-type="graph"]:hover,
+.openerp .oe_vm_switch button[data-view-type="graph"]:focus,
+.openerp .oe_vm_switch button[data-view-type="graph"][disabled="disabled"] {
+ background-position:-44px -21px;
+}
+.openerp .oe_vm_switch button[data-view-type="gantt"] {
+ background-position:-66px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="gantt"]:active,
+.openerp .oe_vm_switch button[data-view-type="gantt"]:hover,
+.openerp .oe_vm_switch button[data-view-type="gantt"]:focus,
+.openerp .oe_vm_switch button[data-view-type="gantt"][disabled="disabled"] {
+ background-position:-66px -21px;
+}
+.openerp .oe_vm_switch button[data-view-type="calendar"] {
+ background-position:-88px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="calendar"]:active,
+.openerp .oe_vm_switch button[data-view-type="calendar"]:hover,
+.openerp .oe_vm_switch button[data-view-type="calendar"]:focus,
+.openerp .oe_vm_switch button[data-view-type="calendar"][disabled="disabled"]{
+ background-position:-88px -21px;
+}
+.openerp .oe_vm_switch button[data-view-type="kanban"] {
+ background-position:-110px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="kanban"]:active,
+.openerp .oe_vm_switch button[data-view-type="kanban"]:hover,
+.openerp .oe_vm_switch button[data-view-type="kanban"]:focus,
+.openerp .oe_vm_switch button[data-view-type="kanban"][disabled="disabled"] {
+ background-position:-110px -21px;
+}
+
+.openerp .oe_vm_switch button[data-view-type="diagram"] {
+ background-position:0px 0px;
+}
+.openerp .oe_vm_switch button[data-view-type="diagram"]:active,
+.openerp .oe_vm_switch button[data-view-type="diagram"]:hover,
+.openerp .oe_vm_switch button[data-view-type="diagram"]:focus,
+.openerp .oe_vm_switch button[data-view-type="diagram"][disabled="disabled"] {
+ background-position:0px -21px;
+}
+
+.openerp .oe-list-pager button[disabled="disabled"], .openerp .oe_form_pager button[disabled="disabled"] {
+ opacity:0.5;
+ filter:alpha(opacity=50); /* For IE8 and earlier */
+}
+.openerp .oe-list-pager button[data-pager-action="first"], .openerp .oe_form_pager button[data-pager-action="first"] {
+ background: url("/web/static/src/img/pager_first.png") no-repeat scroll center center transparent;
+}
+.openerp .oe-list-pager button[data-pager-action="previous"], .openerp .oe_form_pager button[data-pager-action="previous"] {
+ background: url("/web/static/src/img/pager_left.png") no-repeat scroll center center transparent;
+}
+.openerp .oe-list-pager button[data-pager-action="next"], .openerp .oe_form_pager button[data-pager-action="next"] {
+ background: url("/web/static/src/img/pager_right.png") no-repeat scroll center center transparent;
+}
+.openerp .oe-list-pager button[data-pager-action="last"], .openerp .oe_form_pager button[data-pager-action="last"] {
+ background: url("/web/static/src/img/pager_last.png") no-repeat scroll center center transparent;
+}
+
=== added file 'addons/web/static/src/img/iconset-a-help.gif'
Binary files addons/web/static/src/img/iconset-a-help.gif 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/iconset-a-help.gif 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/iconset-a-help.png'
Binary files addons/web/static/src/img/iconset-a-help.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/iconset-a-help.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_first.png'
Binary files addons/web/static/src/img/pager_first.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_first.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_first_inactive.png'
Binary files addons/web/static/src/img/pager_first_inactive.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_first_inactive.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_last.png'
Binary files addons/web/static/src/img/pager_last.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_last.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_last_inactive.png'
Binary files addons/web/static/src/img/pager_last_inactive.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_last_inactive.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_left.png'
Binary files addons/web/static/src/img/pager_left.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_left.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_left_inactive.png'
Binary files addons/web/static/src/img/pager_left_inactive.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_left_inactive.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_right.png'
Binary files addons/web/static/src/img/pager_right.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_right.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/pager_right_inactive.png'
Binary files addons/web/static/src/img/pager_right_inactive.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/pager_right_inactive.png 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/sep-a.gif'
Binary files addons/web/static/src/img/sep-a.gif 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/sep-a.gif 2011-12-14 16:35:38 +0000 differ
=== added file 'addons/web/static/src/img/views-icons-a.png'
Binary files addons/web/static/src/img/views-icons-a.png 1970-01-01 00:00:00 +0000 and addons/web/static/src/img/views-icons-a.png 2011-12-14 16:35:38 +0000 differ
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2011-12-14 14:43:17 +0000
+++ addons/web/static/src/xml/base.xml 2011-12-14 16:35:38 +0000
@@ -423,9 +423,7 @@
</h2>
<div class="oe_vm_switch">
<t t-if="views.length != 1" t-foreach="views" t-as="view">
- <button type="button" t-att-data-view-type="view.view_type">
- <t t-esc="view.view_type"/>
- </button>
+ <button type="button" t-att-data-view-type="view.view_type" t-att-title="view.view_type"></button>
</t>
</div>
</div>
@@ -637,17 +635,17 @@
<th t-name="Listview.navigation.button" t-if="!no_leaf and options.pager !== false"
class="oe-list-pager" t-att-colspan="columns_count">
<button type="button" disabled="disabled"
- data-pager-action="first">First</button>
+ data-pager-action="first"></button>
<button type="button" disabled="disabled"
- data-pager-action="previous"><</button>
+ data-pager-action="previous"></button>
<span class="oe-pager-state">
</span>
<button type="button" disabled="disabled"
- data-pager-action="next">></button>
+ data-pager-action="next"></button>
<button type="button" disabled="disabled"
- data-pager-action="last">Last</button>
+ data-pager-action="last"></button>
</th>
<t t-name="ListView.rows" t-foreach="records.length" t-as="index">
<t t-call="ListView.row">
@@ -690,13 +688,13 @@
<button type="button" class="oe_form_button_cancel">Cancel</button>
</div>
<div class="oe_form_pager" t-if="widget.options.pager !== false">
- <button type="button" data-pager-action="first">First</button>
- <button type="button" data-pager-action="previous"><<</button>
-
- <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
-
- <button type="button" data-pager-action="next">>></button>
- <button type="button" data-pager-action="last">Last</button>
+ <button type="button" data-pager-action="first"></button>
+ <button type="button" data-pager-action="previous"></button>
+
+ <span class="oe_pager_index">0</span><span class="oe_pager_separator"> / </span><span class="oe_pager_count">0</span>
+
+ <button type="button" data-pager-action="next"></button>
+ <button type="button" data-pager-action="last"></button>
</div>
</div>
<t t-raw="frame.render()"/>
@@ -899,7 +897,9 @@
</div>
</t>
<t t-name="FieldURI.readonly">
- <a href="#">#</a>
+ <div>
+ <a href="#">#</a>
+ </div>
</t>
<t t-name="FieldEmail">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
--- addons/web_calendar/static/src/css/web_calendar.css 2011-12-12 15:06:09 +0000
+++ addons/web_calendar/static/src/css/web_calendar.css 2011-12-14 16:35:38 +0000
@@ -23,7 +23,12 @@
}
.openerp .dhx_cal_navline{
- height:20px; position:absolute;z-index:3;width:750px;color:#2F3A48;
+ height:20px;
+ position:absolute;
+ z-index:3;
+ width:750px;
+ color:#2F3A48;
+ background-color:#eee;
}
.openerp .dhx_cal_navline div{
top:2px;
@@ -197,7 +202,7 @@
line-height:17px;
text-decoration:none;
cursor:default;
- border:1px dotted #8894A3;
+ /*border:1px dotted #8894A3;*/
border-bottom:0px;
background-color:white /*#F4F4F4;*/
}
@@ -215,9 +220,9 @@
font-size:0.8em;
font-weight:bold;
color:#3F3F3F;
- border-bottom:1px dotted #8894A3;
+ /*border-bottom:1px dotted #8894A3;
border-top:1px dotted #8894A3;
- /*border-right:1px dotted #8894A3;z-index:2;*/
+ border-right:1px dotted #8894A3;z-index:2;*/
overflow:hidden;
background-color: white; /*#F4F4F4;*/
text-shadow: 0 1px 0 white;
=== modified file 'addons/web_process/static/src/css/process.css'
--- addons/web_process/static/src/css/process.css 2011-11-30 13:54:48 +0000
+++ addons/web_process/static/src/css/process.css 2011-12-14 16:35:38 +0000
@@ -52,12 +52,12 @@
.oe-process-view {
height: 20px;
- margin-top:4px;
+ margin-top:8px;
padding: 0;
width: 24px;
cursor: pointer;
display: block;
- background: url(/web/static/src/img/icons/gtk-help.png) no-repeat center center;
+ background: url(/web/static/src/img/iconset-a-help.png) no-repeat center center;
float: left;
}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
