Download as
Browse Code »

Commit 626f081d1de13e73c16aa8c90dd154a25dc4cf68

Authored by Rodrigo Souto
1 parent 534b6af9
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

Adjusting abuse report ui 

(ActionItem2093)
Showing 3 changed files with 10 additions and 3 deletions   Show diff stats
app/views/profile/report_abuse.html.erb
  Diff comments   View file @626f081
@@ -6,8 +6,9 @@ @@ -6,8 +6,9 @@
6 6
7 <p><%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %> </p> 7 <p><%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %> </p>
8 8
9 - <%= submit_button(:ok, _('Report profile'), :style => 'margin-top: 10px; float: left; cursor: pointer;', :id => 'report-abuse-submit-button', :onclick => "jQuery('#form-submit-loading').show()") %>  
10 - <div id="form-submit-loading" class="small-loading" style="width: 16px; height: 16px; margin-top: 13px; float: left; display: none;"></div> 9 + <%= submit_button(:send, _('Report profile'), :style => 'float: left; cursor: pointer;', :id => 'report-abuse-submit-button', :onclick => "jQuery('#form-submit-loading').show()") %>
  10 + <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'jQuery.colorbox.close(); return false;')%>
  11 + <div id="form-submit-loading" class="small-loading" style="width: 16px; height: 16px; margin-top: 3px; float: left; display: none;"></div>
11 <% end %> 12 <% end %>
12 13
13 <script type="text/javascript"> 14 <script type="text/javascript">
public/javascripts/report-abuse.js
  Diff comments   View file @626f081
@@ -3,7 +3,7 @@ jQuery(function($) { @@ -3,7 +3,7 @@ jQuery(function($) {
3 if($(this).attr('href')){ 3 if($(this).attr('href')){
4 $.fn.colorbox({ 4 $.fn.colorbox({
5 href: $(this).attr('href'), 5 href: $(this).attr('href'),
6 - innerHeight: '310px', 6 + innerHeight: '300px',
7 innerWidth: '445px' 7 innerWidth: '445px'
8 }); 8 });
9 } 9 }
public/stylesheets/application.css
  Diff comments   View file @626f081
@@ -6197,3 +6197,9 @@ h1#agenda-title { @@ -6197,3 +6197,9 @@ h1#agenda-title {
6197 .comment_reply .recaptcha_image_cell { 6197 .comment_reply .recaptcha_image_cell {
6198 background: transparent !important; 6198 background: transparent !important;
6199 } 6199 }
  6200 +
  6201 +/* Colorbox */
  6202 +
  6203 +#cboxClose {
  6204 + display: none !important;
  6205 +}