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

Refactor Account settings page with bootstrap grid

Browse source
This commit is contained in:
Flaburgan 2015-06-15 17:27:06 +02:00
parent 5537e8687b
commit 3e4b8500a4
10 changed files with 268 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/views/profiles/edit.haml
View file

@ -6,11 +6,12 @@
= render "shared/settings_nav"
.container-fluid
.col-lg-8.col-lg-offset-2
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
.row
.col-lg-8.col-lg-offset-2
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
= form_tag profile_path, method: :put, multipart: true, id: "update_profile_form" do
= render "edit_public", profile: @profile, aspect: @aspect, person: @person, mobile: false
= render "edit_private", person: @person, profile: @profile, aspect: @aspect, step: @step
= form_tag profile_path, method: :put, multipart: true, id: "update_profile_form" do
= render "edit_public", profile: @profile, aspect: @aspect, person: @person, mobile: false
= render "edit_private", person: @person, profile: @profile, aspect: @aspect, step: @step

16
app/views/profiles/edit.mobile.haml
View file

@ -5,11 +5,13 @@
.settings_container
= render "shared/settings_nav"
.col-lg-8.col-lg-offset-2
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default button"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
.container-fluid
.row
.col-lg-8.col-lg-offset-2
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
= form_tag profile_path, method: :put, multipart: true, id: "update_profile_form" do
= render "edit_public", profile: @profile, aspect: @aspect, person: @person, mobile: true
= render "edit_private", person: @person, profile: @profile, aspect: @aspect, step: @step
= form_tag profile_path, method: :put, multipart: true, id: "update_profile_form" do
= render "edit_public", profile: @profile, aspect: @aspect, person: @person, mobile: true
= render "edit_private", person: @person, profile: @profile, aspect: @aspect, step: @step

15
app/views/services/index.html.haml
View file

@ -9,11 +9,12 @@
= render 'shared/settings_nav'
.container-fluid
.small-horizontal-spacer
.col-lg-8.col-lg-offset-2
.col-md-7
= render 'add_remove_services'
.row
.col-lg-8.col-lg-offset-2
%h3= t('.title')
.col-md-7
= render 'add_remove_services'
.col-md-5
%p
= t('.services_explanation')
.col-md-5
%p
= t('.services_explanation')

11
app/views/services/index.mobile.haml
View file

@ -8,8 +8,11 @@
= render 'shared/settings_nav'
.col-md-12
= render 'add_remove_services'
.container-fluid
.row
.col-md-12
= render 'add_remove_services'
.col-md-12.services_explanation
= t('.services_explanation')
.row
.col-md-12.services_explanation
= t('.services_explanation')

204
app/views/users/_edit.haml Normal file
View file

@ -0,0 +1,204 @@
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- content_for :page_title do
= t('.edit_account')
= render 'shared/settings_nav'
.container-fluid
.row
.col-lg-8.col-lg-offset-2
.row
.col-md-6
%h3= t('.your_handle')
%p
%b= current_user.diaspora_handle
.col-md-6
%h3
= t(".your_email")
%i.entypo.lock.gray.settings_visibility{title: t("users.edit.your_email_private")}
= form_for 'user', url: user_path, html: { method: :put, class: "form-horizontal col-md-12" , id: "email-form"} do |f|
= f.error_messages
.form-group
= f.text_field :email, value: @user.unconfirmed_email || @user.email, class: "col-md-7 form-control"
.clearfix= f.submit t('.change_email'), class: "btn btn-primary pull-right"
- if @user.unconfirmed_email.present?
%div= t('.email_awaiting_confirmation', email: @user.email, :unconfirmed_email => @user.unconfirmed_email)
%hr
.row
.col-md-12
%h3= t('.change_password')
= form_for @user, url: user_path, html: { method: :put, class: "form-horizontal" } do |f|
- if (@user.errors.keys & [:password, :password_confirmation, :current_password]).present?
= f.error_messages
.form-group
= f.label :current_password, t('.current_password'), class: "col-sm-6 control-label"
.col-sm-6
= f.password_field :current_password, placeholder: t('.current_password_expl'), class: "form-control"
.form-group
= f.label :password, t('.new_password'), class: "col-sm-6 control-label"
%div.col-sm-6
= f.password_field :password, placeholder: t('.character_minimum_expl'), class: "form-control"
.form-group
= f.label :password_confirmation, t('password_confirmation'), class: "col-sm-6 control-label"
.col-sm-6
= f.password_field :password_confirmation, placeholder: t('.character_minimum_expl'), class: "form-control"
.clearfix
= f.submit t('.change_password'), class: "btn btn-primary pull-right", name: 'change_password'
%hr
.row
.col-md-12
%h3= t('.change_language')
= form_for 'user', url: user_path, html: { method: :put} do |f|
.form-inline.clearfix
= f.select :language, available_language_options, {}, { class: 'form-control form-group' }
= f.submit t('.change_language'), class: "btn btn-primary pull-right"
%hr
.row
.col-md-12
%h3= t(".change_color_theme")
= form_for "user", url: user_path, html: {method: :put} do |f|
.form-inline.clearfix
= f.select :color_theme, available_color_themes, {}, {class: "form-control form-group"}
= f.submit t(".change_color_theme"), class: "btn btn-primary pull-right"
%hr
.row
.col-md-12
%h3#stream-preferences
= t('.stream_preferences')
= form_for current_user, url: user_path, html: { method: :put } do |f|
= f.fields_for :stream_preferences do |type|
#stream_prefs
- if AppConfig.settings.community_spotlight.enable?
= f.label :show_community_spotlight_in_stream, class: "checkbox-inline" do
= f.check_box :show_community_spotlight_in_stream
= t('.show_community_spotlight')
= f.label :getting_started, class: "checkbox-inline" do
= f.check_box :getting_started
= t('.show_getting_started')
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right'
%hr
.row
.col-md-12
%h3#auto-follow-back-preferences
= t('.following')
= form_for current_user, url: user_path, html: { method: :put, class: "form-horizontal"} do |f|
= f.label :auto_follow_back, class: "checkbox-inline" do
= f.check_box :auto_follow_back
= t('.auto_follow_back')
.small-horizontal-spacer
.form-group.row
%label.col-sm-6.control-label= t('.auto_follow_aspect')
.col-sm-6
= f.select :auto_follow_back_aspect_id, aspect_options_for_select(current_user.aspects), {}, { class: 'form-control' }
.small-horizontal-spacer
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right'
%hr
.row
.col-md-12
%h3
= t('.receive_email_notifications')
= form_for 'user', url: user_path, html: { method: :put } do |f|
= f.fields_for :email_preferences do |type|
#email_prefs
- if current_user.admin?
= type.label :someone_reported, class: "checkbox-inline" do
= type.check_box :someone_reported, {checked: @email_prefs['someone_reported']}, false, true
= t('.someone_reported')
.small-horizontal-spacer
= type.label :started_sharing, class: "checkbox-inline" do
= type.check_box :started_sharing, {checked: @email_prefs['started_sharing']}, false, true
= t('.started_sharing')
.small-horizontal-spacer
= type.label :mentioned, class: "checkbox-inline" do
= type.check_box :mentioned, {checked: @email_prefs['mentioned']}, false, true
= t('.mentioned')
.small-horizontal-spacer
= type.label :liked, class: "checkbox-inline" do
= type.check_box :liked, {checked: @email_prefs['liked']}, false, true
= t('.liked')
.small-horizontal-spacer
= type.label :reshared, class: "checkbox-inline" do
= type.check_box :reshared, {checked: @email_prefs['reshared']}, false, true
= t('.reshared')
.small-horizontal-spacer
= type.label :comment_on_post, class: "checkbox-inline" do
= type.check_box :comment_on_post, {checked: @email_prefs['comment_on_post']}, false, true
= t('.comment_on_post')
.small-horizontal-spacer
= type.label :also_commented, class: "checkbox-inline" do
= type.check_box :also_commented, {checked: @email_prefs['also_commented']}, false, true
= t('.also_commented')
.small-horizontal-spacer
= type.label :private_message, class: "checkbox-inline" do
= type.check_box :private_message, {checked: @email_prefs['private_message']}, false, true
= t('.private_message')
.small-horizontal-spacer
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right', id: "change_email_preferences"
%hr
.row
#account_data.col-lg-7
.row
.col-md-6
%h3= t('.export_data')
.form-group
- if current_user.exporting
.export-in-progress= t('.export_in_progress')
- elsif current_user.export.present?
= link_to t('.request_export_update'), export_profile_user_path, method: :post, class: "btn btn-default btn-block"
.small-horizontal-spacer
= link_to t('.download_export'), download_profile_user_path, class: "btn btn-success btn-block"
.small-horizontal-spacer
%h6
= t('.last_exported_at', timestamp: current_user.exported_at)
- else
= link_to t('.request_export'), export_profile_user_path, method: :post, class: "btn btn-default btn-block"
.form-group
- if current_user.exporting_photos
.export-in-progress= t('.export_photos_in_progress')
- elsif current_user.exported_photos_file.present?
= link_to t('.request_export_photos_update'), export_photos_user_path, class: "btn btn-default btn-block"
.small-horizontal-spacer
= link_to t('.download_export_photos'), download_photos_user_path, method: :post, class: "btn btn-success btn-block"
.small-horizontal-spacer
%h6
= t('.last_exported_at', timestamp: current_user.exported_photos_at)
- else
= link_to t('.request_export_photos'), export_photos_user_path, method: :post, class: "btn btn-default btn-block"
.col-lg-5
%h3
= t('.close_account_text')
.form-group
.btn.btn-danger{ id: "close_account", data: {toggle: "modal", target: "#closeAccountModal"}}
= t(".close_account_text")
= render "close_account_modal"

54
app/views/users/_privacy_settings.haml
View file

@ -1,33 +1,35 @@
= render 'shared/settings_nav'
.container-fluid
.col-lg-8.col-lg-offset-2
%h3
= t('.title')
.row
.col-lg-8.col-lg-offset-2
.row
.col-md-12
%h3
= t('.title')
= form_for current_user, url: user_path, html: { method: :put } do |f|
= f.error_messages
= form_for current_user, url: user_path, html: { method: :put } do |f|
= f.error_messages
= f.fields_for :stream_preferences do |type|
#stream_prefs
= f.label :strip_exif, class: "checkbox" do
= f.check_box :strip_exif
= t('.strip_exif')
= f.fields_for :stream_preferences do |type|
#stream_prefs.checkbox
= f.label :strip_exif do
= f.check_box :strip_exif
= t('.strip_exif')
= f.submit t('users.edit.change'), class: 'btn btn-primary pull-right'
%hr
.row
.col-md-12
%h3
= t('.ignored_users')
.small-horizontal-spacer
.clearfix
= f.submit t('users.edit.change'), class: 'btn btn-primary pull-right'
- if @blocks.length.zero?
%p
= t('.no_user_ignored_message')
%hr
.small-horizontal-spacer
%h3
= t('.ignored_users')
- if @blocks.length.zero?
= t('.no_user_ignored_message')
- @blocks.each do |block|
= block.person_name
\-
= link_to t('.stop_ignoring'), block_path(block),
method: :delete
- @blocks.each do |block|
= block.person_name
\-
= link_to t('.stop_ignoring'), block_path(block),
method: :delete

245
app/views/users/edit.haml
View file

@ -1,245 +0,0 @@
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- content_for :page_title do
= t('.edit_account')
= render 'shared/settings_nav'
.container-fluid
.col-lg-8.col-lg-offset-2
.row
.col-md-6
%h3= t('.your_handle')
%p
%b= current_user.diaspora_handle
.col-md-6
%h3
= t(".your_email")
%i.entypo.lock.gray.settings_visibility{title: t("users.edit.your_email_private")}
= form_for 'user', url: user_path, html: { method: :put, class: "form-horizontal col-md-12" , id: "email-form"} do |f|
= f.error_messages
.form-group
= f.text_field :email, value: @user.unconfirmed_email || @user.email, class: "col-md-7 form-control"
.form-group
.clearfix= f.submit t('.change_email'), class: "btn btn-primary pull-right"
- if @user.unconfirmed_email.present?
%div= t('.email_awaiting_confirmation', email: @user.email, :unconfirmed_email => @user.unconfirmed_email)
%hr
%h3= t('.change_password')
= form_for @user, url: user_path, html: { method: :put, class: "form-horizontal" } do |f|
- if (@user.errors.keys & [:password, :password_confirmation, :current_password]).present?
= f.error_messages
%div.form-group
= f.label :current_password, t('.current_password'), class: "col-sm-6 control-label"
%div.col-sm-6
= f.password_field :current_password, placeholder: t('.current_password_expl'), class: "form-control"
%div.form-group
= f.label :password, t('.new_password'), class: "col-sm-6 control-label"
%div.col-sm-6
= f.password_field :password, placeholder: t('.character_minimum_expl'), class: "form-control"
%div.form-group
= f.label :password_confirmation, t('password_confirmation'), class: "col-sm-6 control-label"
%div.col-sm-6
= f.password_field :password_confirmation, placeholder: t('.character_minimum_expl'), class: "form-control"
.clearfix
= f.submit t('.change_password'), class: "btn btn-primary pull-right", name: 'change_password'
%hr
%h3= t('.change_language')
= form_for 'user', url: user_path, html: { method: :put} do |f|
.form-inline.clearfix
= f.select :language, available_language_options, {}, { class: 'form-control form-group' }
= f.submit t('.change_language'), class: "btn btn-primary pull-right"
%hr
%h3= t(".change_color_theme")
= form_for "user", url: user_path, html: {method: :put} do |f|
.form-inline.clearfix
= f.select :color_theme, available_color_themes, {}, {class: "form-control form-group"}
= f.submit t(".change_color_theme"), class: "btn btn-primary pull-right"
%hr
%h3#stream-preferences
= t('.stream_preferences')
= form_for current_user, url: user_path, html: { method: :put } do |f|
= f.fields_for :stream_preferences do |type|
#stream_prefs
- if AppConfig.settings.community_spotlight.enable?
= f.label :show_community_spotlight_in_stream, class: "checkbox-inline" do
= f.check_box :show_community_spotlight_in_stream
= t('.show_community_spotlight')
= f.label :getting_started, class: "checkbox-inline" do
= f.check_box :getting_started
= t('.show_getting_started')
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right'
%hr
%h3#auto-follow-back-preferences
= t('.following')
= form_for current_user, url: user_path, html: { method: :put, class: "form-horizontal"} do |f|
= f.label :auto_follow_back, class: "checkbox-inline" do
= f.check_box :auto_follow_back
= t('.auto_follow_back')
.small-horizontal-spacer
%div.form-group.row
%label.col-sm-6.control-label= t('.auto_follow_aspect')
%div.col-sm-6
= f.select :auto_follow_back_aspect_id, aspect_options_for_select(current_user.aspects), {}, { class: 'form-control' }
.small-horizontal-spacer
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right'
%hr
%h3
= t('.receive_email_notifications')
= form_for 'user', url: user_path, html: { method: :put } do |f|
= f.fields_for :email_preferences do |type|
#email_prefs
- if current_user.admin?
= type.label :someone_reported, class: "checkbox-inline" do
= type.check_box :someone_reported, {checked: @email_prefs['someone_reported']}, false, true
= t('.someone_reported')
.small-horizontal-spacer
= type.label :started_sharing, class: "checkbox-inline" do
= type.check_box :started_sharing, {checked: @email_prefs['started_sharing']}, false, true
= t('.started_sharing')
.small-horizontal-spacer
= type.label :mentioned, class: "checkbox-inline" do
= type.check_box :mentioned, {checked: @email_prefs['mentioned']}, false, true
= t('.mentioned')
.small-horizontal-spacer
= type.label :liked, class: "checkbox-inline" do
= type.check_box :liked, {checked: @email_prefs['liked']}, false, true
= t('.liked')
.small-horizontal-spacer
= type.label :reshared, class: "checkbox-inline" do
= type.check_box :reshared, {checked: @email_prefs['reshared']}, false, true
= t('.reshared')
.small-horizontal-spacer
= type.label :comment_on_post, class: "checkbox-inline" do
= type.check_box :comment_on_post, {checked: @email_prefs['comment_on_post']}, false, true
= t('.comment_on_post')
.small-horizontal-spacer
= type.label :also_commented, class: "checkbox-inline" do
= type.check_box :also_commented, {checked: @email_prefs['also_commented']}, false, true
= t('.also_commented')
.small-horizontal-spacer
= type.label :private_message, class: "checkbox-inline" do
= type.check_box :private_message, {checked: @email_prefs['private_message']}, false, true
= t('.private_message')
.small-horizontal-spacer
.clearfix= f.submit t('.change'), class: 'btn btn-primary pull-right', id: "change_email_preferences"
%hr
.row
#account_data.col-lg-7
.row
%h3.col-md-12= t('.export_data')
.col-md-6.form-group
- if current_user.exporting
.export-in-progress= t('.export_in_progress')
- elsif current_user.export.present?
= link_to t('.request_export_update'), export_profile_user_path, method: :post, class: "btn btn-default btn-block"
.small-horizontal-spacer
= link_to t('.download_export'), download_profile_user_path, class: "btn btn-success btn-block"
.small-horizontal-spacer
%h6
= t('.last_exported_at', timestamp: current_user.exported_at)
- else
= link_to t('.request_export'), export_profile_user_path, method: :post, class: "btn btn-default btn-block"
.col-md-6.form-group
- if current_user.exporting_photos
.export-in-progress= t('.export_photos_in_progress')
- elsif current_user.exported_photos_file.present?
= link_to t('.request_export_photos_update'), export_photos_user_path, class: "btn btn-default btn-block"
.small-horizontal-spacer
= link_to t('.download_export_photos'), download_photos_user_path, method: :post, class: "btn btn-success btn-block"
.small-horizontal-spacer
%h6
= t('.last_exported_at', timestamp: current_user.exported_photos_at)
- else
= link_to t('.request_export_photos'), export_photos_user_path, method: :post, class: "btn btn-default btn-block"
.col-lg-5
%h3.text-right
= t('.close_account_text')
- if mobile
= form_for "user", url: user_path, html: { method: :delete } do |f|
= f.error_messages
.form-group
.clearfix= f.label :close_account_password, t("users.edit.current_password"), for: :close_account_password,
class: "pull-right", style: "padding-top: 9px;"
.small-horizontal-spacer
.clearfix= f.password_field :current_password, id: :close_account_password, class: "form-control"
%p
.clearfix= f.submit t('users.edit.close_account_text'), class: "btn btn-danger pull-right",
id: "close_account_confirm", data: { confirm: t("are_you_sure_delete_account") }
- if not mobile
=link_to t('.close_account_text'), '#close_account_pane', rel: 'facebox',
class: "btn btn-danger pull-right", id: "close_account"
.hidden#close_account_pane{rel: 'facebox'}
#inner_account_delete
%h1
= t('.close_account.dont_go')
%p
= t('.close_account.make_diaspora_better')
.row
.col-md-6
= image_tag 'sadcat.jpg'
.small-horizontal-spacer
%small
%b
= t('.close_account.mr_wiggles')
.col-md-6
%ul
%li
= t('.close_account.what_we_delete')
%li
= t('.close_account.locked_out')
%li
= t('.close_account.lock_username')
%p
%b
= t('.close_account.no_turning_back')
= form_for 'user', url: user_path, html: { method: :delete } do |f|
= f.error_messages
%p
= f.label :close_account_password, t('.current_password'), for: :close_account_password
= f.password_field :current_password, id: :close_account_password
%p
.small-horizontal-spacer
= f.submit t('.close_account_text'), class: "btn btn-danger", id: "close_account_confirm",
data: { confirm: t('are_you_sure_delete_account') }
.small-horizontal-spacer

2
app/views/users/edit.html.haml Normal file
View file

@ -0,0 +1,2 @@
.container-fluid
= render "edit"

2
app/views/users/edit.mobile.haml
View file

@ -1,2 +1,2 @@
.settings_container
= render "edit", mobile: true
= render "edit"

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

@ -1100,6 +1100,7 @@ en:
twitter: "Twitter"
wordpress: "WordPress"
index:
title: "Manage connected services"
connect: "Connect"
disconnect: "Disconnect"
logged_in_as: "Logged in as %{nickname}."