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

[IMP] cleaning style

Browse Source 
bzr revid: fp@tinyerp.com-20140323181740-ox6no7z5znv1kz11
This commit is contained in:
Fabien Pinckaers
2014-03-23 19:17:40 +01:00
parent 55ff4f21da
commit 3fb12be332
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_blog/static/src/css/website_blog.css
+8 -2
View File
@@ -9,6 +9,12 @@
display: block;
}
.read_width {
max-width: 700px;
margin-left: auto;
margin-right: auto;
}
.blog_content a.oe_mail_expand:after {
content: " →";
}
@@ -44,8 +50,8 @@ p.post-meta {
}
.cover_footer {
min-height: 200px;
height: 50vh;
min-height: 350px;
height: 65vh;
cursor: pointer;
}
addons/website_blog/static/src/css/website_blog.sass
+7 -2
View File
@@ -9,6 +9,11 @@
&:first-of-type
display: block
.read_width
max-width: 700px
margin-left: auto
margin-right: auto
.blog_content
a.oe_mail_expand:after
content: " →"
@@ -39,8 +44,8 @@ p.post-meta
font-weight: bold
.cover_footer
min-height : 200px
height: 50vh
min-height : 350px
height: 65vh
cursor: pointer
/*Inline Discussion
addons/website_blog/static/src/js/website_blog.js
+1 -1
View File
@@ -24,7 +24,7 @@ $(document).ready(function() {
return false;
}
var content = $(".js_discuss");
var content = $(".js_discuss #blog_content p");
if(content){
$('#discussions_wrapper').empty();
new openerp.website.blog_discussion({'content' : content});
addons/website_blog/static/src/xml/website_blog.inline.discussion.xml
+5 -10
View File
@@ -2,19 +2,14 @@
<templates id="template" xml:space="preserve">
<t t-name="website.blog_discussion.comment">
<li class="media">
<div class="pull-left">
<img class="media-object img-circle" t-att-src="res.author_image" style="width: 30px;"/>
</div>
<div class="media-body">
<img class="media-object pull-left img-circle" t-att-src="res.author_image" style="width: 30px; margin-right: 5px;"/>
<div class="media-body">
<h5 class="media-heading">
<small><span t-esc='res.author_name'/> on <span t-esc='res.date'/></small>
</h5>
</div>
<small t-field='res.author_name'/>
<div t-field='res.body'/>
</div>
</li>
<li>
<h6 t-esc='res.body'/>
</li>
<hr class="mb0 mt0"/>
</t>
<t t-name="website.blog_discussion.popover">
<div class="mycontent hidden">
addons/website_blog/views/website_blog_templates.xml
+20 -18
View File
@@ -196,19 +196,17 @@
</div>
<section id="comments" class="container">
<ul class="media-list" id="comments-list">
<ul class="media-list read_width" id="comments-list">
<li t-foreach="blog_post.website_message_ids" t-as="message" class="media">
<span class="pull-left">
<img class="media-object img img-circle" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(message.author_id.id)"/>
</span>
<div class="media-body">
<img class="media-object pull-left" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(message.author_id.id)" style="width: 50px; margin-right: 10px;"/>
<div class="media-body">
<t t-call="website.publish_short">
<t t-set="object" t-value="message"/>
</t>
<h5 class="media-heading">
<span t-field="message.author_id"/> <small>on <span t-field="message.date"/></small>
</h5>
<div t-field="message.body"/>
</div>
<t t-call="website.publish_short">
<t t-set="object" t-value="message"/>
</t>
<strong t-field="message.author_id"/> <span class="text-muted">on <span t-field="message.date"/></span>
<div t-field="message.body"/>
</div>
</li>
</ul>
@@ -257,17 +255,21 @@
inherit_option_id="website_blog.blog_post_complete"
groups="website_mail.group_comment">
<xpath expr="//ul[@id='comments-list']" position="before">
<section class="mb32 css_editable_mode_hidden">
<section class="mb32 read_width css_editable_mode_hidden">
<hr/>
<form id="comment" t-attf-action="/blogpost/comment" method="POST">
<input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
<img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
<div class="pull-left mb32" style="width: 75%%">
<textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
<button type="submit" class="btn btn-primary mt8">Post</button>
<div class="media">
<span class="pull-left">
<img class="img img-circle media-object" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)"/>
</span>
<div class="media-body">
<input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
<textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
<button type="submit" class="btn btn-primary mt8">Post</button>
</div>
</div>
</form>
</section>
<div class="clearfix"/>
</xpath>
</template>