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

DG MS; added interactions & permalink in the new stream [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-05-22 15:47:03 -07:00
parent 2e52def47a
commit 20360b5cc5
5 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/views/post/stream_frame.js
View file

@ -4,12 +4,15 @@ app.views.Post.StreamFrame = app.views.Base.extend({
templateName : "stream-frame", templateName : "stream-frame",
subviews : { subviews : {
".small-frame" : "smallFrameView" ".small-frame" : "smallFrameView",
'.stream-frame-feedback' : 'feedbackView'
}, },
initialize : function(options) { initialize : function(options) {
this.stream = options.stream this.stream = options.stream
this.smallFrameView = new app.views.Post.SmallFrame({model : this.model, stream: this.stream}) this.smallFrameView = new app.views.Post.SmallFrame({model : this.model})
this.feedbackView = new app.views.FeedbackActions({ model: this.model })
}, },
events : _.extend({ events : _.extend({

2
app/assets/javascripts/app/views/post/stream_interactions_view.js
View file

@ -2,7 +2,6 @@ app.views.StreamInteractions = app.views.Base.extend({
id : "post-info", id : "post-info",
subviews:{ subviews:{
".feedback" : "feedback",
".comments" : "comments", ".comments" : "comments",
".new-comment" : "newCommentView" ".new-comment" : "newCommentView"
}, },
@ -15,7 +14,6 @@ app.views.StreamInteractions = app.views.Base.extend({
this.render() this.render()
}, this)); }, this));
this.feedback = new app.views.FeedbackActions({ model: model })
this.comments = new app.views.PostViewerReactions({ model: model.interactions }) this.comments = new app.views.PostViewerReactions({ model: model.interactions })
this.newCommentView = new app.views.PostViewerNewComment({ model : model }) this.newCommentView = new app.views.PostViewerNewComment({ model : model })
} }

7
app/assets/stylesheets/new_styles/_canvas.scss
View file

@ -387,9 +387,16 @@
.stream-frame { .stream-frame {
margin-bottom : 40px; margin-bottom : 40px;
.stream-frame-feedback {
float : right;
margin-top : 8px;
}
.canvas-frame {
.info { .info {
display : none; display : none;
} }
}
/* a media box object */ /* a media box object */
.author { .author {

17
app/assets/stylesheets/new_styles/_interactions.scss
View file

@ -227,6 +227,7 @@
} }
} }
.permalink-wrapper,
#user-controls { #user-controls {
height: 30px; height: 30px;
@ -236,10 +237,9 @@
width: 27px; width: 27px;
} }
.label { a {
@include opacity(0.6); @include opacity(0.6);
@include transition(opacity, 0.3s); @include transition(opacity, 0.3s);
@include box-shadow(0, 0, 2px, rgba(255,255,255,0.9));
position: relative; position: relative;
@ -257,9 +257,13 @@
margin: 0; margin: 0;
} }
background-color: #000;
color: #fff; color: #fff;
&.label {
@include box-shadow(0, 0, 2px, rgba(255,255,255,0.9));
background-color: #000;
}
&.comment { &.comment {
padding-right: 5px; padding-right: 5px;
margin-right: 0; margin-right: 0;
@ -326,3 +330,10 @@
padding : 7px; padding : 7px;
} }
} }
.permalink-wrapper {
float : right;
margin-top : 9px;
margin-right : -5px;
margin-left : 4px;
}

7
app/assets/templates/stream-frame.jst.hbs
View file

@ -1,3 +1,10 @@
<div class="permalink-wrapper info">
<a href="/p/{{guid}}">
<i class="icon-zoom-in icon-white"></i>
</a>
</div>
<div class='stream-frame-feedback'></div>
<div class="media author"> <div class="media author">
{{#linkToPerson author}} {{#linkToPerson author}}
<div class="img"> <div class="img">