1
Download as
Browse Code »

Commit ed63bab09a77c398c9228030a8ace0f11e9a6268

Authored by Rodrigo Souto
1 parent 1781dc2f
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

report-abuse: replace modal windwow by colorbox

Showing 2 changed files with 5 additions and 8 deletions   Show diff stats
app/views/profile/report_abuse.html.erb
  Diff comments   View file @ed63bab
... ... @@ -9,7 +9,7 @@
9 9 <% end %>
10 10  
11 11 <%= submit_button(:send, _('Report profile'), :style => 'float: left; cursor: pointer;', :id => 'report-abuse-submit-button', :onclick => "jQuery('#form-submit-loading').show()") %>
12   - <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'noosfero.modal.close(); return false;')%>
  12 + <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'jQuery.colorbox.close(); return false;')%>
13 13 <div id="form-submit-loading" class="small-loading" style="width: 16px; height: 16px; margin-top: 3px; float: left; display: none;"></div>
14 14 <% end %>
15 15  
... ... @@ -30,7 +30,7 @@
30 30 success: function(data, status, ajax){
31 31 if ( !data.ok ) display_notice(data.error.message);
32 32 else {
33   - noosfero.modal.close();
  33 + $.colorbox.close();
34 34 display_notice(data.message);
35 35 window.location.reload();
36 36 }
... ...
public/javascripts/report-abuse.js
  Diff comments   View file @ed63bab
1 1 jQuery(function($) {
2 2 $('.report-abuse-action').live('click', function() {
3   - if($(this).attr('href')){
4   - noosfero.modal.inline($(this).attr('href'), {
5   - innerHeight: '300px',
6   - innerWidth: '445px'
7   - });
8   - }
  3 + if($(this).attr('href'))
  4 + $.colorbox({href: $(this).attr('href')});
  5 +
9 6 return false;
10 7 });
11 8  
... ...