From 8ac5abb7bc678dcaf4f6ae112e880becefaf825f Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 26 Aug 2015 19:06:12 +0200
Subject: [PATCH 01/13] Updates custom icons font

---
 app/assets/fonts/icons.eot        | Bin 5824 -> 7048 bytes
 app/assets/fonts/icons.svg        |   5 +++++
 app/assets/fonts/icons.ttf        | Bin 5668 -> 6892 bytes
 app/assets/fonts/icons.woff       | Bin 4464 -> 5472 bytes
 app/assets/stylesheets/icons.scss |  16 +++++++++++++++-
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index a1cc83d43d12151ca8a386601a45b4974e3b0142..81c974cd3258f7d6f9c571b76923521fc7617880 100644
GIT binary patch
delta 1655
zcmZ8hO^g&p6s}j*)m1&+Jv~3&J-zeG&g}HSlAUE|=LfSZ%kJv(yONE@p9s+juxP>p
zS-=2+%zDsZ<id1_i3byjBpf`Lkcf$ia`K=T!^sHYz<~?IlO{$J@zpG%ajNU*y?R~s
zzVCh0x5h4Z^ouz{9%V1<ZSBG7d-pGIUpcsJULhp=BOxTe<GJS-$X=qO{RP?^_PsdX
z*mr0Dw}il}Xuo`LrF-JT?^idX{X6#ek91F-c>I_!jK7Zi^2pJ%%cH0M>Jh?j5#j}J
z9qu0D)%QM%5>V)UMSsS3)VT{sk00#r$nIUnxHYu5uXN9xAa9dvxW5(c4ad4Ghn=Yp
z?h+FGguY`Zj-NcGy`U}PJv(v#O#(P#zkl!agEyS%--t=kLC9@(6=VLLDH-^snxfBP
zjFrgM=q|j*X34o|D_vSjsc6zC>oej|SV(?wJ|SypshjddBZqL7*w!zaBj*se`puHA
zT0O>GRc!PfZSgG0k$m(A-9Zb*XqXkFF3YfNE+4(iE=F6Jj0|loCO<KX#(Cqj*rgj=
zwF`+JQ%S%tcz&D&WR8$(vr-OQICyTxpKR2I!&=xZyF%x#z8P>X*TR+xX?NPKW~bf3
z;7+@d@jX}gYRve+c{1Qy-0}D~uv!m-FM|Ni`p%l?Py61Q<9BlTTw$C_>G!0h;{`Nx
zJV<ix#hq6g^K<?F+<e3F3mMPzi@sBzpIfXKaypZikWyHZ>A6CEac*8QF<^!gxJe4+
zCA7;z7rM%#1h{I?fI@+3wwtxE=41Xsuas*z3Y@}TE$p<KGqgR?*#<MP4OAp9JBWIK
zP9e*{^qGl9so?q}fsoeNu${1jY2_)D8d14CHML;ppV?!%lyOP{C{PAegBa+PYv|)p
zAIhq@OH)&2=)381B`oKPZam-1W>O`SQsvrPDW~@=ZyF7T=!DA{qdG8k6gJ>A29gP(
z*_y+$)o^rD#SI0cPZ+2o1CNMDwh_|7LLkI(2%9s|&iDo7!Oidia-lnbRm9>U8DY(H
zd;bf?3f?rCW@r)Tk+jTJ&f#m$q!vRkAgHiL6T`*2MY-gC&ik>L^-gQc53a?5_k|_;
zF`ZlKRa~8SGAZ8-hQQLmSRGH>F}~B*o<?c*Zllv6JydU>RN)x>NwO%!Nm21Ctx9WB
zkv|1qWl&Dx>K=^jHfFmM6T#5d*^O~cFvWCt>EXkriDoXlgcNBy#2Ef(27-n=q(OF*
zE96rp=~`344acEQYvnqqRah&Bl``UAZzvem)}_*EGo_X~sOy!MuoXe=)i6P{6vfEo
zKbs{Oyu42QfZ3<=8R#i|7TT&9&5qLE6Jc==q4ow?Cq1y0ZWsp%i~)A4Geb}WWV*gg
znzoQJGm&=OWZJeJ+mIDa2&0(JI*!H!H;t@QFs<r^TIj`0UCOi}1ZM`fQX(cbzH#$n
zGMPxbrfnFekxB){xRX!ejXi*bHd-p>^PvyBc2)5?ph=3l<$_A3JWPj!&`^k+aVhP1
zIhl~A(zO)vILLG|6Hf(hI`7y?+j6XUGI7m!yrGPjOv$uvN=ujA&|;3T%(&x>jZ_)a
zr4e%y>7<{m#BKZnP#UBJXs9p^XudGIv9!V9yGC}Y2S08%++U#`UH3NOc-uP(rD(x#
a8LyN5<Nz5V)#yBGycm7#=gj|ni2nxSn(He7

delta 464
zcmYk2KP*F06vn^%?$b08bfB~<segl^X(C!86$byd21!FA<h7*+<wZ#eqJyCZ39hk=
z-O$8p=p->oj2Kujm?Q=aeD}rRCg+^@JLlZ*-1CaPm5{6A1v<RPuBcghNfwTWvZ<sR
z0K9GhfwAF{QH;R_G`y07@u_fk{CoBi5YyyDDr?z^r^zbv8*MXV<?NpyNcKOn?#?W4
zEw+EkW<Ztz&(6|<m9A>58B`w8vUh5X^G=z4vE|j2)iWKgurE!HX01&dX&kZMM-Hx7
z*@e3PgL|O9iMbVfHMcIWrOi1-))Nr)v_kTwG+!6{K()aHa4Vi$|3?E(-mQZ=7a{4#
zp?VNA(n4PK853NbZ+9%<XaZ{_tsa2MIpDuA$yz4QP4%(<qEL56L^a4!RhB`uEgRLD
z+~;?V>NG>Va4~D{denyRT}0H9zl;9FpA&xNYL1L(9YGz#nN>^To;;c*eDtP6I;UTQ
Mo4Knm9sh6m3lD%^+5i9m

diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index 049938913..da328ba6e 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -30,4 +30,9 @@
 <glyph unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
 <glyph unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
 <glyph unicode="&#119;" d="M434 389c-1 0-2 0-3 0l0 0c-17-9-37-14-58-14-38 0-73 17-95 45-21 19-49 31-80 31-29 0-56-11-77-29-4 9-13 15-24 15-15 0-27-12-27-27l0-322c0-15 12-27 27-27 15 0 27 12 27 27l0 145c17 9 36 13 56 13 39 0 73-17 96-45 21-19 49-31 79-31 33 0 63 14 84 36 2 2 3 4 3 6l0 169c0 5-4 8-8 8z"/>
+<glyph unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-190 83l370 0c-31 34-54 73-70 117-16 44-24 90-24 139 0 48-30 73-91 73-61 0-91-25-91-73 0-49-8-95-24-139-16-44-39-83-70-117z m423 0c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 36 30 64 68 82 113 19 45 28 93 28 143 0 31 9 56 27 75 19 18 44 29 76 33-2 3-2 7-2 11 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-11 32-4 57-15 76-33 18-19 27-44 27-75 0-50 9-98 28-143 18-45 46-83 82-113z"/>
+<glyph unicode="&#121;" d="M256 402c-39 0-75-6-109-20-34-13-61-31-81-53-19-23-29-47-29-73 0-21 6-42 20-61 14-19 33-36 58-50l24-14-7-28c-5-17-12-34-20-49 29 12 55 28 78 49l13 11 16-2c13-2 25-2 37-2 39 0 75 6 109 20 34 13 61 31 81 53 19 23 29 47 29 73 0 26-10 50-29 73-20 22-47 40-81 53-34 14-70 20-109 20z m256-146c0-33-11-64-34-92-23-28-54-50-93-66-40-17-83-25-129-25-13 0-27 1-41 2-38-33-82-56-132-69-9-2-20-4-32-6l-2 0c-3 0-5 1-8 3-2 2-3 5-4 8l0 0c-1 1-1 2 0 4 0 1 0 2 0 2 0 1 1 2 2 3l1 3c0 0 1 1 2 2 2 2 2 3 3 3 1 1 4 5 8 10 5 5 8 8 10 10 2 3 5 6 9 12 4 5 7 10 9 14 3 5 5 10 8 17 3 7 5 14 8 22-30 17-54 38-71 63-17 25-26 51-26 80 0 33 11 64 34 92 23 28 54 50 93 66 40 17 83 25 129 25 46 0 89-8 129-25 39-16 70-38 93-66 23-28 34-59 34-92z"/>
+<glyph unicode="&#122;" d="M183 203l0-20c0-8-4-14-11-17-3-1-5-1-7-1-6 0-10 1-13 5l-147 146c-3 4-5 8-5 13 0 5 2 9 5 13l147 146c5 6 12 8 20 4 7-3 11-9 11-17l0-19-114-114c-3-4-5-8-5-13 0-5 2-9 5-13z m329-11c0-11-2-24-5-38-3-15-7-28-11-40-4-11-9-23-14-35-5-12-8-21-11-26l-6-12c-1-3-4-4-8-4-1 0-2 0-2 0-5 1-7 5-7 10 8 76-2 130-30 161-12 14-29 24-49 32-20 7-46 12-76 15l0-72c0-8-4-14-12-17-2-1-4-1-7-1-5 0-9 1-13 5l-146 146c-3 4-5 8-5 13 0 5 2 9 5 13l146 146c6 6 13 8 20 4 8-3 12-9 12-17l0-74c78-6 135-27 171-64 32-33 48-81 48-145z"/>
+<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"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index aa9c63faae88382db31d66dded442022c23bbae3..207ad475e797e86deb07d18b464f9ed6ea8a6519 100644
GIT binary patch
delta 1663
zcmZ8hOKclO7@mJ-XJ^*C>-A%Iz45cP<8_)+hd6!|C4D4;v}qekM8!i;z-pTYscEC6
zptfq|TtGtff>#xn3PIFLh!YYLMM45DT;PH@A&L-i;L?f{NJvO6|2U-wJUfs7vH#BZ
z&F8uC$lX?t03pOC8-$Uk=H`wqtS_0@2+4kj-u!{bpO_;@h>rHhXm30E^jPEQ?H9i!
z1fE0tnG-AB)wjP{8$tVT>~Eg#uCLy|kCjOFLyXJQXD%*{p1;>4gndPb7c8IZp5)ax
z-o@BY*xSp?r+Qs&jB<S0MaS^+%J~cOGx{Ui>VtD<&YkEU$R1h30vl-WU+G?0C9jg3
z7~hTdwzJ)pQ_kdDSS<JfeP>tCt)JJP)E0092QmK202~7R?dR8if7zM(i<lJMgnZ97
zF-OgGbD<A=Scz;#`{8*uO)f>(VR12~qNGo@W(1@_k^G<@8IYxD%M*>9#93n7Dm+6j
zApz<)O}c7zUjfD3Xq2{imgGo2dWjyOg<|v$Ek<9{49n*7(XaGs^gh+16}BrT-!qEF
zW#dNd>L=IPl|+xJO~4;mKTZNNLrAq*DTgf_JU8P{G-}(!TG%YRLg%i&6L2oq!j?*D
zciOFHr`^HiPP>uuJy-Z@%=o~0GT>U=@%R_8Ru6(tg8(l2&W7ht`QC=(cXIh$VT?-Y
z_oSp_1vGO!NOJDQoo5@fGyVR|Y{T&j8PD^JzEhu_S*RCsI+K==QdpAdxk7zmW>zsV
zV1^R7MGE8?+GU{&UG1U-xN7eMg#x$PZq~w@kNX#TrCh^N;1u?1VW-vHN896_y|54V
zg382Y2T>2uDP$R#x-i}-6<mKf5YpPU-A>rSl=2ixji_9noSd`sj~%vL$~dI}6et6#
zK@4=tHS}?)4`o%})yc^+^xbs15|(pCH=gfhGpUkEsd62ul+%Zoc8mr?blhc(Q5~2n
zg$+23fn-8xw&t*GH5{E#c|*bI0|u(dz+K{zy@Yh|AQ0jhgw1`>&iDo7!Oidia-lnb
zr-+A#WP~-(?fowmPw<w>G((FxkECU;aSoqzCbbxX0YQZ|n%G{fTa-)Q=e!?_S+BPq
z{noWO@V>A_Kc;gly@spHPA27>!4Oy)7;9r`JH`*%+QTf(K4f$nL|qVlQiZed56Pks
zCq%`ov?{F$MgAmsmBDceSNCA}kTKmI9}k9hPmjbk!4%Wo#XENv$D6tAB2uL35M%hC
z83-C~lLk3Nu8|Lvq-#wDHyndHt(EJbR$;9iR?3KftD#_2+mcGB&6HZ|pgym(gsliF
zR>KXVr6@)w{|lC2@bVV%17;t}XP~EW546=`G&@Rr4}`@%gxVWmo$$a`x?vn7Fb3GE
z&I~~jkm>p|Y1%@@%tYF8lWE&_Y(rKwA&g==>o^({+%&RI!L+JZYM~c1bt%(^5S$s@
zN{N`%_{h$MWHOO<P1`U`Bb5q@aVMX`FZKWu+Gwei&xbzD&sXs|u1Siz<$_A3JlqZk
zp`j2t<5Jr3axx)JrE4kTagga`CY}o1bl$O(w&hsyWa6gpctaU4nUZPUl$I{Jp~W0w
znQ_P2HC$y(mqyG<q?3NK61VXNpfpGc&`@C-(0pNZq_oZ8^TYG%!OJb<{t4~K@^;|Z
j_ST^kedM)_7s!j`I2k6@=oha5#ps@wGap{On+yK}LU-!;

delta 448
zcmYLFJxGF46g}^I8b(A8S!xDaK?H>m84+3yWi8P!QV_-SrzHCHBLx)-9d!tz*XY>L
zD6}>>1wjzBMM1S#gHupY4R${bdT`(6oWncso?G>t4Q9arv?2$NMZbS_J`t2Ypu<G0
zV|IGRk6APUmN&xAg%$Vk!q3Jfz}5%{LaNXLFUv;4RjTxkNNBYhIl=Nwx@l)Gv)%i}
zy8vDU%m>kk2pfA^CrNvx8jVIHSz&N1x<NY;eNi=;Hk~SSgiD0Id-0GMS#y`kAgn)7
zMOs4`$E1%DcE*GnX&Wy*0PR-dVp=?r<kwuI0rI2=>ftD0F8Es9YV&@eMIjovV-;7U
zD;3uX^Km<l<P=-y0x4N!OSAzBQ7=c`1K1~|ugU=f`GS^WAgtS^D6)RUUuSYc@yLwg
zmuBviPfDj`JTFU1vn=o-dT>$Zhh}+ieP<qdV;i9R)0SX%xoh_@$a8ylzm1#?<k%Qi
Q{}s2JSKoU7pS<Gw1x}t{)c^nh

diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index b17f6344502ea8c3b68f47cd807f079b47ba9356..fe9c25404dffa5cf90ea5aab6195b640be6abd7d 100644
GIT binary patch
delta 5379
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

delta 4362
zcmXY!WmFWv8itofX$b*oSm|yA328*SYk_51x|byvB?P3qJEcJZfki@rrBg~e1d(P1
z)P=kEo;&9}XU_Y4XXcxkf3wMV#z7OPr>?GNY^(<WP<aDL0N6pVpGw1lASVU@s7;`%
zm(%L%#<~Ci1tqq`h=s||AzeX3RZSi11hAPI3mZTUfUjpHEQWP2u~`EPNT1oZ)6v7;
z8|yN#89U>^bvo5{picH+0Dux7>v*w95pa+xLa`F-M6j723l}~@7#9!f;Sa}3O{@^d
zB0-prtLb46$8JO!ip_-ogI*utY472Lby3*-9oxi{LN0FA+sn@%dnFLoQDR{O;9<KL
zM4P#}Gc5+Nj20BSSyr;5AHq1j8<u98*n}u6-mJWb&JFo+aQiqe#vLP~S_NlXZL4k`
zq4p+Ee)Tv{_P`*pK*%QvRvqmMFp_7minSI`IwF!jK%Y&MQl_z_-TO6%(mVVCcTwII
zzqbkhh*u`}9QP-YKi2(DWH+vLDdtwkuCA_jlbD#o!xIjdhpt2rGno1Ilga$9K(ys*
z2<WeFGcvFw`P1LjXLpDvn?n<@$tX|clh$Xs<sB#BoK=|E`SG*dZrI&j@3S0_`Ikwb
zfZ|;)3{Apf2-H8?OW;1v{@8frxLGb{{KfcUPLucshy~J%k{<|-4$8QFvM;*dl<OtB
z0XZp?Y8NHSWxWcm(m)<wN@H5DgHHh0>G_|7FF*B8{cc!OX-5>_A*=r);76HO_ebq3
z$C=OmoXRY3Af<!&DcW70Nb!C&pPLoL^A~wJ$mQZST7`Tt#+YSq&w5bhl4ckuc_tb5
zfpnD(wRX5x?;%q~CMA>Q;i&gUp*=deLh;t=qWH5-M6$(T6^Xu4jIyB|`d*Z7*s5we
z#?d^=ljl%3SP@~pSxkN2K~mwrmn_(SS!`Y+T}c)uri)Sc8oy^{0mb&-d=@_Ie*OXe
zZ8TvkOWYCpp|aBv&t@d6*?l%%@oKYsZSB@Xrd-G@`)g3Ii92niOU@fDmo8%gTJEv(
zg_)ntf8;4yv`ta$z-o@x_^N|=^`C`X7O<{KjfKt?Lo0*`iSUhI1FTMgRroDGdTyOB
zMF;tID>k$zv`1b_K|xf3J!ybA;cs;r3hvvuv_-ZsO`1sGReG4$_+(ymu%v@A81iTk
zq)TnY0Duy1HsL(|<JJt)&u%HT`Z5}A3SF%K2&!Cm=|H!Ol4NhH-MjlsSr)koPYOme
z%jkmCtPw@F0zyfX%*ja_8W`u-T$xwJ7lm+7siNe4jGB2=QqRa#HeD4&!!fx-r*AM;
z-jsoR@B9$eau}C8GkQ7OeA5GCqDfI|7E1Qa*iikk3R`6_+}3u|ea}$JkVo%JDy=|F
z`f<Wyo+v*eT3CSY9tZRo;|94u<UMNKr%zJWLwuiMF6+M8giH*&=N!;o%=sD=O6}+S
ztlAYks@gSLxgyy?QziV2l1a>#!70ZF>$F$0|MkW||3X9HF8>m~xQXjWr5Qbhf3|+i
z5m(~uxy=2Pi24p}o#4D5MW8ziG{U8&(P?)zN}P3fY8R^>$CDKk`=S_qSLSrIx3zd9
zjo4x;K$||PL%-^oE-KE?PtMkKYneIEj!bGJ9jic1s5LA@lde7o@D{uK2Ub6^?n?a^
z!Xib%aAZv+Ryb(cN335g`tsDzg2A1TY{WVVBB%g~C*xvR@0MKsci_I0-gcZk+3q>M
z-mXXyAea%h{CJHoWw6?hvX)Gg=0$&lKEln3Qi4iYH$qG{*Ynwga)k#O&m2x>1CFcI
zridAVLHhZuYE9b4mA8I?nuPFMOJ>c$z((@Yqn*7N{bB0Ro^IjdUi<=fR6IUcVMIS(
zedGHsT-A&>&E8w~n<68UoNPHlC>=mO?VoUB{Im^k_M28<+SS{`;vZHM5GJ#uJp}I8
zM}z)(6E(Kw=`yPWUs{QSJssB0*jJWDo9p9=y{m7;bkpNHXBltKli+iP1cHY*>n>7d
zLsdYMri~WW1`zuji<{0;JNbOO*m9u!Ex~iX^GxlyCbN7zasuXQg4d5T#(5OFaMu!}
ztzMf~2$jv?+SHxxFtfH8tbCv%10%d+r1(Mu<_OU@=~C0uKV?c7X76z(+VbM|Dn8{k
zIH+@u>qpEqyP8<}HP1HJM8G#!8js|%NLYd-*9wU;RjBUh`BIRw1+GWXFD0kx7$*3#
z_i&rf#b4P1&(53mZ%RPa)NIJbE6}Zeo24t4WTBkIRn@xw3slGB`F2XPZ3Hi3o@2^^
z<6K=!`0x$;&op)@FyJL$ZKt#~Yd=NcJ3=FC3hATS<86qIxc-p}&pf|9Ft66k^&xu7
zG`8HFQEJW5{Q-aR^V+PRHA&kw{;e7cWPm`(U)ThUdCKRI_3A53aK+V>%zBKSj676a
zB-CAUP|{{?E-anHlu(NShG74ka_uXs`cb{y;F<%fY?WB2%XsxnG_)$q214hr<A)Z2
zNqG7jEUuHvsZV_EIM}UwK*$_e<HfuHnI;P+gyXXk;%qpFgOxiD8J3oFLsLK&j-Aml
z(>x*aDT*kISlk>DhNMje+a$fhk7x70`hK5Bh5FO-&WJ0t#eAlLA{3a{7OWR$n7(GU
zXwiM+@$CPCgm%U2iq0q)iPIQ~Rs6D*Zpo&<F`T3Q#Fz2Tp^`6F#UzD>td+_VmdB{Y
z`X`4|66(TSTPgKHi6Sv(eSj`scX#}|n3zl3LTpca3;m7l!F=IUh#@Bw-ooH$`!`tg
zr><~}1%77gu2~Rq0wT|l^Tkp9HZM5`@dz<LSC~u~e9FWW4c1UUQ(rMfO|zRCkTC($
z8s=%zLgg?LN432tF94F&`>AO3ZtgCd)ulUQ_1$h!@vfeAFifzc_2MMb-Pej^ujOBJ
zf>to%k1X95J(VUN*dcpBaDn-n``Xc9)jXbMN$$_{OVj5Kh$@bXFfCRt2SX>s?<V4*
zU^b%N{y+;<b^#wT+hOa=-b?Uo_HX1J<I&&Ar|$8nkf1Z#rg)BDz0nvHxhaW+S-;`X
zk~SF8#fdznv67^vMV0}ZQtVDybWWYbJ;1XP6}$1)@m62H_cO2Gdiwr|bRTN)Uu{1I
zwQdUHcnN$$T$|nZ2b;6pENx({ec6)hwAj)VcliuW=r!%e9vC7mZXzP5NkX&#?d<sp
zw$qq8xR`pnw22S}bbG!{<p1$aXi%=;nJr?7N{~uW$$+1?$GAR2n?qJ{@Hh7<w>`_#
zJq|m*bG4vHPfHK79eRNs_AL7t*mqa<MNYh_7gnC<2p^R20GAf5c)}<%TZ_PWWY-F(
zj<ch-^eAZL@yEW)mTxsOqw^*9yy)EJ8K47rP(0ToC6e15Maw+HK6|~aTNr0Qkdlg#
zjnAoib0E=>94q%GLz}#4?NJG1tk~40Q_K5N<5mMgmAr*=LnITiDy<}w9!t8p_C-cx
ztqL#)aR*(UTw+|l)r|{CiBT{xGO?he)yk|rh;$cW{$b|qEJqDC>h|Pa;dgT{i4Lww
z-)wpED5X_Ch&z&?4)S)gpzV=dDK&g|^jt9DSmj{Yfaz_()O~DC$1O}U?Zq~Sa(BQ5
zq|b1-<Pok|*!NfJmyatlvst`afo8`3#s-q2h;N$LTEOD{6CFjg+qW;VP`X^026<6x
z+8R$glC<6}7GCr&F3a1!4TtzuUiC_Aw8guZs)o{s6Wks5yic@pcy;AY+}!CI=#>^s
z+`p>U%t%I8SpOM5JU(q{tuv2j=agpuUXfg}p|K2l&oe}0R@tX^Nx%2{h>$CYEhzQ)
z6tTX62@Us7SqPvdC9*JtHh19>=Yt*bZXfZIG8N9()t5)UKjI;oRTR6(+wUZ(SPC?!
z&>&SJE%<TZYOm;>K|>VrBQ3rA0+^(Ig|jr}L~Y5GR`%?SeAjxe6kWt}t9ExRU38<4
z^K@6M)SRhSp6Er*1=&jzYD2<tYuJ#KHR64du+YwSrmPE9*2t<?&-w2@tHaN`HX4f$
z)m~MOxli;}_Ne5S3y6V~2b3m*@rGUenfBc4{oVRrGLT3T*10rVLCa%GKSbIQFW+3P
zqDp&?wn>Z1xiV!-$`|O7s&%KkQ5D?D5B63@q7wx)+h5sYgb2r_c=)MG<F7k;rx6BY
zei$2e+0<)Ne9qj^XljFp<e`_WzSE79S-2NVVo4J+OYdyYo=v}QUpL&I_UhD?p>R&>
zSC+A0$*)hLfys*vOpYvY(4ewe_Q1;&B#312FOG-lbw|Iz>8E`Roxc0ugP<kx4g8~3
z6|7`KWxS($jC|i`sc-X6*jv+)1qimdh1VYn>qhO%BSvMsF?lb-gY6|9S~NLjvp5UG
zKg<YMmxQ|n?8#e4ETnHyIz4}A0!%dHzev#E2l}>0>C?hkC+t4|j<)IURYEk`d=5We
zL8}BeT+0`@!RR#qs9xZQxYqlUCiV5QDqQ*f>vXu2`aJDY^ui8tH=X?3{vOdXy2K04
zK-w5TG)aunq5H^Jk^rj}Sfo5HJ&7?Eb5zDv#?%`q92<re{$pFy(ZZvZ*DBU7a;Q|Q
z&qT&^FV*bNS^1i9QEFwKQzX6eQkL{2x#_Z|#>?f>tJG`jWjY`epiw0%=DOzU=0V{z
zph$Oy{~eS%4!<3W87ihCv`0`DxsVEy1tb+R+t{sj-fWNQ3{;5W?BEx@dnJ%8l-!sp
z4Epk|%&DhLvd6}dF8VfmSeV6znd@*aM>8Ur+Q@cMmkbhN#+Mmiash{0nm)8p?0?zn
zuTjnRLxtNKx+BTzf7ah`*@{k3q?T0klN?-h<!oZ=6@dqP@1YKS;0UH70g5EjBKd#c
zM{vltaP(Qq@BH>M@g5hi(l5*02H%F9DZmw0WRNYs=L4hsLO&Hp57!iR?f`0$wnlE?
zsf9W--Zl1RFEmrv_<PAbf|^I9ChQ@<^{HMf7^{L6-o}{IF5rjxgY|%BJ|n{+-zc2Q
zIF!n3kn(Td{rbc%-ijzfqZ>?oo>BOp4t1#(XkGg-NHbJFeRZa>g-<H2hZG6l*ZfN<
zwv%D{rKxzz`)aVn*rlB?t=RX5d7iP4)5O}x{>0yrc5)zhbYOn_EPC6?JR+!x84|#_
z{^0hVFc5L=Wfu;Vo?e{mu4~5Z@Bi+-$0-Z3JcSoHf<PcJK=jR}&v5wb1D%8^8hZ(V
z9y?(<0Px=;7zEnHb9g{V33348tN5@%a4zWq1R4PCbOvfsgeI8BIrQuvCz6Fajd5sI
zNd<?P0cUyZVF-5Z$3$832oX|zZuTf|!hwY|q2OMn!OMPp7NtS$Z%ec0BwX@sC7o?!
zmD?WX(WW)it;|0d5|8&hay11NV~oEikZZhB)>6|QjI9Pvi;IZ9^9-sBPneC<^7!_t
zho`QKA?(Q?Y5TnUMob<_)Jx*0|356i;kenuYv<OZSIk>nG@=hU<QzXDL5*i#fTw~3
zz`%(zvESo#8X9#3Aa)Ob6C3pZ_Xmd;cqA#f4k}SbD=w$K2-i&IKo3<at5}NAXAAj9
z(3~V%MD;=KJvKN^-W$uRlc(VAss>pKS9sIK+^(NN)^RC%(nWg{RDKRnd**N#T@0ki
zWdGpw=~u9eb2e1;h1@ng4fJu_eUK~<ENZn+#TG*Zefq_V<DBylb8W-?m&BNL3fCqX
zxk;uaDlVJA=fChht_mF}d}T<p;w{4({&f4#WC4NvnVHq8W$3|LbgAEv=|_wFoEp#U
zz4spiILFY4cI}6=VFgcY7{!;nynkUpdGGI>j~<uxh(-SQZ6Hd738YZ$eUktL{{cGL
B8Z`g_

diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 6a014579c..5d521a9ce 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -106,4 +106,18 @@
 .icon-flag:before {
   content: "w";
 }
-
+.icon-notification:before {
+  content: "x";
+}
+.icon-comment:before {
+  content: "y";
+}
+.icon-reply:before {
+  content: "z";
+}
+.icon-facebook:before {
+  content: "A";
+}
+.icon-google-plus:before {
+  content: "B";
+}
\ No newline at end of file

From ad9e2cc637fcc833aeb79e6ea9e7797e4ed94a3f Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 26 Aug 2015 20:32:48 +0200
Subject: [PATCH 02/13] Adds styles for social share and auth

---
 app/assets/stylesheets/participacion.scss | 119 ++++++++++++++++++++++
 app/views/devise/_omniauth_form.html.erb  |  18 ++--
 config/locales/devise_views.en.yml        |   2 +-
 config/locales/devise_views.es.yml        |   2 +-
 config/locales/en.yml                     |   3 +
 config/locales/es.yml                     |   3 +
 6 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index e20a2cb36..116b57ff8 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -14,6 +14,7 @@
 // 12. Official levels
 // 13. Pagination
 // 14. Tables
+// 15. Social
 //
 
 // 01. Variables
@@ -856,4 +857,122 @@ table {
   }
 }
 
+// 15. Social
+// - - - - - - - - - - - - - - - - - - - - - - - - -
 
+.button.button-twitter {
+  background: #45B0E3;
+
+  &:before {
+    background: #40A2D1;
+    content: "f";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 0;
+    line-height: $line-height*2;
+    padding: 0 rem-calc(20);
+    position: absolute;
+    top: 0;
+  }
+}
+
+.social-share-button-twitter {
+  background: #45B0E3;
+  color: white;
+  height: rem-calc(48);
+  position: relative;
+  width: rem-calc(48);
+
+  &:before {
+    content: "f";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 50%;
+    line-height: $line-height*2;
+    margin-left: rem-calc(-11);
+    position: absolute;
+    top: 0;
+  }
+
+  &:hover {
+    color: #40A2D1;
+  }
+}
+
+.button.button-facebook {
+  background: #3B5998;
+
+  &:before {
+    background: #354F88;
+    content: "A";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 0;
+    line-height: $line-height*2;
+    padding: 0 rem-calc(20);
+    position: absolute;
+    top: 0;
+  }
+}
+
+.social-share-button-facebook {
+  background: #3B5998;
+  color: white;
+  height: rem-calc(48);
+  position: relative;
+  width: rem-calc(48);
+
+  &:before {
+    content: "A";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 50%;
+    line-height: $line-height*2;
+    margin-left: rem-calc(-11);
+    position: absolute;
+    top: 0;
+  }
+
+  &:hover {
+    color: #354F88;
+  }
+}
+
+.button.button-google {
+  background: #DE4C34;
+
+  &:before {
+    background: #CE3E26;
+    content: "B";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 0;
+    line-height: $line-height*2;
+    padding: 0 rem-calc(20);
+    position: absolute;
+    top: 0;
+  }
+}
+
+.social-share-button-google_plus {
+  background: #DE4C34;
+  color: white;
+  height: rem-calc(48);
+  position: relative;
+  width: rem-calc(48);
+
+  &:before {
+    content: "B";
+    font-family: "icons" !important;
+    font-size: rem-calc(24);
+    left: 50%;
+    line-height: $line-height*2;
+    margin-left: rem-calc(-11);
+    position: absolute;
+    top: 0;
+  }
+
+  &:hover {
+    color: #CE3E26;
+  }
+}
diff --git a/app/views/devise/_omniauth_form.html.erb b/app/views/devise/_omniauth_form.html.erb
index fdd812b4f..63e73d160 100644
--- a/app/views/devise/_omniauth_form.html.erb
+++ b/app/views/devise/_omniauth_form.html.erb
@@ -1,7 +1,11 @@
-<br/>
-
-<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: 'button radius expand' %>
-<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: 'button radius expand' %>
-<%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: 'button radius expand' %>
-
-<hr/>
+<% if current_page?(new_user_session_path) %>
+  <%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %>
+  <%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %>
+  <%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %>
+  <hr/>
+<% elsif current_page?(new_user_registration_path) %>
+  <%= link_to t("omniauth.twitter.sign_up"), user_omniauth_authorize_path(:twitter), class: "button-twitter button radius expand" %>
+  <%= link_to t("omniauth.facebook.sign_up"), user_omniauth_authorize_path(:facebook), class: "button-facebook button radius expand" %>
+  <%= link_to t("omniauth.google_oauth2.sign_up"), user_omniauth_authorize_path(:google_oauth2), class: "button-google button radius expand" %>
+  <hr/>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index f0e1eb33a..e6f573cf3 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -55,7 +55,7 @@ en:
           password_label: "Password"
           password_confirmation_label: "Confirm password"
           submit: "Sign up"
-          organization_signup: "Do you represent an organization / group?"
+          organization_signup: "Do you represent an organization / group? Enter here"
     organizations:
       registrations:
         new:
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 49d304748..f955938d4 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -55,7 +55,7 @@ es:
           password_label: "Contraseña"
           password_confirmation_label: "Confirmar contraseña"
           submit: "Registrarse"
-          organization_signup: "¿Representas a una organización / colectivo?"
+          organization_signup: "¿Representas a una organización / colectivo? Entra aquí"
     organizations:
       registrations:
         new:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 322cf585f..049f15435 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -152,7 +152,10 @@ en:
       title: Add Email
     twitter:
       sign_in: Sign in with Twitter
+      sign_up: Sign up with Twitter
     facebook:
       sign_in: Sign in with Facebook
+      sign_up: Sign up with Facebook
     google_oauth2:
       sign_in: Sign in with Google
+      sign_up: Sign up with Google
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5c21c039e..58ae07441 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -152,7 +152,10 @@ es:
       title: Añade tu email
     twitter:
       sign_in: Entra con Twitter
+      sign_up: Regístrate con Twitter
     facebook:
       sign_in: Entra con Facebook
+      sign_up: Regístrate con Facebook
     google_oauth2:
       sign_in: Entra con Google
+      sign_up: Regístrate con Google

From 9cd2297b67ce1b339692c9ffad7fe057764861bf Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 26 Aug 2015 20:36:52 +0200
Subject: [PATCH 03/13] Updates tests for social sign up

---
 spec/features/users_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 1fa30bcbe..829dcba03 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -74,7 +74,7 @@ feature 'Users' do
         expect do
           expect do
             expect do
-              click_link 'Sign in with Twitter'
+              click_link 'Sign up with Twitter'
             end.not_to change { ActionMailer::Base.deliveries.size }
           end.to change { Identity.count }.by(1)
         end.to change { User.count }.by(1)
@@ -109,7 +109,7 @@ feature 'Users' do
         expect do
           expect do
             expect do
-              click_link 'Sign in with Twitter'
+              click_link 'Sign up with Twitter'
             end.not_to change { ActionMailer::Base.deliveries.size }
           end.to change { Identity.count }.by(1)
         end.to change { User.count }.by(1)

From 599ea9a19f654f4af3d2d74836d0a27f5893a71e Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 27 Aug 2015 14:23:34 +0200
Subject: [PATCH 04/13] force ssl in production

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index e84606f73..7a21a1df4 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -42,7 +42,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.

From ccaca54816edb7e4e3519c31c87213c9e5cd6d48 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Wed, 26 Aug 2015 00:06:05 +0200
Subject: [PATCH 05/13] Add filters to specify order of debates#index

---
 app/controllers/debates_controller.rb  |  8 +++-
 app/models/debate.rb                   | 11 +++++
 app/views/debates/_filter_selector.erb |  7 ++++
 app/views/debates/index.html.erb       | 13 +-----
 spec/features/debates_spec.rb          | 57 ++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 app/views/debates/_filter_selector.erb

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index cf6d14f65..c0b23577d 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -1,11 +1,12 @@
 class DebatesController < ApplicationController
+  before_action :parse_filter, only: :index
   before_action :authenticate_user!, except: [:index, :show]
 
   load_and_authorize_resource
   respond_to :html, :js
 
   def index
-    @debates = Debate.search(params).page(params[:page]).for_render
+    @debates = Debate.search(params).page(params[:page]).for_render.sort_by(@filter)
     set_debate_votes(@debates)
   end
 
@@ -71,4 +72,9 @@ class DebatesController < ApplicationController
       @featured_tags = ActsAsTaggableOn::Tag.where(featured: true)
     end
 
+    def parse_filter
+      @valid_filters = ['votes', 'news', 'rated']
+      @filter = @valid_filters.include?(params[:filter]) ? params[:filter] : 'news'
+    end
+
 end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 15590fc60..194d6537b 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -40,6 +40,17 @@ class Debate < ActiveRecord::Base
     end
   end
 
+  def self.sort_by(filter)
+    case filter
+    when 'votes'
+      reorder(cached_votes_total: :desc)
+    when 'news'
+      reorder(created_at: :desc)
+    when 'rated'
+      reorder(cached_votes_up: :desc)
+    end
+  end
+
   def likes
     cached_votes_up
   end
diff --git a/app/views/debates/_filter_selector.erb b/app/views/debates/_filter_selector.erb
new file mode 100644
index 000000000..fa26347f1
--- /dev/null
+++ b/app/views/debates/_filter_selector.erb
@@ -0,0 +1,7 @@
+<% options = @valid_filters.map { |f| [t("debates.index.filter_#{f}"), f] } %>
+
+<%= form_tag('/debates', method: 'get', class: 'inline-block') do %>
+
+  <%= select_tag 'filter', options_for_select(options, @filter), onchange: "this.form.submit()" %>
+
+<% end %>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 59d11f37c..cf4205af6 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -4,18 +4,7 @@
   <div class="filters row">
     <div class="small-12 column">
       <h2><%= t("debates.index.showing") %></h2>
-
-      <select class="inline-block">
-        <option value="filter_news">
-          <%= t("debates.index.filter_news") %>
-        </option>
-        <option value="filter_votes">
-          <%= t("debates.index.filter_votes") %>
-        </option>
-        <option value="filter_rated">
-          <%= t("debates.index.filter_rated") %>
-        </option>
-      </select>
+      <%= render 'filter_selector' %>
     </div>
   </div>
   <!-- /. Filters -->
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 22b689308..748b36c73 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -350,4 +350,61 @@ feature 'Debates' do
     expect(InappropiateFlag.flagged?(user, debate)).to_not be
   end
 
+  feature 'Debate index order filters', :js do
+
+    before do 
+      @debates = [create(:debate), create(:debate), create(:debate)]
+      create_list(:vote, 2, votable: @debates[1])
+      create_list(:vote, 2, votable: @debates[0], vote_flag: false)
+      create(:vote, votable: @debates[0])
+    end
+
+    def expect_debate_order(order)
+      debate_divs = page.all("#debates .debate")
+      (0..2).each do |n|
+        expect(debate_divs[n]).to have_content(@debates[order[n]].title)
+      end
+    end
+
+    scenario 'Default filter is newest' do
+      visit debates_path
+
+      expect(page).to have_select('filter', selected: 'the newest')
+      expect_debate_order([2, 1, 0])
+    end
+
+    scenario 'Debates are ordered by most voted' do 
+      visit debates_path
+
+      select 'the most voted', from: 'filter' 
+      expect(page).to have_select('filter', selected: 'the most voted')
+
+      expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title) # Necessary to force capybara to wait for redirect
+      expect(current_url).to include('filter=votes') 
+      expect_debate_order([0, 1, 2])
+    end
+
+    scenario 'Debates are ordered by best rated' do
+      visit debates_path
+
+      select 'the best rated', from: 'filter' 
+      expect(find("#debates .debate", match: :first)).to have_content(@debates[1].title) 
+
+      expect(current_url).to include('filter=rated') 
+      expect_debate_order([1, 0, 2])
+    end
+
+    scenario 'Debates are ordered by newest' do
+      visit debates_path
+
+      select 'the most voted', from: 'filter' 
+      expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title)
+
+      select 'the newest', from: 'filter' 
+      expect(find("#debates .debate", match: :first)).to have_content(@debates[2].title)
+
+      expect(current_url).to include('filter=news') 
+      expect_debate_order([2, 1, 0])
+    end
+  end
 end

From 2d48966de3806b749461cfdd8b131a7858016503 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 09:28:56 +0200
Subject: [PATCH 06/13] Change variable name and references from "filter" to
 "order"

---
 app/controllers/debates_controller.rb  | 10 +++++-----
 app/models/debate.rb                   |  4 ++--
 app/views/debates/_filter_selector.erb |  7 -------
 app/views/debates/_order_selector.erb  |  7 +++++++
 app/views/debates/index.html.erb       |  2 +-
 config/locales/en.yml                  |  6 +++---
 config/locales/es.yml                  |  6 +++---
 spec/features/debates_spec.rb          | 20 ++++++++++----------
 8 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 app/views/debates/_filter_selector.erb
 create mode 100644 app/views/debates/_order_selector.erb

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index c0b23577d..7f7556f96 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -1,12 +1,12 @@
 class DebatesController < ApplicationController
-  before_action :parse_filter, only: :index
+  before_action :parse_order, only: :index
   before_action :authenticate_user!, except: [:index, :show]
 
   load_and_authorize_resource
   respond_to :html, :js
 
   def index
-    @debates = Debate.search(params).page(params[:page]).for_render.sort_by(@filter)
+    @debates = Debate.search(params).page(params[:page]).for_render.sort_by(@order)
     set_debate_votes(@debates)
   end
 
@@ -72,9 +72,9 @@ class DebatesController < ApplicationController
       @featured_tags = ActsAsTaggableOn::Tag.where(featured: true)
     end
 
-    def parse_filter
-      @valid_filters = ['votes', 'news', 'rated']
-      @filter = @valid_filters.include?(params[:filter]) ? params[:filter] : 'news'
+    def parse_order
+      @valid_orders = ['votes', 'news', 'rated']
+      @order = @valid_orders.include?(params[:order]) ? params[:order] : 'news'
     end
 
 end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 194d6537b..9b815c6db 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -40,8 +40,8 @@ class Debate < ActiveRecord::Base
     end
   end
 
-  def self.sort_by(filter)
-    case filter
+  def self.sort_by(order)
+    case order
     when 'votes'
       reorder(cached_votes_total: :desc)
     when 'news'
diff --git a/app/views/debates/_filter_selector.erb b/app/views/debates/_filter_selector.erb
deleted file mode 100644
index fa26347f1..000000000
--- a/app/views/debates/_filter_selector.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% options = @valid_filters.map { |f| [t("debates.index.filter_#{f}"), f] } %>
-
-<%= form_tag('/debates', method: 'get', class: 'inline-block') do %>
-
-  <%= select_tag 'filter', options_for_select(options, @filter), onchange: "this.form.submit()" %>
-
-<% end %>
diff --git a/app/views/debates/_order_selector.erb b/app/views/debates/_order_selector.erb
new file mode 100644
index 000000000..6516a172d
--- /dev/null
+++ b/app/views/debates/_order_selector.erb
@@ -0,0 +1,7 @@
+<% options = @valid_orders.map { |f| [t("debates.index.order_#{f}"), f] } %>
+
+<%= form_tag('/debates', method: 'get', class: 'inline-block') do %>
+
+  <%= select_tag 'order', options_for_select(options, @order), onchange: "this.form.submit()" %>
+
+<% end %>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index cf4205af6..13600160c 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -4,7 +4,7 @@
   <div class="filters row">
     <div class="small-12 column">
       <h2><%= t("debates.index.showing") %></h2>
-      <%= render 'filter_selector' %>
+      <%= render 'order_selector' %>
     </div>
   </div>
   <!-- /. Filters -->
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 322cf585f..4bc7f33e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,9 +33,9 @@ en:
     index:
       create_debate: Create a debate
       showing: You are seeing debates
-      filter_news: the newest
-      filter_votes: the most voted
-      filter_rated: the best rated
+      order_news: the newest
+      order_votes: the most voted
+      order_rated: the best rated
       filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
     debate:
       debate: Debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5c21c039e..dc133aaff 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -33,9 +33,9 @@ es:
     index:
       create_debate: Crea un debate
       showing: "Estás viendo los debates"
-      filter_news: "más nuevos"
-      filter_votes: "más votados"
-      filter_rated: mejor valorados
+      order_news: "más nuevos"
+      order_votes: "más votados"
+      order_rated: mejor valorados
       filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
     debate:
       debate: Debate
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 748b36c73..c76e4971c 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -366,44 +366,44 @@ feature 'Debates' do
       end
     end
 
-    scenario 'Default filter is newest' do
+    scenario 'Default order is newest' do
       visit debates_path
 
-      expect(page).to have_select('filter', selected: 'the newest')
+      expect(page).to have_select('order', selected: 'the newest')
       expect_debate_order([2, 1, 0])
     end
 
     scenario 'Debates are ordered by most voted' do 
       visit debates_path
 
-      select 'the most voted', from: 'filter' 
-      expect(page).to have_select('filter', selected: 'the most voted')
+      select 'the most voted', from: 'order' 
+      expect(page).to have_select('order', selected: 'the most voted')
 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title) # Necessary to force capybara to wait for redirect
-      expect(current_url).to include('filter=votes') 
+      expect(current_url).to include('order=votes') 
       expect_debate_order([0, 1, 2])
     end
 
     scenario 'Debates are ordered by best rated' do
       visit debates_path
 
-      select 'the best rated', from: 'filter' 
+      select 'the best rated', from: 'order' 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[1].title) 
 
-      expect(current_url).to include('filter=rated') 
+      expect(current_url).to include('order=rated') 
       expect_debate_order([1, 0, 2])
     end
 
     scenario 'Debates are ordered by newest' do
       visit debates_path
 
-      select 'the most voted', from: 'filter' 
+      select 'the most voted', from: 'order' 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title)
 
-      select 'the newest', from: 'filter' 
+      select 'the newest', from: 'order' 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[2].title)
 
-      expect(current_url).to include('filter=news') 
+      expect(current_url).to include('order=news') 
       expect_debate_order([2, 1, 0])
     end
   end

From 6f32801a88393e09617ca6045009026e750748d4 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 09:38:02 +0200
Subject: [PATCH 07/13] Change names of debate order filters

* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
---
 app/controllers/debates_controller.rb | 4 ++--
 app/models/debate.rb                  | 6 +++---
 config/locales/en.yml                 | 6 +++---
 config/locales/es.yml                 | 6 +++---
 spec/features/debates_spec.rb         | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 7f7556f96..bc733c67a 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -73,8 +73,8 @@ class DebatesController < ApplicationController
     end
 
     def parse_order
-      @valid_orders = ['votes', 'news', 'rated']
-      @order = @valid_orders.include?(params[:order]) ? params[:order] : 'news'
+      @valid_orders = ['total_votes', 'created_at', 'likes']
+      @order = @valid_orders.include?(params[:order]) ? params[:order] : 'created_at'
     end
 
 end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 9b815c6db..82931dfff 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -42,11 +42,11 @@ class Debate < ActiveRecord::Base
 
   def self.sort_by(order)
     case order
-    when 'votes'
+    when 'total_votes'
       reorder(cached_votes_total: :desc)
-    when 'news'
+    when 'created_at'
       reorder(created_at: :desc)
-    when 'rated'
+    when 'likes'
       reorder(cached_votes_up: :desc)
     end
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4bc7f33e3..7e049594d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,9 +33,9 @@ en:
     index:
       create_debate: Create a debate
       showing: You are seeing debates
-      order_news: the newest
-      order_votes: the most voted
-      order_rated: the best rated
+      order_created_at: the newest
+      order_total_votes: the most voted
+      order_likes: the best rated
       filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
     debate:
       debate: Debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index dc133aaff..fce3bad63 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -33,9 +33,9 @@ es:
     index:
       create_debate: Crea un debate
       showing: "Estás viendo los debates"
-      order_news: "más nuevos"
-      order_votes: "más votados"
-      order_rated: mejor valorados
+      order_created_at: "más nuevos"
+      order_total_votes: "más votados"
+      order_likes: mejor valorados
       filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
     debate:
       debate: Debate
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index c76e4971c..cf6c71829 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -366,7 +366,7 @@ feature 'Debates' do
       end
     end
 
-    scenario 'Default order is newest' do
+    scenario 'Default order is created_at' do
       visit debates_path
 
       expect(page).to have_select('order', selected: 'the newest')
@@ -380,7 +380,7 @@ feature 'Debates' do
       expect(page).to have_select('order', selected: 'the most voted')
 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title) # Necessary to force capybara to wait for redirect
-      expect(current_url).to include('order=votes') 
+      expect(current_url).to include('order=total_votes') 
       expect_debate_order([0, 1, 2])
     end
 
@@ -390,7 +390,7 @@ feature 'Debates' do
       select 'the best rated', from: 'order' 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[1].title) 
 
-      expect(current_url).to include('order=rated') 
+      expect(current_url).to include('order=likes') 
       expect_debate_order([1, 0, 2])
     end
 
@@ -403,7 +403,7 @@ feature 'Debates' do
       select 'the newest', from: 'order' 
       expect(find("#debates .debate", match: :first)).to have_content(@debates[2].title)
 
-      expect(current_url).to include('order=news') 
+      expect(current_url).to include('order=created_at') 
       expect_debate_order([2, 1, 0])
     end
   end

From b6df3be8c0e00a406a84a66fea3eb674fbee6c8a Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 12:42:05 +0200
Subject: [PATCH 08/13] Change Debate.sort_by method for individual scopes

---
 app/controllers/debates_controller.rb |  2 +-
 app/models/debate.rb                  | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index bc733c67a..efa441d81 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -6,7 +6,7 @@ class DebatesController < ApplicationController
   respond_to :html, :js
 
   def index
-    @debates = Debate.search(params).page(params[:page]).for_render.sort_by(@order)
+    @debates = Debate.search(params).page(params[:page]).for_render.send("sort_by_#{@order}")
     set_debate_votes(@debates)
   end
 
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 82931dfff..779cca33a 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -28,6 +28,10 @@ class Debate < ActiveRecord::Base
   scope :archived, -> { where("archived_at IS NOT NULL AND hidden_at IS NULL") }
   scope :flagged_as_inappropiate, -> { where("inappropiate_flags_count > 0") }
   scope :for_render, -> { includes(:tags) }
+  scope :sort_by_total_votes, -> { reorder(cached_votes_total: :desc) }
+  scope :sort_by_likes , -> { reorder(cached_votes_up: :desc) }
+  scope :sort_by_created_at, -> { reorder(created_at: :desc) }
+      
 
   # Ahoy setup
   visitable # Ahoy will automatically assign visit_id on create
@@ -40,17 +44,6 @@ class Debate < ActiveRecord::Base
     end
   end
 
-  def self.sort_by(order)
-    case order
-    when 'total_votes'
-      reorder(cached_votes_total: :desc)
-    when 'created_at'
-      reorder(created_at: :desc)
-    when 'likes'
-      reorder(cached_votes_up: :desc)
-    end
-  end
-
   def likes
     cached_votes_up
   end

From f5622b342573f0a127fab6c5c6908c788b6602d9 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 12:56:06 +0200
Subject: [PATCH 09/13] Assign each test debate to one variable

---
 spec/features/debates_spec.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index cf6c71829..dfafeb7db 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -353,16 +353,20 @@ feature 'Debates' do
   feature 'Debate index order filters', :js do
 
     before do 
-      @debates = [create(:debate), create(:debate), create(:debate)]
-      create_list(:vote, 2, votable: @debates[1])
-      create_list(:vote, 2, votable: @debates[0], vote_flag: false)
-      create(:vote, votable: @debates[0])
+      # TODO consider using debate title literally
+      @most_voted_debate  = create(:debate)
+      @most_liked_debate  = create(:debate)
+      @most_recent_debate = create(:debate)
+      create_list(:vote, 2, votable: @most_liked_debate)
+      create_list(:vote, 2, votable: @most_voted_debate, vote_flag: false)
+      create(:vote, votable: @most_voted_debate)
     end
 
     def expect_debate_order(order)
+      debates = [@most_voted_debate, @most_liked_debate, @most_recent_debate]
       debate_divs = page.all("#debates .debate")
       (0..2).each do |n|
-        expect(debate_divs[n]).to have_content(@debates[order[n]].title)
+        expect(debate_divs[n]).to have_content(debates[order[n]].title)
       end
     end
 
@@ -379,7 +383,7 @@ feature 'Debates' do
       select 'the most voted', from: 'order' 
       expect(page).to have_select('order', selected: 'the most voted')
 
-      expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title) # Necessary to force capybara to wait for redirect
+      expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) # Necessary to force capybara to wait for redirect
       expect(current_url).to include('order=total_votes') 
       expect_debate_order([0, 1, 2])
     end
@@ -388,7 +392,7 @@ feature 'Debates' do
       visit debates_path
 
       select 'the best rated', from: 'order' 
-      expect(find("#debates .debate", match: :first)).to have_content(@debates[1].title) 
+      expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title) 
 
       expect(current_url).to include('order=likes') 
       expect_debate_order([1, 0, 2])
@@ -398,10 +402,10 @@ feature 'Debates' do
       visit debates_path
 
       select 'the most voted', from: 'order' 
-      expect(find("#debates .debate", match: :first)).to have_content(@debates[0].title)
+      expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
 
       select 'the newest', from: 'order' 
-      expect(find("#debates .debate", match: :first)).to have_content(@debates[2].title)
+      expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title)
 
       expect(current_url).to include('order=created_at') 
       expect_debate_order([2, 1, 0])

From bfeff8d24193a63693ff5f2b322c84683f21d51c Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 13:54:18 +0200
Subject: [PATCH 10/13] Implement custom rspec matcher appear_before

---
 spec/features/debates_spec.rb          | 21 +++++++++------------
 spec/features/moderation_spec.rb       |  1 +
 spec/support/matchers/appear_before.rb |  6 ++++++
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 spec/support/matchers/appear_before.rb

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index dfafeb7db..8904199b3 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -362,19 +362,13 @@ feature 'Debates' do
       create(:vote, votable: @most_voted_debate)
     end
 
-    def expect_debate_order(order)
-      debates = [@most_voted_debate, @most_liked_debate, @most_recent_debate]
-      debate_divs = page.all("#debates .debate")
-      (0..2).each do |n|
-        expect(debate_divs[n]).to have_content(debates[order[n]].title)
-      end
-    end
-
     scenario 'Default order is created_at' do
       visit debates_path
 
       expect(page).to have_select('order', selected: 'the newest')
-      expect_debate_order([2, 1, 0])
+      #expect_debate_order([2, 1, 0])
+      expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
+      expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
     end
 
     scenario 'Debates are ordered by most voted' do 
@@ -385,7 +379,8 @@ feature 'Debates' do
 
       expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) # Necessary to force capybara to wait for redirect
       expect(current_url).to include('order=total_votes') 
-      expect_debate_order([0, 1, 2])
+      expect(@most_voted_debate.title).to appear_before(@most_liked_debate.title)
+      expect(@most_liked_debate.title).to appear_before(@most_recent_debate.title)
     end
 
     scenario 'Debates are ordered by best rated' do
@@ -395,7 +390,8 @@ feature 'Debates' do
       expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title) 
 
       expect(current_url).to include('order=likes') 
-      expect_debate_order([1, 0, 2])
+      expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
+      expect(@most_voted_debate.title).to appear_before(@most_recent_debate.title)
     end
 
     scenario 'Debates are ordered by newest' do
@@ -408,7 +404,8 @@ feature 'Debates' do
       expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title)
 
       expect(current_url).to include('order=created_at') 
-      expect_debate_order([2, 1, 0])
+      expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
+      expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
     end
   end
 end
diff --git a/spec/features/moderation_spec.rb b/spec/features/moderation_spec.rb
index 78df5e56f..aa49d381c 100644
--- a/spec/features/moderation_spec.rb
+++ b/spec/features/moderation_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require 'support/matchers/appear_before'
 
 feature 'Admin' do
   let(:user) { create(:user) }
diff --git a/spec/support/matchers/appear_before.rb b/spec/support/matchers/appear_before.rb
new file mode 100644
index 000000000..bb1d65072
--- /dev/null
+++ b/spec/support/matchers/appear_before.rb
@@ -0,0 +1,6 @@
+RSpec::Matchers.define :appear_before do |later_content|
+  match do |earlier_content|
+    page.body.index(earlier_content) < page.body.index(later_content)
+  end
+end
+

From ec7da859496c0be0ddd5a5adf41e8c6c41ffd8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Thu, 27 Aug 2015 16:13:40 +0200
Subject: [PATCH 11/13] updates uglier version (security bug release)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 94e26694c..cd2ae196d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,7 +130,7 @@ GEM
       mail (~> 2.2)
     errbase (0.0.3)
     erubis (2.7.0)
-    execjs (2.5.2)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -338,7 +338,7 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)

From e8004ca1d3c5e6c6d64b48a0d440bf6e165ed16a Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Thu, 27 Aug 2015 14:54:04 +0200
Subject: [PATCH 12/13] Add to javascript to handle debates order change

---
 app/assets/javascripts/application.js           |  1 +
 .../debates_order_selector.js.coffee            | 17 +++++++++++++++++
 app/helpers/debates_helper.rb                   | 12 ++++++++++++
 app/views/debates/_order_selector.erb           | 12 +++++-------
 spec/features/debates_spec.rb                   | 14 ++++++--------
 spec/features/moderation_spec.rb                |  1 -
 6 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/javascripts/debates_order_selector.js.coffee
 create mode 100644 app/helpers/debates_helper.rb

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a5aaf5c01..6e5b1df3d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -32,6 +32,7 @@ var initialize_modules = function() {
   App.Tags.initialize();
   App.Stats.initialize();
   App.LocaleSwitcher.initialize();
+  App.DebatesOrderSelector.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/debates_order_selector.js.coffee b/app/assets/javascripts/debates_order_selector.js.coffee
new file mode 100644
index 000000000..94002f5ac
--- /dev/null
+++ b/app/assets/javascripts/debates_order_selector.js.coffee
@@ -0,0 +1,17 @@
+App.DebatesOrderSelector =
+
+  href_with_params: (query_params) ->
+    loc = window.location
+
+    loc.protocol + "//" + loc.hostname +
+      (if loc.port then ':' + loc.port else '') +
+      loc.pathname +
+      loc.hash +
+      '?' + $.param(query_params)
+
+  initialize: ->
+    $('.js-order-selector').on 'change', ->
+      query_params = window.getQueryParameters()
+      query_params['order'] = $(this).val()
+      window.location.assign(App.DebatesOrderSelector.href_with_params(query_params))
+
diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
new file mode 100644
index 000000000..52bb9c17c
--- /dev/null
+++ b/app/helpers/debates_helper.rb
@@ -0,0 +1,12 @@
+module DebatesHelper
+  def available_options_for_order_selector(valid_orders, current_order)
+    options_for_select(available_order_filters_array(valid_orders), current_order)
+  end
+
+  private
+
+    def available_order_filters_array(orders)
+      orders.map { |f| [t("debates.index.order_#{f}"), f] }
+    end
+
+end
diff --git a/app/views/debates/_order_selector.erb b/app/views/debates/_order_selector.erb
index 6516a172d..de18cfc45 100644
--- a/app/views/debates/_order_selector.erb
+++ b/app/views/debates/_order_selector.erb
@@ -1,7 +1,5 @@
-<% options = @valid_orders.map { |f| [t("debates.index.order_#{f}"), f] } %>
-
-<%= form_tag('/debates', method: 'get', class: 'inline-block') do %>
-
-  <%= select_tag 'order', options_for_select(options, @order), onchange: "this.form.submit()" %>
-
-<% end %>
+<form class="inline-block">
+   <select class="js-order-selector" name="order-selector"> 
+     <%= available_options_for_order_selector(@valid_orders, @order) %>
+   </select>
+</form>
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 8904199b3..82669770d 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -365,17 +365,15 @@ feature 'Debates' do
     scenario 'Default order is created_at' do
       visit debates_path
 
-      expect(page).to have_select('order', selected: 'the newest')
-      #expect_debate_order([2, 1, 0])
+      expect(page).to have_select('order-selector', selected: 'the newest')
       expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
-      expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
     end
 
     scenario 'Debates are ordered by most voted' do 
       visit debates_path
 
-      select 'the most voted', from: 'order' 
-      expect(page).to have_select('order', selected: 'the most voted')
+      select 'the most voted', from: 'order-selector' 
+      expect(page).to have_select('order-selector', selected: 'the most voted')
 
       expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) # Necessary to force capybara to wait for redirect
       expect(current_url).to include('order=total_votes') 
@@ -386,7 +384,7 @@ feature 'Debates' do
     scenario 'Debates are ordered by best rated' do
       visit debates_path
 
-      select 'the best rated', from: 'order' 
+      select 'the best rated', from: 'order-selector' 
       expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title) 
 
       expect(current_url).to include('order=likes') 
@@ -397,10 +395,10 @@ feature 'Debates' do
     scenario 'Debates are ordered by newest' do
       visit debates_path
 
-      select 'the most voted', from: 'order' 
+      select 'the most voted', from: 'order-selector' 
       expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
 
-      select 'the newest', from: 'order' 
+      select 'the newest', from: 'order-selector' 
       expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title)
 
       expect(current_url).to include('order=created_at') 
diff --git a/spec/features/moderation_spec.rb b/spec/features/moderation_spec.rb
index aa49d381c..78df5e56f 100644
--- a/spec/features/moderation_spec.rb
+++ b/spec/features/moderation_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
-require 'support/matchers/appear_before'
 
 feature 'Admin' do
   let(:user) { create(:user) }

From 1d997d49290c7ca650fec70b2e81ef8cb814ef4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Thu, 27 Aug 2015 18:07:57 +0200
Subject: [PATCH 13/13] fixes build, changes i18n ignored keys and specs ref:
 #254

---
 app/helpers/debates_helper.rb |  2 +-
 config/i18n-tasks.yml         |  1 +
 config/locales/en.yml         |  7 ++++---
 config/locales/es.yml         |  7 ++++---
 spec/features/debates_spec.rb | 29 +++++++++++++++--------------
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
index 52bb9c17c..c594a8fa6 100644
--- a/app/helpers/debates_helper.rb
+++ b/app/helpers/debates_helper.rb
@@ -6,7 +6,7 @@ module DebatesHelper
   private
 
     def available_order_filters_array(orders)
-      orders.map { |f| [t("debates.index.order_#{f}"), f] }
+      orders.map { |f| [t("debates.index.orders.#{f}"), f] }
     end
 
 end
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index dd5b7f0c4..d45c73d9b 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -102,6 +102,7 @@ ignore_unused:
   - 'admin.officials.level_*'
   - 'helpers.page_entries_info.*' # kaminari
   - 'views.pagination.*' # kaminari
+  - 'debates.index.orders.*' #order filters for debates
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c1d872ea1..a255991da 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,9 +33,10 @@ en:
     index:
       create_debate: Create a debate
       showing: You are seeing debates
-      order_created_at: the newest
-      order_total_votes: the most voted
-      order_likes: the best rated
+      orders:
+        created_at: newest
+        total_votes: most voted
+        likes: best rated
       filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
     debate:
       debate: Debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c116b7899..f37bc0545 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -33,9 +33,10 @@ es:
     index:
       create_debate: Crea un debate
       showing: "Estás viendo los debates"
-      order_created_at: "más nuevos"
-      order_total_votes: "más votados"
-      order_likes: mejor valorados
+      orders:
+        created_at: "más nuevos"
+        total_votes: "más votados"
+        likes: mejor valorados
       filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
     debate:
       debate: Debate
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 82669770d..b9e174915 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -352,8 +352,7 @@ feature 'Debates' do
 
   feature 'Debate index order filters', :js do
 
-    before do 
-      # TODO consider using debate title literally
+    before do
       @most_voted_debate  = create(:debate)
       @most_liked_debate  = create(:debate)
       @most_recent_debate = create(:debate)
@@ -365,18 +364,18 @@ feature 'Debates' do
     scenario 'Default order is created_at' do
       visit debates_path
 
-      expect(page).to have_select('order-selector', selected: 'the newest')
+      expect(page).to have_select('order-selector', selected: 'newest')
       expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
     end
 
-    scenario 'Debates are ordered by most voted' do 
+    scenario 'Debates are ordered by most voted' do
       visit debates_path
 
-      select 'the most voted', from: 'order-selector' 
-      expect(page).to have_select('order-selector', selected: 'the most voted')
+      select 'most voted', from: 'order-selector'
+      expect(page).to have_select('order-selector', selected: 'most voted')
+      expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
 
-      expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) # Necessary to force capybara to wait for redirect
-      expect(current_url).to include('order=total_votes') 
+      expect(current_url).to include('order=total_votes')
       expect(@most_voted_debate.title).to appear_before(@most_liked_debate.title)
       expect(@most_liked_debate.title).to appear_before(@most_recent_debate.title)
     end
@@ -384,10 +383,11 @@ feature 'Debates' do
     scenario 'Debates are ordered by best rated' do
       visit debates_path
 
-      select 'the best rated', from: 'order-selector' 
-      expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title) 
+      select 'best rated', from: 'order-selector'
+      expect(page).to have_select('order-selector', selected: 'best rated')
+      expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title)
 
-      expect(current_url).to include('order=likes') 
+      expect(current_url).to include('order=likes')
       expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
       expect(@most_voted_debate.title).to appear_before(@most_recent_debate.title)
     end
@@ -395,13 +395,14 @@ feature 'Debates' do
     scenario 'Debates are ordered by newest' do
       visit debates_path
 
-      select 'the most voted', from: 'order-selector' 
+      select 'most voted', from: 'order-selector'
       expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
 
-      select 'the newest', from: 'order-selector' 
+      select 'newest', from: 'order-selector'
+      expect(page).to have_select('order-selector', selected: 'newest')
       expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title)
 
-      expect(current_url).to include('order=created_at') 
+      expect(current_url).to include('order=created_at')
       expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
       expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
     end