Merge pull request #5754 from svbergerem/fix-invitations-mobile

Fix mobile sign up with invitation

Changelog.md

@@ -143,6 +143,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Remove border from reply form for conversations [#5744](https://github.com/diaspora/diaspora/pull/5744)
 * Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731)
 * Correct photo count on profile page [#5751](https://github.com/diaspora/diaspora/pull/5751)
+* Fix mobile sign up from an invitation [#5754](https://github.com/diaspora/diaspora/pull/5754)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

app/assets/stylesheets/mobile/mobile.scss

@@ -985,6 +985,10 @@ select#user_language, #user_auto_follow_back_aspect_id, #aspect_ids_ {
   color: inherit;
   background-color: $background-grey;
   border-radius: 10px;
+  .img .avatar {
+    width: 50px;
+    height: 50px;
+  }
 }
 
 .search-mobile {

app/views/people/_add_contact.haml

@@ -1,8 +1,8 @@
 .well
   = t('.invited_by')
   .media
-    .float-right
+    .pull-right
       = aspect_membership_dropdown(contact, inviter, false)
-    = person_image_link(inviter, :class => 'img')
+    = person_image_link(inviter, :size => :thumb_small, :class => 'img')
     .bd
       = person_link(inviter)

app/views/registrations/new.mobile.haml

@@ -34,15 +34,17 @@
               = f.label :password, t('password').upcase
               .controls
                 = f.password_field :password, :placeholder => "••••••••"
- 
+
             .control-group
               = f.label :password_confirmation, t('password_confirmation').upcase
               .controls
                 = f.password_field :password_confirmation, :placeholder => "••••••••"
-                
+
             - if AppConfig.settings.captcha.enable?
               = show_simple_captcha(:object => 'user', :code_type => 'numeric')
-            
+
+            = invite_hidden_tag(invite)
+
             - if AppConfig.settings.terms.enable?
               = t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
 

features/desktop/invitations.feature

@@ -3,7 +3,6 @@ Feature: Invitations
 
   Scenario: Accepting an invitation
     When I visit alice's invitation code url
-    # Then I should see the "alice is excited" message
     When I fill in the new user form
     And I press "Sign up"
     Then I should see the "welcome to diaspora" message

features/mobile/invitations.feature

@@ -0,0 +1,12 @@
+@javascript
+Feature: Invitations
+
+  Background:
+    Given I toggle the mobile view
+  
+  Scenario: Accepting an invitation
+    When I visit alice's invitation code url
+    When I fill in the new user form
+    And I press "Create my account!"
+    Then I should see the "welcome to diaspora" message
+    And I should be able to friend Alice