muck-invites 3.3.1 → 3.3.2

data/README.rdoc

@@ -28,7 +28,11 @@ The simple version that simply asks for an email and password:
   <%= link_to 'Invite Your Friends', new_invite_path, :class => 'invite_box' %>
 
 The better method that uses oauth to talk to email services instead of asking for a password:
-  <%= link_to 'Invite Friends', compose_invites_path, :class => 'invite_box' %>
+
+  <%= link_to 'Invite Friends', compose_invites_path, :class => 'invite_box iframe' %>
+The 'invite_box' class will result in the invite showing up in a popup. Remove that class if you want to customize the link to do something else. 
+By default the popup will use the 'popup' layout from muck-engine.
+
 
 === Oauth
 The invite system can use oauth where available to acquire contacts. To enable this functionality install the

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/app/controllers/muck/invites_controller.rb

@@ -32,7 +32,7 @@ class Muck::InvitesController < ApplicationController
     rescue Contacts::AuthenticationError => ex
       @success = false
       @message = ex.to_s
-    end    
+    end   
     respond_to do |format|
       format.html do
         flash[:error] = @message if @message
@@ -56,10 +56,7 @@ class Muck::InvitesController < ApplicationController
       @message = t('muck.invites.emails_empty')
     end
     respond_to do |format|
-      format.html do
-        flash[:notice] = @message
-        redirect_back_or_default('/')
-      end
+      format.html { render :template => 'invites/create', :layout => false }
       format.pjs { render :template => 'invites/create', :layout => false }
       format.js { render :template => 'invites/create', :layout => false }
     end 

data/app/views/invites/_contact_list.erb

@@ -1,9 +1,9 @@
 <table class="contacts-list">
  <% contacts.each_with_index do |contact,i| %>
    <tr class="contact <%= i%2==0 ? 'even' : 'odd' %>">
-     <td class="cb"><input type="checkbox" value="<%= h(contact[1]) %>" name="emails[]"></td>
+     <td class="cb"><input type="checkbox" value="<%= contact[:email] %>" name="emails[]"></td>
      <td class="name"><%= contact[:name] %></td>
      <td class="email"><%= contact[:email] %></td>
    </tr>
  <% end %>
-</table>
+</table>

data/app/views/invites/_contact_list_gravatar.erb

@@ -1,4 +1,4 @@
-<% default_image = File.join(root_url, 'profile_default.jpg') %>
+<% default_image = File.join(root_url, 'images/profile_default.jpg') %>
 <table class="contacts-list">
  <% contacts.each_with_index do |contact,i| %>
    <tr class="contact <%= i%2==0 ? 'even' : 'odd' %>">

data/app/views/invites/_invite_compose.erb

@@ -1,4 +1,6 @@
 <div id="compose-invite">
+  <h2>Email invites to friends</h2>
+  <!--
   <div class="tabs">
     <ul>
       <li><a href="gmail" class="active"><span>Gmail</span></a></li>
@@ -8,19 +10,23 @@
       <li><a href="plaxo"><span>Plaxo</span></a></li>
     </ul>
   </div>
+  -->
   <div id="invite-contents">
     <%= invite_ajax_message_container %>
-    <%= render :partial => 'invites/gmail_oauth' %>
-    <%= render :partial => 'invites/contacts_query', :locals => { :id => 'yahoo', :title => 'Yahoo' } %>
-    <%= render :partial => 'invites/contacts_query', :locals => { :id => 'windows', :title => 'Windows Live' } %>
-    <%= render :partial => 'invites/contacts_query', :locals => { :id => 'aol', :title => 'AOL' } %>
-    <%= render :partial => 'invites/contacts_query', :locals => { :id => 'plaxo', :title => 'Plaxo' } %>
+    <% if google_oauth_for(current_user) -%>
+      <p><%=translate('muck.invites.select_emails') %></p>
+      <%= render :partial => 'invites/gmail_oauth' %>
+    <% end -%>
+    <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'yahoo', :title => 'Yahoo' } %>
+    <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'windows', :title => 'Windows Live' } %>
+    <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'aol', :title => 'AOL' } %>
+    <%#= render :partial => 'invites/contacts_query', :locals => { :id => 'plaxo', :title => 'Plaxo' } %>
   </div>
   <div id="invite">
     <%= muck_form_for(:invite_contacts, :url => {:action => 'create'}, :html => {:id => "invite-contacts-form", :name => 'invite-contacts-form'} ) do |f| -%>
       <div class="form-row">
         <label class="invite-email" for="emails">Emails</label>
-        <p class="invite-email">Enter emails of friends to invite or select them above:</p>
+        <p class="invite-email"><%=translate('muck.invites.email_friends_prompt') %></p>
         <%= text_area_tag :emails, emails || params[:emails] %>
       </div>
       <div class="form-row">

data/app/views/invites/create.html.erb

@@ -0,0 +1 @@
+<%= @message %>

data/config/locales/en.yml

@@ -9,18 +9,20 @@ en:
       new_invites: Invite your email contacts to join %{app_name}
       invite_friends: Invite your friends to join %{app_name}
       email_password_help: The password of your email account
-      create_success: Invites were sent to %{emails}}. You will be notified if they join %{app_name}
-      emails_empty: You didn't specify any emails
+      create_success: Invites were sent to %{emails}. You will be notified if they join %{app_name}
       we_wont_email: We won't email these addresses without your permission.
       invited_joined: "%{user}} joined %{app_name}"
       retrieving_contacts: Retrieving contacts
       we_dont_store: We don't store your login and your password is submitted securely.
+      emails_empty: You didn't specify any emails
       invalid_email_error: does not look like a valid email address.
       your_email: Your Email
       your_email_help: The email address of an account with contacts that you want to invite
+      select_emails: "Select emails:"
       select_all: Select All
       no_contacts_found: No contacts were found
+      compose_invites: Compose Invite
+      email_friends_prompt: "Enter emails of friends to invite:"
       email_password_prompt_title: Please enter your %{title} email and password
       email_password: Email Password
       continue_button: Continue
-      compose_invites: Compose Invite

data/config/routes.rb

@@ -6,9 +6,6 @@ Rails.application.routes.draw do
     collection do
       post :get_contacts
       get :compose
-      post :compose
-      get :new
-      post :new
     end
   end
 end

data/muck-invites.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "3.3.1"
+  s.version = "3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
-  s.date = %q{2011-04-27}
+  s.date = %q{2011-04-28}
   s.description = %q{The invite engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "app/views/invites/_invite_standard.erb",
     "app/views/invites/compose.erb",
     "app/views/invites/create.erb",
+    "app/views/invites/create.html.erb",
     "app/views/invites/get_contacts.html.erb",
     "app/views/invites/get_contacts.js.erb",
     "app/views/invites/new.erb",

data/public/stylesheets/muck-invites.css

@@ -7,10 +7,11 @@
 .contact-chooser table{border-collapse:collapse;margin:0;padding:0;}
 .contact-chooser .icon{width:20px;height:20px;}
 .contact-chooser-list{width:500px;}
-.select-all {background-color:#EEEEEE;border-bottom:1px solid #CCCCCC;color:#666666;line-height:200%;margin:0;padding:0 5px;}
+.select-all{background-color:#EEEEEE;border-bottom:1px solid #CCCCCC;color:#666666;line-height:200%;margin:0;padding:0 5px;}
 .table-wrapper{height:250px;overflow-y:scroll;padding:4px 0 0;}
 .tabs ul{padding:2px;margin:0;}
 .tabs ul li{list-style:none;font-weight:bold;display:inline-block;}
 .tabs ul li a{float:left;text-decoration:none;font-weight:bold;}
 .tabs ul li a:hover{text-decoration:underline;}
-#invite textarea{width:600px;height:80px;font-size:1em;}
+#invite textarea{width:600px;height:80px;font-size:1em;}
+.contacts-list .icon img{width:20px;}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-invites
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 3
-  - 1
-  version: 3.3.1
+  - 2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -06:00
+date: 2011-04-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - app/views/invites/_invite_standard.erb
 - app/views/invites/compose.erb
 - app/views/invites/create.erb
+- app/views/invites/create.html.erb
 - app/views/invites/get_contacts.html.erb
 - app/views/invites/get_contacts.js.erb
 - app/views/invites/new.erb