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

swapped new invitation lightbox for a proper page.

Browse source
This commit is contained in:
danielvincent 2010-12-03 00:57:53 -08:00
parent 30668bf2e6
commit 7fdbc9015b
11 changed files with 81 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/views/invitations/_new.haml
View file

@ -1,24 +0,0 @@
.span-12.last
.modal_title_bar
%h4
= t('.invite_someone_to_join')
%i
= t('.if_they_accept_info')
%br
= t('.comma_seperated_plz')
= form_for User.new, :url => invitation_path(User) do |invite|
%p
= invite.label :email , t('email')
= invite.text_field :email
= t('.to')
- unless @aspect.is_a? Aspect
= invite.select(:aspects, @aspects_dropdown_array)
- else
= invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)
%br
= t('.message')
= invite.text_area :invite_messages, :value => ""
%p= invite.submit t('.send_an_invitation')

40
app/views/invitations/new.html.haml Normal file
View file

@ -0,0 +1,40 @@
:javascript
$(function() {
$('#new_user [title]').tipsy({trigger: 'focus', gravity: 'w'});
$("#user_email").focus();
});
.span-3.append-1.prepend-3
= image_tag 'icons/monotone_email_letter_round.png', :height => "128px", :width => "128px"
.span-15.last
%h2
= t('.invite_someone_to_join')
.description
= t('.if_they_accept_info')
%br
= form_for User.new, :url => invitation_path(User) do |invite|
%h4
Email
%p
= invite.label :email , t('email')
= invite.text_field :email, :title => t('.comma_seperated_plz')
%br
%h4
Aspect
- unless @aspect.is_a? Aspect
= invite.select(:aspects, @aspects_dropdown_array)
- else
= invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)
%br
%br
%h4
= t('.personal_message')
= invite.text_area :invite_messages, :rows => 3, :value => ""
%p
= invite.submit t('.send_an_invitation')

10
app/views/people/show.html.haml
View file

@ -20,17 +20,15 @@
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact}
.span-15.last
%h4
-if @post_type == :photos
Photos
- else
Recent Posts
- if @contact || current_user.person == @person
- if @posts.count > 0
-if @post_type == :photos
%h4
Photos
= render 'photos/index', :photos => @posts
- else
%h4
Recent Posts
= render 'shared/stream', :posts => @post_hashes
= will_paginate @posts

6
app/views/shared/_add_contact.html.haml
View file

@ -21,9 +21,5 @@
%ul#request_result{:aspect_id => aspect_id}
%li.error.hidden
#message
= link_to t('.know_email'), "#invite_user_pane", :class => "invite_user_button"
%br
.yo{ :style => "display:none;"}
#invite_user_pane
= render "invitations/new"
= link_to t('.know_email'), new_user_invitation_path

6
app/views/shared/_invitations.haml
View file

@ -2,12 +2,8 @@
= t('.invites_closed')
-else
-if invites > 0
= link_to t('.invite_someone'), "#invite_user_pane", :class => "invite_user_button", :title => t('.invite_someone')
= link_to t('.invite_someone'), new_user_invitation_path, :title => t('.invite_someone')
= t('.invitations_left', :count => invites)
%br
.yo{ :style => "display:none;"}
#invite_user_pane
= render "invitations/new"
- else
= t('.dont_have_now')

24
app/views/users/edit.html.haml
View file

@ -40,12 +40,12 @@
%h2
= t('account')
.span-8.append-1.last
.span-8.append-2
%h3
= t('.your_handle')
%p
%b= current_user.diaspora_handle
.span-8.prepend-2.last
.span-8.last
%h3
= t('.your_email')
%p
@ -53,10 +53,7 @@
%br
%br
%br
%br
%br
%br
%hr
%br
%h3
@ -76,6 +73,11 @@
= t('or')
= f.submit t('.change_password')
%br
%br
%hr
%br
%h3
= t('.change_language')
= form_for @user do |f|
@ -86,16 +88,18 @@
= f.submit t('.change_language')
%br
%br
%hr
%br
.span-8.append-2
%h3
= t('.export_data')
= link_to t('.download_xml'), users_export_path, :class => "button"
= link_to t('.download_photos'), users_export_photos_path, :class => "button"
%br
%br
%br
.span-8.last
%h3
= t('.close_account')
= link_to t('.close_account'), current_user,

2
config/locales/diaspora/en.yml
View file

@ -279,7 +279,7 @@ en:
if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
comma_seperated_plz: "You can enter multiple email addresses separated by commas."
to: "To"
message: "Message:"
personal_message: "Personal message"
send_an_invitation: "Send an invitation"
send_invitation: "Send invitation"
check_token:

BIN
public/images/icons/monotone_email_letter_round.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,004 B

6
public/javascripts/view.js
View file

@ -19,13 +19,17 @@ $(document).ready(function(){
//buttons//////
$(".add_aspect_button," +
".manage_aspect_contacts_button," +
".invite_user_button," +
".add_photo_button," +
".remove_person_button," +
".question_mark").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
$("input[type='submit']").addClass("button");
// focus aspect name on fancybox
$(".add_aspect_button").click( function(){
$("#aspect_name").focus();
});
$("#q").focus(
function() {
$(this).addClass('active');

27
public/stylesheets/sass/application.sass
View file

@ -295,7 +295,7 @@ header
img
:position relative
:top 5px
:top 6px
:display inline-block
.from
@ -983,7 +983,10 @@ label
:font
:size 12px
:-webkit-box-shadow 0 1px 1px #666
:-webkit-box-shadow 0 1px #666
:-moz-box-shadow 0 1px #666
:box-shadow 0 1px #666
:border 1px solid #000
@ -1617,6 +1620,7 @@ ul#request_result
:-webkit-box-shadow 0 1px #fff
:-moz-box-shadow 0 1px #fff
:box-shadow 0 1px #fff
input.contact_list_search
:width 100%
@ -1635,8 +1639,6 @@ ul#request_result
:padding 8px
:border
:bottom 1px solid #eee
:font
:weight bold
&:hover
:background
@ -1646,16 +1648,6 @@ ul#request_result
:right 8px
:top 2px
.avatar
:height 22px
:width 22px
:position absolute
:top 6px
span.name
:font
:size 14px
a.button
:padding
:right 4px
@ -1672,13 +1664,6 @@ ul#request_result
:background -webkit-gradient( linear, left bottom, left top, color-stop(0, rgb(130,55,55)), color-stop(1, rgb(199,119,119)))
:background -moz-linear-gradient(top, rgb(199,119,119), rgb(130,55,55))
#edit_aspect_pane .contact_list
.avatar
:height 22px
:width 22px
:position absolute
:top 6px
footer
:margin
:top 40px