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

app/views/services/index.html.haml

@@ -17,15 +17,5 @@
   %h2
     = t('_services')
 
-  %ul
+  = render 'shared/add_remove_services'
-    - for service in @services
-      %h3
-        %b= service.provider
-        = t('.logged_in_as')
-        %b
-          = service.nickname
-        = link_to t('.disconnect'), service_path(service), :confirm => t('.really_disconnect', :service => service.provider), :method => :delete
-
-  %h4= link_to image_tag('services/twitter_sign_in.png'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
-  %h4= link_to image_tag('services/facebook_sign_in.png'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 

app/views/shared/_add_remove_services.haml

@@ -0,0 +1,18 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+%ul.stream#service_stream
+  - for service in @services
+    %h3
+      %b= service.provider
+      = t('services.index.logged_in_as')
+      %b= service.nickname
+      = link_to t('services.index.disconnect'), service_path(service), :confirm => t('services.index.really_disconnect', :service => service.provider), :method => :delete
+
+- unless @services.any?{|x| x.provider == 'twitter'}
+  %h4= link_to t('services.index.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
+
+- unless @services.any?{|x| x.provider == 'facebook'}
+  %h4= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""

app/views/users/getting_started/_step_3.html.haml

@@ -7,19 +7,8 @@
   = t('.your_services')
   .description
     = t('.description')
-%ul.stream#service_stream
-  - for service in @services
-    %h3
-      %b= service.provider
-      = t('services.index.logged_in_as')
-      %b= service.nickname
-      = link_to t('services.index.disconnect'), service, :confirm => t('services.index.really_disconnect', :service => service.provider), :method => :delete
 
-- unless @services.any?{|x| x.provider == 'twitter'}
+= render 'shared/add_remove_services'
-  %h4= link_to t('services.index.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
-
-- unless @services.any?{|x| x.provider == 'facebook'}
-  %h4= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 
 .submit_block
   = link_to "#{t('users.getting_started.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"