stubbornella media and img dom structure FTW! major css deletion <3
This commit is contained in:
danielgrippi
parent
398ca3d97b
commit
e6e49bbf1f
14 changed files with 231 additions and 957 deletions
|
|
@ -3,17 +3,17 @@
|
|||
-# the COPYRIGHT file.
|
||||
|
||||
.stream_element{:id => person.id}
|
||||
.right
|
||||
= render :partial => 'people/relationship_action',
|
||||
:locals => { :person => person, :contact => contact,
|
||||
:current_user => current_user }
|
||||
.media
|
||||
%div{:style => "float:right;margin-top:2px;"}
|
||||
= render :partial => 'people/relationship_action',
|
||||
:locals => { :person => person, :contact => contact,
|
||||
:current_user => current_user }
|
||||
.img
|
||||
= person_image_link(person)
|
||||
|
||||
= person_image_link(person)
|
||||
|
||||
.content
|
||||
%span.from
|
||||
.bd
|
||||
=person_link(person)
|
||||
|
||||
.info
|
||||
= Diaspora::Taggable.format_tags(person.profile.tag_string)
|
||||
.info
|
||||
= Diaspora::Taggable.format_tags(person.profile.tag_string)
|
||||
|
||||
|
|
|
|||
|
|
@ -74,11 +74,5 @@
|
|||
%p
|
||||
#fileInfo
|
||||
|
||||
-if !aspect.nil? && aspect != :getting_started && current_user.person.has_photos?
|
||||
%br
|
||||
%br
|
||||
%p
|
||||
\...#{t('.or_select_one_existing', :photos => link_to(t('_photos'), person_photos_path(person))).html_safe}
|
||||
|
||||
#publisher_photo_upload
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ Feature: commenting
|
|||
When I focus the comment field
|
||||
And I fill in "text" with "is that a poodle?"
|
||||
And I press "Comment"
|
||||
Then I should see "is that a poodle?" within "li.comment div.content"
|
||||
And I should see "less than a minute ago" within "li.comment time"
|
||||
Then I should see "is that a poodle?" within ".comment"
|
||||
And I should see "less than a minute ago" within ".comment time"
|
||||
|
||||
Scenario: comment on a photo from the photo page
|
||||
When I sign in as "bob@bob.bob"
|
||||
|
|
@ -27,8 +27,8 @@ Feature: commenting
|
|||
And I focus the comment field
|
||||
And I fill in "text" with "hahahah"
|
||||
And I press "Comment"
|
||||
Then I should see "hahaha" within "li.comment div.content"
|
||||
And I should see "less than a minute ago" within "li.comment time"
|
||||
Then I should see "hahaha" within ".comment"
|
||||
And I should see "less than a minute ago" within ".comment time"
|
||||
|
||||
Scenario: comment on your own photo from the photo page
|
||||
When I sign in as "alice@alice.alice"
|
||||
|
|
@ -37,8 +37,8 @@ Feature: commenting
|
|||
And I focus the comment field
|
||||
And I fill in "text" with "hahahah"
|
||||
And I press "Comment"
|
||||
Then I should see "hahaha" within "li.comment div.content"
|
||||
And I should see "less than a minute ago" within "li.comment time"
|
||||
Then I should see "hahaha" within ".comment"
|
||||
And I should see "less than a minute ago" within ".comment time"
|
||||
|
||||
Scenario: delete a comment
|
||||
When I sign in as "bob@bob.bob"
|
||||
|
|
|
|||
|
|
@ -1,30 +1,32 @@
|
|||
{{#unless all_comments_loaded}}
|
||||
<ul class="show_comments {{#unless showExpandCommentsLink}} hidden {{/unless}}">
|
||||
<li>
|
||||
<div class="show_comments comment {{#unless showExpandCommentsLink}} hidden {{/unless}}">
|
||||
<div class="media">
|
||||
<a href="/posts/{{id}}/comments" class="toggle_post_comments">
|
||||
{{t "stream.more_comments" count=moreCommentsCount}}
|
||||
{{t "stream.more_comments" count=moreCommentsCount}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{/unless}}
|
||||
|
||||
<ul class="comments"> </ul>
|
||||
<div class="comments"> </div>
|
||||
|
||||
{{#if current_user}}
|
||||
<div class="new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}">
|
||||
<form accept-charset="UTF-8" action="/posts/{{id}}/comments" class="new_comment" id="new_comment_on_{{id}}" method="post">
|
||||
<div class="comment no-border">
|
||||
<div class="media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}">
|
||||
{{#with current_user}}
|
||||
<a href="/people/{{guid}}">
|
||||
<a href="/people/{{guid}}" class="img">
|
||||
<img src="{{avatar.small}}" class="avatar" />
|
||||
</a>
|
||||
{{/with}}
|
||||
|
||||
<p>
|
||||
<textarea class="comment_box" id="comment_text_on_{{id}}" name="text" rows="2" placeholder="{{t "stream.comment"}}" />
|
||||
</p>
|
||||
<div class="submit_button">
|
||||
<input class="button creation" id="comment_submit_{{id}}" name="commit" type="submit" value="{{t "stream.comment"}}" />
|
||||
<div class="bd">
|
||||
<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"}}" />
|
||||
<div class="submit_button">
|
||||
<input class="button creation" id="comment_submit_{{id}}" name="commit" type="submit" value="{{t "stream.comment"}}" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
@ -1,27 +1,28 @@
|
|||
<div class="right controls">
|
||||
<div class="media">
|
||||
|
||||
{{#if canRemove}}
|
||||
<a href="#" class="delete comment_delete" title="{{t "delete"}}">
|
||||
<img alt="Deletelabel" src="{{imageUrl "/images/deletelabel.png"}}" />
|
||||
<a/>
|
||||
<div class="controls">
|
||||
<a href="#" class="delete comment_delete" title="{{t "delete"}}">
|
||||
<img alt="Deletelabel" src="{{imageUrl "/images/deletelabel.png"}}" />
|
||||
<a/>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
<a href="/people/{{author.guid}}">
|
||||
<img src="{{author.avatar.small}}" class="avatar" />
|
||||
</a>
|
||||
<a href="/people/{{author.guid}}" class="img">
|
||||
<img src="{{author.avatar.small}}" class="avatar" />
|
||||
</a>
|
||||
|
||||
<div class="content">
|
||||
<span class="from">
|
||||
<a href="/people/{{author.guid}}">
|
||||
<div class="bd">
|
||||
<a href="/people/{{author.guid}}" class="author">
|
||||
{{author.name}}
|
||||
</a>
|
||||
</span>
|
||||
|
||||
<div class="collapsible">
|
||||
{{{text}}}
|
||||
</div>
|
||||
<div class="collapsible">
|
||||
{{{text}}}
|
||||
</div>
|
||||
|
||||
<div class="comment_info">
|
||||
<time class="timeago" datetime="{{created_at}}"/>
|
||||
<div class="info">
|
||||
<time class="timeago" datetime="{{created_at}}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<span class="post_scope">
|
||||
<span class="post_scope grey">
|
||||
{{#if public}}
|
||||
{{t "stream.public"}}
|
||||
{{else}}
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
via {{provider_display_name}}
|
||||
</strong>
|
||||
{{/if}}
|
||||
–
|
||||
</span>
|
||||
–
|
||||
|
||||
<a href="#" class="like_action" rel='nofollow'>
|
||||
{{#if user_like}}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,28 @@
|
|||
{{#if likes_count}}
|
||||
<img alt="Heart" src="/images/icons/pin.png" />
|
||||
{{#unless likes.length}}
|
||||
{{#if hasLikes}}
|
||||
<div class="comment">
|
||||
<div class="media">
|
||||
<span class="img">
|
||||
<img alt="Heart" src="/images/icons/pin.png" />
|
||||
</span>
|
||||
|
||||
<a href="#" class="expand_likes">
|
||||
{{t "stream.likes" count=likes_count}}
|
||||
</a>
|
||||
|
||||
{{else}}
|
||||
|
||||
<span class="likes_list">
|
||||
|
||||
{{#each likes}}
|
||||
{{#with attributes.author}}
|
||||
<a href="/people/{{guid}}">
|
||||
<img src="{{avatar.small}}" class="avatar" title="{{name}}"/>
|
||||
<div class="bd">
|
||||
{{#unless likes.length}}
|
||||
<a href="#" class="expand_likes">
|
||||
{{t "stream.likes" count=likes_count}}
|
||||
</a>
|
||||
{{/with}}
|
||||
{{/each}}
|
||||
|
||||
</span>
|
||||
{{else}}
|
||||
|
||||
{{/unless}}
|
||||
{{#each likes}}
|
||||
{{#with attributes.author}}
|
||||
<a href="/people/{{guid}}">
|
||||
<img src="{{avatar.small}}" class="avatar micro" title="{{name}}"/>
|
||||
</a>
|
||||
{{/with}}
|
||||
{{/each}}
|
||||
|
||||
{{/unless}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,5 @@
|
|||
{{/each}}
|
||||
{{/if}}
|
||||
|
||||
<div class="collapsible">
|
||||
{{{text}}}
|
||||
{{{o_embed_html}}}
|
||||
</div>
|
||||
{{{text}}}
|
||||
{{{o_embed_html}}}
|
||||
|
|
|
|||
|
|
@ -1,36 +1,37 @@
|
|||
<div class="right controls">
|
||||
{{#if authorIsCurrentUser}}
|
||||
<a href="#" rel=nofollow>
|
||||
<img src="/images/icons/ignoreuser.png" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" />
|
||||
<img src="/images/deletelabel.png" class="delete control_icon hide_post" title="{{t "stream.hide"}}" />
|
||||
</a>
|
||||
{{else}}
|
||||
<a href="#" rel=nofollow>
|
||||
<img src="/images/deletelabel.png" class="delete control_icon remove_post" title="{{t "delete"}}" />
|
||||
</a>
|
||||
<div class="media">
|
||||
|
||||
{{#if current_user}}
|
||||
<div class="controls">
|
||||
{{#if authorIsCurrentUser}}
|
||||
<a href="#" rel=nofollow>
|
||||
<img src="/images/icons/ignoreuser.png" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" />
|
||||
</a>
|
||||
<a href="#" rel=nofollow>
|
||||
<img src="/images/deletelabel.png" class="delete control_icon hide_post" title="{{t "stream.hide"}}" />
|
||||
</a>
|
||||
{{else}}
|
||||
<a href="#" rel=nofollow>
|
||||
<img src="/images/deletelabel.png" class="delete control_icon remove_post" title="{{t "delete"}}" />
|
||||
</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="sm_body">
|
||||
{{#with author}}
|
||||
<a href="/people/{{guid}}">
|
||||
<a href="/people/{{guid}}" class="img">
|
||||
<img src="{{avatar.small}}" class="avatar" />
|
||||
</a>
|
||||
{{/with}}
|
||||
|
||||
<div class="content">
|
||||
<div class="bd">
|
||||
<div>
|
||||
{{#with author}}
|
||||
<a href="/people/{{guid}}" class="author">
|
||||
{{name}}
|
||||
</a>
|
||||
{{/with}}
|
||||
|
||||
<div class="post_initial_info">
|
||||
<span class="from">
|
||||
{{#with author}}
|
||||
<a href="/people/{{guid}}">
|
||||
{{name}}
|
||||
</a>
|
||||
{{/with}}
|
||||
</span>
|
||||
|
||||
<span class="details">
|
||||
<span class="details grey">
|
||||
-
|
||||
<a href="/posts/{{id}}">
|
||||
<time class="timeago" datetime="{{created_at}}" />
|
||||
|
|
@ -53,7 +54,7 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="post-content"> </div>
|
||||
<div class="post-content collapsible"> </div>
|
||||
|
||||
{{#if nsfw}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ app.views.CommentStream = app.views.Base.extend({
|
|||
// on post ownership in the Comment view.
|
||||
comment.set({parent : this.model.toJSON()})
|
||||
|
||||
this.$("ul.comments").append(new app.views.Comment({
|
||||
this.$(".comments").append(new app.views.Comment({
|
||||
model: comment
|
||||
}).render().el);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ app.views.Comment = app.views.Content.extend({
|
|||
|
||||
templateName: "comment",
|
||||
|
||||
tagName : "li",
|
||||
|
||||
className : "comment",
|
||||
|
||||
events : {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ app.views.LikesInfo = app.views.StreamObject.extend({
|
|||
|
||||
templateName : "likes-info",
|
||||
|
||||
className : "likes_container",
|
||||
|
||||
events : {
|
||||
"click .expand_likes" : "showAvatars"
|
||||
},
|
||||
|
|
@ -11,7 +9,14 @@ app.views.LikesInfo = app.views.StreamObject.extend({
|
|||
tooltipSelector : ".avatar",
|
||||
|
||||
presenter : function() {
|
||||
return _.extend(this.defaultPresenter(), {likes : this.model.likes.models})
|
||||
return _.extend(this.defaultPresenter(), {
|
||||
likes : this.model.likes.models,
|
||||
hasLikes : this.hasLikes()
|
||||
})
|
||||
},
|
||||
|
||||
hasLikes : function() {
|
||||
return this.model.likes.models.length > 0
|
||||
},
|
||||
|
||||
showAvatars : function(evt){
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,9 +3,9 @@ describe("app.views.LikesInfo", function(){
|
|||
loginAs({id : -1, name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}});
|
||||
|
||||
Diaspora.I18n.loadLocale({stream : {
|
||||
likes : {
|
||||
zero : "<%= count %> Likes",
|
||||
one : "<%= count %> Like"}
|
||||
pins : {
|
||||
zero : "<%= count %> Pins",
|
||||
one : "<%= count %> Pin"}
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -18,7 +18,9 @@ describe("app.views.LikesInfo", function(){
|
|||
it("displays a the like count if it is above zero", function() {
|
||||
this.view.render();
|
||||
|
||||
expect($(this.view.el).text()).toContain(Diaspora.I18n.t('stream.likes', {count : this.view.model.get("likes_count")}))
|
||||
console.log($(this.view.el))
|
||||
|
||||
expect($(this.view.el).text()).toContain(Diaspora.I18n.t('stream.pins', {count : this.view.model.get("likes_count")}))
|
||||
})
|
||||
|
||||
it("does not display the like count if it is zero", function() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue