DG MS; invite is now a lightbox on feed and manage pages
This commit is contained in:
parent
afad554f01
commit
be017bfb0a
5 changed files with 26 additions and 6 deletions
|
|
@ -21,13 +21,20 @@
|
|||
= request.person.real_name
|
||||
%h3=t('.ignore_remove')
|
||||
|
||||
%li.remove
|
||||
.remove
|
||||
%ul.dropzone
|
||||
%li.grey Drag to ignore/remove
|
||||
|
||||
%h3= link_to "Invite a friend!", "#invite_user_pane", :id => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
|
||||
|
||||
.yo{ :style => "display:none;"}
|
||||
#invite_user_pane
|
||||
= render "invitations/new"
|
||||
|
||||
- content_for :publish do
|
||||
= link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
|
||||
= link_to "invite a friend!", new_user_invitation_path
|
||||
|
||||
|
||||
%ul#aspect_list
|
||||
- for aspect in @aspects
|
||||
%li.aspect
|
||||
|
|
|
|||
8
app/views/invitations/_new.haml
Normal file
8
app/views/invitations/_new.haml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
%h2 Send invitation
|
||||
= form_for User.new, :url => invitation_path(User) do |f|
|
||||
/= devise_error_messages!
|
||||
%p
|
||||
= f.label :email
|
||||
= f.text_field :email
|
||||
%p= f.submit "Send an invitation"
|
||||
/= link_to "Home", after_sign_in_path_for(resource_name)
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
%h2 Send invitation
|
||||
= form_for resource, :as => resource_name, :url => invitation_path(resource_name) do |f|
|
||||
= form_for User.new, :url => invitation_path(User) do |f|
|
||||
= devise_error_messages!
|
||||
%p
|
||||
= f.label :email
|
||||
%br/
|
||||
= f.text_field :email
|
||||
%p= f.submit "Send an invitation"
|
||||
= link_to "Home", after_sign_in_path_for(resource_name)
|
||||
%br/
|
||||
/= link_to "Home", after_sign_in_path_for(resource_name)
|
||||
|
|
|
|||
|
|
@ -19,5 +19,11 @@
|
|||
= render "requests/new_request", :aspect => @aspect
|
||||
-else
|
||||
.clear
|
||||
%br
|
||||
= link_to t('.add_friends'), aspects_manage_path
|
||||
|
||||
%br
|
||||
= link_to "Invite a friend!", "#invite_user_pane", :id => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
|
||||
.yo{ :style => "display:none;"}
|
||||
#invite_user_pane
|
||||
= render "invitations/new"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ $(document).ready(function(){
|
|||
//buttons//////
|
||||
$("#add_aspect_button").fancybox({ 'titleShow' : false });
|
||||
$("#add_request_button").fancybox({ 'titleShow': false });
|
||||
$("#invite_user_button").fancybox({ 'titleShow': false });
|
||||
$(".add_request_button").fancybox({ 'titleShow': false });
|
||||
|
||||
$("input[type='submit']").addClass("button");
|
||||
|
|
|
|||
Loading…
Reference in a new issue