Download as
Browse Code »

Commit 21fb3fcc02152763770b348fbd078dcc738f24fe

Authored by Rodrigo Souto
1 parent 16b3ad01
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

[media-panel-improvements] Show/Hide all uploads

Showing 3 changed files with 26 additions and 0 deletions   Show diff stats
app/views/cms/_text_editor_sidebar.html.erb
  Diff comments   View file @21fb3fc
@@ -15,6 +15,10 @@ @@ -15,6 +15,10 @@
15 <p><%= file_field_tag('file', :multiple => true) %></p> 15 <p><%= file_field_tag('file', :multiple => true) %></p>
16 <% end %> 16 <% end %>
17 </div> 17 </div>
  18 + <div class='hide-and-show-uploads'>
  19 + <%= link_to(_('Hide all uploads'), nil, :id => 'hide-uploads', :style => 'display: none;', 'data-bootstraped' => false) %>
  20 + <%= link_to(_('Show all uploads'), nil, :id => 'show-uploads', :style => 'display: none;') %>
  21 + </div>
18 </div> 22 </div>
19 23
20 <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'> 24 <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
public/javascripts/media-panel.js
  Diff comments   View file @21fb3fc
@@ -5,6 +5,10 @@ jQuery(&#39;#file&#39;).fileupload({ @@ -5,6 +5,10 @@ jQuery(&#39;#file&#39;).fileupload({
5 data.submit(); 5 data.submit();
6 }, 6 },
7 progress: function (e, data) { 7 progress: function (e, data) {
  8 + if (jQuery('#hide-uploads').data('bootstraped') == false) {
  9 + jQuery('#hide-uploads').show();
  10 + jQuery('#hide-uploads').data('bootstraped', true);
  11 + }
8 if (data.context) { 12 if (data.context) {
9 progress = parseInt(data.loaded / data.total * 100, 10); 13 progress = parseInt(data.loaded / data.total * 100, 10);
10 data.context.find('.bar').css('width', progress + '%'); 14 data.context.find('.bar').css('width', progress + '%');
@@ -18,6 +22,20 @@ jQuery(&#39;#file&#39;).fileupload({ @@ -18,6 +22,20 @@ jQuery(&#39;#file&#39;).fileupload({
18 } 22 }
19 }); 23 });
20 24
  25 +jQuery('#hide-uploads').click(function(){
  26 + jQuery('#hide-uploads').hide();
  27 + jQuery('#show-uploads').show();
  28 + jQuery('.upload').slideUp();
  29 + return false;
  30 +});
  31 +
  32 +jQuery('#show-uploads').click(function(){
  33 + jQuery('#hide-uploads').show();
  34 + jQuery('#show-uploads').hide();
  35 + jQuery('.upload').slideDown();
  36 + return false;
  37 +});
  38 +
21 function loadPublishedMedia() { 39 function loadPublishedMedia() {
22 var parent_id = jQuery('#published-media #parent_id').val(); 40 var parent_id = jQuery('#published-media #parent_id').val();
23 var q = jQuery('#published-media #q').val(); 41 var q = jQuery('#published-media #q').val();
public/stylesheets/application.css
  Diff comments   View file @21fb3fc
@@ -3415,6 +3415,10 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] { @@ -3415,6 +3415,10 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
3415 3415
3416 } 3416 }
3417 3417
  3418 +#media-upload-box .hide-and-show-uploads {
  3419 + text-align: center;
  3420 +}
  3421 +
3418 .text-editor-sidebar { 3422 .text-editor-sidebar {
3419 position: absolute; 3423 position: absolute;
3420 width: 280px; 3424 width: 280px;