fixed build. publisher lights up on hover on aspect#index page. updated login page text.

app/helpers/aspects_helper.rb

@@ -16,10 +16,10 @@ module AspectsHelper
   end
 
   def add_to_aspect_button(aspect_id, person_id)
-    link_to image_tag('icons/monotone_plus_add_round.png'), {:action => 'add_to_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'add button'
+    link_to image_tag('icons/monotone_plus_add_round.png'), {:controller => "aspects", :action => 'add_to_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'add button'
   end
 
   def remove_from_aspect_button(aspect_id, person_id)
-    link_to image_tag('icons/monotone_check_yes.png'), {:action => 'remove_from_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'added button'
+    link_to image_tag('icons/monotone_check_yes.png'), {:controller => "aspects", :action => 'remove_from_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'added button'
   end
 end

app/views/aspects/index.html.haml

@@ -10,7 +10,7 @@
         = current_user.diaspora_handle
         = info_text(t('.handle_explanation'))
 
-.span-15.last
+.span-15
   = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
   = render 'shared/publisher', :aspect => @aspect
   = render 'aspects/no_posts_message', :post_count => @posts.count, :contact_count => @contacts.count

app/views/aspects/show.html.haml

@@ -16,7 +16,7 @@
     = link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger"
 
 
-.span-8.append-1.last
+.span-8.append-1
   = render 'shared/aspect_contacts', :contacts => @aspect_contacts, :aspect => @aspect
 
 .span-15.last

app/views/devise/sessions/new.haml

@@ -30,10 +30,14 @@
 
 .span-13.last
   %h1
-  = t('.tech_preview')
+    = t('.alpha_software')
+
   %h3
-  = t('.account_deletion') 
+    = t('.bugs_and_feedback')
-  %h3
+
-  = t('.risk') 
+  %h4
+    %span.brandon DIASPORA*
+    = t('.modern_browsers')
+  = image_tag('modern_browsers.png')
     
 

app/views/people/_profile_photo_upload.html.haml

@@ -11,4 +11,4 @@
     %p
       \...#{t('.or_select_one')}
       = link_to t('_photos'), person_photos_path(@person)
-      \.
+

app/views/people/_profile_sidebar.html.haml

@@ -38,13 +38,17 @@
       %li  
         %h3 #{t('.bio')}
         = person.profile.bio
+
       %li
-        .span-4.last
+        .span-4
           %h3 #{t('.gender')}
           = person.profile.gender
+
         .span-4.last
           %h3 #{t('.born')}
           = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday
+
+        .clearfix
   %br
   %br
   %br

app/views/services/index.html.haml

@@ -23,6 +23,6 @@
           = service.nickname
         = link_to t('.disconnect'), service, :confirm => t('.really_disconnect', :service => service.provider), :method => :delete
 
-  %h4= link_to t('.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
+  %h4= link_to image_tag('services/twitter_sign_in.png'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
-  %h4= link_to t('.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
+  %h4= link_to image_tag('services/facebook_sign_in.png'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 

app/views/shared/_contact_list.html.haml

@@ -47,6 +47,10 @@
         $(this).parent().html(html);
         ContactList.refreshContactCount();
 
+        if( $(".contact_pictures")[0].childElementCount == 0 ) {
+          $("#no_contacts").fadeIn(200);
+        }
+
         $(this).fadeTo(200,1);
       });
 
@@ -54,7 +58,6 @@
         alert("#{t('.cannot_remove')}");
       });
 
-
       $('.add').live('ajax:loading', function(data, html, xhr) {
         $(this).fadeTo(200,0.4);
       });
@@ -66,10 +69,13 @@
         $(this).parent().html(html);
         ContactList.refreshContactCount();
 
+        if( $("#no_contacts").is(':visible') ) {
+          $("#no_contacts").fadeOut(200);
+        }
+
         $(this).fadeTo(200,1);
       });
 
-
       $('.added').live('mouseover', function(){
         $(this).addClass("remove");
         $(this).children("img").attr("src","/images/icons/monotone_close_exit_delete.png");

app/views/shared/_publisher.haml

@@ -22,19 +22,19 @@
       });
 
       $("#content_creation_button").bind("click", function(evt){
-        $("#publisher").find(".content_creation").show();
+        $("#publisher").removeClass("closed");
         $("#publisher").find("textarea").focus();
       });
     });
 
-#publisher
+#publisher{:class=>("closed" if aspect == :all)}
 
   - if aspect == :all
     #content_creation_button
       = image_tag 'icons/monotone_chat_talk.png', :id => 'share_bubble'
       %h4 share across all of your aspects
 
-  .content_creation{:style=>("display:none;" if aspect == :all)}
+  .content_creation
     = form_for(StatusMessage.new, :remote => true) do |status|
       %ul#photodropzone
       = status.error_messages

config/locales/devise/devise.en.yml

@@ -22,9 +22,9 @@ en:
         sign_in: 'Sign in'
         have_a_problem: "Have a problem? Find an answer here"
         remember_me: "Remember me"
-        tech_preview: "Important, please read: This is a technology preview; do not provide any private information."
+        alpha_software: 'You are about to use alpha software.'
-        account_deletion: "Also, be advised that your account may be deleted until we move into a more stable development period."
+        bugs_and_feedback: 'Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report.'
-        risk: "USE AT YOUR OWN RISK!!!"
+        modern_browsers: 'only supports modern browsers.'
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -86,4 +86,4 @@ en:
         sign_up: 'Sign up'
         forgot_your_password: 'Forgot your password?'
         receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"

config/locales/diaspora/en.yml

@@ -308,7 +308,7 @@ en:
           your_bio: "Your bio"
           your_photo: "Your photo"
           update_profile: "Update Profile"
-          allow_search: "Allow for people to search for you"
+          allow_search: "Allow for people to search for you within Diaspora"
       profile_photo_upload:
           or_select_one: "or select one from your already existing"
       update:

public/javascripts/view.js

@@ -13,7 +13,7 @@ $(document).ready(function(){
 
   $('#flash_notice, #flash_error, #flash_alert').animate({
     top: 0
-  }).delay(4000).animate({
+  }).delay(2000).animate({
     top: -100 
   }, $(this).remove());
 

public/stylesheets/sass/application.sass

@@ -829,6 +829,20 @@ label
     :-moz-border-radius 5px
     :border-radius 5px
 
+  &.closed
+    &:hover
+      :background
+        :color #fafafa
+
+      h4
+        :color #777
+
+      img
+        :opacity 0.7
+
+    .content_creation
+      :display none
+
   form
     :position relative
     :top 0
@@ -883,8 +897,6 @@ label
       :top 15px
       :bottom 5px
     :position relative
-    :background
-      :color #eee
     :margin
       :bottom -12px