Download as
Browse Code »

Commit 30428e4c74df9e2b472fd27f68703fa460cdc2bd

Authored by Daniela Feitosa
1 parent 4f4bf0c5
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

Replacing meta by span on text_editor_sidebar 

The meta tags were being included on <head>

(ActionItem2371)
Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
app/views/cms/_text_editor_sidebar.rhtml
  Diff comments   View file @30428e4
1 <div class='text-editor-sidebar'> 1 <div class='text-editor-sidebar'>
2 - <meta name='button-add' value='<%= _('Add to the text') %>'/>  
3 - <meta name='button-zoom' value='<%= _('Zoom in') %>'/>  
4 - <meta name='button-close' value='<%= _('Close') %>'/> 2 + <span class='button-add' data-value='<%= _('Add to the text') %>'></span>
  3 + <span class='button-zoom' data-value='<%= _('Zoom in') %>'></span>
  4 + <span class='button-close' data-value='<%= _('Close') %>'></span>
  5 +
5 <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %> 6 <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
6 <div class='text-editor-sidebar-box' id='media-upload-box'> 7 <div class='text-editor-sidebar-box' id='media-upload-box'>
7 <div class='header'><strong><%= _('Insert media') %></strong></div> 8 <div class='header'><strong><%= _('Insert media') %></strong></div>
public/javascripts/article.js
  Diff comments   View file @30428e4
@@ -24,9 +24,9 @@ jQuery(function($) { @@ -24,9 +24,9 @@ jQuery(function($) {
24 return false; 24 return false;
25 }) 25 })
26 26
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');  
29 - var button_close = $('.text-editor-sidebar meta[name=button-close]').attr('value'); 27 + var button_add = $('.text-editor-sidebar span.button-add').attr('data-value');
  28 + var button_zoom = $('.text-editor-sidebar span.button-zoom').attr('data-value');
  29 + var button_close = $('.text-editor-sidebar span.button-close').attr('data-value');
30 30
31 function add_to_text_button(extra_class) { 31 function add_to_text_button(extra_class) {
32 if (!extra_class) { extra_class = '' } 32 if (!extra_class) { extra_class = '' }