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

Rearrange userdata-export section and change timestamp to timeago

Browse source
This commit is contained in:
Janakas 2017-12-28 18:20:15 +01:00 committed by Dennis Schubert
parent d150a6b2af
commit 497c647983
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/settings.scss
View file

@ -36,3 +36,7 @@
max-width: 100%; max-width: 100%;
min-width: 100%; min-width: 100%;
} }
.account-data h6 {
color: $text-grey;
}

18
app/views/users/_edit.haml
View file

@ -181,35 +181,33 @@
%hr %hr
.row .row
.col-md-6#account_data .col-md-6.account-data
%h3= t(".export_data") %h3= t(".export_data")
%h4= t("profile")
.form-group .form-group
- if current_user.exporting - if current_user.exporting
.export-in-progress= t(".export_in_progress") .export-in-progress= t(".export_in_progress")
- elsif current_user.export.present? - elsif current_user.export.present?
= link_to t(".request_export_update"), export_profile_user_path, method: :post,
class: "btn btn-default"
.small-horizontal-spacer
= link_to t(".download_export"), download_profile_user_path, = link_to t(".download_export"), download_profile_user_path,
class: "btn btn-success" class: "btn btn-success"
.small-horizontal-spacer = link_to t(".request_export_update"), export_profile_user_path, method: :post,
class: "btn btn-default"
%h6 %h6
= t(".last_exported_at", timestamp: current_user.exported_at) = t(".last_exported_html", timeago: timeago(current_user.exported_at))
- else - else
= link_to t(".request_export"), export_profile_user_path, method: :post, = link_to t(".request_export"), export_profile_user_path, method: :post,
class: "btn btn-default" class: "btn btn-default"
%h4= t("javascripts.profile.photos")
.form-group .form-group
- if current_user.exporting_photos - if current_user.exporting_photos
.export-in-progress= t(".export_photos_in_progress") .export-in-progress= t(".export_photos_in_progress")
- elsif current_user.exported_photos_file.present? - elsif current_user.exported_photos_file.present?
= link_to t(".download_export_photos"), download_photos_user_path, class: "btn btn-success"
= link_to t(".request_export_photos_update"), export_photos_user_path, method: :post, = link_to t(".request_export_photos_update"), export_photos_user_path, method: :post,
class: "btn btn-default" class: "btn btn-default"
.small-horizontal-spacer
= link_to t(".download_export_photos"), download_photos_user_path, class: "btn btn-success"
.small-horizontal-spacer
%h6 %h6
= t(".last_exported_at", timestamp: current_user.exported_photos_at) = t(".last_exported_html", timeago: timeago(current_user.exported_photos_at))
- else - else
= link_to t(".request_export_photos"), export_photos_user_path, method: :post, = link_to t(".request_export_photos"), export_photos_user_path, method: :post,
class: "btn btn-default" class: "btn btn-default"

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

@ -1213,7 +1213,7 @@ en:
request_export_update: "Refresh my profile data" request_export_update: "Refresh my profile data"
export_data: "Export data" export_data: "Export data"
export_in_progress: "We are currently processing your data. Please check back in a few moments." export_in_progress: "We are currently processing your data. Please check back in a few moments."
last_exported_at: "(Last updated at %{timestamp})" last_exported_html: "(Last updated %{timeago})"
download_export_photos: "Download my photos" download_export_photos: "Download my photos"
request_export_photos: "Request my photos" request_export_photos: "Request my photos"
request_export_photos_update: "Refresh my photos" request_export_photos_update: "Refresh my photos"

2
features/desktop/change_settings.feature
View file

@ -55,6 +55,6 @@ Feature: Change settings
Then I should see "Public" within ".aspect-dropdown" Then I should see "Public" within ".aspect-dropdown"
Scenario: exporting profile data Scenario: exporting profile data
When I click on the first selector "#account_data a" When I click on the first selector ".account-data a"
Then I should see "Download my profile" Then I should see "Download my profile"
And I should have 1 email delivery And I should have 1 email delivery