From 7f4af0359f82e1590579c99cb1a95b4b10f1d558 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Fri, 27 Apr 2012 20:45:26 -0700
Subject: [PATCH] add bootstrap tooltips for great justice (and clarity) [ci
skip]
---
app/assets/javascripts/app/pages/profile.js | 2 ++
.../javascripts/app/views/profile_info_view.js | 2 ++
app/assets/stylesheets/new_styles/_canvas.scss | 16 ++++++++++------
app/assets/templates/post-viewer.jst.hbs | 1 -
app/assets/templates/profile-info.jst.hbs | 2 +-
app/assets/templates/profile.jst.hbs | 8 ++++----
app/assets/templates/small-frame.jst.hbs | 4 +++-
spec/javascripts/app/pages/profile_spec.js | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js
index 33c9f88f65..02b353d24e 100644
--- a/app/assets/javascripts/app/pages/profile.js
+++ b/app/assets/javascripts/app/pages/profile.js
@@ -15,6 +15,8 @@ app.pages.Profile = app.views.Base.extend({
"click #edit-mode-toggle" : "toggleEdit"
},
+ tooltipSelector : "*[rel=tooltip]",
+
personGUID : null,
editMode : false,
diff --git a/app/assets/javascripts/app/views/profile_info_view.js b/app/assets/javascripts/app/views/profile_info_view.js
index 8fcc3bceda..0b2fb95746 100644
--- a/app/assets/javascripts/app/views/profile_info_view.js
+++ b/app/assets/javascripts/app/views/profile_info_view.js
@@ -1,6 +1,8 @@
app.views.ProfileInfo = app.views.Base.extend({
templateName : "profile-info",
+ tooltipSelector : "*[rel=tooltip]",
+
initialize : function(){
this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted
}
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index b19c665bdd..5f99bc2f1a 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -147,15 +147,19 @@ body {
width : 29px;
}
+ .timestamp,
.permalink {
- cursor : pointer;
- position : absolute;
- right : 10px;
+ margin : 1px 7px;
+ }
+
+ .timestamp {
+ float : left;
margin-top : 2px;
+ }
- &:hover {
- background-color : #ddd;
- }
+ .permalink {
+ cursor : pointer;
+ float : right;
}
}
diff --git a/app/assets/templates/post-viewer.jst.hbs b/app/assets/templates/post-viewer.jst.hbs
index 5fddd6ef6b..a34e1a3e3a 100644
--- a/app/assets/templates/post-viewer.jst.hbs
+++ b/app/assets/templates/post-viewer.jst.hbs
@@ -13,7 +13,6 @@
</span>
</a>
-
<div id="post-content"> </div>
<div id="post-nav"> </div>
<div id="post-interactions"> </div>
\ No newline at end of file
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index cdb6f3f3ce..5b3aa27b43 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -37,7 +37,7 @@
{{#if isOwnProfile}}
<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>
</a>
{{/if}}
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index 5aea788bb5..a066fd645b 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -15,11 +15,11 @@
<section id="profile-controls">
{{#if isOwnProfile}}
- <a href="#composer" title="New Post" class="control small" rel="facebox">
- <img src='{{imageUrl "buttons/pub@2x.png"}}' />
+ <a href="#composer" class="control small" rel="facebox">
+ <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
</a>
- <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small">
- <img src='{{imageUrl "buttons/edit@2x.png"}}' />
+ <a href="#" id="edit-mode-toggle" class="control small">
+ <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
</a>
{{/if}}
</section>
diff --git a/app/assets/templates/small-frame.jst.hbs b/app/assets/templates/small-frame.jst.hbs
index ce5370e795..4ce198356b 100644
--- a/app/assets/templates/small-frame.jst.hbs
+++ b/app/assets/templates/small-frame.jst.hbs
@@ -35,11 +35,13 @@
{{/linkToPerson}}
{{/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-retweet"></i> {{reshares_count}}
<i class="icon-comment"></i> {{comments_count}}
- <i class="icon-share permalink"></i>
</div>
</div>
diff --git a/spec/javascripts/app/pages/profile_spec.js b/spec/javascripts/app/pages/profile_spec.js
index 175ed7e780..162dfa26b2 100644
--- a/spec/javascripts/app/pages/profile_spec.js
+++ b/spec/javascripts/app/pages/profile_spec.js
@@ -44,7 +44,7 @@ describe("app.pages.Profile", function(){
// will fix this in the next commit.
// spyOn(this.page, "isOwnProfile").andReturn(false)
// this.page.render()
-// expect(this.page.$("#profile-controls .control").length).toBe(1)
+// expect(this.page.$("#follow .control").length).toBe(1)
})
})
--
GitLab