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

Port Getting Started page to Bootstrap

Browse source
This commit is contained in:
Błażej Pankowiak 2014-07-04 18:06:49 +02:00
parent 0515c33769
commit 0d0ed4db28
5 changed files with 71 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/assets/stylesheets/getting-started.css.scss Normal file
View file

@ -0,0 +1,33 @@
#hello-there {
.avatar {
width: 50px;
height: 50px;
}
.awesome {
text-align: center;
}
.hero-unit {
margin: 58px 42px;
padding: 40px 80px;
}
h2 {
margin-top: 80px;
}
p, form {
margin-left: 30px;
}
ul.as-selections {
width: 100%;
li.as-original {
input {
margin-bottom: 15px;
}
}
}
}

3
app/assets/stylesheets/new-templates.css.scss
View file

@ -45,3 +45,6 @@
/* help */
@import 'help';
/* getting started */
@import 'getting-started'

4
app/controllers/users_controller.rb
View file

@ -5,6 +5,8 @@
class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create, :public, :user_photo]
use_bootstrap_for :getting_started
respond_to :html
def edit
@ -117,8 +119,6 @@ class UsersController < ApplicationController
@person = @user.person
@profile = @user.profile
@css_framework = :bootstrap
@include_application_css = true #Hack for multiple CSS frameworks and having two main styles
respond_to do |format|
format.mobile { render "users/getting_started" }
format.all { render "users/getting_started", layout: "with_header_with_footer" }

3
app/views/photos/_new_profile_photo.haml
View file

@ -60,7 +60,7 @@
#profile_photo_upload
= owner_image_tag(:thumb_medium)
#file-upload.button
#file-upload.btn
=t('.upload')
= image_tag('mobile-spinner.gif', :class => 'hidden', :style => "z-index:-1", :id => 'file-upload-spinner')
@ -69,4 +69,3 @@
#fileInfo
#publisher_photo_upload

63
app/views/users/getting_started.haml
View file

@ -5,42 +5,43 @@
- content_for :head do
= javascript_include_tag :profile
%section#hello-there
.hero-unit
%h1.center
= t('.well_hello_there')
%h3.center
= t(".community_welcome")
.container
.row
%section#hello-there.span12
.hero-unit
%h1.text-center
= t('.well_hello_there')
%h3.text-center
= t(".community_welcome")
= invited_by_message
%h2
= t(".who_are_you")
= invited_by_message
- if AppConfig.configured_services.include? :facebook
%p
!= t('.connect_to_facebook', :link => link_to(t('.connect_to_facebook_link'), "auth/facebook?callback_url=#{getting_started_url}"))
%h2
= t(".who_are_you")
= form_tag profile_path, :method => :put, :remote => true, :id => 'edit_profile' do
%fieldset
= label_tag 'profile[first_name]', t('profiles.edit.your_name')
= text_field_tag 'profile[first_name]', current_user.first_name
= image_tag 'ajax-loader.gif', :id => "gs-name-form-spinner", :class => "hidden"
= label_tag :your_photo, t('profiles.edit.your_photo')
= render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
- if AppConfig.configured_services.include? :facebook
%p
!= t('.connect_to_facebook', :link => link_to(t('.connect_to_facebook_link'), "auth/facebook?callback_url=#{getting_started_url}"))
%h2
= t('.what_are_you_in_to')
= form_tag profile_path, :method => :put, :remote => true, :id => 'edit_profile' do
%fieldset
= label_tag 'profile[first_name]', t('profiles.edit.your_name')
= text_field_tag 'profile[first_name]', current_user.first_name
= image_tag 'ajax-loader.gif', :id => "gs-name-form-spinner", :class => "hidden"
= label_tag :your_photo, t('profiles.edit.your_photo')
= render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
%p
= t('.hashtag_explanation')
%h2
= t('.what_are_you_in_to')
= form_tag(tag_followings_path, :method => 'get', :class => "tag_input search_form") do
%fieldset
= label_tag 'follow_tags', t('.hashtag_suggestions')
#tags_list
= text_field_tag 'follow_tags', nil, :class => "nostrap"
%p
= t('.hashtag_explanation')
.awesome
= link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, :id => "awesome_button", :class => "button creation"
= form_tag(tag_followings_path, :method => 'get', :class => "tag_input search_form") do
%fieldset
= label_tag 'follow_tags', t('.hashtag_suggestions')
#tags_list
= text_field_tag 'follow_tags', nil, :class => "nostrap"
.awesome
= link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, :id => "awesome_button", :class => "btn creation"