From af500dabbccc0fca4344286901c9dc72ddf5114d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Fri, 13 Jul 2018 00:23:49 +0200 Subject: [PATCH] Add section in the User's settings to register the protocol handler closes #7833 --- app/assets/javascripts/app/pages/settings.js | 4 ++++ app/assets/javascripts/helpers/protocol_handler.js | 2 -- app/views/users/_edit.haml | 10 ++++++++++ config/locales/diaspora/en.yml | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/pages/settings.js b/app/assets/javascripts/app/pages/settings.js index be522514f..6592c1b8c 100644 --- a/app/assets/javascripts/app/pages/settings.js +++ b/app/assets/javascripts/app/pages/settings.js @@ -15,6 +15,10 @@ app.pages.Settings = Backbone.View.extend({ form: $("#post-default-aspects") }); $("#update_profile_form").areYouSure(); + + $("#register-protocol-handler").click(function() { + Diaspora.ProtocolHandler.register(); + }); } }); // @license-end diff --git a/app/assets/javascripts/helpers/protocol_handler.js b/app/assets/javascripts/helpers/protocol_handler.js index c857c1b51..090362f27 100644 --- a/app/assets/javascripts/helpers/protocol_handler.js +++ b/app/assets/javascripts/helpers/protocol_handler.js @@ -19,5 +19,3 @@ Diaspora.ProtocolHandler = { return true; } }; - -Diaspora.ProtocolHandler.register(); diff --git a/app/views/users/_edit.haml b/app/views/users/_edit.haml index 0ec3102b7..65bf97f0e 100644 --- a/app/views/users/_edit.haml +++ b/app/views/users/_edit.haml @@ -180,6 +180,16 @@ .clearfix= f.submit t(".change"), class: "btn btn-primary pull-right", id: "change_email_preferences" %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 .col-md-6.account-data %h3= t(".export_data") diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index f28b8f551..e6d80d0b1 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -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." 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: title: "Privacy settings" strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)"