Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFaldrian <faldrian@och-noe.de>2014-11-06 02:21:01 +0300
committerFaldrian <faldrian@och-noe.de>2014-11-07 18:37:52 +0300
commitd928c69e3666e79db6dae9148b3198aec7322229 (patch)
treea057bdfcf542f4a8f586fd5b91deda556230b303 /app/views/publisher
parentc7f4051ac04a49b6bd51bc1e2d7c3824cd5c866f (diff)
Fix: displaying more than one row of image attachments broke publisher
Diffstat (limited to 'app/views/publisher')
-rw-r--r--app/views/publisher/_publisher_blueprint.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/publisher/_publisher_blueprint.html.haml b/app/views/publisher/_publisher_blueprint.html.haml
index b43ea5512..d3bb109bb 100644
--- a/app/views/publisher/_publisher_blueprint.html.haml
+++ b/app/views/publisher/_publisher_blueprint.html.haml
@@ -16,7 +16,6 @@
%params
#publisher_textarea_wrapper
= link_to(content_tag(:div, nil, :class => 'icons-deletelabel'), "#", :id => "hide_publisher", :title => t('shared.publisher.discard_post'))
- %ul#photodropzone
- if current_user.getting_started?
= status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}...",
:title => popover_with_close_html( '1. ' + t('shared.public_explain.share') ),
@@ -24,7 +23,7 @@
- else
= status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => "#{t('contacts.index.start_a_conversation')}..."
= status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
-
+ %ul#photodropzone
%span#publisher-images
%span.markdownIndications
!= t('shared.publisher.formatWithMarkdown', markdown_link: link_to(t('help.markdown'), 'https://diasporafoundation.org/formatting', target: :blank))