From 4631b39d253ce7cc379eb8db1875323712dea0c2 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Sep 2015 14:10:01 +0200
Subject: [PATCH 1/5] Updates custom icons fonts

---
 app/assets/fonts/icons.eot        | Bin 8764 -> 9196 bytes
 app/assets/fonts/icons.svg        |   1 +
 app/assets/fonts/icons.ttf        | Bin 8608 -> 9040 bytes
 app/assets/fonts/icons.woff       | Bin 6544 -> 6828 bytes
 app/assets/stylesheets/icons.scss |   3 +++
 5 files changed, 4 insertions(+)

diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 031a512683d70524c3715c7df4e146dbe2dcd554..a876f3ced8fbb0ca19d18ac995e27555e830c5a0 100644
GIT binary patch
delta 939
zcmYjPOGs2<6h7yF-8&C;yz>z9(TtNbVhqtZk0eWjDIq9@9z;epjAo+a3@AO3A&55B
z!fq{sAltPlDTIOwg2ad*grJQsT(oGR+ekyl&Yc;;%m1JMd)@!s3+F>>wMVT60s4Yd
zDj~8>)5}xc+02c}Ie=gc02+EyhmXK<P{cjN{k<plM0=OceFVTW#7}3k>HOW52d%_6
zXx|x1kLS0xfK%Q{zCJX1{nGm6+1CL43qa$<<-zoT?D#Wpy0EeEjcw68uPAqPG?z)A
z-01gH?l$pMHhnD*BkUge`-uC;(%He;!L}8EKqqM<`P}$~xFRM1nxB(D07#Yg@^n-7
zLQUsya4-@8zE>>`Y(E*4blp147Z|~Sxrpz%m)JuV!Ib%lJwd<uj5nA!`A=5;ZuX*>
zuP<=$LJO|q5@g{PJfc=UjVnzB1I^)3IFyVf6Y*F$77r&A$%9BGk&KsBf(I~UDe*Fl
z$GXt+{|5=SN9(+a{TQt)-?|%{HC5+p4@4>DPQ-l$NtFC#q6=f;P|5dNk&2e6Xd3=<
zs9srHYZTXgUXQLRq=z$x9O-L0qL4~yj4`34u9X}?9xcW==j7^A(-wVpr|Nas?DcCp
zsVZ1NUD-8$iaCov5Sf@kB~TG~$&_d+DUxxfX!99C1+Th1#Z9BiS>y7$4eMS(O)1P!
zqHa_>ZIa@W>4sagDJFzMWw>n`7u3(nXpEK;$`TOwGFOeSxVcNSOR0IJ&~S%zN}W0}
z!3}Bs5AU}alLlSDQJO)2YrzkrrMUnQAmMQZOK`y33Ra{q(6pkkkz%JwDPsoJU{o-N
zZfL7uL7Dp%EWrm)D_D^}2g8to9E`y@z;GrvW`6Y_;}PgE8v-pX(qX0oeaOr<zLSRT
gP2doQ&9y*d*iVfGH7?JqHO8=T{_|h!+&;Yj0I+J8(*OVf

delta 472
zcmYjMODKd<7(MrYHAbPxW{jDC{us$%ri@uwc$3J2B#D0W@W?+i8H!RvNra-iQWjFm
z!a~^yWy54e*~nvOH`!Q_q{cVQ!s5I4ob#P~zwf-Zoi{6W4q#W^QoK^qJN~>?Z}?;L
zYk;~0ps206r4?OJhzE$<yL+lU-A{uT0P82-=Qs4|T5_t4_$Sr!s2+=^QV_{MNPW}j
z<XouO*nb1WOTcnD7Ssc>=VOECF>CxpNYR@k^0iM!{Ce+qXNY_Y#2XELHi`*ho%%lF
z_ONaQ^J-V`0ow{`;b<f_EzL+>)S|f<0i%=ZdEA>E&aHb#wm<@KXCAoze+&54P3emt
zG8eP+M|Q@yg$mZh6T%K}5Uo5ezEJx(AYEDbgIelT5&r!jkRW3xgJopnG=mk=?|7+0
zbvB}$(laTGyk=}>u#7_NWw1heg1fbRzUb(X-EhIjZyY5ix69}9RJ&_<wN}7$v|3t~
iSBf^;Fr+mw@B_{2w9!0?^8AHMXU6SN;_H9HbmAX+@@BUH

diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index eb3464e6c..6753ba685 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -36,4 +36,5 @@
 <glyph unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
 <glyph unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
 <glyph unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
+<glyph unicode="&#68;" d="M487 375c7-10 9-23 5-36l-79-259c-3-12-11-23-22-31-11-8-22-12-35-12l-263 0c-15 0-29 5-43 15-13 10-23 23-28 37-5 13-5 25-1 37 0 0 0 3 1 7 1 5 1 8 1 11 0 2 0 4-1 6 0 3-1 5-1 6 1 2 2 4 3 6 1 2 2 4 4 6 2 3 4 5 5 7 5 7 9 16 13 26 4 10 7 19 9 26 0 2 0 5 0 9-1 4-1 6 0 8 0 2 2 5 4 8 3 3 5 5 5 7 4 6 8 15 12 26 4 11 7 19 7 26 1 1 0 4 0 9-1 4-1 7 0 8 1 2 3 5 6 8 4 4 6 6 6 7 4 5 8 13 13 24 4 11 7 20 7 28 1 1 0 4 0 7-1 3-1 6-1 7 0 2 1 4 3 6 1 1 3 4 5 6 2 3 3 5 5 6 1 2 3 5 4 9 2 3 3 7 5 10 1 3 2 6 4 10 2 4 4 7 6 9 2 3 4 5 7 7 3 2 7 3 11 3 3 0 8 0 13-1l0-1c7 2 12 2 14 2l218 0c14 0 25-5 32-16 8-10 10-23 6-37l-79-259c-7-22-13-37-20-43-7-7-19-10-37-10l-248 0c-5 0-9-2-11-5-2-3-2-7 0-12 4-13 18-20 41-20l264 0c5 0 10 2 16 5 5 3 8 6 10 11l85 282c2 5 2 10 2 17 7-3 13-7 17-13z m-304 0c-1-3-1-5 0-7 1-1 3-2 6-2l174 0c2 0 4 1 7 2 2 2 4 4 5 7l6 18c0 3 0 5-1 7-1 1-3 2-6 2l-173 0c-3 0-5-1-8-2-2-2-4-4-4-7z m-24-73c-1-3-1-5 0-7 2-2 3-2 6-2l174 0c2 0 5 0 7 2 3 2 4 4 5 7l6 18c1 2 0 5-1 6-1 2-3 3-5 3l-174 0c-3 0-5-1-7-3-3-1-4-4-5-6z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index d40402b21ac6b2c2749df6d5f619d945c12ece64..e052053e79d7bb7ef2d85311d9d523ab53d37f0e 100644
GIT binary patch
delta 881
zcmX|9OGs2<6h7yF-8&Co^Adc{I65PSNaH+`d=!~MP$Og!X~f`64(Q~7Lzy6B5Vh#B
z@X{g(vYnfxa1qp^g$Zq<2x`#;E?Ts(ZKR-M=gtgX{{O$<>z;FeI4h^VjN}0UpbD0N
z!|2G!*txld#SH*|nAD~-!>32!JSgHW;@<d$o>06n@g4v#6TdW>Nn{^vFLx5(qkV5G
zF_%3!pi1Dkldn(B+`hiMc;z(!{|L~WOQ#Y^+4pagyq~nA>2xZe5Is!N$7X}}bS5{i
ze_{v3UlBh$Gdr0W+Z*>%fxE<qGl}^uOtXjNA0zI)k;tUhQ(fBtzJAiCv$JzKaZ}^~
z+E&R=mM%vZ+*)bLT&wB-3pPeFz}KomvixR+<T4JR&ltpa+znvtU^fmM0rm{N#tYVD
zY_VUg`tAA$zS)@P;D!$Tg9XUI9e6?=JsMY<^84C?fnXpOjzuHkU^o(tMPq|VM>G~G
zs{{uyU@DO^jD&~K^bdmsdqef^=y43ym#ZGZHci!gdVL{EIinFzUJ@lg79GNHFi`T{
zW~8D;E1HJCZ7MG7>Kw&gkK3hd3hCjDAxHXKjwqy38e>c-scR)ikVlI#&N;cd)U+QS
zt6jxy7Hi{<PO9?fQCC)tUu5>;H$*1ZPzh87UNR+GN{VEhDcXEZ(1EvVUB!JzmA$6c
z?R1!R1vRBGLy5Yh+HR2)mrQp!HH%_GC{zxoMdO0{nHi1IQbL&m;!##x<0<a9YgQ>W
zmlPT{NW0Xj6BFDa&HM0ilQHR_0vx4rzqK>yg_+VE00@xqw1Oqr;7tW9(mxyDTYbS3
z&_&~m!a`XqJgQ&`9(Z2Ciu4Vm#e0=^L!Yta?O@$~#;SJ|nemvl(jYbXPGZoQ@HNu_
NE%+L3hoe?V{s%B?l5PM1

delta 442
zcmccMw!pcbfsuiMftR6yftew|%`L>YxVWa9fkCkaC@SOb;_AlW%fJTYrvUj1{=xc2
z{<mZHGcYhl0Qq6bxrqhcuZlE){2xHvmY!H#@c%#1BnHJ8pgc!<PGy>0?$VD849rIu
z7^IJ6q$Z}Y8hz^p%H08Cvy6<?`a~9eCRU(k5ukudMs7(3#}20dK>h|G-y<hKIWgpq
zPa4pG1|Z)lH?g9CA&aR8C~pDeE952SrV5yMUT0vC?*NMB733F}u#~d+0;PZsVn_me
z4(P!<nP#uz`E9;3a5Djg85k~cMV)}qOi?E$G1@XJOtxd(J^3%A4x{sAEv7k>7c$9C
ze$4b3sCx4W=A+V+Z57qj6&dot<}om^Ft9SrfwEZ{xEXdq*=#`ZOOv}471f;>w1C0D
z$ifL!%f&DO%4TH{V^{=bvjN4AO}?ZU%WBA=%V06tNJ*91P}gE|q*B1-6-tUg7oAda
WWMr7kqb$oPKUqsznj7xss1pFFyJ5uu

diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 9cfd1b210196bee5ac8e5e23d86aa8a95ddcf3e3..37e8833db521b54c8f317733b8fcac3a1b92175c 100644
GIT binary patch
delta 6722
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
U-}2v+T8be>gZ}&Ei3I@v2mgoEJOBUy

delta 6437
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

diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 5a06bcc1d..1fe6915ee 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -124,3 +124,6 @@
 .icon-language:before {
   content: "C";
 }
+.icon-book:before {
+  content: "D";
+}

From 8559833cc05313817616ab145e676239826d008d Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Sep 2015 14:10:42 +0200
Subject: [PATCH 2/5] Changes texts for emails

---
 app/views/layouts/mailer.html.erb            | 4 ++--
 app/views/mailer/email_verification.html.erb | 6 +++---
 config/locales/devise_views.en.yml           | 2 +-
 config/locales/devise_views.es.yml           | 6 +++---
 config/locales/mailers.en.yml                | 1 +
 config/locales/mailers.es.yml                | 7 ++++---
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 91f31ab18..4372c2eba 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -31,9 +31,9 @@
     <tr>
       <td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
         <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
-          <a href="#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">Preguntas frecuentes</a>&nbsp;<span style="color:#398fd1;">&bullet;</span>&nbsp;<a href="mailto:#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">tec.gobiernoabierto@madrid.es</a></p>
+          <a href="mailto:web.gobiernoabierto@madrid.es" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">web.gobiernoabierto@madrid.es</a></p>
         <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
-        &copy; 2015 Ayuntamiento de Madrid</p>
+        Ayuntamiento de Madrid</p>
       </td>
     </tr>
     </tbody>
diff --git a/app/views/mailer/email_verification.html.erb b/app/views/mailer/email_verification.html.erb
index a57a5b0dc..e86e7b7ce 100644
--- a/app/views/mailer/email_verification.html.erb
+++ b/app/views/mailer/email_verification.html.erb
@@ -1,5 +1,4 @@
 <td style="padding-bottom: 20px; padding-left: 10px;">
-
   <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
     <%= t("mailers.email_verification.title") %>
   </h1>
@@ -10,6 +9,7 @@
           t('mailers.email_verification.click_here_to_verify'),
           email_url(email_verification_token: @token))) %>
   </p>
-
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.email_verification.thanks") %>
+  </p>
 </td>
-
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 9bb0cad79..9869804f2 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -6,7 +6,7 @@ en:
       submit: "Resend confirmation instructions"
     mailer:
       confirmation_instructions:
-        title: "Welcome to open government"
+        title: "Welcome to open government portal"
         welcome: "Welcome"
         text: "You can confirm your account email through the link below:"
         confirm_link: "Confirm my account"
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index a64ac018e..01753bdb6 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -6,16 +6,16 @@ es:
       submit: "Reenviar instrucciones de confirmación"
     mailer:
       confirmation_instructions:
-        title: "Bienvenido/a a gobierno abierto"
+        title: "Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid"
         welcome: "Bienvenido/a"
         text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
         confirm_link: "Confirmar mi cuenta"
       reset_password_instructions:
         hello: "Hola"
-        title: "Cambiar tu contraseña"
+        title: "Cambia tu contraseña"
         text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
         change_link: "Cambiar mi contraseña"
-        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
+        ignore_text: "Si tú no lo has solicitado, puedes ignorar este email."
         info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
       unlock_instructions:
         hello: "Hola"
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index 4e3eeeab3..c5aa00a97 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -12,4 +12,5 @@ en:
       title: Please verify yourself
       instructions_html: "We need to verify you using this email, which we got from the Census. %{verification_link}"
       click_here_to_verify: "Please click here to verify yourself"
+      thanks: "Thanks"
 
diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml
index a6491f032..9b37b2dd5 100644
--- a/config/locales/mailers.es.yml
+++ b/config/locales/mailers.es.yml
@@ -9,6 +9,7 @@ es:
       title: Nueva respuesta a tu comentario
       new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"
     email_verification:
-      title: Por favor verifícate
-      instructions_html: "Vamos a proceder a verificar tu cuenta en la aplicación de participación ciudadana utilizando esta cuenta de correo que sacamos del padrón. %{verification_link}."
-      click_here_to_verify: "Por favor pulsa este enlace para verificarte"
+      title:  Verifica tu cuenta con el siguiente enlace
+      instructions_html: "Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}."
+      click_here_to_verify: "en este enlace"
+      thanks: "Muchas gracias."

From 3255995ea1cdf2ad8ac4bad4b8978e9ddb11bb1c Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Sep 2015 14:15:01 +0200
Subject: [PATCH 3/5] Adds new styles for pages

---
 app/helpers/application_helper.rb         | 10 ++++-
 app/views/layouts/_header.html.erb        | 55 ++++++++++++++++-------
 app/views/pages/more_information.html.erb | 30 ++++++++++---
 app/views/pages/opendata.html.erb         | 13 ------
 app/views/pages/transparency.html.erb     | 13 ------
 5 files changed, 73 insertions(+), 48 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 33fc7e0fa..57c81b4d6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -11,8 +11,16 @@ module ApplicationHelper
     request.path == '/'
   end
 
+  def transparency_page?
+    request.path == '/transparency'
+  end
+
+  def opendata_page?
+    request.path == '/opendata'
+  end
+
   def header_css
-    home_page? ? '' : 'results'
+    home_page? || transparency_page? || opendata_page? ? '' : 'results'
   end
 
   # if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index f651ea3f1..0e72ed0d2 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -27,22 +27,12 @@
         <%= render "shared/admin_login_items" %>
       </section>
 
-      <section class="subnavigation row">
-        <!-- <div class="small-12 medium-2 medium-offset-1 column end">
-          <%#= link_to t("layouts.header.welcome"), root_path %>
-        </div> -->
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
-        </div>
-        <!-- <div class="small-12 medium-2 column end">
-          <%#= link_to t("layouts.header.initiatives"), "#" %>
-        </div> -->
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.more_information"), "/more_information" %>
-        </div>
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
-        </div>
+      <section class="subnavigation row text-center">
+        <%#= link_to t("layouts.header.welcome"), root_path %>
+        <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
+        <%#= link_to t("layouts.header.initiatives"), "#" %>
+        <%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %>
+        <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>
       </section>
     </nav>
   </div>
@@ -62,4 +52,37 @@
       </div>
     </div>
   <% end %>
+
+  <% if transparency_page? %>
+    <div class="row home-page">
+      <div class="small-12 column text-center">
+        <h1><%= t("pages.transparency") %></h1>
+
+      <div class="small-12 medium-10 column small-centered">
+        <p>Estamos trabajando en el nuevo Portal de Transparencia del Ayuntamiento de Madrid, para que no quede ni una esquina del Ayuntamiento que no puedas ver.</p>
+
+        <p>Por ahora puedes visitar el portal que existía hasta ahora:</p>
+
+        <%= link_to "Ir al Portal de Transparencia existente anteriormente", t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
+
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+      </div>
+      </div>
+    </div>
+  <% end %>
+
+  <% if opendata_page? %>
+    <div class="row home-page">
+      <div class="small-12 column text-center">
+        <h1><%= t("pages.opendata") %></h1>
+
+      <div class="small-12 medium-10 column small-centered">
+       <p>Estamos trabajando en el nuevo Portal de Datos Abiertos de Ayuntamiento de Madrid, para que puedas reutilizar todos los datos de Ayuntamiento como quieras. Por ahora puedes visitar el portal qu existía hasta ahora:</p>
+
+        <%= link_to "Ir al Portal de Datos Abiertos existente anteriormente", t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button radius" %>
+
+        <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
+      </div>
+    </div>
+  <% end %>
 </header>
diff --git a/app/views/pages/more_information.html.erb b/app/views/pages/more_information.html.erb
index f20dad05d..12bf34085 100644
--- a/app/views/pages/more_information.html.erb
+++ b/app/views/pages/more_information.html.erb
@@ -1,12 +1,32 @@
 <div class="page row-full">
   <div class="row">
-    <div class="text small-12 column">
+    <div class="more-information text small-12 medium-8">
       <h1>Más información</h1>
       <ul>
-        <li><a href="/how_it_works">¿Cómo funciona este Portal de Gobierno Abierto?</a></li>
-        <li><a href="/how_to_use">Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre</a></li>
-        <li><a href="/coming_soon">Próximas novedades</a></li>
-        <li><a href="/participation">El Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto</a></li>
+        <a href="/how_it_works">
+          <li>
+            ¿Cómo funciona este Portal de Gobierno Abierto?
+            <span>Descubre todo lo que puedes hacer en esta web</span>
+          </li>
+        </a>
+        <a href="/how_to_use">
+          <li>
+            Utilízalo en tu municipio
+            <span>Utilízalo libremente o ayúdanos a mejorarlo, es software libre</span>
+          </li>
+        </a>
+        <a href="/coming_soon">
+          <li>
+            Próximas novedades
+            <span>Seguimos trabajando para los ciudadanos</span>
+          </li>
+        </a>
+        <a href="/participation">
+          <li>
+            El Área de Gobierno
+            <span>Participación Ciudadana, Transparencia y Gobierno Abierto</span>
+          </li>
+        </a>
       </ul>
     </div>
   </div>
diff --git a/app/views/pages/opendata.html.erb b/app/views/pages/opendata.html.erb
index b806aeaa7..e69de29bb 100644
--- a/app/views/pages/opendata.html.erb
+++ b/app/views/pages/opendata.html.erb
@@ -1,13 +0,0 @@
-<div class="row-full page">
-  <div class="row">
-    <div class="small-12 medium-10 column text-center">
-      <h1><%= t('pages.opendata') %></h1>
-
-      <p>Estamos trabajando en el nuevo Portal de Datos Abiertos de Ayuntamiento de Madrid, para que puedas reutilizar todos los datos de Ayuntamiento como quieras. Por ahora puedes visitar el portal qu existía hasta ahora:</p>
-
-      <%= link_to "Ir al Portal de Datos Abiertos existente anteriormente", t("layouts.header.external_link_opendata_url"), target: "_blank", class: "button radius" %>
-
-      <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
-    </div>
-  </div>
-</div>
diff --git a/app/views/pages/transparency.html.erb b/app/views/pages/transparency.html.erb
index 8eae961f8..e69de29bb 100644
--- a/app/views/pages/transparency.html.erb
+++ b/app/views/pages/transparency.html.erb
@@ -1,13 +0,0 @@
-<div class="row-full page">
-  <div class="row">
-    <div class="small-12 medium-10 column text-center">
-      <h1><%= t('pages.transparency') %></h1>
-
-      <p>Estamos trabajando en el nuevo Portal de Transparencia del Ayuntamiento de Madrid, para que no quede ni una esquina del Ayuntamiento que no puedas ver. Por ahora puedes visitar el portal que existía hasta ahora:</p>
-
-      <%= link_to "Ir al Portal de Transparencia existente anteriormente", t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
-
-      <p>Mientras acabamos el nuevo portal, te invitamos a visitar el <a href="http://diario.madrid.es/participa/" target="_blank">blog del Área de Participación Ciudadana, Transparencia y Gobierno Abierto</a> para conocer nuestros avances y novedades; o la <a href="/">sección de Participación Ciudadana</a> donde poder decidir qué ciudad es la que quieres.</p>
-    </div>
-  </div>
-</div>
\ No newline at end of file

From f20192d9d7c226fd1c9d8c4eab6e6704e81d23ad Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Sep 2015 14:15:45 +0200
Subject: [PATCH 4/5] Improves styles for debates

---
 app/assets/stylesheets/debates.scss         | 31 ++++++++++
 app/assets/stylesheets/participacion.scss   | 68 ++++++++++++++++++++-
 app/views/debates/_form.html.erb            |  2 +-
 app/views/debates/edit.html.erb             | 19 ++++--
 app/views/welcome/_featured_debate.html.erb |  2 +-
 5 files changed, 113 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 2fe4a8383..518ccf5b1 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -383,6 +383,16 @@
     .anonymous-votes, .organizations-votes {
       padding-top: rem-calc(24);
     }
+
+    .divider {
+      display: none;
+    }
+
+    @media (min-width: $medium-breakpoint) {
+      .divider {
+        display: inline-block;
+      }
+    }
   }
 }
 
@@ -463,6 +473,23 @@
       line-height: $line-height;
       padding: rem-calc(24);
     }
+
+    @media (min-width: $small-breakpoint  + em-calc(1)) and (max-width:$medium-breakpoint) {
+      .in-favor, .against {
+        text-align: left;
+        width: rem-calc(100);
+      }
+    }
+
+    .divider {
+      display: none;
+    }
+
+    @media (min-width: $medium-breakpoint) {
+      .divider {
+        display: inline-block;
+      }
+    }
   }
 
   .leave-comment {
@@ -536,6 +563,10 @@
   }
 }
 
+.debate-edit {
+  @extend .debate-new;
+}
+
 // 05. Comments
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index bd8759c98..d272042df 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -460,7 +460,10 @@ header {
 
       &:hover {
         background: none;
-        color: $link-hover;
+        // color: $link-hover;
+        color: white;
+        text-decoration: underline;
+        transition: text-decoration 275ms;
       }
     }
 
@@ -488,6 +491,10 @@ header {
 
   a {
     color: white;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
 }
 
@@ -502,7 +509,15 @@ header {
 
   a {
     color: $link;
+    display: inline-block;
     font-size: rem-calc(14);
+    min-width: rem-calc(192);
+    position: relative;
+
+    &:hover {
+      color: $text;
+      text-decoration: underline;
+    }
 
     &.active {
       color: $text;
@@ -745,8 +760,7 @@ form {
   }
 
   .ckeditor {
-    margin-bottom: rem-calc(24);
-    min-height: rem-calc(336);
+    min-height: rem-calc(312);
   }
 
   .checkbox {
@@ -1172,6 +1186,53 @@ table {
       }
     }
   }
+
+  .more-information {
+    margin-top: rem-calc(24);
+
+    ul {
+      list-style-type: none;
+      margin-left: 0;
+
+      a:first-child {
+        border-top: 1px solid $border;
+        display: block;
+        padding-top: rem-calc(12);
+      }
+
+      li {
+        border-bottom: 1px solid $border;
+        font-size: rem-calc(16);
+        padding-bottom: rem-calc(12);
+        padding-left: rem-calc(36);
+        position: relative;
+
+        span {
+          color: $text-medium;
+          display: block;
+          font-size: rem-calc(13);
+        }
+
+        &:before {
+          content: 'D';
+          color: $link;
+          font-family: "icons" !important;
+          left: 0;
+          margin-right: rem-calc(12);
+          position: absolute;
+        }
+
+        &:after {
+          content: 'c';
+          color: $text-light;
+          font-family: "icons" !important;
+          position: absolute;
+          right: 0;
+          top: rem-calc(6);
+        }
+      }
+    }
+  }
 }
 
 // 17. Verification
@@ -1259,6 +1320,7 @@ table {
 
     span {
       display: inline-block;
+      min-width: rem-calc(288);
     }
   }
 }
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index dd4ed2e29..334c444cf 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -34,7 +34,7 @@
     </div>
 
     <div class="actions small-12 column">
-      <%= f.submit(class: "button radius", value: t("debates.form.start_debate")) %>
+      <%= f.submit(class: "button radius", value: t("debates.#{action_name}.form.submit_button")) %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb
index dc90707b2..45499263f 100644
--- a/app/views/debates/edit.html.erb
+++ b/app/views/debates/edit.html.erb
@@ -1,6 +1,17 @@
-<h1><%= t("debates.edit.editing") %></h1>
+<div class="debate-edit row">
 
-<%= render 'form' %>
+  <div class="small-12 column">
+    <%= link_to debates_path, class: "left back clear" do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("debates.edit.back_link") %>
+    <% end %>
 
-<%= link_to t("debates.edit.show_link"), @debate %> |
-<%= link_to t("debates.edit.back_link"), debates_path %>
+    <div class="right">
+      <%= link_to t("debates.edit.show_link"), @debate %>
+    </div>
+
+    <h1><%= t("debates.edit.editing") %></h1>
+
+    <%= render "form" %>
+  </div>
+</div>
diff --git a/app/views/welcome/_featured_debate.html.erb b/app/views/welcome/_featured_debate.html.erb
index 00fe7ce73..b364f875c 100644
--- a/app/views/welcome/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -1,5 +1,5 @@
 <% cache [locale_and_user_status, featured_debate, 'featured'] do %>
-  <div class="small-12 medium-4 column">
+  <div class="small-12 medium-4 column end">
     <div id="<%= dom_id featured_debate %>" class="debate-featured">
       <div class="panel">
 

From efeb5a745796530f79b7b15ba92966b86a2e7a48 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Sep 2015 14:19:45 +0200
Subject: [PATCH 5/5] Updates texts and changes test

---
 config/locales/en.yml         | 13 +++++++++++--
 config/locales/es.yml         | 13 +++++++++++--
 spec/features/debates_spec.rb | 10 +++++-----
 spec/features/tags_spec.rb    |  4 ++--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d503443aa..254216eeb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -104,9 +104,8 @@ en:
       tags_label: Topics
       tags_instructions: >
         Tag this debate. You can choose among our proposals on the list or add any other topic you want by
-        writing them separated by "," and then pressing "enter".
+        writing them separated by ",".
         Some suggestions:
-      start_debate: Start a debate
     show:
       back_link: Back
       author_deleted: Deleted user
@@ -122,6 +121,8 @@ en:
       editing: Edit debate
       show_link: Show debate
       back_link: Back
+      form:
+        submit_button: "Save changes"
     new:
       start_new: Start a debate
       back_link: Back
@@ -131,6 +132,14 @@ en:
       recommendation_three: "Any discussion or comment that involves an illegal act will be eliminated, also intending to sabotage the debate spaces, everything else is permitted."
       recommendation_four: "The harsh criticism are very welcome. This is a space of thought but we recommend preserving the elegance and intelligence. The world is better with them present."
       recommendation_five: "Enjoy this space, voices that fill it, it is yours too."
+      form:
+        submit_button: "Start a debate"
+    create:
+      form:
+        submit_button: "Start a debate"
+    update:
+      form:
+        submit_button: "Save changes"
   comments:
     form:
       leave_comment: Write a comment
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c11ae5ebc..6f1fe251b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -104,9 +104,8 @@ es:
       tags_label: Temas
       tags_instructions: >
         Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees.
-        Para ello solo tienes que escribir las etiquetas que desees separadas por "," y pulsar "intro".
+        Para ello solo tienes que escribir las etiquetas que desees separadas por ",".
         Algunas recomendaciones:
-      start_debate: Empieza un debate
     show:
       back_link: Volver
       author_deleted: Usuario eliminado
@@ -122,6 +121,8 @@ es:
       editing: Editar debate
       show_link: Ver debate
       back_link: Volver
+      form:
+        submit_button: "Guardar cambios"
     new:
       start_new: Empezar un debate
       back_link: Volver
@@ -131,6 +132,14 @@ es:
       recommendation_three: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido."
       recommendation_four: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes."
       recommendation_five: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
+      form:
+        submit_button: "Empieza un debate"
+    create:
+      form:
+        submit_button: "Empieza un debate"
+    update:
+      form:
+        submit_button: "Guardar cambios"
   comments:
     form:
       leave_comment: Deja tu comentario
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 1cd8c6069..361855967 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -222,7 +222,7 @@ feature 'Debates' do
     fill_in 'debate_description', with: "Let's..."
     fill_in 'debate_captcha', with: correct_captcha_text
 
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to have_content "Debate was successfully updated."
     expect(page).to have_content "End child poverty"
@@ -235,7 +235,7 @@ feature 'Debates' do
 
     visit edit_debate_path(debate)
     fill_in 'debate_title', with: ""
-    click_button 'Start a debate'
+    click_button "Save changes"
 
     expect(page).to have_content error_message
   end
@@ -249,13 +249,13 @@ feature 'Debates' do
 
     fill_in 'debate_title', with: "New title"
     fill_in 'debate_captcha', with: "wrong!"
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to_not have_content "Debate was successfully updated."
     expect(page).to have_content "1 error"
 
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to have_content "Debate was successfully updated."
   end
@@ -271,7 +271,7 @@ feature 'Debates' do
 
     fill_in 'debate_title', with: ""
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button "Start a debate"
+    click_button "Save changes"
 
     expect(page).to_not have_content "Debate was successfully updated."
     expect(page).to have_content "1 error"
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 80106cf3b..1b47f87a1 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -90,7 +90,7 @@ feature 'Tags' do
 
     fill_in 'debate_tag_list', with: "Economía, Hacienda"
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button 'Start a debate'
+    click_button 'Save changes'
 
     expect(page).to have_content 'Debate was successfully updated.'
     within('.tags') do
@@ -107,7 +107,7 @@ feature 'Tags' do
 
     fill_in 'debate_tag_list', with: ""
     fill_in 'debate_captcha', with: correct_captcha_text
-    click_button 'Start a debate'
+    click_button 'Save changes'
 
     expect(page).to have_content 'Debate was successfully updated.'
     expect(page).to_not have_content 'Economía'