nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further refinements. added back buttons, more explanation text.

Browse source
This commit is contained in:
danielvincent 2010-10-26 23:27:26 -07:00
parent f1fbb68fd8
commit a8086f2990
6 changed files with 79 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/users/getting_started/1.html.haml
View file

@ -71,6 +71,3 @@
.submit_block
= person.submit "Save and continue →"
/.bottom_notification
/ .blue_button
/ SKIP

3
app/views/users/getting_started/2.html.haml
View file

@ -35,7 +35,7 @@
%h3
Your aspects
.description
Diaspora aspects are mappings of your real-life aspects. You can manage these later by clicking the manage tab on the top right.
Diaspora aspects are mappings of your real-life aspects. You can manage these later by clicking the manage tab on the top right. Your aspects are unique to you, and not visible by others.
%h4
Aspect name
@ -63,4 +63,5 @@
%br
.submit_block
= link_to "Back", getting_started_path(1), :class => "button"
= link_to "Save and continue →", getting_started_path(3), :class => "button"

6
app/views/users/getting_started/3.html.haml
View file

@ -20,7 +20,10 @@
.span-15.last
.floating
%h3 Your services
%h3
Your services
.description
Connect your existing social networks to your Diaspora account. You will be able to post publically through your Everyone tab when you select "public."
%ul#stream
- for service in @services
%h3
@ -34,4 +37,5 @@
%h4= link_to "Connect to facebook", "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
.submit_block
= link_to "Back", getting_started_path(2), :class => "button"
= link_to "Save and continue →", getting_started_path(4), :class => "button"

31
app/views/users/getting_started/4.html.haml
View file

@ -21,7 +21,36 @@
.span-15.last
.floating
%h1
You're all set up!
= "You're all set up, #{current_user.person.profile.first_name}!"
.description
You're now ready to start sharing with
%ul.inline_aspect_listing
- for aspect in @aspects
%li= aspect
%br
%br
%h3
= link_to "Continue on to your everyone page, an overview of all of your aspects.", root_path
%br
%br
%br
%p
You can change your profile any time by clicking
%b edit profile
in your user menu (top right).
%p
You can connect/disconnect your services any time by clicking
%b edit account
in your user menu (top right).
%p
You can manage your aspects any time by clicking the
%b manage
tab. Your contacts can also be added while on a particular aspect page, as well.
.submit_block
= link_to "Back", getting_started_path(3), :class => "button"

6
config/locales/diaspora/en.yml
View file

@ -117,6 +117,12 @@ en:
edit:
editing_profile: "Editing profile"
destroy: "Account successfully closed."
getting_started:
'1':
albums: "Albums"
you_dont_have_any_photos: "You don't have any photos! Go to the"
page_to_upload_some: "page to upload some."
or: "or"
comments:
comment:
ago: "ago"

34
public/stylesheets/sass/application.sass
View file

@ -393,6 +393,9 @@ li.message
form
:position relative
input,
textarea,
label
:font
:size 14px
@ -596,7 +599,6 @@ li.message .from .right
h5
:color #ccc
input:not([type='submit']),
textarea
:font
@ -612,6 +614,8 @@ textarea
:-webkit-border-radius 5px
:-moz-border-radius 5px
input[type='checkbox']
:width auto
.submit_block
:text
@ -685,7 +689,6 @@ label
:display inline
.public_toggle
:width 300px
:font
:size smaller
:style italic
@ -1298,6 +1301,7 @@ ul.aspects
:display inline
.floating
:position relative
:padding 12px
:background
:color rgb(255,255,255)
@ -1306,8 +1310,12 @@ ul.aspects
:border
:bottom 1px solid #ccc
:top 1px solid #fff
:min-height 500px
.submit_block
:position absolute
:bottom 13px
:right 12px
.bottom_notification
:position fixed
@ -1325,3 +1333,23 @@ ul.aspects
:color #fff
:padding 21px
.inline_aspect_listing
:margin 0
:padding 0
:list
:style none
:display inline
> li
:display inline
:font
:weight normal
&:after
:content ", "
&:last-child
&:before
:content "and "
&:after
:content "."