From 4205a56363f41ce609899b6a13f8b85c733cf642 Mon Sep 17 00:00:00 2001 From: Andrew Nugged Date: Thu, 23 Jul 2015 18:02:40 +0200 Subject: [PATCH] Favorites! Favorites evrywhere! Fav-button everywhere: near every talk on user page and on schedule page, near unscheduled talks. ![Favorites everywhere!](https://i.imgflip.com/oky8w.jpg "Favorites! Favorites everywhere!") --- actdocs/templates/core/talk/schedule | 3 +++ actdocs/templates/talk/fav_ajax | 20 ++++++++++++++++++++ actdocs/templates/talk/list | 2 +- actdocs/templates/talk/talk_list | 21 +-------------------- actdocs/templates/user/show | 6 ++++++ 5 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 actdocs/templates/talk/fav_ajax diff --git a/actdocs/templates/core/talk/schedule b/actdocs/templates/core/talk/schedule index 77ac9fd..cc01e18 100644 --- a/actdocs/templates/core/talk/schedule +++ b/actdocs/templates/core/talk/schedule @@ -17,6 +17,7 @@ {{Speaker}} +   {{Talk title}} [% IF global.config.talks_languages %]{{Language}}[% END %] {{Duration}} @@ -30,6 +31,8 @@ [% user_info(t.user) %] + [% PROCESS talk/fav_ajax onetalk = t %] + [% IF t.type == 'Act::Event' %] [% event_link(t) %] diff --git a/actdocs/templates/talk/fav_ajax b/actdocs/templates/talk/fav_ajax new file mode 100644 index 0000000..3d4671a --- /dev/null +++ b/actdocs/templates/talk/fav_ajax @@ -0,0 +1,20 @@ + [% IF global.request.user.has_registered %] + + + [% ELSE %] + title="{{add to personal schedule}}" + data-toggle="tooltip" data-placement="top" + class="talk-checkbox" + data-talkfav="0" data-talkid="[% onetalk.talk_id %]" + data-titlerev="{{remove from personal schedule}}"> + + [% END %] + + [% END %] diff --git a/actdocs/templates/talk/list b/actdocs/templates/talk/list index 0b10299..9c35f3a 100644 --- a/actdocs/templates/talk/list +++ b/actdocs/templates/talk/list @@ -1,5 +1,5 @@ [% - IF tag; + IF tag; title = loc("List of talks tagged ", tag); ELSE; title = loc("List of talks"); diff --git a/actdocs/templates/talk/talk_list b/actdocs/templates/talk/talk_list index bf49534..6856ae9 100644 --- a/actdocs/templates/talk/talk_list +++ b/actdocs/templates/talk/talk_list @@ -36,26 +36,7 @@ @date 14-Jun-2015 @desc Trying to make a star appearing close to the user's favorite talks. The star will also be a link to modify the choice --> - [% IF global.request.user.has_registered %] - - - [% ELSE %] - title="{{add to personal schedule}}" - data-toggle="tooltip" data-placement="top" - class="talk-checkbox" - data-talkfav="0" data-talkid="[% t.talk_id %]" - data-titlerev="{{remove from personal schedule}}"> - - [% END %] - - [% END %] + [% PROCESS talk/fav_ajax onetalk = t %] [% talk_link(t) %] diff --git a/actdocs/templates/user/show b/actdocs/templates/user/show index 401f28a..8aaa06d 100644 --- a/actdocs/templates/user/show +++ b/actdocs/templates/user/show @@ -150,6 +150,11 @@ {{Pending}} [% END %] + [% IF t.confirmed %] + + [% PROCESS talk/fav_ajax onetalk = t %] + + [% END %] [% talk_link(t) %] @@ -206,6 +211,7 @@ [% FOREACH t = mytalks %] + [% END %]
[% PROCESS talk/fav_ajax onetalk = t %] [% talk_link(t) %]