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

app/views/aspects/_no_contacts_message.haml

@@ -5,11 +5,7 @@
 #no_contacts.floating.empty_message{:style => ("display:none" unless contact_count == 0)}
   - if aspect == :all
     %h3=t('.nobody')
-    %h4= link_to t('.add_contact'), aspects_manage_path
+    %h4= link_to t('.invite'), new_user_invitation_path
-    %h4= link_to t('.invite'), "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => t('.invite')
   - else
     %h3=t('.nobody_in_aspect', :aspect_name => aspect.name)
-    - if defined?(options) && options
-      %h4= link_to t('.add_contact_to', :aspect_name => aspect.name), "#manage_aspect_contacts_pane", :class => "manage_aspect_contacts_button"
-      %h4= link_to t('.invite', :aspect_name => aspect.name), "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => t('.invite')
 

app/views/aspects/index.html.haml

@@ -11,8 +11,8 @@
         = info_text(t('.handle_explanation'))
 
 .span-15.append-1
-  = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
   = render 'shared/publisher', :aspect => @aspect
+  = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
   = render 'aspects/no_posts_message', :post_count => @post_hashes.length, :contact_count => @contacts.count
 
   = render 'shared/stream', :posts => @post_hashes

app/views/devise/sessions/new.mobile.haml

@@ -0,0 +1,29 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+.floating.login_form
+  %h3
+    = t('.login')
+  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+    #user
+      %p.username
+        = f.label :username , t('username')
+        = f.text_field :username
+      %p.user_network
+        ="@#{APP_CONFIG[:terse_pod_url]}"
+
+      %p
+        = f.label :password , t('password')
+        = f.password_field :password
+    = f.submit t('.sign_in')
+
+  %p
+    = render :partial => "devise/shared/links"
+
+.alpha-warning
+  %h1
+    = t('.alpha_software')
+
+  %h3
+    = t('.bugs_and_feedback_mobile')

app/views/layouts/application.mobile.haml

@@ -11,7 +11,7 @@
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
 
     = include_javascripts :mobile 
-    = stylesheet_link_tag 'mobile', 'vendor/jquery_mobile.min'
+    = stylesheet_link_tag 'vendor/jquery_mobile.min', 'mobile'
     = csrf_meta_tag
     
     :javascript

config/locales/devise/devise.en.yml

@@ -24,6 +24,7 @@ en:
         remember_me: "Remember me"
         alpha_software: 'You are about to use alpha software.'
         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.'
+        bugs_and_feedback_mobile: 'Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report.'
         modern_browsers: 'only supports modern browsers.'
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'

public/javascripts/custom-mobile-scripting.js

@@ -3,10 +3,9 @@
 *   the COPYRIGHT file.
 */
 
-// $(document).bind("mobileinit", function(){
+$(document).bind("mobileinit", function(){
-//   $.extend(  $.mobile , {
+   $.extend(  $.mobile , {
-// 
+     ajaxLinksEnabled : false,
-//     ajaxLinksEnabled : false
+     ajaxFormsEnabled : false
-//     ajaxFormsEnabled : false
+   });
-//   });
+});
-// });

public/stylesheets/sass/_mixins.sass

@@ -0,0 +1,6 @@
+@mixin mobile-box
+  :margin 10px
+  :padding 0 15px
+  :border 1px #999 solid
+  :'-moz-border-radius' 15px
+  :border-radius 15px

public/stylesheets/sass/mobile.sass

@@ -1,3 +1,5 @@
+@import "mixins"
+
 #landing_content
   :text-align center
 
@@ -29,18 +31,24 @@
     :-moz-box-shadow 0 1px 3px #ccc
     :box-shadow 0 1px 3px #ccc
 
+.alpha-warning
+  @include mobile-box
+
+.login_form
+  @include mobile-box
+  label
+    :font-weight bold
+
 img
   :border-radius 5px
 ul
   :list-style none
 
-
 .avatar
   :width 50px
   :height 50px
   :padding 0
 
-
 li.message
   :width 90%
   :position relative