Download as
Browse Code »

Commit 743b2a60b332f74cfa55c92b341fa49dfe619870

Authored by Antonio Terceiro
1 parent 4dab3b15
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Move "loading" icon from the button to the box

Showing 3 changed files with 5 additions and 4 deletions   Show diff stats
app/views/cms/_text_editor_sidebar.rhtml
  Diff comments   View file @743b2a6
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p> 25 <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
26 </div> 26 </div>
27 </div> 27 </div>
28 - <div class='text-editor-sidebar-box'> 28 + <div id='media-search-box' class='text-editor-sidebar-box'>
29 <p><strong>Media search</strong></p> 29 <p><strong>Media search</strong></p>
30 <p> 30 <p>
31 <% form_tag({ :action => 'search' }) do %> 31 <% form_tag({ :action => 'search' }) do %>
public/javascripts/article.js
  Diff comments   View file @743b2a6
@@ -41,13 +41,13 @@ jQuery(function($) { @@ -41,13 +41,13 @@ jQuery(function($) {
41 $('#media-search-button').click(function() { 41 $('#media-search-button').click(function() {
42 var query = '*' + $('#media-search-query').val() + '*'; 42 var query = '*' + $('#media-search-query').val() + '*';
43 var $button = $(this); 43 var $button = $(this);
44 - $button.toggleClass('icon-loading'); 44 + $('#media-search-box').toggleClass('icon-loading');
45 $.get($(this).parent().attr('action'), { 'q': query }, function(data) { 45 $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
46 insert_items(data, '#media-search-results ul'); 46 insert_items(data, '#media-search-results ul');
47 if (data.length && data.length > 0) { 47 if (data.length && data.length > 0) {
48 $('#media-search-results').slideDown(); 48 $('#media-search-results').slideDown();
49 } 49 }
50 - $button.toggleClass('icon-loading'); 50 + $('#media-search-box').toggleClass('icon-loading');
51 }); 51 });
52 return false; 52 return false;
53 }); 53 });
public/stylesheets/application.css
  Diff comments   View file @743b2a6
@@ -3397,7 +3397,8 @@ div.with_media_panel .formfield input { @@ -3397,7 +3397,8 @@ div.with_media_panel .formfield input {
3397 background-color: transparent; 3397 background-color: transparent;
3398 border: none; 3398 border: none;
3399 } 3399 }
3400 -.text-editor-sidebar #media-upload-box { 3400 +.text-editor-sidebar #media-upload-box,
  3401 +.text-editor-sidebar #media-search-box {
3401 background-repeat: no-repeat; 3402 background-repeat: no-repeat;
3402 background-position: top right ; 3403 background-position: top right ;
3403 } 3404 }