Merge pull request #24 from nugged/favorites_they_are_everywhere

Favorites! Favorites evrywhere!
Act-Conferences · Jul 23, 2015 · e349340 · e349340
2 parents 28aac71 + 4205a56
commit e349340
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 21 deletions.
diff --git a/actdocs/templates/core/talk/schedule b/actdocs/templates/core/talk/schedule
@@ -17,6 +17,7 @@
         <thead>
           <tr>
             <th>{{Speaker}}</th>
+            <th>&nbsp;</th>
             <th>{{Talk title}}</th>
             [% IF global.config.talks_languages %]<th>{{Language}}</th>[% END %]
             <th>{{Duration}}</th>
@@ -30,6 +31,8 @@
              [% user_info(t.user) %]
             </td>
 
+            <td width="30">[% PROCESS talk/fav_ajax onetalk = t %]</td>
+
             <td>
               [% IF t.type == 'Act::Event' %]
                 [% event_link(t) %]

diff --git a/actdocs/templates/talk/fav_ajax b/actdocs/templates/talk/fav_ajax
@@ -0,0 +1,20 @@
+          [% IF global.request.user.has_registered %]
+          <a href="/ye2015/talk/[% onetalk.talk_id %]"
+                   [%# For best toggling state, reversed test and tald_id stored in tag data- items: %]
+                   [% IF global.request.user.is_my_talk(onetalk.talk_id) %]
+                     title="{{remove from personal schedule}}"
+                     data-toggle="tooltip" data-placement="top"
+                     class="talk-checkbox"
+                     data-talkfav="1" data-talkid="[% onetalk.talk_id %]"
+                     data-titlerev="{{add to personal schedule}}">
+                     <img src="/ye2015/img/fav-3.png" width="20px">
+                   [% 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}}">
+                      <img src="/ye2015/img/no-fav-3.png" width="20px">
+                  [% END %]
+          </a>
+          [% END %]
diff --git 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>", tag);
   ELSE;
     title = loc("List of talks");

diff --git 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 %]
-          <a href="/ye2015/talk/[% t.talk_id %]"
-                   [%# For best toggling state, reversed test and tald_id stored in tag data- items: %]
-                   [% IF global.request.user.is_my_talk(t.talk_id) %]
-                     title="{{remove from personal schedule}}"
-                     data-toggle="tooltip" data-placement="top"
-                     class="talk-checkbox"
-                     data-talkfav="1" data-talkid="[% t.talk_id %]"
-                     data-titlerev="{{add to personal schedule}}">
-                     <img src="/ye2015/img/fav-3.png" width="20px">
-                   [% 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}}">
-                      <img src="/ye2015/img/no-fav-3.png" width="20px">
-                  [% END %]
-          </a>
-          [% END %]
+          [% PROCESS talk/fav_ajax onetalk = t %]
         </td>
         <td>
           [% talk_link(t) %]

diff --git a/actdocs/templates/user/show b/actdocs/templates/user/show
@@ -150,6 +150,11 @@
                 <span class="label label-warning">{{Pending}}</span>
               [% END %]
             </td>
+            [% IF t.confirmed %]
+            <td width="30">
+              [% PROCESS talk/fav_ajax onetalk = t %]
+            </td>
+            [% END %]
             <td>
             [% talk_link(t) %]
             </td>
@@ -206,6 +211,7 @@
       <table class="table">
         [% FOREACH t = mytalks %]
           <tr>
+            <td width="30">[% PROCESS talk/fav_ajax onetalk = t %]</td>
             <td>[% talk_link(t) %]</td>
           </tr>
         [% END %]