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

Add indication about markdown formatting in the publisher

Browse source
This commit is contained in:
flaburgan 2013-11-13 13:06:36 -08:00
parent c660c90091
commit 923a4f2ab4
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -56,6 +56,7 @@ A new feature [has been added](https://github.com/diaspora/diaspora/pull/4602) t
* Improve the management of the contacts visibility settings in an aspect [#4567](https://github.com/diaspora/diaspora/pull/4567) * Improve the management of the contacts visibility settings in an aspect [#4567](https://github.com/diaspora/diaspora/pull/4567)
* Add actions on aspects on the contact page [#4570](https://github.com/diaspora/diaspora/pull/4570) * Add actions on aspects on the contact page [#4570](https://github.com/diaspora/diaspora/pull/4570)
* Added a statistics route with general pod information, and if enabled in pod settings, total user, half year/monthly active users and local post counts [#4602](https://github.com/diaspora/diaspora/pull/4602) * Added a statistics route with general pod information, and if enabled in pod settings, total user, half year/monthly active users and local post counts [#4602](https://github.com/diaspora/diaspora/pull/4602)
* Add indication about markdown formatting in the publisher [#4589](https://github.com/diaspora/diaspora/pull/4589)
# 0.2.0.1 # 0.2.0.1

9
app/assets/stylesheets/publisher.css.scss
View file

@ -261,10 +261,9 @@
} }
#publisher.closed { #publisher.closed {
#publisher_textarea_wrapper { #publisher_textarea_wrapper #hide_publisher,
#hide_publisher { .markdownIndications {
display: none; display: none;
}
} }
} }
@ -277,6 +276,8 @@
} }
#publisher-images { #publisher-images {
padding-left: 5px;
#locator { #locator {
bottom: 1px !important; bottom: 1px !important;
display: inline-block; display: inline-block;

2
app/views/shared/_publisher.html.haml
View file

@ -26,6 +26,8 @@
= status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit' = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
#publisher-images #publisher-images
%span.markdownIndications
!= t('.formatWithMarkdown', link: link_to('markdown', 'https://diasporafoundation.org/formatting'))
#locator.btn{:title => t('.get_location')} #locator.btn{:title => t('.get_location')}
= image_tag 'icons/marker.png', :alt => t('.get_location').titleize, :class => 'publisher_image' = image_tag 'icons/marker.png', :alt => t('.get_location').titleize, :class => 'publisher_image'
#file-upload.btn{:title => t('.upload_photos')} #file-upload.btn{:title => t('.upload_photos')}

1
config/locales/diaspora/en.yml
View file

@ -992,6 +992,7 @@ en:
one: "In %{count} aspect" one: "In %{count} aspect"
other: "In %{count} aspects" other: "In %{count} aspects"
publisher: publisher:
formatWithMarkdown: "You can use %{link} to format your post"
posting: "Posting..." posting: "Posting..."
share: "Share" share: "Share"
preview: "Preview" preview: "Preview"