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

add bootstrap tooltips for great justice (and clarity) [ci skip]

Browse source
This commit is contained in:
danielgrippi 2012-04-27 20:45:26 -07:00
parent 889b86f9cb
commit 7f4af0359f
8 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/pages/profile.js
View file

@ -15,6 +15,8 @@ app.pages.Profile = app.views.Base.extend({
"click #edit-mode-toggle" : "toggleEdit" "click #edit-mode-toggle" : "toggleEdit"
}, },
tooltipSelector : "*[rel=tooltip]",
personGUID : null, personGUID : null,
editMode : false, editMode : false,

2
app/assets/javascripts/app/views/profile_info_view.js
View file

@ -1,6 +1,8 @@
app.views.ProfileInfo = app.views.Base.extend({ app.views.ProfileInfo = app.views.Base.extend({
templateName : "profile-info", templateName : "profile-info",
tooltipSelector : "*[rel=tooltip]",
initialize : function(){ initialize : function(){
this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted
} }

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

@ -147,15 +147,19 @@ body {
width : 29px; width : 29px;
} }
.timestamp,
.permalink {
margin : 1px 7px;
}
.timestamp {
float : left;
margin-top : 2px;
}
.permalink { .permalink {
cursor : pointer; cursor : pointer;
position : absolute; float : right;
right : 10px;
margin-top : 2px;
&:hover {
background-color : #ddd;
}
} }
} }

1
app/assets/templates/post-viewer.jst.hbs
View file

@ -13,7 +13,6 @@
</span> </span>
</a> </a>
<div id="post-content"> </div> <div id="post-content"> </div>
<div id="post-nav"> </div> <div id="post-nav"> </div>
<div id="post-interactions"> </div> <div id="post-interactions"> </div>

2
app/assets/templates/profile-info.jst.hbs
View file

@ -37,7 +37,7 @@
{{#if isOwnProfile}} {{#if isOwnProfile}}
<span class="divider">•</span> <span class="divider">•</span>
<a href="/profile/edit" title="Edit Profile" style="margin-left:2px;"> <a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;">
<i class="icon-cog"></i> <i class="icon-cog"></i>
</a> </a>
{{/if}} {{/if}}

8
app/assets/templates/profile.jst.hbs
View file

@ -15,11 +15,11 @@
<section id="profile-controls"> <section id="profile-controls">
{{#if isOwnProfile}} {{#if isOwnProfile}}
<a href="#composer" title="New Post" class="control small" rel="facebox"> <a href="#composer" class="control small" rel="facebox">
<img src='{{imageUrl "buttons/pub@2x.png"}}' /> <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
</a> </a>
<a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small"> <a href="#" id="edit-mode-toggle" class="control small">
<img src='{{imageUrl "buttons/edit@2x.png"}}' /> <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
</a> </a>
{{/if}} {{/if}}
</section> </section>

4
app/assets/templates/small-frame.jst.hbs
View file

@ -35,11 +35,13 @@
{{/linkToPerson}} {{/linkToPerson}}
{{/if}} {{/if}}
<i class="icon-time timestamp" title="{{created_at}}" rel="tooltip"></i>
<i class="icon-share permalink" title="View Post" rel="tooltip"></i>
<i class="icon-heart"></i> {{likes_count}} <i class="icon-heart"></i> {{likes_count}}
<i class="icon-retweet"></i> {{reshares_count}} <i class="icon-retweet"></i> {{reshares_count}}
<i class="icon-comment"></i> {{comments_count}} <i class="icon-comment"></i> {{comments_count}}
<i class="icon-share permalink"></i>
</div> </div>
</div> </div>

2
spec/javascripts/app/pages/profile_spec.js
View file

@ -44,7 +44,7 @@ describe("app.pages.Profile", function(){
// will fix this in the next commit. // will fix this in the next commit.
// spyOn(this.page, "isOwnProfile").andReturn(false) // spyOn(this.page, "isOwnProfile").andReturn(false)
// this.page.render() // this.page.render()
// expect(this.page.$("#profile-controls .control").length).toBe(1) // expect(this.page.$("#follow .control").length).toBe(1)
}) })
}) })