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

app/controllers/application_controller.rb

@@ -3,10 +3,10 @@
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
-  #has_mobile_fu
+#  has_mobile_fu
   protect_from_forgery :except => :receive
 
-  # =>before_filter :mobile_except_ipad
+#  before_filter :mobile_except_ipad
   before_filter :set_contacts_and_status, :except => [:create, :update]
   before_filter :count_requests
   before_filter :set_invites

app/views/aspects/index.mobile.haml

@@ -2,6 +2,12 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
+%div
+  %h1
+    = person_image_tag (current_user.person)
+    = current_user.name
+= select_tag "aspect_picker", aspect_select_options(@aspects, @aspect)
+
 %div{:data => {:role => 'content'}}
   %div{:data => {:role => 'fieldcontain'}}
     =render 'shared/publisher', :aspect => @aspect

app/views/home/show.mobile.haml

@@ -0,0 +1,39 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#landing_content
+  #diaspora_description.section
+    %p
+      = t('.tagline_first_half')
+      %br
+      = t('.tagline_second_half')
+
+  #why
+    .info_pane{:data => {:role => "collapsible", :collapsed => "true"}}
+      %h2
+        = t('.choice')
+      %p
+        = t('.choice_explanation')
+    .info_pane{:data => {:role => "collapsible", :collapsed => "true"}}
+      %h2
+        = t('.ownership')
+      %p
+        = t('.ownership_explanation')
+    .info_pane{:data => {:role => "collapsible", :collapsed => "true"}}
+      %h2
+        = t('.simplicity')
+      %p
+        = t('.simplicity_explanation')
+
+  #signup
+    #signup_field.section
+      = render 'shared/mail_signup_form'
+
+    #login_field.section
+      = t('.already_account')
+      = link_to t('.login_here'), new_user_session_path
+
+  #info_links
+    %h3
+      = link_to t('.learn_about_host'), 'http://bit.ly/dZqyd3'

app/views/layouts/application.mobile.haml

@@ -17,19 +17,10 @@
     :javascript
       $(document).ready(Mobile.initialize);
 
-
     = yield(:head)
 
   %body
-    #content{:data => {:role => 'page'}}
     %div{:data => {:role => 'header', :nobackbtn => 'true'}}
-        %h1
-          = person_image_tag (current_user.person)
-          = current_user.name 
-      = select_tag "aspect_picker", aspect_select_options(@aspects, @aspect)
-      
+      = link_to image_tag('diaspora_logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
+    #content{:data => {:role => 'page', :theme => "b"}}
       = yield
-           
-      /%div{:data => {:role => 'fieldcontain'}}
-      /  = form_tag(people_path, :method => 'get') do
-      /    = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search'

config/locales/diaspora/en.yml

@@ -391,6 +391,8 @@ en:
   home:
       show:
           share_what_you_want: "Share what you want, with whom you want."
+          tagline_first_half: "Share what you want,"
+          tagline_second_half: "with whom you want."
           already_account: "already have an account?"
           login_here: "log in here"
           choice: "Choice"

public/stylesheets/sass/mobile.sass

@@ -1,3 +1,34 @@
+#landing_content
+  :text-align center
+
+  .info_pane
+    :text-align left
+
+#diaspora_description
+  :background
+    :image url('../images/ball_small.png')
+    :repeat no-repeat
+    :position top center
+
+  :padding
+    :top 195px
+  :margin
+    :top -18px
+
+  :font
+    :size 1.3em
+    :weight bold
+  :text-shadow 0 1px 3px #999
+  :line-height 1.5
+  
+  p
+    :padding 12px
+    :background
+      :color #fff
+    :-webkit-box-shadow 0 1px 3px #ccc
+    :-moz-box-shadow 0 1px 3px #ccc
+    :box-shadow 0 1px 3px #ccc
+
 img
   :border-radius 5px
 ul