Permalink
Browse files

make sign up pages ppretty

  • Loading branch information...
1 parent ed473e0 commit 9bf60d71e4ca88617d35255b53c50044fa44f7df @maxwell maxwell committed Oct 20, 2011
@@ -1,39 +1,48 @@
= javascript_include_tag "validation"
+-# = javascript_include_tag 'vendor/jquery.ghostInput'
-:javascript
- $(function() {
- $("#user_username").focus();
- });
-
+= javascript_tag "Diaspora.Page = 'InvitationsEdit';"
.span-7.append-1.prepend-3
%br
%br
%br
%br
- %h2
- = t('.join_the_movement')
+ %h1
+ = t('users.getting_started.welcome')
%h3.accept_invitation_text
- = t('.sign_up_today')
+ = t('.sign_up_message')
+ - flash.each do |name, msg|
+ %p{:class => "login_#{name}"}= msg
+
+ = image_tag 'diaspora_collage.png', :style => "margin-left:-50px;"
.span-10
%br
%br
%br
%br
- = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => 'sign_up_form'}) do |f|
- %p
- = f.label :username , t('username')
- = f.text_field :username, :title => t('.enter_username')
- %p
- = f.label :email , t('email')
- = f.text_field :email, :title => t('.enter_email')
-
- %p
- = f.label :password , t('password')
- = f.password_field :password, :title => t('.enter_password')
- %p
- = f.label :password_confirmation , t('password_confirmation')
- = f.password_field :password_confirmation, :title => t('.enter_password_again')
+ = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f|
+ %fieldset
+ .clearfix
+ %b
+ = t('username')
+ = f.text_field :username, :title => t('registrations.new.enter_username')
+ %span.host_uri
+ = "@#{AppConfig[:pod_uri].host}"
+ .clearfix
+ %b
+ = t('email')
+ = f.email_field :email, :title => t('registrations.new.enter_email')
+ .clearfix
+ %b
+ = t('password')
+ = f.password_field :password, :title => t('registrations.new.enter_password')
+ .clearfix
+ %b
+ = t('password_confirmation')
+ = f.password_field :password_confirmation, :title => t('registrations.new.enter_password_again')
+
+ .submit_field
+ = f.submit t('registrations.new.create_my_account'), :class => 'in_aspects'
- = f.submit t('.create_my_account')
@@ -633,7 +633,7 @@ en:
create_my_account: "Create my account!"
join_the_movement: "Join the movement!"
- sign_up_today: "Sign up today"
+ sign_up_message: "Social Networking with a <3"
@jmallach
jmallach Oct 23, 2011 Contributor

How about using ♥ instead? I swear I had to look this emoticon up on the Wikipedia...

@maxwell
maxwell Oct 25, 2011 Member

pull requests welcome! ♥

@veganstraightedge
veganstraightedge Nov 1, 2011 Contributor

Use ♥ with caution. Not every typeface has this unicode character. When it's not there the user will see a box.

@jmallach
jmallach Nov 13, 2011 Contributor

How does Windows behave with a default install? I'd like to assume at least one font in there has the character, and the beast knows how to fallback to other fonts if the default one doesn't have it, but I'm probably asking forw ay too much?

enter_email: "Enter an email"
enter_username: "Pick a username (only letters, numbers, and underscores)"
@@ -3,5 +3,6 @@ Diaspora.Pages.InvitationsEdit = function() {
this.subscribe("page/ready", function(evt, body) {
$('#user_username').tipsy({trigger: 'select', gravity: 'w'});
+
});
};
@@ -3478,7 +3478,7 @@ ul#getting_started
:right 10px
:left auto
-.accept_invitation_form fieldset
+.new_user_form fieldset, .accept_invitation_form fieldset
@include border-radius(3px)
:background
@@ -3488,3 +3488,8 @@ ul#getting_started
.submit_field
:margin
:top 15px
+ span.host_uri
+ :float right
+ :margin-top -28px
+ :color #999
+ :padding-right 9px

0 comments on commit 9bf60d7

Please sign in to comment.