Download as
Browse Code »

Commit 7261d10e93332914d6ceb6910178e572e1030f6a

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

Adding a "Close" link to the image zoom dialog

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/views/cms/_text_editor_sidebar.rhtml
  Diff comments   View file @7261d10
1 <div class='text-editor-sidebar'> 1 <div class='text-editor-sidebar'>
2 <meta name='button.add' value='<%= _('Add to the text') %>'/> 2 <meta name='button.add' value='<%= _('Add to the text') %>'/>
3 <meta name='button.zoom' value='<%= _('Zoom in') %>'/> 3 <meta name='button.zoom' value='<%= _('Zoom in') %>'/>
  4 + <meta name='button.close' value='<%= _('Close') %>'/>
4 <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %> 5 <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
5 <div class='text-editor-sidebar-box' id='media-upload-box'> 6 <div class='text-editor-sidebar-box' id='media-upload-box'>
6 <div class='header'<strong><%= _('Media upload') %></strong></div> 7 <div class='header'<strong><%= _('Media upload') %></strong></div>
public/javascripts/article.js
  Diff comments   View file @7261d10
@@ -26,6 +26,7 @@ jQuery(function($) { @@ -26,6 +26,7 @@ jQuery(function($) {
26 26
27 var button_add = $('.text-editor-sidebar meta[name=button.add]').attr('value'); 27 var button_add = $('.text-editor-sidebar meta[name=button.add]').attr('value');
28 var button_zoom = $('.text-editor-sidebar meta[name=button.zoom]').attr('value'); 28 var button_zoom = $('.text-editor-sidebar meta[name=button.zoom]').attr('value');
  29 + var button_close = $('.text-editor-sidebar meta[name=button.close]').attr('value');
29 30
30 function add_to_text_button() { 31 function add_to_text_button() {
31 return '<a class="button icon-add add-to-text" href="#"><span>' + button_add + '</span></a>'; 32 return '<a class="button icon-add add-to-text" href="#"><span>' + button_add + '</span></a>';
@@ -35,6 +36,10 @@ jQuery(function($) { @@ -35,6 +36,10 @@ jQuery(function($) {
35 return '<a class="add-to-text" href="#">' + button_add + '</a>'; 36 return '<a class="add-to-text" href="#">' + button_add + '</a>';
36 } 37 }
37 38
  39 + function close_link() {
  40 + return '<a class="close" href="#">' + button_close + '</a>';
  41 + }
  42 +
38 function zoom_button() { 43 function zoom_button() {
39 return '<a class="button icon-zoom zoom" href="#" title="' + button_zoom + '"><span>' + button_zoom + '</span></a>'; 44 return '<a class="button icon-zoom zoom" href="#" title="' + button_zoom + '"><span>' + button_zoom + '</span></a>';
40 } 45 }
@@ -88,9 +93,13 @@ jQuery(function($) { @@ -88,9 +93,13 @@ jQuery(function($) {
88 var $item = $(this).closest('.item'); 93 var $item = $(this).closest('.item');
89 var html_selector = $item.attr('data-item'); 94 var html_selector = $item.attr('data-item');
90 var img = $item.find(html_selector).find('img').attr('src'); 95 var img = $item.find(html_selector).find('img').attr('src');
91 - $.colorbox({ html: '<div class="item" data-item="div"><div><img src="' + img + '" style="max-width: 580px; max-height: 580px"/></div>' + '<div class="controls" style="padding-top: 5px;">' + add_to_text_link() + '</div></div>', maxWidth: '640px', maxHeight: '670px', scrolling: false }); 96 + $.colorbox({ html: '<div class="item" data-item="div"><div><img src="' + img + '" style="max-width: 580px; max-height: 580px"/></div>' + '<div class="controls" style="padding-top: 5px;">' + add_to_text_link() + '&nbsp;&nbsp;&nbsp;' + close_link() + '</div></div>', maxWidth: '640px', maxHeight: '670px', scrolling: false });
92 return false; 97 return false;
93 }); 98 });
  99 + $('.controls a.close').live('click', function() {
  100 + $.colorbox.close();
  101 + return false;
  102 + })
94 103
95 // FIXME the user may also want to add the item to the abstract textarea! 104 // FIXME the user may also want to add the item to the abstract textarea!
96 var text_field = 'article_body'; 105 var text_field = 'article_body';