restyling of wall and chatter

bzr revid: mit@openerp.com-20120410161424-pdgx77dn0o7t31am
This commit is contained in:
Minh Tran
2012-04-10 18:14:24 +02:00
parent a936f27674
commit 6d84bb7899
3 changed files with 53 additions and 27 deletions
+44 -21
View File
@@ -4,17 +4,23 @@
div.oe_mail_wall {
overflow: auto;
padding: 5px;
padding: 0;
background: white;
}
div.oe_mail_wall_search {
width: 55%;
/*div.oe_mail_wall_search {*/
/*width: 550px;*/
/*}*/
.oe_mail_wall_button_comment {
float: right;
}
/* 2 columns view */
div.oe_mail_wall_left {
float: left;
width: 65%;
width: 560px;
margin: 8px;
}
div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
width: 34%;
}
.oe_mail_wall_threads {
margin-top: 8px;
}
.oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
height: 20px;
padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
.oe_mail_recthread {
overflow: auto;
padding: 5px 5px 5px 5px;
}
/* Left-side CSS */
.oe_mail_recthread_actions {
margin-bottom: 10px;
margin-bottom: 8px;
}
.oe_mail_recthread_followers {
margin-bottom: 10px;
margin-bottom: 8px;
}
.oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
.oe_mail_recthread_right {
float: right;
width: 25%;
margin-right: 5%;
width: 240px;
}
.oe_mail_button_follow, .oe_mail_button_unfollow {
width: 120px;
/*width: 120px;*/
}
.oe_mail_button_followers {
display: inline;
width: 120px;
}
.oe_mail_followers h4 {
margin: 0 0 8px;
display: inline-block;
width: 240px;
}
/* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
div.oe_mail_thread_display {
white-space: normal;
margin-bottom: 5px;
/*margin-bottom: 5px;*/
}
div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
padding: 1px;
}
.notification, .email {
background: #E0E0E0;
.notification, .comment {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
border-radius: 4px;
}
.comment {
padding: 4px;
.oe_mail_thread_msg > .comment {
background: #eee;
}
.oe_mail_thread_subthread .comment {
background: white;
}
.notification {
background: #eee;
}
.notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
border-radius: 3px;
}
.oe_mail_wall .oe_mail_wall_act textarea {
width: 550px;
}
textarea.oe_mail {
height: 60px;
}
input.oe_mail:focus, textarea.oe_mail:focus {
outline: 0;
border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
font-weight: bold;
}
.oe_mail_msg_reply, .oe_mail_msg_delete {
margin-right: 4px;
}
a.oe_mail_oe_intlink {
color: #8786b7;
}
+1 -1
View File
@@ -638,7 +638,7 @@ openerp.mail = function(session) {
load_search_view: function (view_id, defaults, hidden) {
var self = this;
this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
return $.when(search_view_loaded).then(function () {
self.searchview.on_search.add(self.do_searchview_search);
});
+8 -5
View File
@@ -2,13 +2,17 @@
<template>
<div t-name="Wall" class="oe_mail_wall">
<div class="oe_mail_wall_search">
<div class="oe_view_manager_header">
<div class="oe_view_manager_row">
<h2 class="oe_view_title">All Feeds</h2>
</div>
</div>
<div class="oe_mail_wall_left">
<div class="oe_mail_wall_act">
<textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
<textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
<button class="oe_mail_wall_button_comment" type="button">Post comment</button>
</div>
<div class="oe_clear"></div>
<div class="oe_mail_wall_threads">
</div>
<div class="oe_mail_wall_more">
@@ -65,7 +69,6 @@
<t t-name="NoteDisplay">
<p class="oe_mail_msg">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
<span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
<t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
<br />
@@ -73,9 +76,9 @@
<a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
on <t t-raw="record.date"/>
</span>
<t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
<t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
<t t-if="display['show_delete']">
<t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
<t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
</t>
<t t-if="display['show_hide']">
<t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>