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

fix stream css

Browse source
This commit is contained in:
danielgrippi 2012-02-27 19:08:37 -08:00
parent 1e518cbcff
commit 3d48dc4fb0
4 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
public/javascripts/app/templates/comment-stream.handlebars
View file

@ -10,23 +10,21 @@
<div class="comments"> </div> <div class="comments"> </div>
{{#if current_user}} {{#if loggedIn}}
<div class="comment no-border"> <div class="comment no-border media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}">
<div class="media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}"> {{#with current_user}}
{{#with current_user}} <a href="/people/{{guid}}" class="img">
<a href="/people/{{guid}}" class="img"> {{{personImage this}}}
{{{personImage this}}} </a>
</a> {{/with}}
{{/with}}
<div class="bd"> <div class="bd">
<form accept-charset="UTF-8" action="/posts/{{id}}/comments" class="new_comment" id="new_comment_on_{{id}}" method="post"> <form accept-charset="UTF-8" action="/posts/{{id}}/comments" class="new_comment" id="new_comment_on_{{id}}" method="post">
<textarea class="comment_box" id="comment_text_on_{{id}}" name="text" rows="2" placeholder="{{t "stream.comment"}}" /> <textarea class="comment_box" id="comment_text_on_{{id}}" name="text" rows="2" placeholder="{{t "stream.comment"}}" />
<div class="submit_button"> <div class="submit_button">
<input class="button creation" id="comment_submit_{{id}}" name="commit" type="submit" value="{{t "stream.comment"}}" /> <input class="button creation" id="comment_submit_{{id}}" name="commit" type="submit" value="{{t "stream.comment"}}" />
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

4
public/javascripts/app/templates/status-message.handlebars
View file

@ -15,8 +15,6 @@
{{/if}} {{/if}}
<div class="collapsible"> <div class="collapsible">
<p> {{{text}}}
{{{text}}}
</p>
{{{o_embed_html}}} {{{o_embed_html}}}
</div> </div>

5
public/javascripts/app/views.js
View file

@ -19,7 +19,10 @@ app.views.Base = Backbone.View.extend({
defaultPresenter : function(){ defaultPresenter : function(){
var modelJson = this.model ? this.model.toJSON() : {} var modelJson = this.model ? this.model.toJSON() : {}
return _.extend(modelJson, {current_user: app.currentUser.attributes}); return _.extend(modelJson, {
current_user : app.currentUser.attributes,
loggedIn : app.currentUser.authenticated()
});
}, },
render : function() { render : function() {

2
public/stylesheets/sass/application.sass
View file

@ -534,7 +534,7 @@ ul.as-selections
:border none :border none
.comment .comment
.media &.media
:margin :margin
:left 0 :left 0
:right 0 :right 0