Download as
Browse Code »

Commit 27d58fea989ecbe84c1592a4d9d4a054d96880f0

Authored by Victor Costa
1 parent 46e64d51
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

rails3: fix link_list_block

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/link_list_block.rb
  Diff comments   View file @27d58fe
@@ -89,7 +89,7 @@ class LinkListBlock < Block @@ -89,7 +89,7 @@ class LinkListBlock < Block
89 def icons_options 89 def icons_options
90 ICONS.map do |i| 90 ICONS.map do |i|
91 "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe 91 "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
92 - end 92 + end.join
93 end 93 end
94 94
95 private 95 private
app/views/box_organizer/_link_list_block.html.erb
  Diff comments   View file @27d58fe
@@ -18,12 +18,12 @@ @@ -18,12 +18,12 @@
18 </div> 18 </div>
19 19
20 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page| 20 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
21 - page.insert_html :bottom, 'links', content_tag('tr', 21 + page.insert_html :bottom, 'links', j(content_tag('tr',
22 content_tag('td', icon_selector('ok')) + 22 content_tag('td', icon_selector('ok')) +
23 content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) + 23 content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
24 content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') + 24 content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
25 content_tag('td', select_tag('block[links][][target]', 25 content_tag('td', select_tag('block[links][][target]',
26 options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target]))) 26 options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
27 ) + 27 ) +
28 - javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight") 28 + javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight"))
29 end %> 29 end %>