From 7b1ff4cd7bc1cc7da2b3cb7f5b3b54a643f01c36 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 9 Aug 2011 17:20:21 -0700
Subject: [PATCH] more mobile site compatability. edit profile now is a switch
hitter, adding flash to the signup form
---
app/views/invitations/edit.mobile.haml | 3 +++
app/views/layouts/application.mobile.haml | 3 +++
app/views/profiles/{_edit.html.haml => _edit.haml} | 0
.../profiles/{_edit_public.html.haml => _edit_public.haml} | 0
app/views/profiles/{edit.html.haml => edit.haml} | 0
config/locales/diaspora/en.yml | 1 +
6 files changed, 7 insertions(+)
rename app/views/profiles/{_edit.html.haml => _edit.haml} (100%)
rename app/views/profiles/{_edit_public.html.haml => _edit_public.haml} (100%)
rename app/views/profiles/{edit.html.haml => edit.haml} (100%)
diff --git a/app/views/invitations/edit.mobile.haml b/app/views/invitations/edit.mobile.haml
index ad425750c0..0a7202232a 100644
--- a/app/views/invitations/edit.mobile.haml
+++ b/app/views/invitations/edit.mobile.haml
@@ -2,7 +2,10 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
+
#login_form
+ %h3
+ = t('.your_account_awaits')
= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
%p
= f.label :username , t('username')
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index 69a3f59ffc..75b06767ad 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -56,6 +56,9 @@
= link_to(image_tag('icons/list_white.png'), '#menu', :id => "menu_button")
= link_to(image_tag('icons/search_white.png'), people_path)
= link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path)
+ %p
+ - flash.each do |name, msg|
+ = content_tag :div, msg, :id => "flash_#{name}"
= yield
diff --git a/app/views/profiles/_edit.html.haml b/app/views/profiles/_edit.haml
similarity index 100%
rename from app/views/profiles/_edit.html.haml
rename to app/views/profiles/_edit.haml
diff --git a/app/views/profiles/_edit_public.html.haml b/app/views/profiles/_edit_public.haml
similarity index 100%
rename from app/views/profiles/_edit_public.html.haml
rename to app/views/profiles/_edit_public.haml
diff --git a/app/views/profiles/edit.html.haml b/app/views/profiles/edit.haml
similarity index 100%
rename from app/views/profiles/edit.html.haml
rename to app/views/profiles/edit.haml
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 27510a19c0..94d13eed5c 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -51,6 +51,7 @@ en:
invalid: "is invalid."
username:
taken: "is already taken."
+ invalid: "is invalid. We only allow letters, numbers, and underscores"
email:
taken: "is already taken."
person:
--
GitLab