From 7e5f5964e9f49559b3c5429cec8a0bb8c89841e3 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 7 Feb 2015 14:59:18 +0100 Subject: [PATCH] Remove photo export from settings --- app/assets/javascripts/view.js | 6 ------ app/views/users/edit.html.haml | 3 --- app/views/users/edit.mobile.haml | 3 --- config/locales/diaspora/en.yml | 3 --- 4 files changed, 15 deletions(-) diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js index 69906e286..7220d511c 100644 --- a/app/assets/javascripts/view.js +++ b/app/assets/javascripts/view.js @@ -58,12 +58,6 @@ var View = { $(this).siblings("#tag_following_submit").removeClass('hidden'); }); - /* photo exporting in the works */ - $("#photo-export-button").bind("click", function(evt){ - evt.preventDefault(); - alert($(this).attr('title')); - }); - $(document.body).click(this.dropdowns.removeFocus); $('a[rel*=facebox]').facebox(); diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 39b992f82..b3bf48d8e 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -195,9 +195,6 @@ .small-horizontal-spacer = link_to t('.request_export'), export_profile_user_path, :class => "button" - .small-horizontal-spacer - = link_to t('.download_photos'), "#", :class => "button", :id => "photo-export-button", :title => t('.photo_export_unavailable') - .span6 %h3 = t('.close_account_text') diff --git a/app/views/users/edit.mobile.haml b/app/views/users/edit.mobile.haml index c26390eb8..a3f51f281 100644 --- a/app/views/users/edit.mobile.haml +++ b/app/views/users/edit.mobile.haml @@ -174,9 +174,6 @@ - else .small-horizontal-spacer = link_to t('.request_export'), export_profile_user_path, :class => "button" - %br - %br - = link_to t('.download_photos'), "#", :class => "btn", :id => "photo-export-button", :title => t('.photo_export_unavailable') .span-5.last %h4 diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 7c34292cb..4d950bae5 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1300,12 +1300,9 @@ en: download_export: "Download my profile" request_export: "Request my profile data" request_export_update: "Refresh my profile data" - download_xml: "Download my data (XML)" - download_photos: "Download my photos" 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})" - photo_export_unavailable: "Photo exporting currently unavailable" close_account: dont_go: "Hey, please don’t go!"