diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index 1d74540a06e30f640ba3b61359209a9e90beb75f..12e34791e75a974907ec54bd9bd4b70fef007d4d 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -773,3 +773,9 @@ textarea#conversation_text { -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } + +.registrations_error, +.registrations_notice { + color: #DF0101; + text-shadow: 1px 1px 5px #666; +} diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 171042958109e5550e03970331617c87c648767a..76cef3be5282a3acf306b4dac022ab4df6c29e35 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -19,7 +19,7 @@ class RegistrationsController < Devise::RegistrationsController else @user.errors.delete(:person) - flash[:error] = @user.errors.full_messages.join(";") + flash[:error] = @user.errors.full_messages.join(" - ") Rails.logger.info("event=registration status=failure errors='#{@user.errors.full_messages.join(', ')}'") render :new end diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml index 6567704651d3ef516e8cb7de1284965c5454ba33..8564392502bd660a6a14399edba48762b123322b 100644 --- a/app/views/registrations/new.mobile.haml +++ b/app/views/registrations/new.mobile.haml @@ -4,39 +4,47 @@ = javascript_include_tag "validation" += stylesheet_link_tag :mobile + +:css + div.navbar.navbar-fixed-top{ display:none;} + body{ padding: 10px;} + legend{ background-image: url(/assets/header-bg-long.jpg); color: #939393;} + .stream + - flash.each do |name, msg| + %p{:class => "registrations_#{name}"}= 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| %fieldset %legend - = t('welcome') + = image_tag('branding/header-logo2x.png', :height => 40, :width => 40) + = t('aspects.aspect_stream.make_something').upcase .control-group - = f.label :username, t('username') + = f.label :username, t('username').upcase .controls - = f.text_field :username - %span.host_uri - = diaspora_id_host + = f.text_field :username, :placeholder => "jedi_guy" .control-group - = f.label :email, t('email') + = f.label :email, t('email').upcase .controls - = f.text_field :email + = f.text_field :email, :placeholder => "luke@hoth.net" .control-group - = f.label :password, t('password') + = f.label :password, t('password').upcase .controls - = f.password_field :password + = f.password_field :password, :placeholder => "••••••••" .control-group - = f.label :password_confirmation, t('password_confirmation') + = f.label :password_confirmation, t('password_confirmation').upcase .controls - = f.password_field :password_confirmation + = f.password_field :password_confirmation, :placeholder => "••••••••" .controls = f.submit t('registrations.new.create_my_account'), :class => 'btn primary' - = link_to t('devise.sessions.new.sign_in'), new_user_session_path() + = link_to t('devise.sessions.new.sign_in'), new_user_session_path(), :class => 'btn primary', :style => "float: right;" %footer = link_to t('layouts.application.toggle'), toggle_mobile_path