Unverified Commit af500dab authored by Dennis Schubert's avatar Dennis Schubert Committed by Benjamin Neff
Browse files

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

closes #7833
parent f8a4a2c5

app/assets/javascripts/app/pages/settings.js

+4 −0
Original line number Diff line number Diff line
@@ -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

app/assets/javascripts/helpers/protocol_handler.js

+0 −2
Original line number Diff line number Diff line
@@ -19,5 +19,3 @@ Diaspora.ProtocolHandler = { 
    return true;

  }

};
 


Diaspora.ProtocolHandler.register();

app/views/users/_edit.haml

+10 −0
Original line number Diff line number Diff line
@@ -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")

config/locales/diaspora/en.yml

+5 −0
Original line number Diff line number Diff line
@@ -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)"