From 07a4fb8e967c4bb83dc55747fe547f5532b53a75 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 27 Oct 2011 17:22:33 -0700
Subject: [PATCH] download photo unavailable prompt
---
app/views/users/edit.html.haml | 10 +++++-----
config/locales/diaspora/en.yml | 1 +
public/javascripts/view.js | 6 ++++++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index f6f043053b..1a745022ad 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -23,7 +23,7 @@
= f.error_messages
%p
= f.text_field :email, :value => @user.unconfirmed_email || @user.email
- = f.submit t('.change_email')
+ = f.submit t('.change_email'), :class => "button"
%br
- if @user.unconfirmed_email.present?
%p= t('.email_awaiting_confirmation', :email => @user.email, :unconfirmed_email => @user.unconfirmed_email)
@@ -52,7 +52,7 @@
.submit_block
= link_to t('cancel'), edit_user_path
= t('or')
- = f.submit t('.change_password')
+ = f.submit t('.change_password'), :class => "button"
%br
%br
@@ -66,7 +66,7 @@
%p
= f.select :language, available_language_options
- = f.submit t('.change_language')
+ = f.submit t('.change_language'), :class => "button"
%br
%br
@@ -148,7 +148,7 @@
= type.label :reshared, t('.reshared')
= type.check_box :reshared, {:checked => @email_prefs['reshared']}, false, true
%br
- = f.submit t('.change')
+ = f.submit t('.change'), :class => "button"
%br
%br
@@ -161,7 +161,7 @@
= t('.export_data')
= link_to t('.download_xml'), export_user_path, :class => "button"
%br
- = link_to t('.download_photos'), export_photos_user_path, :class => "button"
+ = link_to t('.download_photos'), "#", :class => "button", :id => "photo-export-button", :title => t('.photo_export_unavailable')
.span-5.last
%h3
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 549d350f0f..112d8095b2 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -885,6 +885,7 @@ en:
works_on_modern: "Works on all modern smartphones"
edit:
export_data: "Export Data"
+ photo_export_unavailable: "Photo exporting currently unavailable"
close_account: "Close Account"
change_language: "Change language"
change_password: "Change password"
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 2201a712ba..2fcb15a364 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -62,6 +62,12 @@ var View = {
// Diaspora.Page.subscribe("stream/scrolled", startAutoResize)
// Diaspora.Page.subscribe("stream/reloaded", startAutoResize)
+ /* photo exporting in the works */
+ $("#photo-export-button").bind("click", function(evt){
+ evt.preventDefault();
+ alert($(this).attr('title'));
+ });
+
$(document.body)
.click(this.dropdowns.removeFocus)
.click(this.reshareButton.removeFocus);
--
GitLab