Download as
Browse Code »

Commit 565f45527705fe7a3a911919878e78297098dc9d

Authored by Antonio Terceiro
1 parent f476a761
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

Cosmetics 

  * Explicitly name the "Icon" column
  * Remove annoying scroll from links edition
  * Point the browser to the top of the page. This way when I edit a block
    that is far down I am sent to the place where the popup appears with
    the edit screen

(ActionItem1428)
Showing 3 changed files with 2 additions and 7 deletions   Show diff stats
app/views/box_organizer/_link_list_block.rhtml
  Diff comments   View file @565f455
1 <strong><%= _('Links') %></strong> 1 <strong><%= _('Links') %></strong>
2 <div id='edit-link-list-block'> 2 <div id='edit-link-list-block'>
3 <table id='links' class='noborder'> 3 <table id='links' class='noborder'>
4 - <tr><th></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr> 4 + <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
5 <% for link in @block.links do %> 5 <% for link in @block.links do %>
6 <tr> 6 <tr>
7 <td> 7 <td>
public/javascripts/lightbox.js
  Diff comments   View file @565f455
@@ -80,6 +80,7 @@ lightbox.prototype = { @@ -80,6 +80,7 @@ lightbox.prototype = {
80 } 80 }
81 this.hideObjectsAndEmbeds('hidden'); 81 this.hideObjectsAndEmbeds('hidden');
82 this.displayLightbox("block"); 82 this.displayLightbox("block");
  83 + window.location.href= "#";
83 }, 84 },
84 85
85 // Ie requires height to 100% and overflow hidden or else you can scroll down past the lightbox 86 // Ie requires height to 100% and overflow hidden or else you can scroll down past the lightbox
public/stylesheets/application.css
  Diff comments   View file @565f455
@@ -1514,12 +1514,6 @@ input.disabled { @@ -1514,12 +1514,6 @@ input.disabled {
1514 } 1514 }
1515 1515
1516 /* ==> blocks/link-list-block.css <<= */ 1516 /* ==> blocks/link-list-block.css <<= */
1517 -  
1518 -#edit-link-list-block {  
1519 - overflow: auto;  
1520 - overflow-x: hidden;  
1521 - height: 120px;  
1522 -}  
1523 1517
1524 #edit-link-list-block table { 1518 #edit-link-list-block table {
1525 width: 100%; 1519 width: 100%;