Commit 59e49557 authored by danielgrippi's avatar danielgrippi
Browse files

added translation keys; some css cleanup

parent 923a73fb
......@@ -11,7 +11,6 @@ module InterimStreamHackinessHelper
end
##### These methods need to go away once we pass publisher object into the partial ######
def publisher_prefill_text
if params[:prefill].present?
params[:prefill]
......
......@@ -16,7 +16,7 @@
= render 'shared/publisher', :selected_aspects => stream.aspects, :aspect_ids => stream.aspect_ids, :for_all_aspects => stream.for_all_aspects?, :aspect => stream.aspect
= render 'aspects/no_posts_message'
#gs-shim{:title => "3. Stay Updated", 'data-content' => "Your main stream is populated with all of your contacts, tags you follow, and curated members from the community."}
#gs-shim{:title => "3. #{t('.stay_updated')}", 'data-content' => t('.stay_updated_explanation')}
#main_stream.stream{:data => {:guids => stream.aspect_ids.join(','), :time_for_scroll => time_for_scroll(stream.ajax_stream?, stream)}}
- if !stream.ajax_stream? && stream.posts.length > 0
......
......@@ -6,18 +6,14 @@
- content_for :head do
= include_javascripts :home
#welcome-to-diaspora
.container
%h1
Welcome to Diaspora, #{current_user.first_name}!
%h3
This is your stream, with some explainer text
%br
%br
%br
%br
%br
- if current_user.getting_started?
#welcome-to-diaspora
.container
%h1
Welcome to Diaspora, #{current_user.first_name}!
%br
%br
%br
.span-5.leftNavBar
#home_user_badge
......@@ -25,12 +21,6 @@
%h3
= current_user.first_name
- unless has_completed_getting_started?
.section
%ul.left_nav
%li
= link_to t(".welcome"), getting_started_path, :class => "home_selector"
.section
%ul.left_nav
%li
......
......@@ -56,13 +56,12 @@
= link_to( image_tag('deletelabel.png'), "#", :id => "hide_publisher", :title => t('.discard_post'))
%ul#photodropzone
= status.text_area :fake_text, :rows => 2, :value => h(publisher_prefill_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind'),
:title => "1. Share", 'data-content' => t('shared.public_explain.new_user_welcome_message')
:title => "1. #{t('shared.public_explain.share')}", 'data-content' => t('shared.public_explain.new_user_welcome_message')
= status.hidden_field :text, :value => '', :class => 'clear_on_submit'
#file-upload{:title => t('.upload_photos')}
= image_tag 'icons/camera.svg', :height => 14
- if publisher_public
= hidden_field_tag 'aspect_ids[]', "public"
- elsif all_aspects_selected?(selected_aspects)
......@@ -80,7 +79,7 @@
= link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')
// NOTE(dropdown special casing to DRY up -- taken from the aspect_dropdown partial)
.dropdown{:class => "hang_right", :title => '2. Control your Audience', 'data-content'=> t('shared.public_explain.visibility_dropdown')}
.dropdown{:class => "hang_right", :title => "2. #{t('shared.public_explain.control_your_audience')}", 'data-content'=> t('shared.public_explain.visibility_dropdown')}
.button.toggle.publisher
- if publisher_public
= t('public')
......
......@@ -10,8 +10,7 @@
%section#hello-there
.hero-unit
%h1.center
/= welcome_text
Well, hello there!
= t('.well_hello_there')
%p.center
= t(".community_welcome")
......@@ -26,9 +25,10 @@
.row
%p
= t('.we_can_speed_things_up')
We can speed things up a bit by
= link_to "hooking up your Facebook account", "auth/facebook?callback_url=#{getting_started_url}"
to Diaspora. This will pull your name and photo, and enable cross-positng.
= link_to t('.hooking_up_fb'), "auth/facebook?callback_url=#{getting_started_url}"
= t('.what_facebook_does')
.row
.span6
......@@ -76,5 +76,6 @@
%br
.input
= link_to "#{t('.awesome_take_me_to_diaspora')} »", "#", :id => "awesome_button", :class => "btn primary"
= image_tag 'ajax-loader.gif', :id => "awesome_spinner", :class => "hidden"
......@@ -152,7 +152,6 @@ en:
acquaintances: "Acquaintances"
friends: "Friends"
index:
welcome: "Welcome"
community_spotlight: "Community Spotlight"
see_more_from_us: "See more of the D* community."
donate: "Donate"
......@@ -189,6 +188,11 @@ en:
services:
heading: "Connect Services"
content: "You can connect the following services to Diaspora:"
aspect_stream:
stay_updated: "Stay Updated"
stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and curated members from the community."
aspect_memberships:
destroy:
success: "Successfully removed person from aspect"
......@@ -753,9 +757,12 @@ en:
reshare:
reshare: "Reshare"
public_explain:
new_user_welcome_message: "Use #hashtags to classify you posts and find people who share your interests. Call out awesome people with @Mentions"
control_your_audience: "Control your Audience"
new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions"
visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this one public)"
title: "Set up connected services"
share: "Share"
outside: "Public messages will be available for others outside of Diaspora to see."
logged_in: "logged in to %{service}"
manage: "manage connected services"
......@@ -897,13 +904,15 @@ en:
show_community_spotlight: "Show Community Spotlight in Stream?"
destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora."
getting_started:
welcome: "Welcome!"
welcome_with_name: "Welcome, %{name}!"
well_hello_there: "Well, hello there!"
community_welcome: "Diaspora's community is happy to have you aboard!"
awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
who_are_you: "Who are you?"
we_can_speed_things_up: "We can speed things up a bit by"
hooking_up_fb: "hooking up your Facebook account"
what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
what_are_you_in_to: "What are you into?"
hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They're also a great way to find new people on Diaspora."
......
......@@ -142,7 +142,7 @@ header
@include box-shadow(0,1px,2px,rgba(0,0,0,0.5))
@include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
:z-index 50
:z-index 1001
:padding 6px 0
:color #CCC
:height 26px
......@@ -3393,6 +3393,10 @@ a.toggle_selector
:box-shadow none
#welcome-to-diaspora
:-webkit-box-shadow inset 0 -2px 10px rgba(0,0,0,0.35)
:position absolute
:width 100%
:left 0
......@@ -3406,4 +3410,4 @@ a.toggle_selector
#gs-shim
:position absolute
:top 380px
:top 340px
......@@ -4,7 +4,7 @@
@import 'mixins';
#lightbox{
z-index: 30;
z-index: 1002;
position: fixed;
top: 0;
right: 0;
......@@ -78,7 +78,7 @@
-webkit-box-shadow:inset 0 0 50px #000000;
box-shadow:inset 0 0 50px #000000;
z-index: 29;
z-index: 1002;
position: fixed;
height: 100%;
width: 100%;
......@@ -89,7 +89,7 @@
}
#lightbox-imageset{
z-index: 30;
z-index: 1004;
position: fixed;
width: 100%;
left: 0;
......
......@@ -29,7 +29,7 @@ $button-border-color: #aaa
:border 1px solid $button-border-color
:cursor default
:cursor pointer
:white-space nowrap
&:hover
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment