1
Download as
Browse Code »

Commit edcc13059b31341eb78e58079ac2322f1142f206

Authored by Larissa Reis
1 parent 014031e1
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Uses modal instead of deprecated colorbox

Showing 4 changed files with 9 additions and 4 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @edcc130
@@ -1316,7 +1316,12 @@ module ApplicationHelper @@ -1316,7 +1316,12 @@ module ApplicationHelper
1316 options[:class] = (options[:class] || '') + ' disabled' 1316 options[:class] = (options[:class] || '') + ' disabled'
1317 content_tag('a', ' '+content_tag('span', content), options) 1317 content_tag('a', ' '+content_tag('span', content), options)
1318 else 1318 else
1319 - link_to content, url, options 1319 + if options[:modal]
  1320 + options.delete(:modal)
  1321 + modal_link_to content, url, options
  1322 + else
  1323 + link_to content, url, options
  1324 + end
1320 end 1325 end
1321 end 1326 end
1322 1327
app/helpers/cms_helper.rb
  Diff comments   View file @edcc130
@@ -35,7 +35,7 @@ module CmsHelper @@ -35,7 +35,7 @@ module CmsHelper
35 end 35 end
36 36
37 def display_spread_button(article) 37 def display_spread_button(article)
38 - expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:class => 'colorbox'} 38 + expirable_button article, :spread, _('Spread this'), {:action => 'publish', :id => article.id}, {:class => 'colorbox', :modal => true}
39 end 39 end
40 40
41 def display_delete_button(article) 41 def display_delete_button(article)
app/views/cms/_published_media_items.html.erb
  Diff comments   View file @edcc130
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class='section-title'> 4 <div class='section-title'>
5 <h3><%= header %></h3> 5 <h3><%= header %></h3>
6 <% if @recent_files[key].total_pages > 1 %> 6 <% if @recent_files[key].total_pages > 1 %>
7 - <%= link_to(_('View all'), {:controller => 'cms', :action => 'view_all_media', :profile => profile.identifier, :key => key}, :class => 'view-all colorbox', 'data-key' => key) %> 7 + <%= modal_link_to(_('View all'), {:controller => 'cms', :action => 'view_all_media', :profile => profile.identifier, :key => key}, { :class => 'view-all', 'data-key' => key }) %>
8 <% end %> 8 <% end %>
9 </div> 9 </div>
10 <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: key, show_pagination_links: false } %> 10 <%= render :partial => "cms/media_panel/list_published_media_items", :locals => { key: key, show_pagination_links: false } %>
app/views/content_viewer/_article_toolbar.html.erb
  Diff comments   View file @edcc130
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 18
19 <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %> 19 <% if @page.allow_spread?(user) && !remove_content_button(:spread, @page) %>
20 <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %> 20 <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
21 - <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %> 21 + <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox', :modal => true} if url %>
22 <% end %> 22 <% end %>
23 23
24 <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %> 24 <% if !@page.gallery? && (@page.allow_create?(user) || (@page.parent && @page.parent.allow_create?(user))) %>