Permalink
Browse files

make and pass chunked abstracts to the template; fix talk language; h…

…ide comma after speaker name if no company.

git-svn-id: svn://svn.mongueurs.net/act/trunk@2275 67b57a05-4208-db11-a765-00306e02d86a
  • Loading branch information...
1 parent 3a4b0e9 commit b67a37a60bcc2e72379a86ccdab47048f9e800d8 @maddingue maddingue committed Jul 14, 2011
Showing with 9 additions and 5 deletions.
  1. +4 −1 lib/Act/Handler/Talk/Proceedings.pm
  2. +5 −4 templates/talk/proceedings
@@ -9,7 +9,10 @@ use Act::User;
sub handler {
# retrieve talks and speaker info
my $talks = Act::Talk->get_talks( conf_id => $Request{conference} );
- $_->{user} = Act::User->new( user_id => $_->user_id ) for @$talks;
+ for my $talk (@$talks) {
+ $talk->{chunked_abstract} = Act::Abstract::chunked( $talk->abstract );
+ $talk->{user} = Act::User->new( user_id => $talk->user_id );
+ }
# sort talks
$talks = [
@@ -25,12 +25,13 @@
<dd class="speaker">
<a href="[% make_uri_info('user', t.user.user_id) %]"
- class="name">[% user_info(t.user) %]</a>,
- <span class="company">[% t.user.company %]</span>
+ class="name">[% user_info(t.user) %]</a>[% IF t.user.company %],
+ <span class="company">[% t.user.company %]</span>[% END %]
</dd>
<dd class="info">
- [% global.config.talks_languages.${t.lang || global.config.default_language} %],
+ [% global.config.talks_languages.${t.lang}
+ || global.config.default_language %],
[% IF t.lightning %]
{{lightning}}
[% ELSE %]
@@ -46,7 +47,7 @@
<dd class="abstract">
<blockquote>
- [% expand(chunked_abstract) | html_line_break %]
+ [% expand(t.chunked_abstract) | html_line_break %]
</blockquote>
</dd>

0 comments on commit b67a37a

Please sign in to comment.