From 6643f971959529963d91aca6898218d5c5b627d4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Aug 2015 13:51:25 +0200 Subject: [PATCH 1/7] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 5716 -> 5824 bytes app/assets/fonts/icons.svg | 1 + app/assets/fonts/icons.ttf | Bin 5560 -> 5668 bytes app/assets/fonts/icons.woff | Bin 4380 -> 4464 bytes app/assets/stylesheets/icons.scss | 4 ++++ 5 files changed, 5 insertions(+) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 2c00f1f5b9cb03572d4edc47b957eb166f49e9e1..a1cc83d43d12151ca8a386601a45b4974e3b0142 100644 GIT binary patch delta 501 zcmcbjb3m8vfEWXVir7RpGnP5elNu&EH_J_|C}2oom;jWw z0P+>`5_41etvYWrFo;M1#qtXBi%XbKG8X`C=>W=yF)#v2AZ|!{J|~{v<|_j?6HtJG z;S%FBMP!ZUnDWWnn4B3UC;woo1(J=-9g_{1IVW?nXtQwGF)(a4VUZL_W@K<HgWi&H35*ITzG6ynE7&kFXDcC40>1ivm3vvqx zhzUr_TdOMR8YwX|w({x9%km3w|Jw(Y;GW2C}l1xyjLy@eB;2a~K#HWZYd`-5A^$*ns>RAYZ{h zSl`J1cg$`E2F3^=KP)*nu^@0`*gqiu4G@>5Cl(j{|Ife-R9^y==Sa_~OtY_aS72aZ zp25H%Ad!)pn8GS`IdQT8qkKIRP{#(KDyy9QP(Fl#5l8}Ysy>c5Y+^dmqd$!mbi%- SPp%b{VU(CWOH7If* + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 808c75487bf0422da6e512d3c1049bc9e25a6f6d..aa9c63faae88382db31d66dded442022c23bbae3 100644 GIT binary patch delta 554 zcmYL`KWGzS7{;IPzDs%#(p>QpO^hVDR7GM8Txt|eD)=XHkrb6sq$<}WHbbvHOra5! zb`caDs^{R4v5Q;LMMOjp1Q!KY9qbYv+{8f(thFY5Co#%$?5u~f>qy|c?F1Ra--?kZe#Oefc%5eo3p#_ z&JLXr{YqV%o4<7<`&;e>WFOFPciMIPGH6`FVGN)>j!1E_Et~Uj$sEC*1EqJTQ2D9eD16gx~5sZ!* zF{@M&rJ}VvRG9Ob{bt@WrMNqqPwk87q3zccLJ!0F z)VP#SHFz7leu|^sx^am4gVE(gr=!K%6?Vug`BRi(|Dz;sijU6{ab|T$e$Af{AFsXp LYI65+(fkAW*P*ld<#np|$je!lwuL1HE{Dbw4 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 Date: Tue, 25 Aug 2015 14:09:04 +0200 Subject: [PATCH 2/7] Adds styles for flag as inappropriate --- app/assets/stylesheets/admin.scss | 4 ++-- app/assets/stylesheets/debates.scss | 19 +++++++++++++++ app/assets/stylesheets/participacion.scss | 23 +++++++++++++++++-- app/assets/stylesheets/variables.scss | 1 + app/views/comments/_actions.html.erb | 8 +++++-- app/views/comments/_comment.html.erb | 10 +++----- .../_flag_as_inappropiate_actions.html.erb | 21 +++++++++++++++-- .../_flag_as_inappropiate_actions.html.erb | 19 +++++++++++++-- app/views/debates/show.html.erb | 4 ++-- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 11 files changed, 92 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 7e6096bc3..f62b5efd6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -140,7 +140,7 @@ body.admin { .delete { border-bottom: 1px dotted #CF2A0E; - color: #F04124; + color: $delete; font-size: rem-calc(12); &:hover, &:active, &:focus { @@ -160,7 +160,7 @@ body.admin { } .rejected { - color: #F04124; + color: $delete; } .level { diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 66ea491af..641e7ccff 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -5,6 +5,7 @@ // 03. Show // 04. New // 05. Comments +// 06. Flags // // 01. Debates @@ -541,6 +542,10 @@ font-size: rem-calc(12); margin: rem-calc(6) 0; padding: rem-calc(6); + + .divider { + color: $text-light; + } } .comment-user { @@ -608,3 +613,17 @@ .faded { opacity: 0.4; } + +// 06. Flags +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.flag-disable { + color: $text-medium; + line-height: rem-calc(24); + vertical-align: middle; +} + +.flag-active { + @extend .flag-disable; + color: $delete; +} diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 485dbfd60..b3ee7046a 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -150,6 +150,25 @@ h1, h2, h3, h4, h5, h6 { } } +.f-dropdown { + + li a { + font-size: rem-calc(12); + + &:hover { + color: $link-hover; + } + } + + li:hover, .f-dropdown li:focus { + background: white; + } + + &.open { + outline: none; + } +} + // 04. Header // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -692,13 +711,13 @@ form { } } -img.admin-avatar, img.moderator-avatar { +img.avatar, img.admin-avatar, img.moderator-avatar { border-radius: rem-calc(1000); position: relative; } img.initialjs-avatar { - @extend .moderator-avatar; + @extend .avatar; } .author-deleted { diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 4be7028e3..64861e215 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -38,6 +38,7 @@ $votes-like-act: #5D9E7F; $votes-unlike: #EF8585; $votes-unlike-act: #BD6A6A; +$delete: #F04124; $check: #46DB91; // 03. Forms diff --git a/app/views/comments/_actions.html.erb b/app/views/comments/_actions.html.erb index 5454179f0..51a6743e0 100644 --- a/app/views/comments/_actions.html.erb +++ b/app/views/comments/_actions.html.erb @@ -1,12 +1,16 @@ + + <%= render 'comments/flag_as_inappropiate_actions', comment: comment %> + + <% if can? :hide, comment %> -  |  +  •  <%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment), method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %> <% end %> <% if can? :hide, comment.user %> -  |  +  •  <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id, debate_id: @debate.id), method: :put, data: { confirm: t('admin.actions.confirm') } %> <% end %> diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index ca7474ebd..6f93bdde4 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -58,10 +58,6 @@ <% end %>  • <%= time_ago_in_words(comment.created_at) %> - - - <%= render 'comments/flag_as_inappropiate_actions', comment: comment %> - <% if comment.as_administrator? %> @@ -81,11 +77,11 @@ <%= render 'comments/votes', comment: comment %> -

+

<%= t("debates.comment.responses", count: comment.children_count) %> <% if user_signed_in? %> -  |  +  |  <%= link_to(comment_link_text(comment), "", class: "js-add-comment-link", data: {'id': dom_id(comment)}) %> @@ -93,7 +89,7 @@ <%= render 'comments/form', {parent: comment, toggeable: true} %> <% end %> -

+
<% end %> diff --git a/app/views/comments/_flag_as_inappropiate_actions.html.erb b/app/views/comments/_flag_as_inappropiate_actions.html.erb index fad83d4d6..0b62715e3 100644 --- a/app/views/comments/_flag_as_inappropiate_actions.html.erb +++ b/app/views/comments/_flag_as_inappropiate_actions.html.erb @@ -1,6 +1,23 @@ <% if can? :flag_as_inappropiate, comment %> - <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_comment_path(comment), method: :put, remote: true %> +  |  + + <% end %> + <% if can? :undo_flag_as_inappropiate, comment %> - <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_comment_path(comment), method: :put, remote: true %> +  |  + + <% end %> diff --git a/app/views/debates/_flag_as_inappropiate_actions.html.erb b/app/views/debates/_flag_as_inappropiate_actions.html.erb index 8003600e0..6db9bc5f4 100644 --- a/app/views/debates/_flag_as_inappropiate_actions.html.erb +++ b/app/views/debates/_flag_as_inappropiate_actions.html.erb @@ -1,6 +1,21 @@ <% if can? :flag_as_inappropiate, debate %> - <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_debate_path(debate), method: :put, remote: true %> + + <% end %> + <% if can? :undo_flag_as_inappropiate, debate %> - <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_debate_path(debate), method: :put, remote: true %> + + <% end %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 47ff9e34f..a6765e1b0 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -41,8 +41,8 @@  •    <%= link_to t("debates.show.comments", count: @debate.comment_threads.count), "#comments" %> - - +  •  + <%= render 'debates/flag_as_inappropiate_actions', debate: @debate %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ce3339b25..55e06af4e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -135,7 +135,7 @@ en: tags_cloud: tags: Topics flag_as_inappropiate: Flag as inappropiate - undo_flag_as_inappropiate: Undo flag as inappropiate + undo_flag_as_inappropiate: Undo flag collective: Collective mailer: comment: diff --git a/config/locales/es.yml b/config/locales/es.yml index 1e2cca785..d548f2334 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -135,7 +135,7 @@ es: tags_cloud: tags: Temas flag_as_inappropiate: Denunciar como inapropiado - undo_flag_as_inappropiate: Deshacer denunciar como inapropiado + undo_flag_as_inappropiate: Deshacer denuncia collective: Colectivo mailer: comment: From 8037a82fef911661fe769b8b3e0ce51d8c8e71ad Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Aug 2015 15:19:34 +0200 Subject: [PATCH 3/7] Adds styles to moderation admin --- app/assets/stylesheets/admin.scss | 17 +++++-- app/assets/stylesheets/participacion.scss | 3 +- .../moderation/comments_controller.rb | 2 +- .../moderation/debates_controller.rb | 2 +- app/models/comment.rb | 2 +- app/models/debate.rb | 2 +- app/views/moderation/_menu.html.erb | 12 ++--- app/views/moderation/comments/index.html.erb | 50 +++++++++++-------- app/views/moderation/debates/index.html.erb | 47 +++++++++-------- config/locales/moderation.en.yml | 18 +++---- config/locales/moderation.es.yml | 19 ++++--- 11 files changed, 99 insertions(+), 75 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index f62b5efd6..5afa088d1 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -151,11 +151,16 @@ body.admin { .verified { color: $check; + + a { + border-bottom: 1px dotted $check; + color: $check; + font-size: rem-calc(12); + } } -.verified a { - border-bottom: 1px dotted $check; - color: $check; +.archived { + color: $text-medium; font-size: rem-calc(12); } @@ -163,6 +168,12 @@ body.admin { color: $delete; } +.date { + color: $text-medium; + font-size: rem-calc(12); + font-style: italic; +} + .level { font-size: rem-calc(12); } diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index b3ee7046a..619f25d48 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -135,6 +135,7 @@ h1, h2, h3, h4, h5, h6 { } .sub-nav dt, .sub-nav dd, .sub-nav li { + padding: rem-calc(3) 0; &.active { background: #008CBA; @@ -142,7 +143,7 @@ h1, h2, h3, h4, h5, h6 { color: white; cursor: default; font-weight: normal; - padding: 0.16667rem 0.88889rem; + padding: rem-calc(3) rem-calc(14); a:hover { color: #737373; diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb index 03667e286..6434c708e 100644 --- a/app/controllers/moderation/comments_controller.rb +++ b/app/controllers/moderation/comments_controller.rb @@ -31,7 +31,7 @@ class Moderation::CommentsController < Moderation::BaseController end def set_valid_filters - @valid_filters = %w{all pending_review reviewed} + @valid_filters = %w{all pending_review archived} end def parse_filter diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb index 22e4eac6b..89360ddaa 100644 --- a/app/controllers/moderation/debates_controller.rb +++ b/app/controllers/moderation/debates_controller.rb @@ -31,7 +31,7 @@ class Moderation::DebatesController < Moderation::BaseController end def set_valid_filters - @valid_filters = %w{all pending_review reviewed} + @valid_filters = %w{all pending_review archived} end def parse_filter diff --git a/app/models/comment.rb b/app/models/comment.rb index 824f1dbf0..0fa84dc6e 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -19,7 +19,7 @@ class Comment < ActiveRecord::Base scope :sorted_for_moderation, -> { order(inappropiate_flags_count: :desc, updated_at: :desc) } scope :pending_review, -> { where(reviewed_at: nil, hidden_at: nil) } - scope :reviewed, -> { where("reviewed_at IS NOT NULL AND hidden_at IS NULL") } + scope :archived, -> { where("reviewed_at IS NOT NULL AND hidden_at IS NULL") } scope :flagged_as_inappropiate, -> { where("inappropiate_flags_count > 0") } def self.build(commentable, user, body) diff --git a/app/models/debate.rb b/app/models/debate.rb index c16048f70..e31a82a85 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -25,7 +25,7 @@ class Debate < ActiveRecord::Base scope :sorted_for_moderation, -> { order(inappropiate_flags_count: :desc, updated_at: :desc) } scope :pending_review, -> { where(reviewed_at: nil, hidden_at: nil) } - scope :reviewed, -> { where("reviewed_at IS NOT NULL AND hidden_at IS NULL") } + scope :archived, -> { where("reviewed_at IS NOT NULL AND hidden_at IS NULL") } scope :flagged_as_inappropiate, -> { where("inappropiate_flags_count > 0") } # Ahoy setup diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb index 41e84287a..d7c76b31a 100644 --- a/app/views/moderation/_menu.html.erb +++ b/app/views/moderation/_menu.html.erb @@ -4,17 +4,17 @@ <%= t("moderation.dashboard.index.title") %> -
  • > +
  • > <%= link_to moderation_debates_path do %> - - <%= t('moderation.menu.flagged_debates') %> + + <%= t("moderation.menu.flagged_debates") %> <% end %>
    • -
  • > +
  • > <%= link_to moderation_comments_path do %> - - <%= t('moderation.menu.flagged_comments') %> + + <%= t("moderation.menu.flagged_comments") %> <% end %>
    • diff --git a/app/views/moderation/comments/index.html.erb b/app/views/moderation/comments/index.html.erb index 0d89114f1..02b503497 100644 --- a/app/views/moderation/comments/index.html.erb +++ b/app/views/moderation/comments/index.html.erb @@ -1,45 +1,52 @@ -

    <%= t('moderation.comments.index.title') %>

    +

    <%= t("moderation.comments.index.title") %>

    + +
    +
    <%= t("moderation.comments.index.filter") %>:
    -

    - <%= t('moderation.comments.index.filter') %>: <% @valid_filters.each do |filter| %> <% if @filter == filter %> - <%= t("moderation.comments.index.filters.#{filter}") %> +

    <%= t("moderation.comments.index.filters.#{filter}") %>
    <% else %> - <%= link_to t("moderation.comments.index.filters.#{filter}"), - moderation_comments_path(filter: filter) %> +
    <%= link_to t("moderation.comments.index.filters.#{filter}"), + moderation_comments_path(filter: filter) %>
    <% end %> <% end %> -

    +

    <%= page_entries_info @comments %>

    - - - - - + + + + <% @comments.each do |comment| %> - - - - - + + + <% if can? :mark_as_reviewed, comment %> <% end %> <% if comment.reviewed? %> - <% end %> @@ -47,4 +54,3 @@
    <%= t('moderation.comments.index.headers.flags') %><%= t('moderation.comments.index.headers.updated_at') %><%= t('moderation.comments.index.headers.commentable_type') %><%= t('moderation.comments.index.headers.commentable') %><%= t('moderation.comments.index.headers.comment') %> + <%= t("moderation.comments.index.headers.commentable") %> |  + <%= t("moderation.comments.index.headers.commentable_type") %> |  + <%= t("moderation.comments.index.headers.updated_at") %> + <%= t("moderation.comments.index.headers.comment") %><%= t("moderation.comments.index.headers.flags") %><%= t("moderation.debates.index.headers.actions") %>
    <%= comment.inappropiate_flags_count %><%= l comment.updated_at.to_date %><%= comment.commentable_type.constantize.model_name.human %><%= link_to comment.commentable.title, comment.commentable %><%= comment.body %> - <%= link_to t('moderation.comments.index.hide'), hide_in_moderation_screen_moderation_comment_path(comment, request.query_parameters), method: :put %> + <%= link_to comment.commentable.title, comment.commentable %> +
    + <%= comment.commentable_type.constantize.model_name.human %> + <%= l comment.updated_at.to_date %> +     		<%= comment.body %><%= comment.inappropiate_flags_count %> + <%= link_to t("moderation.comments.index.hide"), hide_in_moderation_screen_moderation_comment_path(comment, request.query_parameters), method: :put, class: "delete" %> - <%= link_to t('moderation.comments.index.mark_as_reviewed'), mark_as_reviewed_moderation_comment_path(comment, request.query_parameters), method: :put %> + <%= link_to t("moderation.comments.index.archive"), mark_as_reviewed_moderation_comment_path(comment, request.query_parameters), method: :put, class: "button radius tiny warning" %> - <%= t('moderation.comments.index.reviewed') %> + + <%= t("moderation.comments.index.archived") %>
    <%= paginate @comments %> - diff --git a/app/views/moderation/debates/index.html.erb b/app/views/moderation/debates/index.html.erb index 611f68e16..68de5807d 100644 --- a/app/views/moderation/debates/index.html.erb +++ b/app/views/moderation/debates/index.html.erb @@ -1,43 +1,51 @@ -

    <%= t('moderation.debates.index.title') %>

    +

    <%= t("moderation.debates.index.title") %>

    + +
    +
    <%= t("moderation.debates.index.filter") %>:
    -

    - <%= t('moderation.debates.index.filter') %>: <% @valid_filters.each do |filter| %> <% if @filter == filter %> - <%= t("moderation.debates.index.filters.#{filter}") %> +

    <%= t("moderation.debates.index.filters.#{filter}") %>
    <% else %> - <%= link_to t("moderation.debates.index.filters.#{filter}"), - moderation_debates_path(filter: filter) %> +
    <%= link_to t("moderation.debates.index.filters.#{filter}"), + moderation_debates_path(filter: filter) %>
    <% end %> <% end %> -

    +

    <%= page_entries_info @debates %>

    - - - - + + + <% @debates.each do |debate| %> - - - - + + <% if can? :mark_as_reviewed, debate %> <% end %> <% if debate.reviewed? %> - <% end %> @@ -45,4 +53,3 @@
    <%= t('moderation.debates.index.headers.flags') %><%= t('moderation.debates.index.headers.updated_at') %><%= t('moderation.debates.index.headers.title') %><%= t('moderation.debates.index.headers.description') %> + <%= t("moderation.debates.index.headers.title") %> |  + <%= t("moderation.debates.index.headers.updated_at") %> |  + <%= t("moderation.debates.index.headers.description") %> + <%= t("moderation.debates.index.headers.flags") %><%= t("moderation.debates.index.headers.actions") %>
    <%= debate.inappropiate_flags_count %><%= l debate.updated_at.to_date %><%= link_to debate.title, debate %><%= debate.description %> - <%= link_to t('moderation.debates.index.hide'), hide_in_moderation_screen_moderation_debate_path(debate, request.query_parameters), method: :put %> + <%= link_to debate.title, debate, target: "_blank" %> +
    + <%= l debate.updated_at.to_date %> +
    + <%= debate.description %> +     		<%= debate.inappropiate_flags_count %> + <%= link_to t("moderation.debates.index.hide"), hide_in_moderation_screen_moderation_debate_path(debate, request.query_parameters), method: :put, class: "delete" %> - <%= link_to t('moderation.debates.index.mark_as_reviewed'), mark_as_reviewed_moderation_debate_path(debate, request.query_parameters), method: :put %> + <%= link_to t("moderation.debates.index.archive"), mark_as_reviewed_moderation_debate_path(debate, request.query_parameters), method: :put, class: "button radius tiny warning" %> - <%= t('moderation.debates.index.reviewed') %> + + <%= t("moderation.debates.index.archived") %>
    <%= paginate @debates %> - diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml index 2728f10d9..7688dfa09 100644 --- a/config/locales/moderation.en.yml +++ b/config/locales/moderation.en.yml @@ -8,7 +8,7 @@ en: title: Moderation comments: index: - title: Comments flagged as inappropiate + title: Comments flagged as inappropriate headers: flags: Flags updated_at: Date @@ -16,27 +16,27 @@ en: commentable: Root comment: Comment hide: Hide - mark_as_reviewed: Mark as reviewed - reviewed: Reviewed + archive: Archive + archived: Archived filter: Filter filters: all: All pending_review: Pending - reviewed: Reviewed + archived: Archived debates: index: - title: Debates flagged as inappropiate + title: Debates flagged as inappropriate headers: flags: Flags updated_at: Date title: Title description: Description + actions: Actions hide: Hide - mark_as_reviewed: Mark as reviewed - reviewed: Reviewed + archive: Archive + archived: Archived filter: Filter filters: all: All pending_review: Pending - reviewed: Reviewed - + archived: Archived diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml index 2afaec7a9..61d6b5f5c 100644 --- a/config/locales/moderation.es.yml +++ b/config/locales/moderation.es.yml @@ -8,7 +8,7 @@ es: title: Moderación comments: index: - title: Comentarios Denunciados como Inapropiados + title: Comentarios denunciados como inapropiados headers: flags: Denuncias updated_at: Fecha @@ -16,28 +16,27 @@ es: commentable: Raíz comment: Comentario hide: Ocultar - mark_as_reviewed: Marcar como revisado - reviewed: Revisado + archive: Archivar + archived: Archivado filter: Filtrar filters: all: Todos pending_review: Pendientes - reviewed: Revisados + archived: Archivados debates: index: - title: Debates Denunciados como Inapropiados + title: Debates denunciados como inapropiados headers: flags: Denuncias updated_at: Fecha title: Título description: Descripción + actions: Acciones hide: Ocultar - mark_as_reviewed: Marcar como revisado - reviewed: Revisado + archive: Archivar + archived: Archivado filter: Filtrar filters: all: Todos pending_review: Pendientes - reviewed: Revisados - - + archived: Archivados From 8bdf03c50d17dd5ad2c9ee19a7b7cbff87fe4ef0 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 25 Aug 2015 16:02:36 +0200 Subject: [PATCH 4/7] Changes some test for moderation --- .../_flag_as_inappropiate_actions.html.erb | 4 +-- config/locales/en.yml | 2 +- spec/features/comments_spec.rb | 14 +++++----- spec/features/moderation/comments_spec.rb | 28 +++++++++---------- spec/features/moderation/debates_spec.rb | 28 +++++++++---------- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/views/comments/_flag_as_inappropiate_actions.html.erb b/app/views/comments/_flag_as_inappropiate_actions.html.erb index 0b62715e3..07440f600 100644 --- a/app/views/comments/_flag_as_inappropiate_actions.html.erb +++ b/app/views/comments/_flag_as_inappropiate_actions.html.erb @@ -5,7 +5,7 @@ <% end %> @@ -17,7 +17,7 @@ <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 55e06af4e..98ac387fc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -134,7 +134,7 @@ en: shared: tags_cloud: tags: Topics - flag_as_inappropiate: Flag as inappropiate + flag_as_inappropiate: Flag as inappropriate undo_flag_as_inappropiate: Undo flag collective: Collective mailer: diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb index 4ed16d915..b1b09a777 100644 --- a/spec/features/comments_spec.rb +++ b/spec/features/comments_spec.rb @@ -133,7 +133,7 @@ feature 'Comments' do expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment") end - scenario "Flagging as inappropiate", :js do + scenario "Flagging as inappropriate", :js do user = create(:user) debate = create(:debate) comment = create(:comment, commentable: debate) @@ -142,15 +142,15 @@ feature 'Comments' do visit debate_path(debate) within "#comment_#{comment.id}" do - expect(page).to_not have_link "Undo flag as inappropiate" - click_on 'Flag as inappropiate' - expect(page).to have_link "Undo flag as inappropiate" + expect(page).to_not have_link "Undo flag as inappropriate" + click_on 'Flag as inappropriate' + expect(page).to have_link "Undo flag as inappropriate" end expect(InappropiateFlag.flagged?(user, comment)).to be end - scenario "Undoing flagging as inappropiate", :js do + scenario "Undoing flagging as inappropriate", :js do user = create(:user) debate = create(:debate) comment = create(:comment, commentable: debate) @@ -160,9 +160,9 @@ feature 'Comments' do visit debate_path(debate) within "#comment_#{comment.id}" do - expect(page).to_not have_link("Flag as inappropiate", exact: true) + expect(page).to_not have_link("Flag as inappropriate", exact: true) click_on 'Undo flag as inappropiate' - expect(page).to have_link("Flag as inappropiate", exact: true) + expect(page).to have_link("Flag as inappropriate", exact: true) end expect(InappropiateFlag.flagged?(user, comment)).to_not be diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb index 5a4100f77..91ed0b083 100644 --- a/spec/features/moderation/comments_spec.rb +++ b/spec/features/moderation/comments_spec.rb @@ -104,43 +104,43 @@ feature 'Moderate Comments' do visit moderation_comments_path expect(page).to_not have_link('All') expect(page).to have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') visit moderation_comments_path(filter: 'all') expect(page).to_not have_link('All') expect(page).to have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') visit moderation_comments_path(filter: 'pending_review') expect(page).to have_link('All') expect(page).to_not have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') - visit moderation_comments_path(filter: 'reviewed') + visit moderation_comments_path(filter: 'archived') expect(page).to have_link('All') expect(page).to have_link('Pending') - expect(page).to_not have_link('Reviewed') + expect(page).to_not have_link('Archived') end scenario "Filtering comments" do create(:comment, :flagged_as_inappropiate, body: "Pending comment") create(:comment, :flagged_as_inappropiate, :hidden, body: "Hidden comment") - create(:comment, :flagged_as_inappropiate, :reviewed, body: "Reviewed comment") + create(:comment, :flagged_as_inappropiate, :reviewed, body: "Archived comment") visit moderation_comments_path(filter: 'all') expect(page).to have_content('Pending comment') expect(page).to_not have_content('Hidden comment') - expect(page).to have_content('Reviewed comment') + expect(page).to have_content('Archived comment') visit moderation_comments_path(filter: 'pending_review') expect(page).to have_content('Pending comment') expect(page).to_not have_content('Hidden comment') - expect(page).to_not have_content('Reviewed comment') + expect(page).to_not have_content('Archived comment') - visit moderation_comments_path(filter: 'reviewed') + visit moderation_comments_path(filter: 'archived') expect(page).to_not have_content('Pending comment') expect(page).to_not have_content('Hidden comment') - expect(page).to have_content('Reviewed comment') + expect(page).to have_content('Archived comment') end scenario "Reviewing links remember the pagination setting and the filter" do @@ -149,7 +149,7 @@ feature 'Moderate Comments' do visit moderation_comments_path(filter: 'pending_review', page: 2) - click_link('Mark as reviewed', match: :first) + click_link('Archive', match: :first) uri = URI.parse(current_url) query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys @@ -172,7 +172,7 @@ feature 'Moderate Comments' do expect(page).to have_content('spammy spam') expect(page).to have_content('1') expect(page).to have_link('Hide') - expect(page).to have_link('Mark as reviewed') + expect(page).to have_link('Archive') end end @@ -189,13 +189,13 @@ feature 'Moderate Comments' do scenario 'Marking the comment as reviewed' do within("#comment_#{@comment.id}") do - click_link('Mark as reviewed') + click_link('Archive') end expect(current_path).to eq(moderation_comments_path) within("#comment_#{@comment.id}") do - expect(page).to have_content('Reviewed') + expect(page).to have_content('Archived') end expect(@comment.reload).to be_reviewed diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb index 1ea3101e0..9a2dfbd24 100644 --- a/spec/features/moderation/debates_spec.rb +++ b/spec/features/moderation/debates_spec.rb @@ -47,43 +47,43 @@ feature 'Moderate debates' do visit moderation_debates_path expect(page).to_not have_link('All') expect(page).to have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') visit moderation_debates_path(filter: 'all') expect(page).to_not have_link('All') expect(page).to have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') visit moderation_debates_path(filter: 'pending_review') expect(page).to have_link('All') expect(page).to_not have_link('Pending') - expect(page).to have_link('Reviewed') + expect(page).to have_link('Archived') - visit moderation_debates_path(filter: 'reviewed') + visit moderation_debates_path(filter: 'archived') expect(page).to have_link('All') expect(page).to have_link('Pending') - expect(page).to_not have_link('Reviewed') + expect(page).to_not have_link('Archived') end scenario "Filtering debates" do create(:debate, :flagged_as_inappropiate, title: "Pending debate") create(:debate, :flagged_as_inappropiate, :hidden, title: "Hidden debate") - create(:debate, :flagged_as_inappropiate, :reviewed, title: "Reviewed debate") + create(:debate, :flagged_as_inappropiate, :reviewed, title: "Archived debate") visit moderation_debates_path(filter: 'all') expect(page).to have_content('Pending debate') expect(page).to_not have_content('Hidden debate') - expect(page).to have_content('Reviewed debate') + expect(page).to have_content('Archived debate') visit moderation_debates_path(filter: 'pending_review') expect(page).to have_content('Pending debate') expect(page).to_not have_content('Hidden debate') - expect(page).to_not have_content('Reviewed debate') + expect(page).to_not have_content('Archived debate') - visit moderation_debates_path(filter: 'reviewed') + visit moderation_debates_path(filter: 'archived') expect(page).to_not have_content('Pending debate') expect(page).to_not have_content('Hidden debate') - expect(page).to have_content('Reviewed debate') + expect(page).to have_content('Archived debate') end scenario "Reviewing links remember the pagination setting and the filter" do @@ -92,7 +92,7 @@ feature 'Moderate debates' do visit moderation_debates_path(filter: 'pending_review', page: 2) - click_link('Mark as reviewed', match: :first) + click_link('Archive', match: :first) uri = URI.parse(current_url) query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys @@ -114,7 +114,7 @@ feature 'Moderate debates' do expect(page).to have_content('buy buy buy') expect(page).to have_content('1') expect(page).to have_link('Hide') - expect(page).to have_link('Mark as reviewed') + expect(page).to have_link('Archive') end end @@ -131,13 +131,13 @@ feature 'Moderate debates' do scenario 'Marking the debate as reviewed' do within("#debate_#{@debate.id}") do - click_link('Mark as reviewed') + click_link('Archive') end expect(current_path).to eq(moderation_debates_path) within("#debate_#{@debate.id}") do - expect(page).to have_content('Reviewed') + expect(page).to have_content('Archived') end expect(@debate.reload).to be_reviewed From 5eeb89584b6563a9de58fd1769d7d9328cd19ba2 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 26 Aug 2015 13:14:07 +0200 Subject: [PATCH 5/7] Fixes a couple specs which fail with the new words (ArchiveD vs Archive) --- spec/features/moderation/comments_spec.rb | 2 +- spec/features/moderation/debates_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb index 91ed0b083..ba40598d8 100644 --- a/spec/features/moderation/comments_spec.rb +++ b/spec/features/moderation/comments_spec.rb @@ -149,7 +149,7 @@ feature 'Moderate Comments' do visit moderation_comments_path(filter: 'pending_review', page: 2) - click_link('Archive', match: :first) + click_link('Archive', match: :first, exact: true) uri = URI.parse(current_url) query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb index 9a2dfbd24..d27a5b9fc 100644 --- a/spec/features/moderation/debates_spec.rb +++ b/spec/features/moderation/debates_spec.rb @@ -92,7 +92,7 @@ feature 'Moderate debates' do visit moderation_debates_path(filter: 'pending_review', page: 2) - click_link('Archive', match: :first) + click_link('Archive', match: :first, exact: true) uri = URI.parse(current_url) query_params = Rack::Utils.parse_nested_query(uri.query).symbolize_keys From 015fe704e4afcaab689e7f07cdb6d5a2ba3e0ff1 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 26 Aug 2015 13:14:42 +0200 Subject: [PATCH 6/7] Fixes flagging specs by making them id-based instead of text-based --- .../_flag_as_inappropiate_actions.html.erb | 12 ++++++------ .../_flag_as_inappropiate_actions.html.erb | 12 ++++++------ spec/features/comments_spec.rb | 16 +++++++++------- spec/features/debates_spec.rb | 14 ++++++++------ 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/app/views/comments/_flag_as_inappropiate_actions.html.erb b/app/views/comments/_flag_as_inappropiate_actions.html.erb index 07440f600..9fba8b5b2 100644 --- a/app/views/comments/_flag_as_inappropiate_actions.html.erb +++ b/app/views/comments/_flag_as_inappropiate_actions.html.erb @@ -1,23 +1,23 @@ <% if can? :flag_as_inappropiate, comment %>  |  - -