From 96bd8cec003d8b8e96b6123d1205007b8df64cbd Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 18:54:26 +0200 Subject: [PATCH 1/9] fixes styles on admin legislation processes subnav --- .../legislation/processes/_subnav.html.erb | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb index 97640c4f4..f8e9bba56 100644 --- a/app/views/admin/legislation/processes/_subnav.html.erb +++ b/app/views/admin/legislation/processes/_subnav.html.erb @@ -1,11 +1,31 @@ From 2e6072ef19c372c880a439f9e1c2bb109308f6a0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 18:54:48 +0200 Subject: [PATCH 2/9] adds missing icons on admin menu --- app/assets/fonts/icons.eot | Bin 12528 -> 14024 bytes app/assets/fonts/icons.svg | 5 +++++ app/assets/fonts/icons.ttf | Bin 12372 -> 13868 bytes app/assets/fonts/icons.woff | Bin 9352 -> 10236 bytes app/assets/stylesheets/icons.scss | 20 ++++++++++++++++++++ app/views/admin/_menu.html.erb | 6 ++++-- 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 5564a5c62a83883cf5911bcc08931452d8ca3931..53439b28145908023bc4579be8476a0643412c40 100644 GIT binary patch delta 2085 zcmZuyO>7%Q6n?Wmv+LbBcH-T2+9vg1;?OvD)7ai^o1dmtC~_r;#7`k@C1f0@L9v}Q zN!w6W7=c7{s06J~sN$y*l@JmLs3-^iE`UN*E=6!jT5*X47gP>Z;^OdT>^LdH(aya0 zy>H&k`}Sq_es;M?mu-Mv`wF$C_0sjpDbm67Rb5EWr07!2F#M`Fw z*$H>-;xxwA@Uf>5kow4PxYj_wbE>$oSk@oV5CWedaJev(%NE5K4q^fo{nv}x#aXxl zpJRMK`oU7Rn1A)Bmq!8ieSp}R*_ru;Z$3&c0VLb;P%A)?h0o;m()#nB!M{Nl5CHg< zzWv4Kys?VRE{>}pK#~*KA`T@4*jU|I6}ot;TC6ro9617?fxB{#JWE0qTevn}!gO8u z2TTS2wAWXDhaNjlJ4k?sg(hIzNoa-O0Gxmes2ux+pbrj1mU}@^IEL#gJH@wl9OhnQ zaP}WKI50Rgd}!q6ZE=(|89x|RbICHS%K$gM^7Zbrn{ml1mf`{*bU+WJF!>X35{hsU z-hg)ib+%K{utE*1-?3BO(J(dqR)4f%S!hK#nCy3=4Qe+dDAZ(RyT)NTkkg1*{bk4Y zr}=t?b`Ydu*kvF6GGuSA%qOG!C)(Fr^QfcBovOOTT*s1)bF=S)^1%hg4&{{ z@3wR;IF65j_FuZ*>_Ncm(Q+8p%gD=NOw$-~Ro6UTO}9MFdQL-7XIa)bTd##mTMWHK zCAE50)ntW|k|I;a(>2ZQ_E?=bR!bhs@{p@;w|0=9!Dys>t#&wlJXo&np)K;$S^845 zUf;=@sUJ#T@@NS1W8W@eHcj`G_(p$h1*S6!l{Gb^%CbzK-b(U)^%yUR++tO;mMuXS zxk^^SjeP{9yzM19wqtk*RcN?7x|c-LDaS@7NyfAWEt3x!*Oa6wZHgvMxneyRdSWCK zF!2}Y@SCQ;BVgQhQQY5k*9Z*7dU|5mS|V$Ap^IRY}4M z)``XOsqRSvsi1Pa&6 zRI5#+nTLGVeGyx9Z%gdb=28QBW^Y;r;5JZ6#lGE9xV6wpAsFkN?+e zC{X#hcTaa1X6u)}gayA_w`I`b>$*)5|D{sx4Rw#=os1s_$%UT+4Jvh81`BS~ZHoAh zm80>KWMAdIcrT8(0BC7y zZ^zwgrQL>3|E;uljZfaZ*1NRp6=2kWzJ=nLdv)_R{|RkPu1t}FVT+%P-A>+H^lMXf z>x$V!;VFgNlV#6M?#=E2^xx#Se0QpXIXtIbHJB*5{#b1A?h=q>0#T}ztF`o|Z#3<{ z!=~mS2)Wj0muD_-$^C+*Q2;*wxj*{vY`5qc3-m5%Z~_Mv6i5d&v|H_#77J2!Y@OW* zlsulnl3&F+Vats6@FY8>S*>^&@tRDv5r=^Vp50JoRPsZ(fN9Q4eKwB44e*A53)!zf zkSk8qLUv&A@R6KS8%=#kG?J0WeR4RpyWWFRSi?XBk3t-Qg_j{Vsee-Sjg3^gnWBR= zL=g+Ij^pSLu|c1EA&y`N7DH@Oe}@TpD6?i2nDELa`8{U|6sDe3j+>L-KO-% + + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 6af0797fb5fe1f6a0dee2d96adbaa03fea58f23c..3bd8e9decc304003e191744344212d5645d1b714 100644 GIT binary patch delta 2128 zcmZuyO>7%Q6n?Wmv+Ld1j^o{RN|X98acCT;X>9Md%}>)R6uGDbK`EqE0^>MM75}73 z+M24WD?l^{B%nS)RZu00IDmwxXeAJE0aPNml%Gpd#HA8k5FDt)#o^6*=>N* z?AVt8|I{4yKbt_QS{EuI(pJk#OxTa(S|Z z*}Cxuj0OAO;Y5Cg8soYH1i;Ng3$WD$l)|tZj>1`Fjy+)*fPIj)wGc?Q4dZI(xi`1$ zv$f`6?b^L(Xn16F@7VPLew?&u-)MDx$^Q3GHD3iRuh&HZUv)VwxUf zuxgosv>h+ePJ&Q$o6H}zLv7Wv0pW-P2qQvoB3OiJ`80_}!;x6pmok&#!GKXRwyBC1 zQYwnN%}|xlB>pv&|58sD{_0<`gulEX%5mRvWI; z20|@SL9Snt6;Yz3B#D&aR7G*Sy+#*~^^(^xyyTMGt?aS)pfyvz)YzOl8LBqcP%8HB z40Xw)Ix87vXH)8uS3#q_?e9vMO;Noid!gSq9J3jTii(_(MNy=OHtD6qVGA+$Zs6-<@u^l9qPFW^0Niw=IZ0Pooam@&d)GjH)j4R%I zwl_{PK^>o9XF%5jok8u6i{kpOJ6dog-rF0;*5X;abKUlW7EA;9F*{40#M~OK2H1=z zPvb<#LyQx2kC12t2Luff1|1@Z(IxDTA)+@R>6Do^al@ko2Rm1zb!^%0oooG}P$;;g zKNuRjJ0)^F6{dJjutbi_^Ax2##|su;<@wvlXQnOqPnV_>j^jn4RZ%=XuOzhV{*JAh z9uR4)eGGXg5Q_9ASk_}>-F7sc5_pai_$kU;DCGr?$IRF8SjIhmEh=h)rg~dF9WDiF zX_IByv@_Wx|;mP|!iR_hm3S+1f$pvB!vV+CHA%`*h$6omxK0g{)PXnMI2^HgiKdZ-&P5Ft}xm5eK?-8=ICM5cB97sG_dpQv%`)ltd&MIVx43iNu zO7>n4_5VRkC6_JaP8G6?<#`1^=80l6X-+X delta 606 zcmZ3Jb0wjkfsuiMftR6yftew|%`L>Y!r*)v1A~DDP*ld<#np`=i-8TumjLn={Dbw4 z{7=Q~XJBBA0P@3D3OgB+-kmzbL>WZ8R|fk6kTpE0i>zqrJN=P6K1w*}~^ zF0ki-9{k&Wq%EG`<|_j?6HtzU;p)$6!4TSITJZmOK&3)p2@VE`JkTtl7)XU46T|;^ z|KBkQfsF!*zyJ$a#Fk+b1NUSn#&AZ1$+H+|djeewQ~<&a1PmA)84|&4b}*lDav#&o$@<28+zjRxmR8m_AkobZ%r184{8Ss11rNED4Ugmn_(A}%?1>|H2IsMqPi1<7RVheoIqD_F-(B6SsBC_ z7D3r;K=EUfFB%C?4m9$ZJljZn@^Pck$+E@@jJA{QjH@;uGJeN6`I)J_x((297NBb& UK?U*}!x`H}=Rq_gT&D#C04sucU;qFB diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 7f8f3c95e81bff9ad949c7b630da7ecfa6e4e196..0ac7f8f19cfa02f884464c3f30b0cf2f98865ef2 100644 GIT binary patch literal 10236 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 diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 96eb10a0d..dc59d1118 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -268,3 +268,23 @@ .icon-search-minus::before { content: '\35'; } + +.icon-calculator::before { + content: "\36"; +} + +.icon-map-marker::before { + content: "\37"; +} + +.icon-user-plus::before { + content: "\38"; +} + +.icon-file-text-o::before { + content: "\39"; +} + +.icon-file-text::before { + content: "\21"; +} diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 21dc7cffb..f2af2c116 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -136,7 +136,7 @@ <% if feature?(:legislation) %>
  • "> <%= link_to admin_legislation_processes_path do %> - + <%= t("admin.menu.legislation") %> <% end %>
    • @@ -156,7 +156,7 @@
  • - + <%= t("admin.menu.title_site_customization") %>
      "> <%= link_to admin_geozones_path do %> + <%= t('admin.menu.geozones') %> <% end %> @@ -185,6 +186,7 @@ <% if feature?(:signature_sheets) %>
    • "> <%= link_to admin_signature_sheets_path do %> + <%= t("admin.menu.signature_sheets") %> <% end %>
      • From 127ae893fcefe2df55253209c8d28c23575115a2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 18:55:14 +0200 Subject: [PATCH 3/9] replaces polls and budgets help icons to add consistency --- app/assets/images/help/help_icon_budgets.png | Bin 2273 -> 1456 bytes app/assets/images/help/help_icon_polls.png | Bin 2051 -> 1683 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/help/help_icon_budgets.png b/app/assets/images/help/help_icon_budgets.png index fc5e3022fc45e78cb6742678c93cc5e9ec580faf..f986a939c54fb097dcb50d96900b9f61a8cb3117 100644 GIT binary patch delta 633 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 Date: Fri, 13 Oct 2017 18:58:58 +0200 Subject: [PATCH 4/9] removes unnecessary helper for welcome page --- app/helpers/welcome_helper.rb | 4 ---- app/views/welcome/index.html.erb | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 9f8c8c13e..fe1c5f450 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -55,8 +55,4 @@ module WelcomeHelper end end - def highlight_background - (feature?("user.recommendations") && current_user) ? "highlight" : "" - end - end diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 0ea0f748d..e27f4436e 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -22,12 +22,12 @@ <%= render "recommended", recommended_debates: @recommended_debates, recommended_proposals: @recommended_proposals %> +
      <% end %> <% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
      - -
      +

      <%= t("welcome.debates.title") %>

      @@ -47,6 +47,5 @@
      -
      <% end %> From ae74e1ba07ddc7bacfbc8bbd05a18d19e70229d6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 19:31:02 +0200 Subject: [PATCH 5/9] improves admin tags layout --- app/views/admin/tags/index.html.erb | 33 +++++++++++++++-------------- config/locales/en/admin.yml | 5 +++-- config/locales/es/admin.yml | 5 +++-- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index f22321f38..787fad46a 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,39 +1,40 @@

      <%= t("admin.tags.index.add_tag") %>

      <%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %> - -
      -
      - <%= f.label :name, t("admin.tags.name.placeholder") %> - <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %> -
      - +
      + <%= f.label :name, t("admin.tags.name.placeholder") %> + <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %>
      <%= f.submit(t("admin.tags.create"), class: "button success") %> - <% end %> -

      <%= t("admin.tags.index.title") %>: <%= page_entries_info @tags %>

      +
      +

      <%= t("admin.tags.index.title") %>: <%= page_entries_info @tags %>

      + + + + + <% @tags.each do |tag| %> - + <% end %> +
      <%= t("admin.tags.index.title") %><%= t("admin.actions.actions") %>
      + <%= form_for(tag, url: admin_tag_path(tag), as: :tag, - html: { id: "edit_tag_#{tag.id}", class: "text-right"}) do |f| %> + html: { id: "edit_tag_#{tag.id}"}) do |f| %> - - <%= tag.name %> - - - <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert on-hover" %> + <%= tag.name %> <% end %> + <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert" %> +
      <%= paginate @tags %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index dfe92305d..cf1f83a2a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -901,11 +901,12 @@ en: total: Total proposals_with_notifications: Proposals with notifications tags: - create: Create Topic - destroy: Destroy Topic + create: Create topic + destroy: Destroy topic index: add_tag: Add a new proposal topic title: Proposal topics + topic: Topic name: placeholder: Type the name of the topic users: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 289546bab..a4a377854 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -903,11 +903,12 @@ es: total: Total proposals_with_notifications: Propuestas con notificaciones tags: - create: Crear Tema - destroy: Eliminar Tema + create: Crear tema + destroy: Eliminar tema index: add_tag: Añade un nuevo tema de propuesta title: Temas de propuesta + topic: Tema name: placeholder: Escribe el nombre del tema users: From d91388b2b3464c3c4b524607a48a0fd7245e82c3 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 20:57:19 +0200 Subject: [PATCH 6/9] improves layout and unifies design of admin moderated content --- app/views/admin/comments/index.html.erb | 68 ++++++++++------- app/views/admin/debates/index.html.erb | 68 ++++++++++------- app/views/admin/hidden_users/index.html.erb | 62 ++++++++------- app/views/admin/proposals/index.html.erb | 84 ++++++++++++--------- config/locales/en/admin.yml | 8 ++ config/locales/es/admin.yml | 8 ++ 6 files changed, 182 insertions(+), 116 deletions(-) diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 75493857c..e07487bcf 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -2,34 +2,46 @@ <%= render 'shared/filter_subnav', i18n_namespace: "admin.comments.index" %> -

      <%= page_entries_info @comments %>

      +<% if @comments.any? %> +

      <%= page_entries_info @comments %>

      - - <% @comments.each do |comment| %> - - - + + <% end %> + +
      - <%= text_with_links comment.body %>
      - <% if comment.commentable.hidden? %> - (<%= t("admin.comments.index.hidden_#{comment.commentable_type.downcase}") %>: <%= comment.commentable.title %>) - <% else %> - <%= link_to comment.commentable.title, comment.commentable %> - <% end %> -       		- <%= link_to t("admin.actions.restore"), - restore_admin_comment_path(comment, request.query_parameters), - method: :put, - data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover-block" %> - <% unless comment.confirmed_hide? %> - <%= link_to t("admin.actions.confirm_hide"), - confirm_hide_admin_comment_path(comment, request.query_parameters), + + + + + + + <% @comments.each do |comment| %> + + + - - <% end %> -
      <%= t("admin.shared.description") %><%= t("admin.shared.actions") %>
      + <%= text_with_links comment.body %>
      + <% if comment.commentable.hidden? %> + (<%= t("admin.comments.index.hidden_#{comment.commentable_type.downcase}") %>: <%= comment.commentable.title %>) + <% else %> + <%= link_to comment.commentable.title, comment.commentable %> + <% end %> +       		+ <%= link_to t("admin.actions.restore"), + restore_admin_comment_path(comment, request.query_parameters), method: :put, - class: "button hollow warning on-hover-block" %> - <% end %> -
      + data: { confirm: t("admin.actions.confirm") }, + class: "button hollow warning" %> + <% unless comment.confirmed_hide? %> + <%= link_to t("admin.actions.confirm_hide"), + confirm_hide_admin_comment_path(comment, request.query_parameters), + method: :put, + class: "button" %> + <% end %> +
      -<%= paginate @comments %> + <%= paginate @comments %> +<% else %> +
      + <%= t("admin.comments.index.no_hidden_comments") %> +
      +<% end %> diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb index 987aa6e72..7715e1032 100644 --- a/app/views/admin/debates/index.html.erb +++ b/app/views/admin/debates/index.html.erb @@ -2,33 +2,47 @@ <%= render 'shared/filter_subnav', i18n_namespace: "admin.debates.index" %> -

      <%= page_entries_info @debates %>

      +<% if @debates.any? %> +

      <%= page_entries_info @debates %>

      - - <% @debates.each do |debate| %> - - - + + <% end %> + +
      - <%= debate.title %> -
      -
      - <%= debate.description %> -
      -       		- <%= link_to t("admin.actions.restore"), - restore_admin_debate_path(debate, request.query_parameters), - method: :put, - data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover" %> - <% unless debate.confirmed_hide? %> - <%= link_to t("admin.actions.confirm_hide"), - confirm_hide_admin_debate_path(debate, request.query_parameters), + + + + + + + + <% @debates.each do |debate| %> + + + + - - <% end %> -
      <%= t("admin.shared.title") %><%= t("admin.shared.description") %><%= t("admin.shared.actions") %>
      + <%= debate.title %> + +
      + <%= debate.description %> +
      +       		+ <%= link_to t("admin.actions.restore"), + restore_admin_debate_path(debate, request.query_parameters), method: :put, - class: "button hollow warning on-hover" %> - <% end %> -
      + data: { confirm: t("admin.actions.confirm") }, + class: "button hollow warning" %> + <% unless debate.confirmed_hide? %> + <%= link_to t("admin.actions.confirm_hide"), + confirm_hide_admin_debate_path(debate, request.query_parameters), + method: :put, + class: "button" %> + <% end %> +
      -<%= paginate @debates %> + <%= paginate @debates %> +<% else %> +
      + <%= t("admin.debates.index.no_hidden_debates") %> +
      +<% end %> diff --git a/app/views/admin/hidden_users/index.html.erb b/app/views/admin/hidden_users/index.html.erb index 21bf016e4..6bcea253c 100644 --- a/app/views/admin/hidden_users/index.html.erb +++ b/app/views/admin/hidden_users/index.html.erb @@ -2,32 +2,42 @@ <%= render 'shared/filter_subnav', i18n_namespace: "admin.hidden_users.index" %> -

      <%= page_entries_info @users %>

      +<% if @users.any? %> +

      <%= page_entries_info @users %>

      - -<% @users.each do |user| %> - - +
      -

      <%= link_to user.name, admin_hidden_user_path(user) %>

      -
      + + + + + + <% @users.each do |user| %> + + - - + + + <% end %> + +
      <%= t("admin.hidden_users.index.user") %><%= t("admin.shared.actions") %>
      +

      <%= link_to user.name, admin_hidden_user_path(user) %>

      +       		- <%= link_to t("admin.actions.restore"), - restore_admin_hidden_user_path(user, request.query_parameters), - method: :put, - data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover" %> - <% unless user.confirmed_hide? %> - <%= link_to t("admin.actions.confirm_hide"), - confirm_hide_admin_hidden_user_path(user, request.query_parameters), - method: :put, - class: "button hollow warning on-hover" %> - <% end %> -
      + <%= link_to t("admin.actions.restore"), + restore_admin_hidden_user_path(user, request.query_parameters), + method: :put, + data: { confirm: t("admin.actions.confirm") }, + class: "button hollow warning" %> + <% unless user.confirmed_hide? %> + <%= link_to t("admin.actions.confirm_hide"), + confirm_hide_admin_hidden_user_path(user, request.query_parameters), + method: :put, + class: "button" %> + <% end %> +
      + + <%= paginate @users %> +<% else %> +
      + <%= t("admin.hidden_users.index.no_hidden_users") %> +
      <% end %> - - -<%= paginate @users %> - - diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb index d929843b1..ba161ce77 100644 --- a/app/views/admin/proposals/index.html.erb +++ b/app/views/admin/proposals/index.html.erb @@ -2,41 +2,55 @@ <%= render 'shared/filter_subnav', i18n_namespace: "admin.proposals.index" %> -

      <%= page_entries_info @proposals %>

      +<% if @proposals.any? %> +

      <%= page_entries_info @proposals %>

      - - <% @proposals.each do |proposal| %> - - - + + <% end %> + +
      - <%= proposal.title %> -
      -
      -

      <%= proposal.summary %>

      - <%= proposal.description %> - <% if proposal.external_url.present? %> -

      <%= text_with_links proposal.external_url %>

      - <% end %> - <% if proposal.video_url.present? %> -

      <%= text_with_links proposal.video_url %>

      - <% end %> -

      <%= proposal.question %>

      -
      -       		- <%= link_to t("admin.actions.restore"), - restore_admin_proposal_path(proposal, request.query_parameters), - method: :put, - data: { confirm: t("admin.actions.confirm") }, - class: "button hollow on-hover-block" %> - <% unless proposal.confirmed_hide? %> - <%= link_to t("admin.actions.confirm_hide"), - confirm_hide_admin_proposal_path(proposal, request.query_parameters), + + + + + + + + <% @proposals.each do |proposal| %> + + + + - - <% end %> -
      <%= t("admin.shared.title") %><%= t("admin.shared.description") %><%= t("admin.shared.actions") %>
      + <%= proposal.title %> + +
      +

      <%= proposal.summary %>

      + <%= proposal.description %> + <% if proposal.external_url.present? %> +

      <%= text_with_links proposal.external_url %>

      + <% end %> + <% if proposal.video_url.present? %> +

      <%= text_with_links proposal.video_url %>

      + <% end %> +

      <%= proposal.question %>

      +
      +       		+ <%= link_to t("admin.actions.restore"), + restore_admin_proposal_path(proposal, request.query_parameters), method: :put, - class: "button hollow warning on-hover-block" %> - <% end %> -
      + data: { confirm: t("admin.actions.confirm") }, + class: "button hollow warning" %> + <% unless proposal.confirmed_hide? %> + <%= link_to t("admin.actions.confirm_hide"), + confirm_hide_admin_proposal_path(proposal, request.query_parameters), + method: :put, + class: "button" %> + <% end %> +
      -<%= paginate @proposals %> + <%= paginate @proposals %> +<% else %> +
      + <%= t("admin.proposals.index.no_hidden_proposals") %> +
      +<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index cf1f83a2a..87bbb6685 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -213,6 +213,7 @@ en: hidden_debate: Hidden debate hidden_proposal: Hidden proposal title: Hidden comments + no_hidden_comments: There is no hidden comments. dashboard: index: back: Go back to %{org} @@ -226,6 +227,7 @@ en: with_confirmed_hide: Confirmed without_confirmed_hide: Pending title: Hidden debates + no_hidden_debates: There is no hidden debates. hidden_users: index: filter: Filter @@ -234,6 +236,8 @@ en: with_confirmed_hide: Confirmed without_confirmed_hide: Pending title: Hidden users + user: User + no_hidden_users: There is no hidden users. show: email: 'Email:' hidden_at: 'Hidden at:' @@ -715,6 +719,7 @@ en: with_confirmed_hide: Confirmed without_confirmed_hide: Pending title: Hidden proposals + no_hidden_proposals: There is no hidden proposals. settings: flash: updated: Value updated @@ -757,6 +762,9 @@ en: placeholder: Search user by name or email search_results: "Search results" no_search_results: "No results found." + actions: Actions + title: Title + description: Description spending_proposals: index: geozone_filter_all: All zones diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index a4a377854..d1a24b314 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -213,6 +213,7 @@ es: hidden_debate: Debate oculto hidden_proposal: Propuesta oculta title: Comentarios ocultos + no_hidden_comments: No hay comentarios ocultos. dashboard: index: back: Volver a %{org} @@ -226,6 +227,7 @@ es: with_confirmed_hide: Confirmados without_confirmed_hide: Pendientes title: Debates ocultos + no_hidden_debates: No hay debates ocultos. hidden_users: index: filter: Filtro @@ -234,6 +236,8 @@ es: with_confirmed_hide: Confirmados without_confirmed_hide: Pendientes title: Usuarios bloqueados + user: Usuario + no_hidden_users: No hay uusarios bloqueados. show: email: 'Email:' hidden_at: 'Bloqueado:' @@ -717,6 +721,7 @@ es: with_confirmed_hide: Confirmadas without_confirmed_hide: Pendientes title: Propuestas ocultas + no_hidden_proposals: No hay propuestas ocultas. settings: flash: updated: Valor actualizado @@ -759,6 +764,9 @@ es: placeholder: Buscar usuario por nombre o email search_results: "Resultados de la búsqueda" no_search_results: "No se han encontrado resultados." + actions: Acciones + title: "Título" + description: "Descripción" spending_proposals: index: geozone_filter_all: Todos los ámbitos de actuación From b52abfb9221513ffdd1906640e24b867794f9784 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 21:00:45 +0200 Subject: [PATCH 7/9] uses correct i18n key --- app/views/admin/tags/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 787fad46a..c60ddaa0f 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -14,7 +14,7 @@ - + From 1da787e2fff3bfbe7748a07b43a71fa83b96cd6d Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 21:01:23 +0200 Subject: [PATCH 8/9] fixes lint warnings using single quoted on icons.scss --- app/assets/stylesheets/icons.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index dc59d1118..b9f2735b4 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -270,21 +270,21 @@ } .icon-calculator::before { - content: "\36"; + content: '\36'; } .icon-map-marker::before { - content: "\37"; + content: '\37'; } .icon-user-plus::before { - content: "\38"; + content: '\38'; } .icon-file-text-o::before { - content: "\39"; + content: '\39'; } .icon-file-text::before { - content: "\21"; + content: '\21'; } From 99e609769507ffe46fee1ac2c6c6466aed9e0c51 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Oct 2017 21:32:19 +0200 Subject: [PATCH 9/9] updates admin tags specs --- app/views/admin/tags/index.html.erb | 2 +- spec/features/admin/tags_spec.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index c60ddaa0f..55e51a8ac 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -29,7 +29,7 @@ <%= tag.name %> <% end %> - diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb index dd9c38c6b..8ff205852 100644 --- a/spec/features/admin/tags_spec.rb +++ b/spec/features/admin/tags_spec.rb @@ -23,7 +23,7 @@ feature 'Admin tags' do within("form.new_tag") do fill_in "tag_name", with: 'important issues' - click_button 'Create Topic' + click_button 'Create topic' end visit admin_tags_path @@ -39,8 +39,8 @@ feature 'Admin tags' do expect(page).to have_content @tag1.name expect(page).to have_content tag2.name - within("#edit_tag_#{tag2.id}") do - click_link 'Destroy Topic' + within("#tag_#{tag2.id}") do + click_link 'Destroy topic' end visit admin_tags_path @@ -58,8 +58,8 @@ feature 'Admin tags' do expect(page).to have_content @tag1.name expect(page).to have_content tag2.name - within("#edit_tag_#{tag2.id}") do - click_link 'Destroy Topic' + within("#tag_#{tag2.id}") do + click_link 'Destroy topic' end visit admin_tags_path @@ -81,7 +81,7 @@ feature 'Admin tags' do within("form.new_tag") do fill_in "tag_name", with: "wow_category" - click_button 'Create Topic' + click_button 'Create topic' end expect(ActsAsTaggableOn::Tag.category.where(name: "wow_category")).to exist
      <%= t("admin.tags.index.title") %><%= t("admin.tags.index.topic") %> <%= t("admin.actions.actions") %>
      + <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert" %>