Skip to content
Extraits de code Groupes Projets
Valider 07a4fb8e rédigé par danielgrippi's avatar danielgrippi
Parcourir les fichiers

download photo unavailable prompt

parent 139cfcdd
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
= f.error_messages = f.error_messages
%p %p
= f.text_field :email, :value => @user.unconfirmed_email || @user.email = f.text_field :email, :value => @user.unconfirmed_email || @user.email
= f.submit t('.change_email') = f.submit t('.change_email'), :class => "button"
%br %br
- if @user.unconfirmed_email.present? - if @user.unconfirmed_email.present?
%p= t('.email_awaiting_confirmation', :email => @user.email, :unconfirmed_email => @user.unconfirmed_email) %p= t('.email_awaiting_confirmation', :email => @user.email, :unconfirmed_email => @user.unconfirmed_email)
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
.submit_block .submit_block
= link_to t('cancel'), edit_user_path = link_to t('cancel'), edit_user_path
= t('or') = t('or')
= f.submit t('.change_password') = f.submit t('.change_password'), :class => "button"
%br %br
%br %br
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
%p %p
= f.select :language, available_language_options = f.select :language, available_language_options
= f.submit t('.change_language') = f.submit t('.change_language'), :class => "button"
%br %br
%br %br
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
= type.label :reshared, t('.reshared') = type.label :reshared, t('.reshared')
= type.check_box :reshared, {:checked => @email_prefs['reshared']}, false, true = type.check_box :reshared, {:checked => @email_prefs['reshared']}, false, true
%br %br
= f.submit t('.change') = f.submit t('.change'), :class => "button"
%br %br
%br %br
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
= t('.export_data') = t('.export_data')
= link_to t('.download_xml'), export_user_path, :class => "button" = link_to t('.download_xml'), export_user_path, :class => "button"
%br %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 .span-5.last
%h3 %h3
......
...@@ -885,6 +885,7 @@ en: ...@@ -885,6 +885,7 @@ en:
works_on_modern: "Works on all modern smartphones" works_on_modern: "Works on all modern smartphones"
edit: edit:
export_data: "Export Data" export_data: "Export Data"
photo_export_unavailable: "Photo exporting currently unavailable"
close_account: "Close Account" close_account: "Close Account"
change_language: "Change language" change_language: "Change language"
change_password: "Change password" change_password: "Change password"
......
...@@ -62,6 +62,12 @@ var View = { ...@@ -62,6 +62,12 @@ var View = {
// Diaspora.Page.subscribe("stream/scrolled", startAutoResize) // Diaspora.Page.subscribe("stream/scrolled", startAutoResize)
// Diaspora.Page.subscribe("stream/reloaded", 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) $(document.body)
.click(this.dropdowns.removeFocus) .click(this.dropdowns.removeFocus)
.click(this.reshareButton.removeFocus); .click(this.reshareButton.removeFocus);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter