Download as
Browse Code »

Commit e8f4fd2b75a6ad182c74eb9d9cd80eb74f8d895f

Authored by dtygel
Committed by Rodrigo Souto
1 parent 84208b3a
Exists in web_steps_improvements and in 9 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.5

Small changes in add media in articles for better comprehension by users

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/views/cms/_drag_and_drop_note.html.erb
  Diff comments   View file @e8f4fd2
1 <p> 1 <p>
2 <em> 2 <em>
3 - <%= _('Drag images to add them to the text.') %>  
4 - <%= _('Click on file names to add links to the text.') %> 3 + <%= _('Drag images to add them to the text or click on file names to add links to the text.') %>
5 </em> 4 </em>
6 </p> 5 </p>
app/views/cms/_text_editor_sidebar.html.erb
  Diff comments   View file @e8f4fd2
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 :parent_id, profile, default_folder, {}, {}, 17 :parent_id, profile, default_folder, {}, {},
18 "type='Folder' or type='Gallery'" 18 "type='Folder' or type='Gallery'"
19 ) %> 19 ) %>
  20 + <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
20 </div> 21 </div>
21 - <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>  
22 <p><%= file_field_tag('file', :multiple => true) %></p> 22 <p><%= file_field_tag('file', :multiple => true) %></p>
23 <% end %> 23 <% end %>
24 </div> 24 </div>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'> 31 <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
32 <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {}, 32 <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
33 "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %> 33 "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
34 - <%= labelled_form_field _('Search'), text_field_tag('q') %> 34 + <%= labelled_form_field _('Search among your uploaded files'), text_field_tag('q', '', placeholder: _('Write words about the file you are looking for')) %>
35 <%= render :partial => 'drag_and_drop_note' %> 35 <%= render :partial => 'drag_and_drop_note' %>
36 <div class='items'> 36 <div class='items'>
37 <%= render :partial => 'published_media_items' %> 37 <%= render :partial => 'published_media_items' %>