From 278a74f1f92f83b02bcc89bdd3cbf98472a5c8e9 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 15 Oct 2010 11:07:11 -0700 Subject: [PATCH] draft --- app/controllers/users_controller.rb | 4 + app/views/users/getting_started.html.haml | 93 +++++++++++++++++++++++ config/routes.rb | 1 + public/stylesheets/sass/application.sass | 15 ++++ 4 files changed, 113 insertions(+) create mode 100644 app/views/users/getting_started.html.haml diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9c1bb3e9c..630335d86 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -65,6 +65,10 @@ class UsersController < ApplicationController end end + def getting_started + render 'users/getting_started' + end + def export exporter = Diaspora::Exporter.new(Diaspora::Exporters::XML) send_data exporter.execute(current_user), :filename => "#{current_user.username}_diaspora_data.xml", :type => :xml diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml new file mode 100644 index 000000000..405c62dbc --- /dev/null +++ b/app/views/users/getting_started.html.haml @@ -0,0 +1,93 @@ +-# Copyright (c) 2010, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + + + +%h1 + = "Welcome, #{current_user.real_name}!" + + .description + Do the stuff below to further complete some things. + +%h2 + %u + Edit your profile + ➔ + Define your aspects ➔ + Find your friends + + +%h3 + Your Profile + .description + This info will be available to whomever you connect with on Diaspora. + +%h4 + Your name + = text_field_tag :first_name, nil, :placeholder => "First name" + = text_field_tag :last_name, nil, :placeholder => "Last name" + +%h4 + Your birthday + %br + = select_date + +%h4 + Your bio + = text_area_tag :bio, nil, :placeholder => "Fill me out" + +%h4 + Your photo + %br + = file_field_tag :photo + + +%br +%br +%br +%h2 + Edit your profile ➔ + %u + Define your aspects + ➔ + Find your friends + +%h3 + Your aspects + .description + These will be blah blah blah blah and some stuff. + +%h4 + Aspect name + = text_field_tag :aspect_name, nil, :placeholder => "New aspect" + +%br +%br +%br +%h2 + Edit your profile ➔ + Define your aspects ➔ + %u + Find your friends + + +%h3 + Your friends + .description + Find your friends on Diaspora, Facebook, or send them an invite via email. + +.span-5 + %h4 + On Diaspora + = text_field_tag :diaspora_handle, nil, :placeholder => "Diaspora handle" + +.span-5 + %h4 + On Facebook + = text_field_tag :facebook_handle, nil, :placeholder => "Name" + +.span-5 + %h4 + Invite + = text_field_tag :email, nil, :placeholder => "Email" diff --git a/config/routes.rb b/config/routes.rb index b9b05ca65..b1d68fff7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,7 @@ Diaspora::Application.routes.draw do :invitations => "invitations"} # added public route to user match 'public/:username', :to => 'users#public' + match 'users/getting_started', :to => 'users#getting_started' match 'users/export', :to => 'users#export' match 'users/import', :to => 'users#import' match 'users/export_photos', :to => 'users#export_photos' diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c4da5d4fc..88999049a 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1136,6 +1136,21 @@ ul#settings_nav :size 80px :display inline-block +h1,h2,h3 + .description + :font + :size 70% + :weight 100 + :color #ccc + :margin + :top 5px + +h2,h3 + .description + :font + :size 80% + :weight 200 + input[type="search"] :-webkit-appearance textfield