diff --git a/Changelog.md b/Changelog.md index 90e97c110..500057361 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ * Fix only sharing flag for contacts that are receiving [#5848](https://github.com/diaspora/diaspora/pull/5848) * Return 406 when requesting a JSON representation of people/:guid/contacts [#5849](https://github.com/diaspora/diaspora/pull/5849) * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) +* Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854) ## Features * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843) diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index 5a928f102..fece5dd08 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -59,11 +59,13 @@ app.views.Publisher = Backbone.View.extend({ this.el_input.val( this.el_hiddenInput.val() ); } - // hide close and preview buttons, in case publisher is standalone + // hide close and preview buttons and manage services link + // in case publisher is standalone // (e.g. bookmarklet, mentions popup) if( this.standalone ) { - this.$('#hide_publisher').hide(); + this.$("#hide_publisher").hide(); this.el_preview.hide(); + this.$(".question_mark").hide(); } // this has to be here, otherwise for some reason the callback for the diff --git a/app/assets/stylesheets/publisher.scss b/app/assets/stylesheets/publisher.scss index 462a13080..8df3350b3 100644 --- a/app/assets/stylesheets/publisher.scss +++ b/app/assets/stylesheets/publisher.scss @@ -30,13 +30,15 @@ .options_and_submit { #publisher_service_icons { - .btn-link { text-decoration: none; } - .btn-link.question_mark .entypo { color: $text-grey; } - .btn-link.question_mark:hover .entypo { color: $black; } - .btn-link.service_icon { + margin-right: 10px; + .btn-link { padding-left: 5px; padding-right: 5px; + text-decoration: none; } + .btn-link.question_mark { margin-left: 5px; } + .btn-link.question_mark .entypo { color: $text-grey; } + .btn-link.question_mark:hover .entypo { color: $black; } .dim { opacity: 0.3; } .social_media_logos-wordpress-16x16 { display: inline-block; diff --git a/spec/javascripts/app/views/publisher_view_spec.js b/spec/javascripts/app/views/publisher_view_spec.js index 8390f6b83..428fc7efa 100644 --- a/spec/javascripts/app/views/publisher_view_spec.js +++ b/spec/javascripts/app/views/publisher_view_spec.js @@ -16,11 +16,15 @@ describe("app.views.Publisher", function() { }); it("hides the close button in standalone mode", function() { - expect(this.view.$('#hide_publisher').is(':visible')).toBeFalsy(); + expect(this.view.$("#hide_publisher").is(":visible")).toBeFalsy(); }); it("hides the post preview button in standalone mode", function() { - expect(this.view.$('.post_preview_button').is(':visible')).toBeFalsy(); + expect(this.view.$(".post_preview_button").is(":visible")).toBeFalsy(); + }); + + it("hides the manage services link in standalone mode", function() { + expect(this.view.$(".question_mark").is(":visible")).toBeFalsy(); }); describe("createStatusMessage", function(){