Skip to content
Extraits de code Groupes Projets
Valider 7f4af035 rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

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

parent 889b86f9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -15,6 +15,8 @@ app.pages.Profile = app.views.Base.extend({ ...@@ -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,
......
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
} }
......
...@@ -147,15 +147,19 @@ body { ...@@ -147,15 +147,19 @@ body {
width : 29px; width : 29px;
} }
.timestamp,
.permalink { .permalink {
cursor : pointer; margin : 1px 7px;
position : absolute; }
right : 10px;
.timestamp {
float : left;
margin-top : 2px; margin-top : 2px;
}
&:hover { .permalink {
background-color : #ddd; cursor : pointer;
} float : right;
} }
} }
......
...@@ -13,7 +13,6 @@ ...@@ -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>
\ No newline at end of file
...@@ -37,7 +37,7 @@ ...@@ -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}}
......
...@@ -15,11 +15,11 @@ ...@@ -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>
......
...@@ -35,11 +35,13 @@ ...@@ -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>
...@@ -44,7 +44,7 @@ describe("app.pages.Profile", function(){ ...@@ -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)
}) })
}) })
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter