Commit 8c6f3bdd authored by danielvincent's avatar danielvincent

added diaspora handle to home page with help text. added email address to account settings page.

parent 857a4b5f
......@@ -180,4 +180,8 @@ module ApplicationHelper
@@youtube_title_cache[id] = ret;
return ret
end
def info_text(text)
"<span class='what_is_this' title='#{text}'>?</span>".html_safe
end
end
......@@ -3,8 +3,12 @@
-# the COPYRIGHT file.
.span-24.last
%h2
%h2{:style => "position:relative;"}
Home
.right
%span.description
= current_user.diaspora_handle
= info_text("This is your diaspora handle. Like an email address, you can give this to people to reach you.")
.span-15.last
= render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
......@@ -16,7 +20,6 @@
#pagination
= will_paginate @posts
.span-8.prepend-1.last
= render 'shared/aspect_contacts', :contacts => @contacts, :aspect => @aspect
......@@ -24,11 +24,24 @@
%h2
= t('account')
= link_to t('.invite_contacts'), new_user_invitation_path(current_user)
.span-8.append-1.last
%h3
Your diaspora handle
%p
%b= current_user.diaspora_handle
.span-8.prepend-2.last
%h3
Your email
%p
= current_user.email
%br
%br
%br
%br
%br
%br
%br
%h3
= t('.change_password')
......
......@@ -81,6 +81,7 @@ $(document).ready(function(){
$(".add_aspect_button", "#aspect_nav").tipsy({gravity:'w'});
$(".person img", ".dropzone").tipsy({live:true});
$(".avatar", ".aspects").tipsy({live:true});
$(".what_is_this").tipsy({live:true,delayIn:400});
$('.webfinger_form').submit(function(evt){
form = $(evt.currentTarget);
......
......@@ -1943,3 +1943,26 @@ h3,h4
:-moz-border-radius 5px
:border-radius 5px
.what_is_this
:display inline-block
:cursor default
:font
:size 8px
:color #fff
:background
:color #ccc
:-webkit-border-radius 10px
:width 15px
:max-width 12px
:text
:indent 4px
:position relative
:top -4px
&:hover
:background
:color #107FC9
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment