Commit 497c6479 authored by Janakas's avatar Janakas Committed by Dennis Schubert

Rearrange userdata-export section and change timestamp to timeago

parent d150a6b2
......@@ -36,3 +36,7 @@
max-width: 100%;
min-width: 100%;
}
.account-data h6 {
color: $text-grey;
}
......@@ -181,35 +181,33 @@
%hr
.row
.col-md-6#account_data
.col-md-6.account-data
%h3= t(".export_data")
%h4= t("profile")
.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"
.small-horizontal-spacer
= link_to t(".download_export"), download_profile_user_path,
class: "btn btn-success"
.small-horizontal-spacer
= link_to t(".request_export_update"), export_profile_user_path, method: :post,
class: "btn btn-default"
%h6
= t(".last_exported_at", timestamp: current_user.exported_at)
= t(".last_exported_html", timeago: timeago(current_user.exported_at))
- else
= link_to t(".request_export"), export_profile_user_path, method: :post,
class: "btn btn-default"
%h4= t("javascripts.profile.photos")
.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(".download_export_photos"), download_photos_user_path, class: "btn btn-success"
= link_to t(".request_export_photos_update"), export_photos_user_path, method: :post,
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
= t(".last_exported_at", timestamp: current_user.exported_photos_at)
= t(".last_exported_html", timeago: timeago(current_user.exported_photos_at))
- else
= link_to t(".request_export_photos"), export_photos_user_path, method: :post,
class: "btn btn-default"
......
......@@ -1213,7 +1213,7 @@ en:
request_export_update: "Refresh my profile data"
export_data: "Export data"
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"
request_export_photos: "Request my photos"
request_export_photos_update: "Refresh my photos"
......
......@@ -55,6 +55,6 @@ Feature: Change settings
Then I should see "Public" within ".aspect-dropdown"
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"
And I should have 1 email delivery
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