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

Merge pull request #5854 from svbergerem/remove-managing-services-standalone

Browse source 
Remove 'manage services' link in standalone mode
This commit is contained in:
Jonne Haß 2015-04-20 22:35:23 +02:00
commit 37ec00f80b
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -8,6 +8,7 @@
* Fix only sharing flag for contacts that are receiving [#5848](https://github.com/diaspora/diaspora/pull/5848) * 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) * 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) * 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 ## Features
* Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843) * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)

6
app/assets/javascripts/app/views/publisher_view.js
View file

@ -59,11 +59,13 @@ app.views.Publisher = Backbone.View.extend({
this.el_input.val( this.el_hiddenInput.val() ); 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) // (e.g. bookmarklet, mentions popup)
if( this.standalone ) { if( this.standalone ) {
this.$('#hide_publisher').hide(); this.$("#hide_publisher").hide();
this.el_preview.hide(); this.el_preview.hide();
this.$(".question_mark").hide();
} }
// this has to be here, otherwise for some reason the callback for the // this has to be here, otherwise for some reason the callback for the

10
app/assets/stylesheets/publisher.scss
View file

@ -30,13 +30,15 @@
.options_and_submit { .options_and_submit {
#publisher_service_icons { #publisher_service_icons {
.btn-link { text-decoration: none; } margin-right: 10px;
.btn-link.question_mark .entypo { color: $text-grey; } .btn-link {
.btn-link.question_mark:hover .entypo { color: $black; }
.btn-link.service_icon {
padding-left: 5px; padding-left: 5px;
padding-right: 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; } .dim { opacity: 0.3; }
.social_media_logos-wordpress-16x16 { .social_media_logos-wordpress-16x16 {
display: inline-block; display: inline-block;

8
spec/javascripts/app/views/publisher_view_spec.js
View file

@ -16,11 +16,15 @@ describe("app.views.Publisher", function() {
}); });
it("hides the close button in standalone mode", 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() { 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(){ describe("createStatusMessage", function(){