Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar

Conflicts:
	Changelog.md

Changelog.md

@@ -120,6 +120,7 @@ by them self.
 * Redirect all mixed case tags to the lower case equivalents [#4058](https://github.com/diaspora/diaspora/issues/4058)
 * Fix wrong message on infinite scroll on contacts page [#3681](https://github.com/diaspora/diaspora/issues/3681)
 * My Activity mobile doesn't show second page when clicking "more". [#4109](https://github.com/diaspora/diaspora/issues/4109)
+* Remove unnecessary navigation bar to access mobile site and re-add flash warning to mobile registrations. [#4085](https://github.com/diaspora/diaspora/pull/4085)
 
 ## Features
 
@@ -128,7 +129,7 @@ by them self.
 * Add the ability to upload photos from the mobile site. [#4004](https://github.com/diaspora/diaspora/issues/4004)
 * Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042)
 * If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706)
-* Add multiphoto for mobile post. [#4065](https://github.com/diaspora/diaspora/issues/4065)
+* Add possibiltiy to upload multiple photos from mobile. [#4067](https://github.com/diaspora/diaspora/issues/4067)
 * Add hotkeys to navigate in stream [#4089](https://github.com/diaspora/diaspora/pull/4089)
 * Add a brief explanatory text about external services connections to services index page [#3064](https://github.com/diaspora/diaspora/issues/3064)
 * Add a preview for posts in the stream [#4099](https://github.com/diaspora/diaspora/issues/4099)

app/assets/stylesheets/mobile.css.scss

@@ -387,8 +387,8 @@ footer {
     margin: 10px;
   }
   padding: {
-    top: 60px;
+    top: 20px;
-    bottom: 30px;
+    bottom: 20px;
   }
 }
 
@@ -904,6 +904,10 @@ textarea#conversation_text {
   text-shadow: 1px 1px 5px #666; 
 }
 
+.registrations {
+  margin: -45px;
+}
+
 form#new_user.new_user input.btn {
   white-space: normal;
 }
@@ -935,6 +939,10 @@ form#new_user.new_user input.btn {
   text-shadow: 1px 1px 20px rgb(126, 240, 77);
 }
 
+input#user_password, #user_username, #user_password_confirmation, #user_email {
+  height: 30px;
+}
+  
 #flash_notice,
 #flash_alert,
 #flash_error {
@@ -944,6 +952,32 @@ form#new_user.new_user input.btn {
   }
 }
 
+#session.message {
+  padding: 10px 12px 8px;
+}
+
+#registration.message {
+  padding: 1px
+}
+
+.session_mobile {
+  margin-top: -55px;
+}
+
+h1.session {
+  font-size: 40px; 
+  font-weight: 200;
+}
+
+.landing  {
+  padding: 20px;
+  margin: -10px -20px 10px -20px;
+  background-color:#4b4b4b;
+  box-shadow: 0 3px 40px rgba(0,0,0,0.8);
+  z-index: 10;
+  position: relative;
+  text-align: center;
+}
 
 form p.checkbox_select {
   position: relative;

app/views/registrations/new.mobile.haml

@@ -8,12 +8,14 @@
 
 :css
   div.navbar.navbar-fixed-top{ display:none;}
-  body{ padding: 10px;}
-  #flash_error .message{ padding: 1px 1px 1px;}
 
+.registrations
 .stream
   - flash.each do |name, msg|
     %p{:class => "registrations_#{name}"}= msg
+    #flash_alert.expose
+      %div{:class => "message", :id => "session"}= msg
+
   #login_form
     .login-container
       = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f|

app/views/sessions/new.mobile.haml

@@ -2,49 +2,47 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= stylesheet_link_tag :mobile
-
 :css
-  body{ padding: 10px; margin: 0px 10px;}
+  .navbar-fixed-top{display: none;}
-  #flash_alert .message{ padding: 10px 12px 8px;}
-  footer{ padding-top: 0;}
-  .landing{ padding: 20px; margin: -10px -20px 10px -20px; background-color:#4b4b4b; box-shadow: 0 3px 40px rgba(0,0,0,0.8); z-index: 10; position: relative; text-align: center;}
-  h1{ font-size: 40px; font-weight: 200;}
 
-.landing
+.session_mobile
-  %h1
+  .landing
-    = "#{pod_name}"
+    %h1{:class =>"session"}
-#main_stream.stream
+      = "#{pod_name}"
-  - flash.each do |name, msg|
-    %p{:class => "login_#{name}"}= msg
 
-  #login_form
+  #main_stream.stream
-    .login-container
+    - flash.each do |name, msg|
-      = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+      %p{:class => "login_#{name}"}= msg
-        %fieldset
+      #flash_alert.expose
-          %legend
+        %div{:class => "message", :id => "session"}= msg
-            = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
+
-            = t('devise.sessions.new.login').upcase
+    #login_form
+      .login-container
+        = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+          %fieldset
+            %legend
+              = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
+              = t('devise.sessions.new.login').upcase
           
-          .control-group
+            .control-group
-            = f.label :username, t('username').upcase
+              = f.label :username, t('username').upcase
+              .controls
+                = f.text_field :username, :autofocus => true
+
+            .control-group
+              = f.label :password , t('password').upcase
+              .controls
+                = f.password_field :password
+
+              = hidden_field(:user, :remember_me, :value => 1)
+
             .controls
-              = f.text_field :username, :autofocus => true
+              = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
+              - if display_registration_link?
+                = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn primary', :style => "float: right;"
 
-          .control-group
+  %footer
-            = f.label :password , t('password').upcase
+    - if display_password_reset_link?
-            .controls
+      = link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
-              = f.password_field :password
 
-            = hidden_field(:user, :remember_me, :value => 1)
+    = link_to t('layouts.application.toggle'), toggle_mobile_path
-
-          .controls
-            = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
-            - if display_registration_link?
-              = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name), :class => 'btn primary', :style => "float: right;"
-
-%footer
-  - if display_password_reset_link?
-    = link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
-
-  = link_to t('layouts.application.toggle'), toggle_mobile_path