From 41c85703b395137bcb48268c0ad482a1015be449 Mon Sep 17 00:00:00 2001 From: "Gergely POLONKAI (W00d5t0ck)" Date: Sat, 25 Aug 2012 17:32:14 +0200 Subject: [PATCH] Changed (un)favourite icons to real icons Signed-off-by: Gergely POLONKAI (W00d5t0ck) --- .../Resources/public/images/penta-blue-24.png | Bin 0 -> 1078 bytes .../Resources/public/images/penta-yellow-24.png | Bin 0 -> 753 bytes .../FrontBundle/Resources/public/js/forum.js | 6 ++++-- .../views/Default/main_template.html.twig | 3 +++ .../Resources/views/Forum/postList.html.twig | 4 ++-- .../views/Forum/topicGroupList.html.twig | 4 ++-- .../Resources/views/Forum/topicList.html.twig | 4 ++-- 7 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 src/KekRozsak/FrontBundle/Resources/public/images/penta-blue-24.png create mode 100644 src/KekRozsak/FrontBundle/Resources/public/images/penta-yellow-24.png diff --git a/src/KekRozsak/FrontBundle/Resources/public/images/penta-blue-24.png b/src/KekRozsak/FrontBundle/Resources/public/images/penta-blue-24.png new file mode 100644 index 0000000000000000000000000000000000000000..53c5a9275be5201aae82fafb2d5aee0edc040803 GIT binary patch literal 1078 zcmV-61j+k}P)BQWPs{$OW>nuy8OiFsvn34-*OIGd_O!Li5R^XKD-# z4Mgi>CRSl^&MbFnIdKs_LEe|rY7ETRPHw(Q)gY2nkqNkQ>Fy>51_lNl1Jxh~28NB) zw1DyXlULf?=e^BlU|?VnEaj_aU|?WmU|{%9l{oOtnC>VpA$*5{q2V6`L&HBw8PS`; zIkViT7Rjob3PE>nKiUH0-?(;vtAeVmA5mV9C|Q&$At{76sNTQ*n87Q+HHU?n^$!CB z1H+%czggbCdYAU==f7$A^!@z${SV9EzrP-HaItkiefa9Uu&BUsbVZ*&epBS;<$MM+ zoPmLXfrXj%4?7R{8y;RJb#5LmjMVh*^#>~rJ!O-}_n(z8GB7YOC>fXYTRLmaVq#|b zxp>#XWQMb|e!~=(Oxn@^@b2@|t0yKdLpCI&U~aU$qLguOzGo3!P&k@(`-+auD7lC!xuS@q9v zy6%QC*A?{bsp*>n8TcB>N9sK3<_nmv@ z6keZq;JOm zGcYhPFdS(3^Wo!{Js;kFlK=DPujJ1kzc)O1u;2#+0|Udk1D98Pc=y?!Bnxc9+tk?E zS$^Eu+y0h;A(T10bHi*F7RKUtPu}@{xckDJor^6qwQ+SH14AhD9d&*7Y^4tSpW%-n`1>V zV`lk3y(V}9Q9k(o?YraGPhXf=8QB&*dGe}yZbMi-TG9M}Ms;BG^CvG`Ia%0NeEax~ z@#pV9jzk5KX=s-OFF%ha3mc2o#S3@6w@%MGj4OQCOiJ1N=-G2mP99Dd9v)78b?Y)- wg2k&x{DkC~%B7hMB!ZOYHPtS0eNpJ*0CU)GpyW3U2><{907*qoM6N<$g7rHNUH||9 literal 0 HcmV?d00001 diff --git a/src/KekRozsak/FrontBundle/Resources/public/images/penta-yellow-24.png b/src/KekRozsak/FrontBundle/Resources/public/images/penta-yellow-24.png new file mode 100644 index 0000000000000000000000000000000000000000..542586aa89e64edd1ea8ba587b2612bf1da925c3 GIT binary patch literal 753 zcmV5+3YU9-?bto$6qh zqC;tij8dc^G_ejsi?!*x``-^&JcJQ}-~QXDL$D<4$Npmn<}fqQGtbPt@AD2gXqx1l zCTVoSaXA4~NIgZ=I-z*7KD{u6Ie?2i370XXa(jaa)#NilK4XNa%lQo`-~zvR1wbhc zKrgv!5=Ie*BwP|MMHrSaxqG4ze!N7CA!Q6He1w>wI(Gs^G%(NW^mvXp6mvcss!@b% zc(;hfD$RI#gs}gz@UTb|h6kJSY-|@cNj$W&!pRLl<+zziZw?@A@|eZLK75eTU7VtX zHVT;eiyxuPi;6OEF$Ccx9&(17GNcfP z({mOd)Q2wv+lNmUga4F~BZ@MlB-b}j$q6bIWkeRO3UXXYx;Mlo>DE_{DMqv63~PeQ z?DBq$?Xu`mf)Rzey2)YM6eFN19%__A=LVZ3Ad62L=V->7#c543s4ye{rWQnev2#93K00000NkvXXu0mjfk!e8_ literal 0 HcmV?d00001 diff --git a/src/KekRozsak/FrontBundle/Resources/public/js/forum.js b/src/KekRozsak/FrontBundle/Resources/public/js/forum.js index e4b9a86..e683c52 100644 --- a/src/KekRozsak/FrontBundle/Resources/public/js/forum.js +++ b/src/KekRozsak/FrontBundle/Resources/public/js/forum.js @@ -24,7 +24,8 @@ function favouriteOn() type: 'GET', url: url }).done(function() { - elem.html('[Kedvenc ikon]'); + elem.find('img').attr('alt', '[Kedvenc]'); + elem.find('img').attr('src', webRoot + '/bundles/kekrozsakfront/images/penta-yellow-24.png'); elem.removeClass('favourite-topic-button'); elem.addClass('unfavourite-topic-button'); elem.attr('id', 'unfavourite-topic-button-' + topicSlug); @@ -58,7 +59,8 @@ function favouriteOff() type: 'GET', url: url }).done(function() { - elem.html('[Nem kedvenc ikon]'); + elem.find('img').attr('alt', '[Nem kedvenc]'); + elem.find('img').attr('src', webRoot + '/bundles/kekrozsakfront/images/penta-blue-24.png'); elem.removeClass('unfavourite-topic-button'); elem.addClass('favourite-topic-button'); elem.attr('id', 'favourite-topic-button-' + topicSlug); diff --git a/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig index a7af022..2684fac 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig @@ -20,6 +20,9 @@ {% javascripts 'bundles/kekrozsakfront/js/*' output='js/kekrozsak.js' %} {% endjavascripts %} + {% block additional_js %}{% endblock %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig index 646e141..c215648 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig @@ -5,9 +5,9 @@ {% block content %}

{% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %} - [Kedvenc ikon] + [Kedvenc] {% else %} - [Nem kedvenc ikon] + [Nem kedvenc] {% endif %} Fórum - {{ topicGroup.title }} - diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig index 4a162e6..c70f1a7 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig @@ -39,9 +39,9 @@ [ikon] {% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %} - [Kedvenc ikon] + [Kedvenc] {% else %} - [Nem kedvenc ikon] + [Nem kedvenc] {% endif %} {{ topic.title }} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig index 842627a..7f0b17a 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig @@ -29,9 +29,9 @@ [ikon] {% if app.user.userData and app.user.userData.isFavouriteForumTopic(topic) %} - [Kedvenc ikon] + [Kedvenc] {% else %} - [Nem kedvenc ikon] + [Nem kedvenc] {% endif %} {{ topic.title }}