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

Add section in the User's settings to register the protocol handler

Browse source 
closes #7833
This commit is contained in:
Dennis Schubert 2018-07-13 00:23:49 +02:00 committed by Benjamin Neff
parent f8a4a2c510
commit af500dabbc
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
4 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/pages/settings.js
View file

@ -15,6 +15,10 @@ app.pages.Settings = Backbone.View.extend({
form: $("#post-default-aspects") form: $("#post-default-aspects")
}); });
$("#update_profile_form").areYouSure(); $("#update_profile_form").areYouSure();
$("#register-protocol-handler").click(function() {
Diaspora.ProtocolHandler.register();
});
} }
}); });
// @license-end // @license-end

2
app/assets/javascripts/helpers/protocol_handler.js
View file

@ -19,5 +19,3 @@ Diaspora.ProtocolHandler = {
return true; return true;
} }
}; };
Diaspora.ProtocolHandler.register();

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

@ -180,6 +180,16 @@
.clearfix= f.submit t(".change"), class: "btn btn-primary pull-right", id: "change_email_preferences" .clearfix= f.submit t(".change"), class: "btn btn-primary pull-right", id: "change_email_preferences"
%hr %hr
.row
.col-md-12
%h3#protocol-handler
= t(".protocol_handler.title")
%p= t(".protocol_handler.description")
.form-group
%button.btn.btn-default#register-protocol-handler
= t(".protocol_handler.register")
%hr
.row .row
.col-md-6.account-data .col-md-6.account-data
%h3= t(".export_data") %h3= t(".export_data")

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

@ -1242,6 +1242,11 @@ en:
lock_username: "Your username will be locked. You will not be able to create a new account on this pod with the same ID." lock_username: "Your username will be locked. You will not be able to create a new account on this pod with the same ID."
no_turning_back: "There is no turning back! If you’re really sure, enter your password below." no_turning_back: "There is no turning back! If you’re really sure, enter your password below."
protocol_handler:
title: "web+diaspora:// protocol handler"
description: "Clicking this button will ask your browser to install a handler that allows us to open web+diaspora:// URLs on your home pod. This is currently experimental and interactions will depend on your browser."
register: "Register"
privacy_settings: privacy_settings:
title: "Privacy settings" title: "Privacy settings"
strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)" strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)"