[MERGE] Merged with web/trunk.
bzr revid: tde@openerp.com-20120706074454-0fy5yal2pl9kc7t4
This commit is contained in:
Thibault Delavallée
commit
63b562e698
|
|
@ -352,6 +352,19 @@
|
|||
.openerp .oe_button.oe_link span:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.openerp .oe_star_on, .openerp .oe_star_off {
|
||||
color: #cccccc;
|
||||
text-shadow: 0 0 2px black;
|
||||
vertical-align: top;
|
||||
position: relative;
|
||||
top: -5px;
|
||||
}
|
||||
.openerp .oe_star_on:hover, .openerp .oe_star_off:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.openerp .oe_star_on {
|
||||
color: gold;
|
||||
}
|
||||
.openerp.oe_tooltip {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
|
@ -379,6 +392,11 @@
|
|||
list-style: none;
|
||||
zoom: 1;
|
||||
}
|
||||
.openerp .oe_notebook.ui-corner-all {
|
||||
-moz-border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.openerp .oe_notebook:before, .openerp .oe_notebook:after {
|
||||
display: table;
|
||||
content: "";
|
||||
|
|
@ -441,12 +459,12 @@
|
|||
.openerp .oe_dropdown_menu {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 28px;
|
||||
top: 32px;
|
||||
z-index: 1;
|
||||
border: 1px solid #afafb6;
|
||||
background: white;
|
||||
padding: 8px;
|
||||
min-width: 120px;
|
||||
padding: 6px 0;
|
||||
min-width: 140px;
|
||||
text-align: left;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
|
|
@ -476,7 +494,7 @@
|
|||
.openerp .oe_dropdown_menu > li > a {
|
||||
white-space: nowrap;
|
||||
display: block;
|
||||
padding: 3px 6px;
|
||||
padding: 4px 15px;
|
||||
color: #4c4c4c;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -1224,7 +1242,7 @@
|
|||
.openerp .oe_searchview input, .openerp .oe_searchview textarea {
|
||||
padding: 3px;
|
||||
height: 14px;
|
||||
font-size: 11px;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
}
|
||||
.openerp .oe_searchview.oe_focused {
|
||||
|
|
@ -1656,7 +1674,7 @@
|
|||
}
|
||||
.openerp .oe_form footer {
|
||||
min-width: 650px;
|
||||
max-width: 960px;
|
||||
max-width: 860px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.openerp ul.oe_form_steps {
|
||||
|
|
@ -1725,7 +1743,7 @@
|
|||
}
|
||||
.openerp .oe_application .oe_form_sheet_width {
|
||||
min-width: 650px;
|
||||
max-width: 960px;
|
||||
max-width: 860px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.openerp .oe_application .oe_form_sheet {
|
||||
|
|
@ -2108,7 +2126,6 @@
|
|||
}
|
||||
.openerp .oe_list_content > tbody {
|
||||
cursor: pointer;
|
||||
background: white;
|
||||
}
|
||||
.openerp .oe_list_content > tbody > tr {
|
||||
border-top: 1px solid #dddddd;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ $facets-border: #afafb6
|
|||
$facets-border-selected: #a6a6fe
|
||||
$hover-background: #f0f0fa
|
||||
$colour4: #8a89ba
|
||||
$sheet-max-width: 860px
|
||||
// }}}
|
||||
// Mixins {{{
|
||||
@font-face
|
||||
|
|
@ -287,6 +288,18 @@ $colour4: #8a89ba
|
|||
font-weight: bold
|
||||
&:hover
|
||||
text-decoration: underline
|
||||
.oe_star_on, .oe_star_off
|
||||
color: #cccccc
|
||||
text-shadow: 0 0 2px black
|
||||
vertical-align: top
|
||||
position: relative
|
||||
top: -5px
|
||||
|
||||
.oe_star_on:hover, .oe_star_off:hover
|
||||
text-decoration: none
|
||||
|
||||
.oe_star_on
|
||||
color: gold
|
||||
|
||||
//.oe_edit_only
|
||||
// }}}
|
||||
|
|
@ -313,6 +326,8 @@ $colour4: #8a89ba
|
|||
padding: 0 16px
|
||||
list-style: none
|
||||
zoom: 1
|
||||
.oe_notebook.ui-corner-all
|
||||
@include radius(0)
|
||||
.oe_notebook:before, .oe_notebook:after
|
||||
display: table
|
||||
content: ""
|
||||
|
|
@ -361,12 +376,12 @@ $colour4: #8a89ba
|
|||
.oe_dropdown_menu
|
||||
display: none
|
||||
position: absolute
|
||||
top: 28px
|
||||
top: 32px
|
||||
z-index: 1
|
||||
border: 1px solid #afafb6
|
||||
background: white
|
||||
padding: 8px
|
||||
min-width: 120px
|
||||
padding: 6px 0
|
||||
min-width: 140px
|
||||
text-align: left
|
||||
@include radius(3px)
|
||||
@include box-shadow(0 1px 4px rgba(0,0,0,0.3))
|
||||
|
|
@ -381,7 +396,7 @@ $colour4: #8a89ba
|
|||
> a
|
||||
white-space: nowrap
|
||||
display: block
|
||||
padding: 3px 6px
|
||||
padding: 4px 15px
|
||||
color: #4c4c4c
|
||||
text-decoration: none
|
||||
&:hover
|
||||
|
|
@ -399,7 +414,6 @@ $colour4: #8a89ba
|
|||
border-right: 4px solid transparent
|
||||
border-top: 4px solid#404040
|
||||
@include opacity(0.5)
|
||||
|
||||
.oe_sidebar
|
||||
white-space: nowrap
|
||||
.oe_dropdown_menu
|
||||
|
|
@ -636,6 +650,7 @@ $colour4: #8a89ba
|
|||
&:hover
|
||||
@include vertical-gradient(#292929, #191919)
|
||||
@include box-shadow(none)
|
||||
|
||||
// }}}
|
||||
// Webclient.leftbar {{{
|
||||
.oe_leftbar
|
||||
|
|
@ -960,7 +975,7 @@ $colour4: #8a89ba
|
|||
input, textarea
|
||||
padding: 3px
|
||||
height: 14px
|
||||
font-size: 11px
|
||||
font-size: 12px
|
||||
line-height: 18px
|
||||
&.oe_focused
|
||||
border-color: $facets-border-selected
|
||||
|
|
@ -1293,7 +1308,7 @@ $colour4: #8a89ba
|
|||
float: right
|
||||
footer
|
||||
min-width: 650px
|
||||
max-width: 960px
|
||||
max-width: $sheet-max-width
|
||||
margin: 0 auto
|
||||
ul.oe_form_steps
|
||||
height: 30px
|
||||
|
|
@ -1348,7 +1363,7 @@ $colour4: #8a89ba
|
|||
border-bottom: 1px solid #ddd
|
||||
.oe_form_sheet_width
|
||||
min-width: 650px
|
||||
max-width: 960px
|
||||
max-width: $sheet-max-width
|
||||
margin: 0 auto
|
||||
.oe_form_sheet
|
||||
background: white
|
||||
|
|
@ -1669,7 +1684,6 @@ $colour4: #8a89ba
|
|||
@include opacity(0.6)
|
||||
> tbody
|
||||
cursor: pointer
|
||||
background: white
|
||||
> tr
|
||||
border-top: 1px solid #ddd
|
||||
> td.oe_list_field_cell
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
.openerp .graph-dropdown {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 40px;
|
||||
top: 32px;
|
||||
right: 8px;
|
||||
padding: 8px;
|
||||
border: 1px solid #afafb6;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<template>
|
||||
<div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
|
||||
<a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&iacute;</a>
|
||||
<div class="graph_header_legend">
|
||||
</div>
|
||||
<a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">B</a>
|
||||
<div class="graph-dropdown">
|
||||
<h3 class="menu-section">
|
||||
Graph Mode
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@charset "utf-8";
|
||||
.openerp .oe_kanban_view {
|
||||
height: inherit;
|
||||
}
|
||||
|
|
@ -19,21 +18,24 @@
|
|||
.openerp .oe_kanban_view .oe_kanban_content div:first-child {
|
||||
margin-right: 12px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_button_new {
|
||||
color: white;
|
||||
background: #dc5f59;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_groups {
|
||||
height: inherit;
|
||||
width: 100%;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_group_title {
|
||||
margin: 1px 1px 4px;
|
||||
padding-left: 2px;
|
||||
font-size: 100%;
|
||||
margin-bottom: 4px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
text-shadow: 0 1px 0 white;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
|
||||
vertical-align: top;
|
||||
padding: 6px 7px 6px 6px;
|
||||
padding: 6px 7px 0 6px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
|
||||
background: #f0eeee;
|
||||
|
|
@ -90,20 +92,19 @@
|
|||
height: 16px;
|
||||
background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_fold_icon {
|
||||
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_add {
|
||||
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
|
||||
float: right;
|
||||
margin-left: 4px;
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
|
||||
position: relative;
|
||||
top: -8px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_quick_create {
|
||||
overflow: hidden;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
|
||||
margin: 4px 0;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
|
||||
width: 200px;
|
||||
|
|
@ -111,12 +112,10 @@
|
|||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_quick_create input {
|
||||
display: block;
|
||||
font-size: 13px;
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_quick_create button {
|
||||
float: right;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_vignette {
|
||||
padding: 8px;
|
||||
min-height: 100px;
|
||||
|
|
@ -333,6 +332,9 @@
|
|||
.openerp .oe_kanban_view .oe_kanban_card h3:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban {
|
||||
margin-top: 4px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_star {
|
||||
float: left;
|
||||
position: inline-block;
|
||||
|
|
@ -375,8 +377,11 @@
|
|||
background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_text_red {
|
||||
background: red;
|
||||
color: black;
|
||||
color: #a61300;
|
||||
font-weight: bold;
|
||||
-moz-border-radius: 4px;
|
||||
-webkit-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.openerp .oe_kanban_view .oe_kanban_ellipsis {
|
||||
overflow: hidden;
|
||||
|
|
|
|||
|
|
@ -33,24 +33,36 @@
|
|||
.oe_kanban_clear
|
||||
clear: both
|
||||
.oe_kanban_content
|
||||
.oe_star_on, .oe_star_off
|
||||
color: #ccc
|
||||
text-shadow: 0 0 2px black
|
||||
vertical-align: top
|
||||
position: relative
|
||||
top: -5px
|
||||
&:hover
|
||||
text-decoration: none
|
||||
.oe_star_on
|
||||
color: gold
|
||||
div:first-child
|
||||
margin-right: 12px
|
||||
.oe_kanban_button_new
|
||||
color: white
|
||||
background: #DC5F59
|
||||
// }}}
|
||||
// KanbanGroups {{{
|
||||
.oe_kanban_groups
|
||||
height: inherit
|
||||
width: 100%
|
||||
.oe_kanban_group_title
|
||||
margin: 1px 1px 4px
|
||||
padding-left: 2px
|
||||
font-size: 100%
|
||||
margin-bottom: 4px
|
||||
font-size: 16px
|
||||
font-weight: bold
|
||||
color: #333333
|
||||
text-shadow: 0 1px 0 white
|
||||
|
||||
.oe_kanban_column, .oe_kanban_group_header
|
||||
vertical-align: top
|
||||
padding: 6px 7px 6px 6px
|
||||
padding: 6px 7px 0 6px
|
||||
|
||||
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
|
||||
background: #f0eeee
|
||||
|
|
@ -102,30 +114,32 @@
|
|||
height: 16px
|
||||
background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat
|
||||
.oe_kanban_group_folded .oe_kanban_fold_icon
|
||||
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
|
||||
// }}}
|
||||
// KanbanQuickCreate {{{
|
||||
.oe_kanban_add
|
||||
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
|
||||
float: right
|
||||
margin-left: 4px
|
||||
cursor: pointer
|
||||
position: absolute
|
||||
top: 6px
|
||||
right: 6px
|
||||
width: 16px
|
||||
height: 16px
|
||||
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
|
||||
position: relative
|
||||
top: -8px
|
||||
//right: 6px
|
||||
//width: 16px
|
||||
//height: 16px
|
||||
|
||||
.oe_kanban_quick_create
|
||||
// apply block formatting context
|
||||
overflow: hidden
|
||||
margin-bottom: 4px
|
||||
.oe_kanban_quick_create_buttons
|
||||
margin: 4px 0
|
||||
.oe_kanban_no_group .oe_kanban_quick_create
|
||||
width: 200px
|
||||
padding: 10px
|
||||
.oe_kanban_quick_create input
|
||||
display: block
|
||||
// margins within width
|
||||
font-size: 13px
|
||||
box-sizing: border-box
|
||||
width: 100%
|
||||
.oe_kanban_quick_create button
|
||||
float: right
|
||||
// }}}
|
||||
// KanbanRecords {{{
|
||||
.oe_kanban_vignette
|
||||
|
|
@ -287,6 +301,8 @@
|
|||
text-decoration: none
|
||||
h3:hover
|
||||
text-decoration: none
|
||||
.oe_dropdown_kanban
|
||||
margin-top: 4px
|
||||
.oe_kanban_star
|
||||
float: left
|
||||
position: inline-block
|
||||
|
|
@ -310,8 +326,9 @@
|
|||
background: red
|
||||
@include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
|
||||
.oe_kanban_text_red
|
||||
background: red
|
||||
color: #000
|
||||
color: #A61300
|
||||
font-weight: bold
|
||||
@include radius(4px)
|
||||
.oe_kanban_ellipsis
|
||||
overflow: hidden
|
||||
text-overflow: ellipsis
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
|
|||
scroll: false
|
||||
});
|
||||
} else {
|
||||
this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
|
||||
this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle').removeClass('oe_kanban_card');
|
||||
}
|
||||
},
|
||||
on_record_moved : function(record, old_group, old_index, new_group, new_index) {
|
||||
|
|
@ -593,7 +593,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
|
|||
|
||||
// If no draghandle is found, make the whole card as draghandle
|
||||
if (!this.$element.find('.oe_kanban_draghandle').length) {
|
||||
this.$element.children(':first').addClass('oe_kanban_draghandle');
|
||||
this.$element.children(':first').addClass('oe_kanban_draghandle').addClass('oe_kanban_card');
|
||||
}
|
||||
|
||||
this.$element.find('.oe_kanban_action').click(function() {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<div t-name="KanbanView.buttons" class="oe_kanban_buttons">
|
||||
<t t-if="widget.options.action_buttons !== false">
|
||||
<t t-if="widget._is_create_enabled()">
|
||||
<button type="button" class="oe_button oe_kanban_button_new oe_highlight">
|
||||
<button type="button" class="oe_button oe_kanban_button_new oe_highlight oe_form_button_hi">
|
||||
<t t-esc="widget.options.create_text || _t('Create')"/>
|
||||
</button>
|
||||
</t>
|
||||
|
|
@ -23,9 +23,16 @@
|
|||
<td class="oe_kanban_group_header">
|
||||
<t t-if="widget.view.group_by">
|
||||
<div class="oe_kanban_header">
|
||||
<div class="oe_kanban_fold_icon"></div>
|
||||
<div class="oe_dropdown_toggle">
|
||||
<span class="oe_e">í</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a href="#">Fold</a></li>
|
||||
<li><a href="#">Edit</a></li>
|
||||
<li><a href="#">Delete</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<t t-if="widget.view._is_quick_create_enabled()">
|
||||
<div class="oe_kanban_add" t-att-title="_t('Quick Create')"></div>
|
||||
<div class="oe_kanban_add oe_e">]</div>
|
||||
</t>
|
||||
<div class="oe_fold_column">
|
||||
<div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openerp-web\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-07-02 09:06+0200\n"
|
||||
"PO-Revision-Date: 2012-02-11 08:49+0000\n"
|
||||
"Last-Translator: Mario Gielissen <Unknown>\n"
|
||||
"PO-Revision-Date: 2012-07-05 08:01+0000\n"
|
||||
"Last-Translator: Erwin <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n"
|
||||
"X-Generator: Launchpad (build 15531)\n"
|
||||
"X-Launchpad-Export-Date: 2012-07-06 05:07+0000\n"
|
||||
"X-Generator: Launchpad (build 15558)\n"
|
||||
|
||||
#. openerp-web
|
||||
#: addons/web_process/static/src/js/process.js:261
|
||||
|
|
@ -110,7 +110,7 @@ msgstr "Proces selecteren"
|
|||
#. openerp-web
|
||||
#: addons/web_process/static/src/xml/web_process.xml:98
|
||||
msgid "Select"
|
||||
msgstr "Selecteer"
|
||||
msgstr "Kies"
|
||||
|
||||
#. openerp-web
|
||||
#: addons/web_process/static/src/xml/web_process.xml:109
|
||||
|
|
|
|||
Loading…
Reference in New Issue