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

[MERGE] Merged trunk.

Browse Source 
bzr revid: jra@tinyerp.com-20121016054150-3wk2tozq98u83kuk
bzr revid: jra@tinyerp.com-20121018060228-4th3uexqp9cks3xx
bzr revid: jra@tinyerp.com-20121019055038-pr1jz3u01hi0qjfq
bzr revid: jra@tinyerp.com-20121022060208-5fd962drv61gnu2j
This commit is contained in:
Jiten (OpenERP)
2012-10-22 11:32:08 +05:30
parent 0626542e58 f6722a220c
commit 87362b5168
4957 changed files with 40688 additions and 22776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/css/mail.css
+50 -35
View File
@@ -54,13 +54,13 @@
/* Specific display of threads in the wall */
/* ------------------------------------------------------------ */
.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea.oe_mail_compose_textarea {
.openerp ul.oe_mail_wall_threads .oe_msg_content textarea.oe_mail_compose_textarea {
width: 434px;
height: 30px;
padding: 4px;
}
.openerp li.oe_mail_wall_thread:first .oe_mail_msg_notification {
.openerp li.oe_mail_wall_thread:first .oe_msg_notification {
border-top: 0;
}
@@ -69,7 +69,7 @@
height: 28px;
}
.openerp div.oe_thread_placeholder div.oe_mail_msg_content {
.openerp div.oe_thread_placeholder div.oe_msg_content {
width: 440px;
}
@@ -143,12 +143,12 @@
/* subtypes
/* ------------------------------------------------------------ */
.openerp .oe_mouse_subtypes {
.openerp .oe_mail_subtypes {
display:inline-block;
position: relative;
z-index: 5;
}
.openerp .oe_mouse_subtypes .oe_recthread_subtypes {
.openerp .oe_mail_subtypes .oe_recthread_subtypes {
background: #fff;
padding: 2px;
border: 1px solid #aaaaaa;
@@ -156,10 +156,10 @@
position: absolute;
z-index: 2;
}
.openerp .oe_mouse_subtypes.oe_mouseout .oe_recthread_subtypes {
.openerp .oe_mail_subtypes.oe_mouseout .oe_recthread_subtypes {
display: none;
}
.openerp .oe_mouse_subtypes.oe_mouseover .oe_recthread_subtypes {
.openerp .oe_mail_subtypes.oe_mouseover .oe_recthread_subtypes {
display: block;
}
@@ -181,8 +181,8 @@
}
/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
.openerp .oe_msg_content textarea.oe_mail_compose_textarea:focus,
.openerp .oe_msg_content div.oe_mail_compose_message_body textarea:focus {
outline: 0;
border-color: rgba(82, 168, 236, 0.8);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -191,10 +191,17 @@
}
.openerp .oe_mail_vote_count,
.openerp .oe_mail_msg_vote{
.openerp .oe_msg_vote{
vertical-align: bottom;
}
.openerp button.oe_mail_starbox{
background: #ff0000;
}
.openerp button.oe_mail_starbox.oe_stared{
background: #00FF00;
}
.openerp div.oe_mail_thread_display {
white-space: normal;
}
@@ -247,35 +254,35 @@
margin: 0 0 4px 0;
}
.openerp .oe_mail_msg_notification,
.openerp .oe_mail_msg_expandable,
.openerp .oe_mail_msg_comment,
.openerp .oe_mail_msg_email {
.openerp .oe_msg_notification,
.openerp .oe_msg_expandable,
.openerp .oe_msg_comment,
.openerp .oe_msg_email {
padding: 8px;
background: white;
position: relative;
}
.openerp .oe_mail_msg_notification:after,
.openerp .oe_mail_msg_comment:after,
.openerp .oe_mail_msg_email:after {
.openerp .oe_msg_notification:after,
.openerp .oe_msg_comment:after,
.openerp .oe_msg_email:after {
content: "";
display: block;
clear: both;
}
.openerp div.oe_mail_msg_content {
.openerp div.oe_msg_content {
float: left;
position: relative;
width: 486px;
}
.openerp div.oe_mail_msg_content > li {
.openerp div.oe_msg_content > li {
float: left;
margin-right: 3px;
}
.openerp .oe_mail_msg_content:after {
.openerp .oe_msg_content:after {
content: "";
display: block;
clear: both;
@@ -319,23 +326,23 @@
/* Messages layout
/* ------------------------------------------------------------ */
.openerp .oe_mail_msg .oe_mail_msg_title {
.openerp .oe_mail_msg .oe_msg_title {
margin: 0;
font-size: 1.3em;
font-weight: bold;
}
.openerp .oe_mail_msg .oe_mail_msg_title a:link,
.openerp .oe_mail_msg .oe_mail_msg_title a:visited {
.openerp .oe_mail_msg .oe_msg_title a:link,
.openerp .oe_mail_msg .oe_msg_title a:visited {
color: #4C4C4C;
text-decoration: none;
}
.openerp .oe_mail_msg .oe_mail_msg_body {
.openerp .oe_mail_msg .oe_msg_body {
margin-bottom: .5em;
text-align: justify;
}
.openerp .oe_mail_msg .oe_mail_msg_body pre {
.openerp .oe_mail_msg .oe_msg_body pre {
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
margin: 0px;
white-space: pre-wrap;
@@ -373,31 +380,31 @@
}
/* Message footer */
.openerp .oe_mail_msg .oe_mail_msg_footer {
.openerp .oe_mail_msg .oe_msg_footer {
color: #888;
}
.openerp .oe_mail_msg .oe_mail_msg_footer li {
.openerp .oe_mail_msg .oe_msg_footer li {
float: left;
margin-right: 3px;
}
.openerp .oe_mail_msg .oe_mail_msg_footer li:after {
.openerp .oe_mail_msg .oe_msg_footer li:after {
content: " · ";
}
.openerp .oe_mail_msg .oe_mail_msg_footer li:last-child:after {
.openerp .oe_mail_msg .oe_msg_footer li:last-child:after {
content: "";
}
/* Attachments list */
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
.openerp .oe_msg_content ul.oe_msg_attachments {
width: 100%;
margin: .5em 0 0 0;
padding: .5em 0;
list-style-position: inside;
}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments.oe_hidden {
.openerp .oe_msg_content ul.oe_msg_attachments.oe_hidden {
display: none;
}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
.openerp .oe_msg_content ul.oe_msg_attachments li {
float: none;
height: 20px;
line-height: 20px;
@@ -405,20 +412,28 @@
padding: 0;
list-style-type: square;
}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process {
.openerp .oe_msg_content ul.oe_msg_attachments .oe_upload_in_process {
float: right;
width: 200px;
height: 16px;
}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process div {
.openerp .oe_msg_content ul.oe_msg_attachments .oe_upload_in_process div {
float: left;
width: 38px;
height: 16px;
margin-right: 2px;
background: #66FF66;
}
.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
.openerp .oe_msg_content ul.oe_msg_attachments .oe_upload_in_process span {
color: #aaaaaa;
position: absolute;
}
/* ------------------------------------------------------------ */
/* Topbar button
/* ------------------------------------------------------------ */
.openerp .oe_topbar .oe_topbar_compose_full_email {
float: right;
margin: 3px 25px 0 0;
}
addons/mail/static/src/css/mail_compose_message.css
+12 -12
View File
@@ -2,11 +2,11 @@
/* Compose Message */
/* ------------------------------ */
.openerp .oe_mail_msg_content .oe_mail_compose_message_footer {
.openerp .oe_msg_content .oe_mail_compose_message_footer {
height: 24px;
}
.openerp .oe_mail_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
.openerp .oe_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
float: left;
}
@@ -98,7 +98,7 @@
font-size: 30px;
}
.openerp .oe_mail .oe_mail_msg_attachments input {
.openerp .oe_mail .oe_msg_attachments input {
visibility: hidden;
}
@@ -128,39 +128,39 @@
}
/* form_view: delete white background */
.openerp .oe_mail_msg_content div.oe_formview {
.openerp .oe_msg_content div.oe_formview {
background-color: transparent;
}
.openerp .oe_mail_msg_content div.oe_form_nosheet {
.openerp .oe_msg_content div.oe_form_nosheet {
margin: 0px;
}
.openerp .oe_mail_msg_content table.oe_form_group {
.openerp .oe_msg_content table.oe_form_group {
margin: 0px;
}
.openerp .oe_mail_msg_content table.oe_form_field,
.openerp .oe_mail_msg_content div.oe_form_field {
.openerp .oe_msg_content table.oe_form_field,
.openerp .oe_msg_content div.oe_form_field {
padding: 0px;
}
.openerp .oe_mail_msg_content td.oe_form_group_cell {
.openerp .oe_msg_content td.oe_form_group_cell {
vertical-align: bottom;
}
/* subject: change width */
.openerp .oe_mail_msg_content .oe_form .oe_form_field input[type='text'] {
.openerp .oe_msg_content .oe_form .oe_form_field input[type='text'] {
width: 472px;
}
/* body_html: cleditor */
.openerp .oe_mail_msg_content div.cleditorMain {
.openerp .oe_msg_content div.cleditorMain {
border: 1px solid #cccccc;
}
/* destination_partner_ids */
.openerp .oe_mail_msg_content div.text-core {
.openerp .oe_msg_content div.text-core {
height: 22px !important;
width: 472px;
}