Merge branch 'master' of git://github.com/diaspora/diaspora

app/views/aspects/index.html.haml

@@ -53,35 +53,6 @@
       %br
       = t(".diaspora_id.content_2")
 
-  .section
-    .title
-      = image_tag('/images/icons/bookmark.png')
-      %h5
-        = t('bookmarklet.heading')
-    .content
-      != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))
-
-  .section
-    .title
-      = image_tag('/images/icons/cubbies.png')
-      %h5
-        = t('.cubbies.heading')
-    .content
-      = t('.cubbies.explanation')
-      = link_to t('.cubbies.learn_more'), token_path
-
-  .section
-    .title
-      = image_tag('/images/icons/monotone_wrench_settings.png')
-      %h5
-        = t('.services.heading')
-    .content
-      = t('.services.content')
-      - AppConfig.configured_services.each do |service|
-        - unless current_user.services.any?{|x| x.provider == service}
-          %br= link_to service.titleize, "/auth/#{service}" 
-
-
   - unless AppConfig[:invites_off]
     .section
       .title
@@ -95,3 +66,31 @@
       .content
         = render "shared/invitations", :invites => @invites
 
+  .section
+    .title
+      = image_tag('/images/icons/cubbies.png')
+      %h5
+        = t('.cubbies.heading')
+    .content
+      = t('.cubbies.explanation')
+      = link_to t('.cubbies.learn_more'), token_path
+
+  - unless AppConfig.configured_services.blank?
+    .section
+      .title
+        = image_tag('/images/icons/monotone_wrench_settings.png')
+        %h5
+          = t('.services.heading')
+      .content
+        = t('.services.content')
+        - AppConfig.configured_services.each do |service|
+          - unless current_user.services.any?{|x| x.provider == service}
+            %br= link_to service.titleize, "/auth/#{service}" 
+
+  .section
+    .title
+      = image_tag('/images/icons/bookmark.png')
+      %h5
+        = t('bookmarklet.heading')
+    .content
+      != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))

features/change_email.feature

@@ -7,8 +7,8 @@ Feature: Change email
     And I follow "settings"
     Then I should be on my account settings page
     When I fill in "user_email" with "new_email@newplac.es"
-    And I press "Change E-Mail"
-    Then I should see "E-Mail Changed"
+    And I press "Change email"
+    Then I should see "Email changed"
     And I follow the "confirm_email" link from the last sent email
     Then I should see "activated"
     And my "email" should be "new_email@newplac.es"

features/change_password.feature

@@ -9,8 +9,8 @@ Feature: Change password
     When I put in my password in "user_current_password" 
     And I fill in "user_password" with "newsecret"
     And I fill in "user_password_confirmation" with "newsecret"
-    And I press "Change Password"
-    Then I should see "Password Changed"
+    And I press "Change password"
+    Then I should see "Password changed"
     Then I should be on the new user session page
     When I sign in with password "newsecret"
     Then I should be on the aspects page

features/repost.feature

@@ -93,6 +93,6 @@ Feature: public repost
     And I should see "Bob" 
     And I go to the home page
 
-    And I should see "1 Reshare"
+    And I should see "1 reshare"
 
   Scenario: Can have text

public/javascripts/widgets/lightbox.js

@@ -43,6 +43,8 @@ jQuery.fn.center = (function() {
         evt.preventDefault();
         self.resetLightbox();
       });
+      self.backdrop.click(self.resetLightbox);
+      self.lightbox.click(self.resetLightbox);
 
       self.body.keydown(function(evt) {
 
@@ -110,7 +112,7 @@ jQuery.fn.center = (function() {
 
     this.imagesetImageClicked = function(evt) { 
       evt.preventDefault();
-     
+      evt.stopPropagation();
 
       self.selectImage($(this));
     };