[Yapcom-commit] rev 88 - lib/YAPC templates

[prev] [thread] [next] [lurker] [Date index for 2003/11/29]

Author: gabor
Date: 2003-11-29 02:08:22 +0200 (Sat, 29 Nov 2003)
New Revision: 88

Modified:
   lib/YAPC/Organizer.pm
   templates/admin_list_proposals.tmpl
Log:
improve the proposal listing for the administrators

Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm	2003-11-28 22:53:13 UTC (rev 87)
+++ lib/YAPC/Organizer.pm	2003-11-29 00:08:22 UTC (rev 88)
@@ -33,6 +33,14 @@
 
 my @run_modes = map {$_, $_} @user_pages, @admin_pages, @other_pages;
 
+# turn urls to links
+sub htmlize {
+   my $str = shift;
+   $str =~ s@(http://\S+)@<a href="$1">$1</a>@g if $str; # turn urls to links
+   return $str;
+}
+
+
 sub setup {
     my $self = shift;
     $self->start_mode('default');
@@ -370,8 +378,13 @@
     foreach my $p (YAPC::Talk->retrieve_all) {
         push @$ar, 
            {
-           abstract => $p->abstract,
+           abstract => htmlize($p->abstract),
+           other => htmlize($p->other),
            title  => $p->title,
+           length => $p->length,
+           fname  => $p->user_id->fname,
+           lname  => $p->user_id->lname,
+           id  => $p->user_id->id,
            };
     }
 
@@ -380,8 +393,6 @@
     return $t->output;
 }
 
-
-
 sub login {
     my $self = shift;
     my $q = $self->query;
@@ -700,7 +711,7 @@
    $url = "http://$url"; if ($url and substr($url, 0, 7) ne 'http://');
  
    my $bio = $p->bio;
-   $bio =~ s@(http://\S+)@<a href="$1">$1</a>@g if $bio; # turn urls to links
+   $bio = htmlize($bio); 
  
    my $t = $self->_server_page('person');
    $t->param($_ => $p->get($_)) foreach (qw(fname lname pauseid mongers));

Modified: templates/admin_list_proposals.tmpl
===================================================================
--- templates/admin_list_proposals.tmpl	2003-11-28 22:53:13 UTC (rev 87)
+++ templates/admin_list_proposals.tmpl	2003-11-29 00:08:22 UTC (rev 88)
@@ -3,19 +3,13 @@
 <p>
 <table>
 <TMPL_LOOP NAME="talks">
-<tr><td colspan="3"><hr></td></tr>
-<tr>
-  <td><TMPL_VAR NAME="title"></td>
-  <td><TMPL_VAR NAME="length"></td>
-  <td><TMPL_VAR NAME="language"></td>
-</tr>
-<tr>
-  <td colspan="3"><TMPL_VAR NAME="abstract"></td>
-</tr>
-<tr>
-  <td><TMPL_VAR NAME="other"></td>
-</tr>  
-<tr><td><hr></td></tr>  
+<tr><td><hr></td></tr>
+<tr><td>Title: <b><TMPL_VAR NAME="title"></b></td></tr>
+<tr><td>Person: <a href="person.html?id=<TMPL_VAR NAME="id">"><TMPL_VAR NAME="fname"> <TMPL_VAR NAME="lname"></a></td></tr>
+<tr><td>Length: <TMPL_VAR NAME="length"></td></tr>
+<tr><td>Language: <TMPL_VAR NAME="language"></td></tr>
+<tr><td>Abstract:<p><pre><TMPL_VAR NAME="abstract"></pre></td></tr>
+<tr><td>Comment:<p><pre><TMPL_VAR NAME="other"></pre></td></tr>  
 </TMPL_LOOP>
 </table>
 </p>

• [Yapcom-commit] rev 88 - lib/YAPC templates svn 02:08 on 29 Nov 2003

Generated at 03:15 on 29 Nov 2003 by mariachi 0.51