From d1a3ea6fd4c45e05da6ef2a662632ebec81bafe4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sat, 22 Aug 2015 14:45:43 +0200 Subject: [PATCH 1/6] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 5404 -> 5516 bytes app/assets/fonts/icons.svg | 1 + app/assets/fonts/icons.ttf | Bin 5248 -> 5360 bytes app/assets/fonts/icons.woff | Bin 4064 -> 4180 bytes app/assets/stylesheets/icons.scss | 7 +++++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index eb4fafebe803b1c67951888ea796bd9477f15690..8e5abb7bc8890c24dbfb74b7c953c9fb2248b5d1 100644 GIT binary patch delta 548 zcmbQE)uYYYBg(+=VIr$J%aq{7%O^VICPy>5Gcbr;VPIg8ad&ZbV{m0)1M;^3`3nBQ z`bPf0V|FnxFh&6RVad6P1%YR*P67EZfVd<*vAE#>e+Fit`ZYj#j`W<$GG*9;8I z6BroyBQjDGQ&^>HJSPh<%Gdt|>ev8OWs#GgoT%-jUIJ7V1LPa!CRP+MBryPWFj@fl z3VDgSsr=@hHy9X%K(^!+i1*!$Q9E@eaW->730eK+PWf)k1_AmfL zf(6J28B;oW6O%oo_~Z{v)j+b4dBWs>%vvn$KyPo>VEM>b&%~h0pv`!d@iqfHg96ay zCTdD-B4S3YBK(YO%1Zi-YU*mXj3(x0){I8tV)Be)OU2~G#N-&=xO%wx1-Q=eu(NY< z^Op+<3h|ubVk`v7i8b(Z^>T5Y;WC5y#gcVrR`M6`hK$?*Q4ghm+ BYl8p) delta 411 zcmeCto}qLj#NmYkbdU^OogsGji!5ErE<78m^g&%g{+Zv&L)NYANE`*5gbIRgW8 z4+8_=hm6$36jq`BW z3VDgSseHDb_Zb+3YJg&S1^LA#%nHoh3=G0=fbszhj6f2IT?M~$#Pi#HW#DE43NSES z{H30XOfxZn#W^6<45*(4s2}1)kl769 + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 98f7a4d84873521cbb303f89632ee7ea1bb63197..0babbfec54d50c3269fa77439e1d5dea67a5d269 100644 GIT binary patch delta 511 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 UmkRm!CXVWq@wETO;Y5Jqf10nNNdN!< delta 3951 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 DW#~a8 diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index b462adac9..a420406fa 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -49,7 +49,7 @@ .icon-angle-up:before { content: "d"; } -.icon-chat-bubble-two:before { +.icon-comments:before { content: "e"; } .icon-twitter:before { @@ -58,7 +58,7 @@ .icon-calendar:before { content: "g"; } -.icon-comment-quotes:before { +.icon-debates:before { content: "i"; } .icon-unlike:before { @@ -97,3 +97,6 @@ .icon-deleted:before { content: "t"; } +.icon-tag:before { + content: "u"; +} From 570169af57c74ad267afd8fa3c7a7c12789bd4d0 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sat, 22 Aug 2015 14:46:26 +0200 Subject: [PATCH 2/6] Changes icons classes names --- app/assets/stylesheets/debates.scss | 8 ++++---- app/assets/stylesheets/participacion.scss | 2 +- app/views/debates/_debate.html.erb | 4 ++-- app/views/debates/new.html.erb | 2 +- app/views/debates/show.html.erb | 2 +- app/views/welcome/_featured_debate.html.erb | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 5ca0559ec..dd29774a5 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -163,7 +163,7 @@ padding-top: 0; } - .icon-comment-quotes { + .icon-debates { color: $debates; font-size: rem-calc(36); line-height: $line-height; @@ -191,7 +191,7 @@ font-weight: lighter; margin-bottom: 0; - .icon-chat-bubble-two { + .icon-comments { font-size: rem-calc(16); vertical-align: top; } @@ -280,7 +280,7 @@ } } - .icon-comment-quotes { + .icon-debates { font-size: rem-calc(18); left: rem-calc(60); top: 0; @@ -450,7 +450,7 @@ margin-bottom: rem-calc(24); } - .icon-comment-quotes { + .icon-debates { color: $debates; font-size: rem-calc(60); line-height: $line-height; diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index eb512ad3f..29159aaba 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -614,7 +614,7 @@ form { margin-bottom: rem-calc(24); } - .icon-comment-quotes { + .icon-debates { color: $debates; font-size: rem-calc(60); line-height: $line-height; diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index 56a5127c5..4dd866df2 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -5,10 +5,10 @@
<%= t("debates.debate.debate") %> - +

<%= link_to debate.title, debate %>

-   +   <%= link_to t("debates.debate.comments", count: debate.comment_threads.count), debate_path(debate, anchor: "comments") %>

diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index c341d178d..7987265bd 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -10,7 +10,7 @@
- +

<%= t("debates.new.recommendations_title") %>

  • <%= t("debates.new.recommendation_one") %>
    • diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index d27edde49..1475e95a8 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -39,7 +39,7 @@  •  <%= l @debate.created_at.to_date %>  •  -   +   <%= link_to t("debates.show.comments", count: @debate.comment_threads.count), "#comments" %>
diff --git a/app/views/welcome/_featured_debate.html.erb b/app/views/welcome/_featured_debate.html.erb index a1992e337..11cb3b733 100644 --- a/app/views/welcome/_featured_debate.html.erb +++ b/app/views/welcome/_featured_debate.html.erb @@ -4,10 +4,10 @@
<%= t("debates.debate.debate") %> - +

<%= link_to featured_debate.title, featured_debate %>

-   +   <%= link_to t("debates.show.comments", count: featured_debate.comment_threads.count), debate_path(featured_debate, anchor: "comments") %>

From 9d992da2bedb198dc3ef94c01e6ca9e225cb8187 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sat, 22 Aug 2015 18:05:32 +0200 Subject: [PATCH 3/6] Adds new icon for rejected items --- app/assets/fonts/icons.eot | Bin 5516 -> 5716 bytes app/assets/fonts/icons.svg | 3 ++- app/assets/fonts/icons.ttf | Bin 5360 -> 5560 bytes app/assets/fonts/icons.woff | Bin 4180 -> 4380 bytes app/assets/stylesheets/icons.scss | 9 ++++++--- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 8e5abb7bc8890c24dbfb74b7c953c9fb2248b5d1..2c00f1f5b9cb03572d4edc47b957eb166f49e9e1 100644 GIT binary patch delta 802 zcmY*X-%C?*6hGhXyYIc;d*^=MyB{iB)7`H!#j)00BXOHk69-Z*(^elk-5CB?7N<+gi3=Hvg#L@AI-qiT-i?0F56ynLbWut!P#pD6v zZz$^v#%lfW5bVfbL%+DNv~gu%V{maDG5JD&l3$S1Y>%IccEX0KzNDEccv@Q+e$$tP!B zr+$Epsqy=8Fq-=Jv_ZozT8H_R^pKGGgWHjrtw6CZ;N4KfR@!y*r7hm(0|_%I;Dlyyfg1wg0WbJL1r37czOCl+NwVT>cDVx{ zuV2-I=2iQanY2@r(2$q@bUb5>JrLYNPN)g*L}jm=-fY_IX`XUyTCI%Qfb4(|I-wsR zu5(TGvzUG&-Nytipr!gUJk9m?n7~v&!VEex$5R>2FED|{xXyJnSf+p$AYT&&PkFKI zDJ0^#?CossF{P{{6sA-WJ>DP__Zcq@?hckXWBO2OtW+Kx(!UqmBe8V3oQ_4>iznl; zSo{%XG!*V&b}Bl;Zm&4wmx{czlNTj_Q=yCVt^(fAB$UV#avu_A(xDj~8y+CoMTA(r zL1zxm5QJ^g(J%?`L9cqCCMU7l72+iCCLikyW!g* uxLi#=<~fUNItOFe!g-j2379rdt8F}pO;Nnh#(QWi6yDFg{e_nQ9?c&nb&10O delta 601 zcmYjNO=#0#7=FH_N!On=ZI-0|q;^Ky3iXdLx}Z*mZjK`B)Vg(S6U}Cwhczp#gAIh? zL8!9BYIf1on;qchoRtE(1RC25S?#^pojPUzUTdW-uKx(wUQTCG~k=s z5(|N~^7>}0&z<510d*IEG1xzF6$20nzarc14lW9R%k!k@_+ zGtPW{e;+*6Z&AKuW_Ia*`hxNW;8y{8>_OGJCmeZL^x`bFe1-j@o|jZ-&(2Ld`OCQm z)lCw%YR+OEQ=lGZ6Yg@IT2=0OvIi(Wk6WLcZ}3Zegn0ZtZi0~~+gvZN-H|VTM}(sQ z@cwsdn?s8z;2+=5iDN_s{V^*OjE1KEdC1&YKF=qyK zO%+d=IZ;z}tI(ZgLoZrprn%9~n9rZOlH~fXEy;$VrlW#=-L~0wb)s0Q6em8GEUQHJ zOo*mc!;qzuHsy(kP8)B(l}3d2kh;o9s!!VSM41l1g%MoCC@LWFy||uYN$-qqg#T&% E2Qp@KlK=n! diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 1010703a6..2f04723b8 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -20,7 +20,6 @@ - @@ -28,4 +27,6 @@ + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 0babbfec54d50c3269fa77439e1d5dea67a5d269..808c75487bf0422da6e512d3c1049bc9e25a6f6d 100644 GIT binary patch delta 806 zcmX|9O=#0#7=FJb{gS2W`j@6ZcC@BzvQeQ@Yd6d0)~@R)t4v+3n|~v0bv>+IVPk9} z)PsuN<{~&`XOSVI>>_yayqkCt^y0~jhzNopY`*Ex!29KW-k&GW`+oV+|0dA}0ss!U z11y{`7AxmguFlQ@_;xTFo+ykLp$HW5ZN$;3>11l^&$YJzWCn3{zG1X3ysjP~{)V=; zXsomj50MFctC$xSmo{#WY)nJ}*lhq;pk6Z;Y@rVZ=02lk>h)UN;F63Dn`I32)*Gwq z!efR({0eb)X?fl_5lX&8f(69shOyp)dDz7KAmV7#Xw;ko4?hBUv7R(r%PXsFlWn1Z zDCR4j;c&p(vC)%r&Y@pmM{0cDACyu@Z>E&mBEuwTo+a1Gnz=)Ub5|gaeF?C`D0(=i zRcQ^?v2ceIpoPd;cC0V2`=!18$2L`4-^QPRi^3m zigwA-?R5Fw9@(b^%rDGcbCYqIH8$wse%oGBN}uvBKFc@xeL>pWWbbwDJ#x(0+Ln|O z17r)l&f_sekC=K(bKvXQ+eu>5oR!vIhD#NGEaG`>YA=$zzX>l zKlzl%xy$vkJC}%O2OkV(pK~1T4Td;Q65O5u6@F5^Ft$Bb&?(i%3zO~g*tqsRAB(8z zayhL=V)-+1RgFL6C>IR%QkD~JA(uzEA&YsvuTRg5a#yZj*ZXt0pDGl{E_s66g}Ce_ zG^QpA-#JnH2+=zy%8C$6T!i3QPU2U{uAmE&U8qz9yEKHpM1d}N0GR(j<%$hIc9uhG3<*@kg|0t#Y E0$8Gp=Kufz delta 685 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 C6Qm#j delta 3881 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 diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index a420406fa..ac6bb9dab 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -76,9 +76,6 @@ .icon-star:before { content: "n"; } -.icon-eye:before { - content: "p"; -} .icon-user:before { content: "o"; } @@ -100,3 +97,9 @@ .icon-tag:before { content: "u"; } +.icon-eye:before { + content: "p"; +} +.icon-x:before { + content: "v"; +} From 6b4b0553b9c9788adcea9dd5103d63e30849349d Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sat, 22 Aug 2015 18:06:03 +0200 Subject: [PATCH 4/6] Adds new icons for admin menu --- app/views/admin/_menu.html.erb | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index bc2d459e2..a76ecfe0f 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -4,59 +4,59 @@ <%= t("admin.dashboard.index.title") %> -
  • > +
  • > <%= link_to admin_tags_path do %> - - <%= t('admin.menu.debate_topics') %> + + <%= t("admin.menu.debate_topics") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_debates_path do %> - - <%= t('admin.menu.hidden_debates') %> + + <%= t("admin.menu.hidden_debates") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_comments_path do %> - - <%= t('admin.menu.hidden_comments') %> + + <%= t("admin.menu.hidden_comments") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_users_path do %> - - <%= t('admin.menu.hidden_users') %> + + <%= t("admin.menu.hidden_users") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_organizations_path do %> - - <%= t('admin.menu.organizations') %> + + <%= t("admin.menu.organizations") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_officials_path do %> - <%= t('admin.menu.officials') %> + <%= t("admin.menu.officials") %> <% end %>
    • -
  • > +
  • > <%= link_to admin_settings_path do %> - <%= t('admin.menu.settings') %> + <%= t("admin.menu.settings") %> <% end %>
    • -
  • > +
  • > <%= link_to stats_path do %> - <%= t('admin.menu.stats') %> + <%= t("admin.menu.stats") %> <% end %>
    • From 30d685ec321f81ad5b2eb70697a8ca53be04e3c6 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sat, 22 Aug 2015 18:06:27 +0200 Subject: [PATCH 5/6] Adds styles for organizations --- app/assets/stylesheets/admin.scss | 14 ++++++ app/assets/stylesheets/participacion.scss | 51 ++++++++++++++++++++ app/views/admin/organizations/index.html.erb | 37 ++++++++------ 3 files changed, 87 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index bf9d7dd22..8d1a2bbcb 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -149,6 +149,20 @@ body.admin { } } +.verified { + color: $check; +} + +.verified a { + border-bottom: 1px dotted $check; + color: $check; + font-size: rem-calc(12); +} + +.rejected { + color: #F04124; +} + .level { font-size: rem-calc(12); } diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 29159aaba..e6aea4db2 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -13,6 +13,7 @@ // 11. Filters // 12. Official levels // 13. Pagination +// 14. Tables // // 01. Variables @@ -126,6 +127,29 @@ h1, h2, h3, h4, h5, h6 { } } +.sub-nav { + background-color: #f2f2f2; + border-radius: rem-calc(3); + padding: rem-calc(10) rem-calc(10) rem-calc(10) 0; + margin: rem-calc(12) 0; +} + +.sub-nav dt, .sub-nav dd, .sub-nav li { + + &.active { + background: #008CBA; + border-radius: rem-calc(3); + color: white; + cursor: default; + font-weight: normal; + padding: 0.16667rem 0.88889rem; + + a:hover { + color: #737373; + } + } +} + // 04. Header // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -762,3 +786,30 @@ ul.pagination { color: $text-medium; } } + +// 14. Tables +// - - - - - - - - - - - - - - - - - - - - - - - - - + +table { + border-collapse: collapse; + border-spacing: 0; + width: 100%; + + tr { + + td { + line-height: $line-height; + padding: rem-calc(12) rem-calc(6); + } + + &:nth-child(odd) { + background: #F0F2F6; + } + } + + .button { + margin: 0; + } +} + + diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb index 425bee1f7..9097da44c 100644 --- a/app/views/admin/organizations/index.html.erb +++ b/app/views/admin/organizations/index.html.erb @@ -1,17 +1,17 @@

    <%= t('admin.organizations.index.title') %>

    -

    - <%= t('admin.organizations.index.filter') %>: +

    +
    <%= t('admin.organizations.index.filter') %>:
    <% @valid_filters.each do |filter| %> <% if @filter == filter %> - <%= t("admin.organizations.index.filters.#{filter}") %> +
    <%= t("admin.organizations.index.filters.#{filter}") %>
    <% else %> - <%= link_to t("admin.organizations.index.filters.#{filter}"), - admin_organizations_path(filter: filter) %> +
    <%= link_to t("admin.organizations.index.filters.#{filter}"), + admin_organizations_path(filter: filter) %>
    <% end %> <% end %> -

    +

    <%= page_entries_info @organizations %>

    @@ -22,22 +22,29 @@ <%= organization.email %> <%= organization.phone_number %> <% if organization.verified? %> - <%= t('admin.organizations.index.verified') %> - <% end %> - <% if can? :verify, organization %> - <%= link_to t('admin.organizations.index.verify'), - verify_admin_organization_path(organization, request.query_parameters), - method: :put - %> + + + <%= t('admin.organizations.index.verified') %> <% end %> <% if organization.rejected? %> - <%= t('admin.organizations.index.rejected') %> + + + <%= t('admin.organizations.index.rejected') %> + + <% end %> + <% if can? :verify, organization %> + + <%= link_to t('admin.organizations.index.verify'), + verify_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button radius tiny success" + %> + <% end %> <% if can? :reject, organization %> <%= link_to t('admin.organizations.index.reject'), reject_admin_organization_path(organization, request.query_parameters), - method: :put + method: :put, class: "button radius tiny alert" %> <% end %> From 908d19e2e7f31f9cd2e7c0e221dc3015c21014d2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Sun, 23 Aug 2015 11:45:43 +0200 Subject: [PATCH 6/6] Improves styles for admin --- app/assets/stylesheets/admin.scss | 4 +++ app/views/admin/comments/index.html.erb | 21 +++++++++++-- app/views/admin/debates/index.html.erb | 13 ++++++++ app/views/admin/organizations/index.html.erb | 33 ++++++++++++++++---- config/locales/admin.en.yml | 13 ++++++++ config/locales/admin.es.yml | 15 ++++++++- 6 files changed, 89 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 8d1a2bbcb..7e6096bc3 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -175,6 +175,10 @@ body.admin { padding: rem-calc(6) rem-calc(12); } +.button.tiny.success { + margin-left: rem-calc(12); +} + // 04. Stats // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 5a0b8f967..87b25680d 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,18 +1,33 @@

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

    + +
    +
    <%= t("admin.comments.index.filter") %>:
    +
    <%= t("admin.comments.filters.all") %>
    +
    <%= t("admin.comments.filters.pending") %>
    +
    <%= t("admin.comments.filters.archived") %>
    +
    + +

    <%= page_entries_info @comments %>

      <% @comments.each do |comment| %>
    • -
      +
      <%= comment.body %> + + <%= link_to t("admin.comments.index.show_debate"), "#" %> +
      -
      +
      + + <%= link_to t("admin.actions.archive"), "#", class: "button radius tiny warning" %> + <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment), method: :put, data: { confirm: t("admin.actions.confirm") }, - class: "button radius small success right" %> + class: "button radius tiny success" %>
      • diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb index 710f6ebd6..dbd85a46f 100644 --- a/app/views/admin/debates/index.html.erb +++ b/app/views/admin/debates/index.html.erb @@ -1,5 +1,14 @@

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

      + +
      +
      <%= t("admin.debates.index.filter") %>:
      +
      <%= t("admin.debates.filters.all") %>
      +
      <%= t("admin.debates.filters.pending") %>
      +
      <%= t("admin.debates.filters.archived") %>
      +
      + +

      <%= page_entries_info @debates %>

        @@ -10,6 +19,10 @@ <%= link_to t("admin.actions.restore"), restore_admin_debate_path(debate), method: :put, data: { confirm: t("admin.actions.confirm") }, class: "button radius tiny success right" %> + + + <%= link_to t("admin.actions.archive"), "#", class: "button radius tiny warning right" %> + <% end %>
      diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb index 9097da44c..df003e6f8 100644 --- a/app/views/admin/organizations/index.html.erb +++ b/app/views/admin/organizations/index.html.erb @@ -1,7 +1,20 @@ -

      <%= t('admin.organizations.index.title') %>

      +

      <%= t("admin.organizations.index.title") %>

      + + +<%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %> +
      +
      + <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %> +
      +
      + <%= f.submit t("admin.officials.index.search"), class: "button radius success" %> +
      +
      +<% end %> +
      -
      <%= t('admin.organizations.index.filter') %>:
      +
      <%= t("admin.organizations.index.filter") %>:
      <% @valid_filters.each do |filter| %> <% if @filter == filter %> @@ -21,28 +34,36 @@ <%= organization.name %> <%= organization.email %> <%= organization.phone_number %> + + Colectivo + <% if organization.verified? %> - <%= t('admin.organizations.index.verified') %> + <%= t("admin.organizations.index.verified") %> <% end %> <% if organization.rejected? %> - <%= t('admin.organizations.index.rejected') %> + <%= t("admin.organizations.index.rejected") %> <% end %> + + + <%= link_to t("admin.organizations.index.edit"), "", class: "button radius tiny secondary" %> + + <% if can? :verify, organization %> - <%= link_to t('admin.organizations.index.verify'), + <%= link_to t("admin.organizations.index.verify"), verify_admin_organization_path(organization, request.query_parameters), method: :put, class: "button radius tiny success" %> <% end %> <% if can? :reject, organization %> - <%= link_to t('admin.organizations.index.reject'), + <%= link_to t("admin.organizations.index.reject"), reject_admin_organization_path(organization, request.query_parameters), method: :put, class: "button radius tiny alert" %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index cdf6774db..971699c0b 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -25,6 +25,7 @@ en: verified: Verified rejected: Rejected filter: Filter + edit: Edit filters: all: All pending: Pending @@ -35,6 +36,7 @@ en: hide_author: Ban author restore: Restore confirm: 'Are you sure?' + archive: Archive tags: index: title: 'Debate topics' @@ -46,15 +48,26 @@ en: comments: index: title: Hidden comments + show_debate: Show debate + filter: Filter restore: success: The comment has been restored + filters: + all: All + pending: Pending + archived: Archived debates: index: title: Hidden debates + filter: Filter show: back: Back restore: success: The debate has been restored + filters: + all: All + pending: Pending + archived: Archived users: index: title: Banned users diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 02f0ef65a..3c264447f 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -25,6 +25,7 @@ es: verified: Verificada rejected: Rechazada filter: Filtro + edit: Editar filters: all: Todas pending: Pendientes @@ -35,26 +36,38 @@ es: hide_author: Bloquear al autor restore: Volver a mostrar confirm: '¿Estás seguro?' + archive: Archivar tags: index: title: 'Temas de debate' add_tag: 'Añade un nuevo tema de debate' - mark_as_featured: 'Proponer etiqueta al crear debate' + mark_as_featured: 'Proponer tema al crear debate' name: placeholder: 'Escribe el nombre del tema' destroy: Elimina la etiqueta comments: index: title: Comentarios ocultos + show_debate: Ver debate + filter: Filtro restore: success: El comentario ha sido permitido + filters: + all: Todos + pending: Pendientes + archived: Archivados debates: index: title: Debates ocultos + filter: Filtro show: back: Volver restore: success: El debate ha sido permitido + filters: + all: Todos + pending: Pendientes + archived: Archivados users: index: title: Usuarios bloqueados