From ad1833b918ac3b3c013b115109fea57d09acddf8 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 18 Aug 2015 13:47:24 +0200 Subject: [PATCH 1/3] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 4428 -> 5068 bytes app/assets/fonts/icons.svg | 5 ++++- app/assets/fonts/icons.ttf | Bin 4272 -> 4912 bytes app/assets/fonts/icons.woff | Bin 3256 -> 3788 bytes app/assets/stylesheets/icons.scss | 15 ++++++++++++--- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 069a97a8bccd73b59f64bbc46313ccf2705e9c47..8168c0ec46814d35eaa4c640d976570d49e1f495 100644 GIT binary patch delta 1525 zcmZuxUx-v?6hG(tKljd^zxUozn{{+%ckbH$)7hE1OS|P1tFC43)~cmOHkf}1cU^W1 z3Y6KmFbdKMAL>CLM1vqKgNz;mi3r-r9-_eTA$;gTp$CJo(9WGTkm%m;JAb}&&Ue1= zch5ab#ic+kWdYV_PpG<>*m3FRiN?&nDfKKs)&+q4mhnxS;W1DEnOmfJ55Iok>|3XH0`Nru=fa`=&6i|y zaaTKq`Ih1M9R*z=$I9U&`BS{p8n{5&Y-hyh_ye&LFvKUVA|Jk z7tXgw*oM|9WauqH4^e>K#1Z$Peyh^3;^ z%5!smE{UoOU4M9OrT#Eh@x7^{?^we0cjX6+upNKRblf&rHuksWl#|cplJUa2ppdaw zu2|(H%Q~?q<~XrENxBpxh>bT~o~sq5(tge-Nvl$Eh%|cp zuo#qUK{?Qh1QM&^BN&bHP-LMqh4qbeZZeS+)`u&F=oVpp6e~I3qZ@>E5=eA)0;Ay< zA`5Qy{IQnr5%teAlvORWan6nFOTl|hMhJ{GB;zJydb!~}7Gr2}ZZj>b5=jv?sgtQF z!c+ej5tx4?jEEwB9a~Q3dD9yuW6Y#uD_Tj~+VWgpkgAk1jPsfjt2r+wm=p{hDUvLn zGMvffkVM?g3MJwh@4pe<4pIbjgmic!K@pvr>&Dyo3)Rs|r~-uLuwFpjQy(TY2y244 z#ljrH5pYr>aKkJCSHK9qj>{0HeI@m$y#h1d0 zS;rPsEM~IKqLV##P33$QU&jC}RfbEcOLcj%`(zs04DSsMEd=W6O)%P>^&?B|*I zBo&CE|Hs82@dnlU3h0Irn4t1J0Q2;}Zm17onGRh*KMaN|^x3H}s4#QYpcHZX+O=}A zQ?i~v$}1riL#@jDSjWhtfPfV3xx=A1T+4M9O09dLku~R287(Kl_ocL?8j#W!>eYlX z33FXHjA`f(b~oGy1joZDcvq%Q+!!KS6H%-qE;TgyW(T8SF({PH@w8Ny>TIV}-||K; zlXp_r^oxywwX1tagbe%hg@HT2>$EXxy}_gn(nIVDC8senD5Rytpi;JMPbP2SNP9fB zj_7P^q0b}mqJ}aKn_x3+A=tLUFqhG(cR?0_fQCfyaduT%X8z0y8z5b0N@M{3=Y9bkPxpRPEJf7>z?>C`v!nqLVR(q>{X9!<`)ou zMZK`#EmvzbpqRgiad~0!*7av2??(YB=Bu+e=DllT_(|S3iL=Iklc#uS3llpRm*%|q zs-45cCeFM;6BUh;|Ew2a_!Nf)>j1K`pi<+9+Hm@2d zet{|=0q}Y6#i4^m+BI0viX0N+L6N=ZoOU+Yc>=a6hwvM8lG;HkCA?fGAfvs#so?QW@=$g z%_&MUYGtixQc-M?GBHh0(X_~@Xr~gYqHtLVa~@_PS(jARQB_HoLoA>KnJbE#&~&>c z)>1;Xb&bqW>>=o!Q$ZFeW7=iah}u?6;#`VZcGQWBOcXn^*$xpmai=q>>Y8Dg+|)Q% zO^$Ur*JRFR#JJ_AiWtL&q3LR}Gtt~?MC4FNju@@Y_=|7L8>0Uq@{<((x7Ja#Kdfap zm^Z;$4!|Hjs9_j^(=ZBWaN=iS946o#oQFxA - @@ -22,4 +21,8 @@ + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 37dde64baee432a645b188a2cecfab35e64756c8..876fc75678bacab5678f2b3b3779b2125145e36f 100644 GIT binary patch delta 1494 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 J?_mMb{{d&pxOV^m delta 3165 zcmXYzc{r3`8^@oqjD4wuv1Lhqm}H-9VM1e>A3~9BYV29EMV7{%C2K_(%UF_#WY0E2 zmZ2dd%UA{}OUT%=#5=w3d!FlauIu}`uj@YNJb>!c7pKAX5VaQ%g%z0AOzd*Z|r( ztDMdwj$sJ_0FDO|yb?MF29`(wV2z=b1ZW8P|0||&Lr>p;<_c+9n1(2z1u&ReTv4Ps zJT2?fK$!_Ud_{ZReEpyj3Sd_dmC7=c{cO>@Ut{A5GkN2s5;;sd=8EiZVWPo^Cx0u3e&U_8P_N zq5pk=X9wfb=tJ_~Kz|>^&K;bdq|T|Gvn&0GG%>Nf5E`&Y(uCDS=Th30Pj*taX7d)w zGJ7Njll7SLfp)`DH@DC}6#k?oc4)FwYv7N|LhZT3 z&&18J3M%o9`Oy)w_mX4B!E7!@E6{DV-+r-$nzc%?<_tts5N#XWE#xEbki_*%DM?0{ z&)cL|swt7~HoWfj!HKDpZ;`@ARB{se(UT9E^qfr%ixfnPL`rg_)9sU6C)GiG+=}_? zo*=NkwDbh&ls?m$Y!*L%Ggm&EYUJ<;6REvKZDHf_T;jSc#(cr1@aDS|ER+!DqkQg! zi9TQ?{4_i=)qk0-)jkT>FKHdSOLrOb3W2lx_zXU_cO!^pb zSjYGq6_0tU5bJ-GsJY+LX4H$wobfXxtoOCLxV>^oa|(Zmhn*FBp;%tMe-|Lkzt;ZA zb^CpCuu?O{kPHTOh2^*>p2Gz057jr1^zS%@h--o`Zt`F%t6htA8#1b5?!N=Ct>(P@a>rh1 z(7BybrxP){8uo+Ty}%ut>jT9=hXVhVuBA#ZUUVyra69$bFgjwqs2va|XXE4jP~M}Gox+N|oS~~%89c*K+rOD2uKygDIkkC?Bt9rNw&}JXm3;LC<}evP7#F)0 z(1ugp1>3JUcRlbjx3eS)BrhrTyYH+ZsRHkQeR{49bs@IyRm$?hk2Dw}T|#dcR%L@ztISRumXSuZpNvH9Cq8(0kYx(46lG z*}PIkN|ZftTzhxksnY)(22q??A0dLmjv#$V1Bw%V0%_(ioG-H}je;|Xv$a~}LyG6& z$mC}xSMui2tb)ap?)Wh?4rfz3zhn6Mn{Beae$Wu%xUb-mv>J$bT|Y5Nn9n0kfPAHH zk}YqYZ-*MYsKVlOy~m|bG(G5&hv*~4j}XkSQ17Y3D07GVwOtYJO z;pJ{TyW9XRoK@qUlv!jrtEBMZLv>W^kbg@Wfht!qAx2z})UTiPzB_}O2!E4HE8D~1-z(e%Q*{Pos?zEf42IbSyy@TNBH!Zbopi;c{$ZtNymyipR(pYU zxF$%z{j7)-=xgVXuW~Zh`^v$1(M))3JTT9ruxRnQH7t;T|7l^TGHh7*L>X+#LNZI; zVXj8UWBa)Ni0%~e!=-*1Qd-3HD7N`4z3qHBB3xj(eG{W07PGvD*h|Q3G92D*(G`k$ z%>T)^wKd1{qhw|IX6oi!KB7*t%$rw$G%w|b_IIQ`Ohxql*`Co3O*$2mqX+{AwyPL$ zL?gNzpgYh|se{)$-#l*reXnh9%{lvdT^T|Cj(2s|B~Y%Vzb7;>7bSP+wG;d)KUu|b zRUmT828S794H8@1*>8IEKi+3;nttD7tUyD?@PM(GSZflJHj?gTk4lI?Q`kc($h>$fqMt?)cuAN&d-A*HT?( zL_`+e-y5tFk;T=%;p(Y;b~(;pRV}Xc@^I#)qP|Qn>-pr&Yt?lDbsXcaf%*_spy5*wd6_66$Ml$l4=TM%c zRNjki7o2g0IM*7Lk>gx5+tH8FNg*5SNw%>V~H|$1+EylR$Bla4C5t zZc}~cuEK+Xm#x{w!$mDURTExEbZOVE1Ou}Z&Od{;e)=Bwv@+S;UtFr2ITmrgeyA}_ z7Jr3&`10OCTvUMHgjqKudxK5M(qDS6Dm(2uItmtl3K_qNh}jCX_0kl)YR9=X-_x@m}Rxxx;f< zliQ>QA;}-lsK?*ysoaNJWS`eBdPeAyG2eoCgQ)EyIVO{Id{!GPW!nYcQmMMq9!;s!TONO0 zvr@GjW~RdqM8**f=oI}tdc9$w5rS{llsmJxgqhFmj zCiW-!%EWx{!8miT`$FXKt1>6hq%N2EXwHp=mQP#WuN@!DoX+^99+!Ub@hhTcuaxJ8 zSUfug1tZf~03aBPMxjtnK-9Kx@8ihjq`7gUE;qm?kC}^B6QUKJP$&xhJr*!G>K=*# z{#eunw9OANYy$9S_3X+RRM@XmP_)Ro3;}st5Hkcc;>D6foAmzI)g=N20ULn1e}Sm{ zongFSdeI?Jj0q}RGcM}%w6ju=dF?dnbQ|{pACaC6$~G3n_jM0`9QgFPv%hDki_nWV zy?=yY0L0>1wg2{`T?Dvyk`l$Wb*$0Wy;2lBx^%ep3q1S9d=cs5yXww5a9L(mIg8(b^t50t zbL7a!srDN(x2wXQ3W+lHB~a@f5b03%?UP@wCv^MRK7I!SvB0G>Fij~DrD9Vo!T(=7 z`6Z<-y;a-K(2lWha^4)83z3-KZuD%hA(pV6-b6_-UP$=v7~r`zFnzsow{1!zB~wB} zmBDaaBuKDR=8&_7Nlhp&F7Zxy`C(hYSf-jJo0UZBl9f~##`<7beblnvCg Date: Tue, 18 Aug 2015 13:48:37 +0200 Subject: [PATCH 2/3] Adds styles for new admin's sections --- app/assets/stylesheets/admin.scss | 38 +++++++++++++++------ app/assets/stylesheets/debates.scss | 8 ++--- app/assets/stylesheets/participacion.scss | 28 ++++++++++++++++ app/assets/stylesheets/variables.scss | 7 ++++ app/views/admin/_menu.html.erb | 6 ++-- app/views/admin/comments/index.html.erb | 2 +- app/views/admin/officials/edit.html.erb | 13 +++---- app/views/admin/officials/index.html.erb | 41 +++++++++++++---------- app/views/admin/officials/search.html.erb | 41 ++++++++++++++--------- app/views/admin/settings/index.html.erb | 9 +++-- app/views/admin/tags/index.html.erb | 4 +-- app/views/stats/show.html.erb | 31 +++++++++++------ config/locales/admin.en.yml | 2 +- config/locales/admin.es.yml | 2 +- 14 files changed, 155 insertions(+), 77 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index f35811ecf..bf9d7dd22 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -3,6 +3,7 @@ // 01. Global styles // 02. Sidebar // 03. List elements +// 04. Stats // // 01. Global styles @@ -16,6 +17,11 @@ body.admin { font-weight: bold; } + h3 { + font-size: rem-calc(14); + font-weight: normal; + } + form { .button { margin-top: 0; @@ -26,15 +32,6 @@ body.admin { margin-right: rem-calc(12); } - .button.create { - background: #EFD90C; - color: $text; - - &:hover { - background: #BDAB09; - } - } - .admin-content { margin-top: rem-calc(24); } @@ -105,6 +102,7 @@ body.admin { .admin-list { list-style-type: none; margin: 0; + margin-bottom: rem-calc(48); form { clear: both; @@ -143,11 +141,29 @@ body.admin { .delete { border-bottom: 1px dotted #CF2A0E; color: #F04124; - font-size: rem-calc(11); - margin-right: rem-calc(12); + font-size: rem-calc(12); &:hover, &:active, &:focus { border: 0; color: #cf2a0e; } } + +.level { + font-size: rem-calc(12); +} + +.official { + background-color: #e7e7e7; + border-radius: rem-calc(3); + font-size: rem-calc(12); + font-weight: normal; + padding: rem-calc(6) rem-calc(12); +} + +// 04. Stats +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.stats { + background: white; +} diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index c8b40f0c3..387e2e453 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -366,10 +366,6 @@ color: $text-medium; } - .bullet { - color: $border; - } - p { font-size: rem-calc(14); line-height: $line-height; @@ -431,6 +427,10 @@ } } +.bullet { + color: $border; +} + // 04. New // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index d6490f4ae..13ecb93c3 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -11,6 +11,7 @@ // 09. Alerts // 10. User account // 11. Filters +// 12. Official levels // // 01. Variables @@ -618,3 +619,30 @@ form { } } } + +// 12. Officials levels +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.level-0 { + background: $level-0; +} + +.level-1 { + background: $level-1; +} + +.level-2 { + background: $level-2; +} + +.level-3 { + background: $level-3; +} + +.level-4 { + background: $level-4; +} + +.level-5 { + background: $level-5; +} diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index ca40c4e53..301598bbe 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -38,6 +38,13 @@ $votes-unlike-act: #BD6A6A; $check: #46DB91; +$level-0: #F08A24; +$level-1: #43AC6A; +$level-2: #43AC6A; +$level-3: #43AC6A; +$level-4: #43AC6A; +$level-5: #43AC6A; + // 03. Forms // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 1193d6638..965e9cedf 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -27,21 +27,21 @@
  • > <%= link_to admin_officials_path do %> - + <%= t('admin.menu.officials') %> <% end %>
  • > <%= link_to admin_settings_path do %> - + <%= t('admin.menu.settings') %> <% end %>
  • > <%= link_to stats_path do %> - + <%= t('admin.menu.stats') %> <% end %>
  • diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 9c52d8834..c8c7faa8e 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -10,7 +10,7 @@
    <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment), method: :put, data: { confirm: t("admin.actions.confirm") }, - class: "button radius tiny success right" %> + class: "button radius small success right" %>
    diff --git a/app/views/admin/officials/edit.html.erb b/app/views/admin/officials/edit.html.erb index b986df2b5..f5748d77f 100644 --- a/app/views/admin/officials/edit.html.erb +++ b/app/views/admin/officials/edit.html.erb @@ -1,14 +1,15 @@ -

    <%= t("admin.officials.edit.title") %>

    +

    + <%= t("admin.officials.edit.title") %> + <%= @user.name %> (<%= @user.email %>) +

    -<%= @user.name %> (<%= @user.email %>) <%= form_for @user, url: admin_official_path(@user) do |f| %> <%= f.text_field :official_position %> <%= f.select :official_level, official_level_options %> + <%= link_to t("admin.officials.edit.back"), admin_officials_path, class: "button radius small secondary" %> <%= f.submit %> <% if @user.official? %> - <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'button tiny alert' %> - <% else %> - <%= link_to t("admin.officials.edit.cancel"), admin_officials_path, class: 'button tiny alert' %> + <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'delete' %> <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb index d0a98a963..35f7df6e7 100644 --- a/app/views/admin/officials/index.html.erb +++ b/app/views/admin/officials/index.html.erb @@ -1,25 +1,32 @@ -

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

    +

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

    -
    <%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %> - <%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %> - <%= f.submit t("admin.officials.index.search") %> +
    +
    + <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %> +
    +
    + <%= f.submit t("admin.officials.index.search"), class: "button radius success" %> +
    +
    <% end %> -
    -
    -<%= page_entries_info @officials %> -
    +

    <%= page_entries_info @officials %>

    -
    +
      <% @officials.each do |official| %> - <%= link_to official.name, edit_admin_official_path(official) %> - <%= official.official_position %> - <%= t("admin.officials.level_#{official.official_level}") %> -

      -<% end %> -
    +
  • + <%= official.name %> +  •  + <%= t("admin.officials.level_#{official.official_level}") %> +  •  + + <%= official.official_position %> + + + <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(official), class: "button radius tiny right" %> +
  • +<% end %> + -
    <%= paginate @officials %> -
    \ No newline at end of file diff --git a/app/views/admin/officials/search.html.erb b/app/views/admin/officials/search.html.erb index 9549c7ad0..868156a90 100644 --- a/app/views/admin/officials/search.html.erb +++ b/app/views/admin/officials/search.html.erb @@ -1,21 +1,30 @@ -

    <%= t("admin.officials.search.title") %>

    +

    <%= t("admin.officials.search.title") %>

    -
    <%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %> - <%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %> - <%= f.submit t("admin.officials.search.search") %> +
    +
    + <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %> +
    +
    + <%= f.submit t("admin.officials.search.search"), class: "button radius success" %> +
    +
    <% end %> -
    -
    -<%= page_entries_info @users %> -
    +

    <%= page_entries_info @users %>

    -
    -<% @users.each do |user| %> - <%= link_to user.name, edit_admin_official_path(user) %> - <%= user.official_position %> - <%= t("admin.officials.level_#{user.official_level}") %> - <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user) %> -<% end %> -
    \ No newline at end of file +
      + <% @users.each do |user| %> +
    • + <%= user.name %> +  •  + + <%= user.official_position %> + +  •  + <%= t("admin.officials.level_#{user.official_level}") %> + + <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user), class: "button radius tiny right" %> +
    • + <% end %> +
    diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index 321b307d0..c18c13b8a 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -1,15 +1,14 @@ -

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

    +

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

    -
      +
        <% @settings.each do |setting| %>
      • <%= setting.key.classify %> <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %> <%= f.text_field :value, label: false, id: dom_id(setting) %> - <%= f.submit(class: "button radius tiny") %> + <%= f.submit(class: "button radius tiny success") %> <% end %> -
      • <% end %> -
      \ No newline at end of file +
    diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 06d9e2385..f6f14d5da 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -16,7 +16,7 @@ - <%= f.submit(class: "button radius create") %> + <%= f.submit(class: "button radius success") %> <% end %> @@ -38,7 +38,7 @@ <% end %> <%= f.submit(class: "button radius tiny success") %> -
    + <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %> <% end %> diff --git a/app/views/stats/show.html.erb b/app/views/stats/show.html.erb index 033d2714d..f5df82b98 100644 --- a/app/views/stats/show.html.erb +++ b/app/views/stats/show.html.erb @@ -1,13 +1,24 @@ -

    Stats

    +
    +
    +
    +

    Stats

    -

    Visits

    -<%= visits_chart_tag id: "visits" %> +
    +

    Visits

    + <%= visits_chart_tag id: "visits" %> +
    -

    Combined

    -<%= events_chart_tag @event_types, id: 'combined' %> +
    +

    Combined

    + <%= events_chart_tag @event_types, id: 'combined' %> +
    - -<% @event_types.each do |event_type| %> -

    <%= event_type.titleize %>

    - <%= events_chart_tag event_type %> -<% end %> +
    + <% @event_types.each do |event_type| %> +

    <%= event_type.titleize %>

    + <%= events_chart_tag event_type %> + <% end %> +
    +
    +
    +
    diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 154cde012..83445cca7 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -58,7 +58,7 @@ en: edit: title: 'Officials: edit user' destroy: "Remove 'Official' condition" - cancel: "Cancel" + back: Back flash: official_updated: 'Official position saved!' official_destroyed: 'User is not an official anymore' diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 419300cf9..a381dd10b 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -58,7 +58,7 @@ es: edit: title: 'Cargos Públicos: Editar usuario' destroy: "Eliminar condición de 'Cargo Público'" - cancel: "Cancelar" + back: Volver flash: official_updated: 'Datos del cargo público guardados' official_destroyed: 'Datos guardados: el usuario ya no es cargo público' From fc9689c2da14e1b464770ac43077e32e188e1167 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 18 Aug 2015 14:04:11 +0200 Subject: [PATCH 3/3] Changes to pass all test --- app/views/admin/officials/index.html.erb | 2 +- app/views/admin/officials/search.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb index 35f7df6e7..bb2f006ab 100644 --- a/app/views/admin/officials/index.html.erb +++ b/app/views/admin/officials/index.html.erb @@ -16,7 +16,7 @@
      <% @officials.each do |official| %>
    • - <%= official.name %> + <%= link_to official.name, edit_admin_official_path(official) %>  •  <%= t("admin.officials.level_#{official.official_level}") %>  •  diff --git a/app/views/admin/officials/search.html.erb b/app/views/admin/officials/search.html.erb index 868156a90..a7f60ca8a 100644 --- a/app/views/admin/officials/search.html.erb +++ b/app/views/admin/officials/search.html.erb @@ -16,7 +16,7 @@
        <% @users.each do |user| %>
      • - <%= user.name %> + <%= link_to user.name, edit_admin_official_path(user) %>  •  <%= user.official_position %>