parent
8ebf9c4a4c
commit
d9a1297271
4 changed files with 10 additions and 19 deletions
|
|
@ -5,6 +5,7 @@
|
||||||
## Bug fixes
|
## Bug fixes
|
||||||
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
|
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
|
||||||
* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
|
* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
|
||||||
|
* Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
|
* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,4 @@ module InterimStreamHackinessHelper
|
||||||
[]
|
[]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def publisher_method(method)
|
|
||||||
@stream.try(:publisher).try(method) == true
|
|
||||||
end
|
|
||||||
|
|
||||||
def publisher_open
|
|
||||||
publisher_method(:open)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -3,24 +3,18 @@
|
||||||
# the COPYRIGHT file.
|
# the COPYRIGHT file.
|
||||||
|
|
||||||
module PublisherHelper
|
module PublisherHelper
|
||||||
def remote?
|
|
||||||
params[:controller] != "tags"
|
|
||||||
end
|
|
||||||
|
|
||||||
def service_button(service)
|
def service_button(service)
|
||||||
provider_title = I18n.t(
|
provider_title = I18n.t("services.index.share_to", provider: service.provider.titleize)
|
||||||
"services.index.share_to",
|
|
||||||
provider: service.provider.titleize)
|
|
||||||
content_tag :div,
|
content_tag :div,
|
||||||
class: "btn btn-link service_icon dim",
|
class: "btn btn-link service_icon dim",
|
||||||
title: "#{provider_title} (#{service.nickname})",
|
title: "#{provider_title} (#{service.nickname})",
|
||||||
id: "#{service.provider}",
|
id: service.provider,
|
||||||
maxchar: "#{service.class::MAX_CHARACTERS}",
|
maxchar: service.class::MAX_CHARACTERS,
|
||||||
data: {toggle: "tooltip", placement: "bottom"} do
|
data: {toggle: "tooltip", placement: "bottom"} do
|
||||||
if service.provider == "wordpress"
|
if service.provider == "wordpress"
|
||||||
content_tag(:span, "", class: "social-media-logos-wordpress-16x16")
|
content_tag(:span, "", class: "social-media-logos-wordpress-16x16")
|
||||||
else
|
else
|
||||||
content_tag(:i, "", class: "entypo-social-#{ service.provider } small")
|
content_tag(:i, "", class: "entypo-social-#{service.provider} small")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -37,6 +31,10 @@ module PublisherHelper
|
||||||
selected_aspects.include?(aspect) && !all_aspects_selected?(selected_aspects) && !public_selected?(selected_aspects)
|
selected_aspects.include?(aspect) && !all_aspects_selected?(selected_aspects) && !public_selected?(selected_aspects)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def publisher_open?
|
||||||
|
publisher_boolean?(:open)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def publisher_boolean?(option)
|
def publisher_boolean?(option)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
.row.publisher#publisher{class: ((aspect == :profile || publisher_open) ? "mention_popup" : "closed")}
|
.row.publisher#publisher{class: ((aspect == :profile || publisher_open?) ? "mention_popup" : "closed")}
|
||||||
.content_creation
|
.content_creation
|
||||||
= form_for(StatusMessage.new) do |status|
|
= form_for(StatusMessage.new) do |status|
|
||||||
= status.error_messages
|
= status.error_messages
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue