nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve reshared posts

Browse source
This commit is contained in:
Steffen van Bergerem 2014-01-31 01:00:09 +01:00
parent 318d190404
commit 97f1c286f4
7 changed files with 110 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -3,6 +3,7 @@
## Refactor ## Refactor
* Drop number of followers from tags page [#4717](https://github.com/diaspora/diaspora/issues/4717) * Drop number of followers from tags page [#4717](https://github.com/diaspora/diaspora/issues/4717)
* Remove some unused beta code [#4738](https://github.com/diaspora/diaspora/issues/4738) * Remove some unused beta code [#4738](https://github.com/diaspora/diaspora/issues/4738)
* Style improvements for SPV, use original author's avatar for reshares [#4754](https://github.com/diaspora/diaspora/issue/4754)
## Bug fixes ## Bug fixes
* Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280) * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)

1
app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
View file

@ -1,6 +1,5 @@
app.views.SinglePostActions = app.views.Feedback.extend({ app.views.SinglePostActions = app.views.Feedback.extend({
templateName: "single-post-viewer/single-post-actions", templateName: "single-post-viewer/single-post-actions",
tooltipSelector: "time",
events: function() { events: function() {
return _.defaults({ return _.defaults({

1
app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
View file

@ -1,5 +1,6 @@
app.views.SinglePostContent = app.views.Base.extend({ app.views.SinglePostContent = app.views.Base.extend({
templateName: 'single-post-viewer/single-post-content', templateName: 'single-post-viewer/single-post-content',
tooltipSelector: "time, .post_scope",
subviews : { subviews : {
"#single-post-actions" : "singlePostActionsView", "#single-post-actions" : "singlePostActionsView",

48
app/assets/stylesheets/single-post-view.css.scss
View file

@ -4,14 +4,15 @@
#single-post-content { #single-post-content {
#head { #head {
padding-bottom: 5px; padding-bottom: 10px;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
#post-info { #post-info {
.author{ color: $grey; }
.info { .info {
color: $text-grey; color: lighten($text-grey,10%);
font-size: 12px; font-size: 12px;
.post-time { color: $grey; } .post-time a { color: $grey; }
i { margin-right: 5px; } .post_scope { margin-right: 5px; }
.status-message-location { .status-message-location {
padding-top: 2px; padding-top: 2px;
line-height: 14px; line-height: 14px;
@ -23,25 +24,38 @@
.bd { .bd {
padding-left: 10px; padding-left: 10px;
} }
.retweet { }
color: $grey; .reshare {
line-height: 14px; border-top: 1px solid lighten($border-grey,5%);
padding-top: 2px; padding-top: 10px;
i { margin-top: 10px;
}
#reshare-info {
line-height: 15px;
i.retweet {
color: $text-dark-grey;
font-size: 28px; font-size: 28px;
line-height: 28px; line-height: 30px;
margin-left: 8px;
margin-right: 8px;
}
.post-time a {
color: $grey;
display: block;
font-size: 12px;
} }
.post-time { display: block; }
.avatar { .avatar {
height: 28px; height: 30px;
width: 28px; width: 30px;
}
} }
.img { margin-right: 10px; }
} }
#single-post-actions { #single-post-actions {
color: $text-grey; padding-right: 5px;
font-size: 12px; i {
i { line-height: 50px; } font-size: 28px;
line-height: 30px;
}
i.comment:hover { i.comment:hover {
color: #424242; color: #424242;
} }

2
app/assets/templates/feedback_tpl.jst.hbs
View file

@ -7,7 +7,7 @@
{{#if provider_display_name}} {{#if provider_display_name}}
<strong> <strong>
via {{provider_display_name}} {{t "stream.via" provider=provider_display_name}}
</strong> </strong>
{{/if}} {{/if}}
– –

42
app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
View file

@ -1,4 +1,5 @@
<div id='head' class='row-fluid'> <div id='head' class='row-fluid'>
<div class='row-fluid'>
<div id='post-info' class='span8'> <div id='post-info' class='span8'>
<div class="img pull-left"> <div class="img pull-left">
{{#if root}} {{#if root}}
@ -22,49 +23,64 @@
</span> </span>
<div class='info'> <div class='info'>
<span class='post_scope'>
{{#if public}} {{#if public}}
<i class="entypo globe small" data-original-title="{{t "stream.public"}}"></i> <span class='post_scope' title="{{t "stream.public"}}">
{{else}} <i class="entypo globe small"></i>
<i class="entypo lock small" data-original-title="{{t "stream.limited"}}"></i>
{{/if}}
</span> </span>
{{else}}
<span class='post_scope' title="{{t "stream.limited"}}">
<i class="entypo lock small"></i>
</span>
{{/if}}
<span class="post-time"> <span class="post-time">
{{#if root}} {{#if root}}
<a href="/posts/{{root.id}}">
<time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" /> <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
</a>
{{else}} {{else}}
<a href="/posts/{{id}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
{{/if}} {{/if}}
</span> </span>
{{#if root}} {{#if root}}
{{#if root.provider_display_name}} {{#if root.provider_display_name}}
via {{root.provider_display_name}} {{t "stream.via" provider=root.provider_display_name}}
{{/if}} {{/if}}
{{else}} {{else}}
{{#if provider_display_name}} {{#if provider_display_name}}
via {{provider_display_name}} {{t "stream.via" provider=provider_display_name}}
{{/if}} {{/if}}
{{/if}} {{/if}}
<div class='status-message-location' /> <div class='status-message-location' />
</div>
</div>
</div>
{{#unless root}}
<div id='single-post-actions' class='span4' />
{{/unless}}
</div>
{{#if root}} {{#if root}}
<div class='retweet'> <div class='row-fluid reshare'>
<div class='pull-left' id='reshare-info'>
<i class='entypo retweet small pull-left'></i> <i class='entypo retweet small pull-left'></i>
<div class="img pull-left"> <div class="img pull-left">
{{{personImage author 'small'}}} {{{personImage author 'small'}}}
</div> </div>
<span class="author">
{{#linkToPerson author}} {{#linkToPerson author}}
{{name}} {{name}}
{{/linkToPerson}} {{/linkToPerson}}
</span>
<span class="post-time"> <span class="post-time">
<a href="/posts/{{id}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
</span> </span>
</div> </div>
<div id='single-post-actions' class='pull-right' />
</div>
{{/if}} {{/if}}
</div>
</div>
</div>
<div id='single-post-actions' class='span4'>
</div>
</div> </div>
<div id='body' class='row-fluid'> <div id='body' class='row-fluid'>
<div id='real-post-content' class='span12'> <div id='real-post-content' class='span12'>

1
config/locales/javascript/javascript.en.yml
View file

@ -111,6 +111,7 @@ en:
hide_nsfw_posts: "Hide #nsfw posts" hide_nsfw_posts: "Hide #nsfw posts"
follow: "Follow" follow: "Follow"
unfollow: "Unfollow" unfollow: "Unfollow"
via: "via <%= provider %>"
likes: likes:
zero: "<%= count %> Likes" zero: "<%= count %> Likes"