From e1014588917bbf91f4e7f72829f581accc32eeb4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Jul 2018 18:49:54 +0200 Subject: [PATCH 1/4] Removes custom content on seeds --- config/locales/en/seeds.yml | 10 +++++----- config/locales/es/seeds.yml | 10 +++++----- db/seeds.rb | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/locales/en/seeds.yml b/config/locales/en/seeds.yml index b77ebfc21..4e40cfd63 100644 --- a/config/locales/en/seeds.yml +++ b/config/locales/en/seeds.yml @@ -1,11 +1,11 @@ en: seeds: settings: - official_level_1_name: Public workers - official_level_2_name: Municipal Organization - official_level_3_name: General Directors - official_level_4_name: Councillors - official_level_5_name: Mayor + official_level_1_name: Official position 1 + official_level_2_name: Official position 2 + official_level_3_name: Official position 3 + official_level_4_name: Official position 4 + official_level_5_name: Official position 5 geozones: north_district: North District west_district: West District diff --git a/config/locales/es/seeds.yml b/config/locales/es/seeds.yml index 7640e4e4d..1d6563bef 100644 --- a/config/locales/es/seeds.yml +++ b/config/locales/es/seeds.yml @@ -1,11 +1,11 @@ es: seeds: settings: - official_level_1_name: Empleados públicos - official_level_2_name: Organización Municipal - official_level_3_name: Directores generales - official_level_4_name: Concejales - official_level_5_name: Alcaldesa + official_level_1_name: Cargo oficial 1 + official_level_2_name: Cargo oficial 2 + official_level_3_name: Cargo oficial 3 + official_level_4_name: Cargo oficial 4 + official_level_5_name: Cargo oficial 5 geozones: north_district: Distrito Norte west_district: Distrito Oeste diff --git a/db/seeds.rb b/db/seeds.rb index e453495f2..e39aa7e8b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -7,11 +7,11 @@ end # Names for the moderation console, as a hint for moderators # to know better how to assign users with official positions -Setting["official_level_1_name"] = "Empleados públicos" -Setting["official_level_2_name"] = "Organización Municipal" -Setting["official_level_3_name"] = "Directores generales" -Setting["official_level_4_name"] = "Concejales" -Setting["official_level_5_name"] = "Alcaldesa" +Setting["official_level_1_name"] = "Cargo oficial 1" +Setting["official_level_2_name"] = "Cargo oficial 2" +Setting["official_level_3_name"] = "Cargo oficial 3" +Setting["official_level_4_name"] = "Cargo oficial 4" +Setting["official_level_5_name"] = "Cargo oficial 5" # Max percentage of allowed anonymous votes on a debate Setting["max_ratio_anon_votes_on_debates"] = 50 @@ -26,7 +26,7 @@ Setting["max_votes_for_proposal_edit"] = 1000 Setting['comments_body_max_length'] = 1000 # Prefix for the Proposal codes -Setting["proposal_code_prefix"] = 'MAD' +Setting["proposal_code_prefix"] = 'CONSUL' # Number of votes needed for proposal success Setting["votes_for_proposal_success"] = 53726 From 7533ce21ab67335b1698a7c3917cede68b7cc2e0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Jul 2018 18:50:19 +0200 Subject: [PATCH 2/4] Unifies spanish investment projects i18n --- config/locales/es/budgets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index e3f7b52ae..14df02fea 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -126,10 +126,10 @@ es: milestone_publication_date: "Publicado el %{publication_date}" milestone_status_changed: El proyecto ha cambiado al estado author: Autor - project_unfeasible_html: 'Este proyecto de inversión ha sido marcado como inviable y no pasará a la fase de votación.' + project_unfeasible_html: 'Este proyecto de gasto ha sido marcado como inviable y no pasará a la fase de votación.' project_selected_html: 'Este proyecto de gasto ha sido seleccionado para la fase de votación.' project_winner: 'Proyecto de gasto ganador' - project_not_selected_html: 'Este proyecto de inversión no ha sido seleccionado para la fase de votación.' + project_not_selected_html: 'Este proyecto de gasto no ha sido seleccionado para la fase de votación.' wrong_price_format: Solo puede incluir caracteres numéricos investment: add: Votar From dcec003d0efa23b3fb09cf797e2ce2bf6515f517 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Jul 2018 18:50:49 +0200 Subject: [PATCH 3/4] Updates header markup and includes new logo --- app/assets/images/logo_header.png | Bin 1959 -> 3655 bytes app/assets/stylesheets/layout.scss | 14 ++++++ app/views/layouts/_header.html.erb | 67 +++++++++++------------------ 3 files changed, 38 insertions(+), 43 deletions(-) diff --git a/app/assets/images/logo_header.png b/app/assets/images/logo_header.png index c178ec7811199c2fd1f25f3d4a62d4f9465d74b1..84478da8325603c1e746a619ef49cdf6dc514f56 100644 GIT binary patch delta 2946 zcmbuBS5T7;8ihZ4OlZ=i2SP8>3DP29=psd0KzcxtB7!1KKYA4@q5BIK2uhPbD3K}x z5=4}?ihv{nVkpsoAT5+-XZCh?FZSlld(J!O_RLeuLlT$Ha=2j01r>z?0KjE!g?0h} zCf4KI0m6Q)N4_whzoq{$UDDSb#%3Lv=CA; zVG(wA2G-$GH~hi_0pI2dd2?=Jd3b#al*K{zL71a6O66eq+ijnic@1#?fM zTmb<3(i&~*95YRO5ONo5E=UTADOYUj(v+3W+>}ZchHN6nc!Y@=SAa!LTYm_9wZh(; zvTs}IJIHcr3px5v@>Wpkk-9z{PbJ5%xVnJ{^(+5)qOe7$JO_Zp@Zrr(6a zFyXJzQ&YKE5Vl4tK7tZpgBO(Aekl>)I4_lX0I*Vpz~vawsTuKKb3?l#1bEy|z*t+i z86UoLPsl2bty6f{rst1d^~5Q%{(L#9htPW?A30|Xm3_9 zevoXr#Ua1~XmP_{ZF6C(GG*C^F<5H;tXJd*4n!7Hl=zgwI}{P0ZKV0gs>oCMzEbew zp)Nvf{3t_nKR>V4=yd_3tjhTJA5eN^xMgKeHO}J68rg;%|7rcu--G>kxXg%-`>f|W zXV{&=?ODZcZJ*aavU`kK?F~z4wTuPAeOf+W6%oBfEDb$pBAM!r3#|-oL*%MpjqMg& zcEb&^IYPV5s=>hqC?Cri7w3dZY5M29_3(6^Ve^>0?l}*y_L&f8Zl6GDaN)3}ra1Q< z;~m*=hjPC<2aXFELy)1l4v=7Xw@Q<>v zOCBXWeR@uW!EG~u;|fmmtbq0jUT;N6EKqq=ly6#v7}#w`^M9WUO&ra|H0Roz@P1_} zt0H3LmMJ(ykGL#T09;uzK?A!YvitHA?gvV+WV>>Hr(Fo@fS4M=6j(WR^*sGH_Uzfj-$ci8!-xT1&W^9V0m3nOOlfOLppmaHZ;|kNs^hz6){9xI zCcH(QBCr0$DEU_mx!Ok#&o5xXtfjmZhYSUAwWT1xlXyL&X_;rATRXxU?D);BVj@ zDo16CAjN;l)$)zQw*cC0VNCXYYk~Cip_vm92k>56_<(=e0P0NHau-c3nU{OSpfiI8 z!`jz{R*Ys)JiJMy=JlZ3yn=)CffEl=`yMsrsKAP>*Jo!pCf`05tK70ZX`kOiElO!7 zoY@St=ZNFfh4#MExRXnBCfE*kqoX?l0uKuMUK*Wmb4kt2bL?}i!#c_qYPW}T&$cUB&|Nid<=Yf^F%=h+4q)vu zX4%sBHpN>NHyTpyIQwpffEOiLs|8pOb5ldaRYtBc@2^`(pwePf7XOSq3vET{f*qWK zt;>!Wv67K%?UHK+@!d@-@PLemO@@?a34=j>h=irzmvBt%&Az+Aq{`GLH{Dbz?AjC? z@hJ`9^ZX^v=%{^tPR{!}zR&p9(;E}HvFGon3wfbUJ$^0vr+N$VEkh3*EK3u}qjBtX zCSKF>vCXnj6^ZS-IIUda=|!JUV6~lstJixvK2R9X#r;anEIFWzTc(4&uGpfmXod8t za?Af2wYF_ERjw;(r|TAJadP`kTLb;E1Qd29B@f_UPe8*8k{uaZd zUOny6vQ_e6Q@gO~sITpF4(w;px%V3txfh%UOKmDgRBSjFjJXkfVaqEO&;y6$8y2RD zt(jU9?kGW#w4uVL zPo=Kmay5CQl4ebBeIl2nHxZHzhF)XSq=%mChX*}W1(n*rC2uHCrAVr8A*Plk5ASg+ z%EB>yY8V-_xk}oxk#Mq7KQFn9MhMVA^C}Pg{5eQ>5vd=`bfNT-UMz0#Ts1vo z=Mm@DZ5N$-nf}eK@*FOA70vs*x7ppPr}P|>YQ?tVD$pZHY3zHH?4TunW#+u8>-X6m z!)@z1^z`?xBRd_+l-rS<5Q}UUX9lcYO5GD3URFSnL zc|A9D9ck^C_2GxXS^?l;kvk0cs(813h+9l4id=~TU_?vl}oLQL56vH({F zSktLvbe;V?;#tsf*{yE3H>%Y~cRz0=e!nF9))g4=9OkcnKCa`%&~C2uc0KKGDv7W9 z2qKak`tkO_otTsFE+ljT4UJM7r3JI{W<3nHn7m$)ue6Dg{{!?`nE=2P08DrRfcF@e|Eo0#+qX|-0`hZ^#0bb(#4%O_*5((`O=iBy{{-U! BK{NmW delta 1219 zcmX>uvz%YCGr-TCmrII^fq{Y7)59eQNC$v02OE&=6a2JxqvBV_$s){(910b=1-`yk zo|BIOljwKO($GBB_(H*_;JbTxN$aW-|fbTc+`H8gQGbTOFxgGmOa$PlL@ z6K1D+%bT7a3=Axyo-U3d6}R5Zj`R=>lsLXu&oyO{rz+>oWn!&UJzYJ!MbfNwS#<3} zws52hI^A&Qe;9p%FEU8v%Y|P;s=7-a2G35I*5!$+|P4o zT=(1miQ8jbS6)~AY>sjIGd7*mT@O~MPZHhWAa;T&vRi<`ojV3tO>{-I}`C$6#*er*2Nqb%Sj(qjyz9HMk#O=6! zY5lZ(h4ZPl8*67L?bR#baB1s45W`z}P&awn;i{JlA~)ZQ-_Yrl;PClui^T^iAGH^K z^P9dt2=93Nt}&G5>#PG#7v5YqNz=IDt>Ul3uEW3atdUZslIDT~=PMs%Y-p?q+F*R7 z{FYBl{_H(nHG(s=&nu-)Yw|Rk&pUm(OzNbAUb6i4R!r(Aniu)?oxSgVGOyXH+i{IN z)Bi@fN6nlKI8EF{e!ks#_I~{-%k-9Z(_StS;fu%R*2~?M@_5}?e?XJHoNvlb?l|5htf7UR z;!S$}*EC$`@2=AsxLxZ1Iqoyk?M zQFKAmf_V~i_Wjb`P#!XmyX&B}<=X(yy@%hfditnoM}3{*@=&eH)yA^i62BJqS{PO) zESs~W>)NCj1@}XadS}_qP*;C+Q{n8xy6A(vSM@X=9MqpWDRuwU`WG8aQv~j8y4v)T zZ`7I5C~Ef9~{vag7#^0@3N;gy$UdwjS>UYGlcJ5)ch@mF7T+Tuad@7s0f znSXazxK$rI`fch0zv93LF)g22FPT}+YG3NGu`FEexBc>+oORmQx|viH8oO)Pz4nRs z;SwnqI(|S%{CCH+?+%NXRcx!@c>L*|_k1Ux%>Ut8D`K(o!;HfHZfBWVtCk=Bc(#S5 zAnsv;mctsSy%Gfh4`-GvuGuCN#&pzL-CyL%)@Glh_YAf<*hGUbG72^qYaNv zW(BPY_xf8TcvRsMN1NuGa>+TNH`e~CxQKkUdwFh$__Gf-7CWWUfGU0bJ>$XZjqQx zmJ{ADh&U&#`TFhVmDf4-nk*)N^5KwCe;#>oC;uj1*#iOrH1!}C-B b0K-R
-
- -
<%= t("application.menu")%>
-
-
-
    -
  • - <%= link_to root_path, accesskey: "0" do %> - <%= image_tag(image_path_for("logo_header.png"), - class: "float-left", - size: "48x48", - alt: t("layouts.header.logo")) %> - <%= setting["org_name"] %> - <% end %> -
    • -
-
-
-
-
    -
  • - <%= link_to root_path, class: "hide-for-small-only", accesskey: "0" do %> - <%= image_tag(image_path_for("logo_header.png"), - class: "hide-for-small-only float-left", - size: "80x80", - alt: t("layouts.header.logo")) %> - <%= setting["org_name"] %> - <% end %> -
    • -
+ + + <%= t("application.menu")%> + + +
+ <%= link_to root_path, accesskey: "0" do %> + <%= image_tag(image_path_for('logo_header.png'), class: 'float-left', alt: t("layouts.header.logo")) %> + <% end %>
-
-
    - <%= render "shared/admin_login_items" %> - <%= render "layouts/notification_item" %> - <%= render "devise/menu/login_items" %> -
-
+
+
+
    + <%= render "shared/admin_login_items" %> + <%= render "layouts/notification_item" %> + <%= render "devise/menu/login_items" %> +
-
-
- <%= render "shared/subnavigation" %> -
- <%= render "shared/top_links" %> +
+
+ <%= render "shared/subnavigation" %> +
+ <%= render "shared/top_links" %> +
+
-
+