[Yapcom-commit] rev 295 - in yapcom/trunk: . html lib/YAPC osdc_israel_2006

svn at pti.co.il svn at pti.co.il
Tue Jan 31 10:43:32 IST 2006


Author: gabor
Date: 2006-01-31 10:43:31 +0200 (Tue, 31 Jan 2006)
New Revision: 295

Modified:
   yapcom/trunk/
   yapcom/trunk/html/style.css
   yapcom/trunk/lib/YAPC/Organizer.pm
   yapcom/trunk/osdc_israel_2006/schedule.tmpl
Log:
release the schedule



Property changes on: yapcom/trunk
___________________________________________________________________
Name: svk:merge
   - 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:9809
   + 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:9811

Modified: yapcom/trunk/html/style.css
===================================================================
--- yapcom/trunk/html/style.css	2006-01-31 08:43:24 UTC (rev 294)
+++ yapcom/trunk/html/style.css	2006-01-31 08:43:31 UTC (rev 295)
@@ -59,6 +59,10 @@
 	vertical-align: top;
 }
 
+.cobreak {
+	background-color: yellow;
+}
+
 .navigation {
 	vertical-align: top;
 	width: 18%;

Modified: yapcom/trunk/lib/YAPC/Organizer.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Organizer.pm	2006-01-31 08:43:24 UTC (rev 294)
+++ yapcom/trunk/lib/YAPC/Organizer.pm	2006-01-31 08:43:31 UTC (rev 295)
@@ -976,10 +976,33 @@
 	$t->param(days => \@YAPC::Config::days);
 	return $t->output;
 }
-
 sub schedule {
 	my ($self) = @_;
+	my $list = YAPC::Talk->retrieve_accepted;
+	my %talks;
+	while (my $p = $list->next) {
+		my $str = sprintf 
+			qq(<a href="talk.html?id=%s">%s</a><br />
+			(%s %s min.)<br />
+			<a href="person.html?id=%s">%s %s</a>
+			),
+			$p->id,
+			$p->title,
+			$p->language,
+			$p->length,
+			$p->user_id->id,
+			$p->user_id->fname,
+			$p->user_id->lname;
+		$talks{"talk_" . $p->id} = $str;
+	}
+	my $t = $self->_server_page('schedule');
+	$t->param(%talks);
+	return $t->output;
+}
 
+sub _schedule {
+	my ($self) = @_;
+
 	my $show_schedule = $YAPC::Config::show_schedule;
 
 	if (my $id = $self->is_logged_in) {

Modified: yapcom/trunk/osdc_israel_2006/schedule.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/schedule.tmpl	2006-01-31 08:43:24 UTC (rev 294)
+++ yapcom/trunk/osdc_israel_2006/schedule.tmpl	2006-01-31 08:43:31 UTC (rev 295)
@@ -1,6 +1,89 @@
 <TMPL_VALUE NAME="title" VALUE="Schedule">
 <TMPL_INCLUDE NAME="header.tmpl">
 
+<h2>26 February 2006</h2>
+<table border="1">
+<tr><td>Time</td><td>Outside</td><td>Main hall</td><td>Room 1</td><td>Room 2</td></tr>
+<tr class="cobreak"><td>08:00-09:00</td><td>RECEPTION</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>09:00-09:20</td><td></td><td>Gabor Szabo<br />Opening (20 min)</td><td></td><td></td></tr>
+<tr class="lecture"><td>09:20-09:40</td><td></td><td>Welcome by ?? from Netanya Academic Collage (20 min)</td><td></td><td></td></tr>
+<tr class="lecture"><td>09:40-10:00</td><td></td><td>About HaMakor (20 min)</td><td></td><td></td></tr>
+<tr class="lecture"><td>10:00-11:00</td><td></td><td><TMPL_VAR talk_29></td><td></td><td></td></tr>
+<tr class="cobreak"><td>11:00-11:30</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>11:30-12:30</td><td></td><td><TMPL_VAR talk_32></td><td><TMPL_VAR talk_59></td><td rowspan="3"><TMPL_VAR talk_40></td></tr>
+<tr class="cobreak"><td>12:30-12:35</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>12:35-13:15</td><td></td><td><TMPL_VAR talk_8></td><td><TMPL_VAR talk_26></td></tr>
+<tr class="cobreak"><td>13:15-14:15</td><td>LUNCH</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>14:15-15:15</td><td></td><td><TMPL_VAR talk_30></td><td><TMPL_VAR talk_23></td><td><TMPL_VAR talk_40></td></tr>
+<tr class="cobreak"><td>15:15-15:20</td><td></td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>15:20-16:00</td><td></td><td><TMPL_VAR talk_56></td><td><TMPL_VAR talk_46></td><td><TMPL_VAR talk_43></td></tr>
+<tr class="cobreak"><td>16:00-16:30</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>16:30-17:30</td><td></td><td><TMPL_VAR talk_50></td><td rowspan="3"><TMPL_VAR talk_11></td><td><TMPL_VAR talk_41></td></tr>
+<tr class="cobreak"><td>17:30-17:35</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>17:35-18:15</td><td></td><td><TMPL_VAR talk_27></td><td><TMPL_VAR talk_3></td></tr>
+<tr class="cobreak"><td>18:15-24:00</td><td>DINNER</td><td></td><td></td><td></td></tr>
+</table>
+<h2>27 February 2006</h2>
+<table border="1">
+<tr><td>Time</td><td>Outside</td><td>Main hall</td><td>Room 1</td><td>Room 2</td></tr>
+<tr class="cobreak"><td>08:00-09:00</td><td>RECEPTION</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>09:00-09:40</td><td></td><td><TMPL_VAR talk_31></td><td></td><td></td></tr>
+<tr class="lecture"><td>09:40-10:40</td><td></td><td><a href="#light">Lightening talks</a></td><td></td><td></td></tr>
+<tr class="cobreak"><td>10:40-11:10</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>11:10-12:10</td><td></td><td><TMPL_VAR talk_20></td><td><TMPL_VAR talk_24></td><td><TMPL_VAR talk_35></td></tr>
+<tr class="cobreak"><td>12:10-12:15</td><td></td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>12:15-13:15</td><td></td><td><TMPL_VAR talk_54></td><td><TMPL_VAR talk_9></td><td><TMPL_VAR talk_42></td></tr>
+<tr class="cobreak"><td>13:15-14:15</td><td>LUNCH</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>14:15-14:55</td><td></td><td><TMPL_VAR talk_15></td><td rowspan="3"><TMPL_VAR talk_13></td><td rowspan="3"><TMPL_VAR talk_2></td></tr>
+<tr class="cobreak"><td>14:55-15:00</td><td></td><td></td></tr>
+<tr class="lecture"><td>15:00-16:00</td><td></td><td><TMPL_VAR talk_16></td></tr>
+<tr class="cobreak"><td>16:00-16:30</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>16:30-17:10</td><td></td><td><TMPL_VAR talk_7></td><td><TMPL_VAR talk_25></td><td><TMPL_VAR talk_53></td></tr>
+<tr class="cobreak"><td>17:10-17:15</td><td></td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>17:15</td><td></td><td rowspan="3"><TMPL_VAR talk_48></td><td rowspan="3"><TMPL_VAR talk_66></td><td><TMPL_VAR talk_34></td></tr>
+<tr class="lecture"><td>17:40</td><td></td><td><TMPL_VAR talk_4></td></tr>
+<tr class="lecture"><td>18:05-18:25</td><td></td><td><TMPL_VAR talk_39></td></tr>
+<tr class="cobreak"><td>18:00-24:00</td><td>BOFs</td><td></td><td></td><td></td></tr>
+</table>
+
+<h2>28 February 2006</h2>
+<table border="1">
+<tr><td>Time</td><td>Outside</td><td>Main hall</td><td>Room 1</td><td>Room 2</td></tr>
+<tr class="cobreak"><td>08:00-09:00</td><td>RECEPTION</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>09:00-10:30</td><td></td><td><TMPL_VAR talk_1></td><td></td><td></td></tr>
+<tr class="cobreak"><td>10:30-11:00</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>11:00-12:00</td><td></td><td rowspan="3"><TMPL_VAR talk_6></td><td><TMPL_VAR talk_70></td><td><TMPL_VAR talk_21></td></tr>
+<tr class="cobreak"><td>12:00-12:05</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>12:05-13:05</td><td></td><td><TMPL_VAR talk_67></td><td><TMPL_VAR talk_44></td></tr>
+<tr class="cobreak"><td>13:05-14:05</td><td>LUNCH</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>14:05-14:45</td><td></td><td rowspan="2"><TMPL_VAR talk_6></td><td><TMPL_VAR talk_55></td><td rowspan="2"><TMPL_VAR talk_51></td></tr>
+<tr class="lecture"><td>14:45-15:05</td><td></td><td><TMPL_VAR talk_37></td></tr>
+<tr class="cobreak"><td>15:05-15:10</td><td></td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>15:10-15:50</td><td></td><td><TMPL_VAR talk_57></td><td><TMPL_VAR talk_65></td><td><TMPL_VAR talk_45></td></tr>
+<tr class="cobreak"><td>15:50-16:20</td><td>BREAK</td><td></td><td></td><td></td></tr>
+<tr class="lecture"><td>16:20-17:50</td><td></td><td><TMPL_VAR talk_28></td><td><TMPL_VAR talk_14></td><td><TMPL_VAR talk_10></td></tr>
+<tr class="lecture"><td>17:20-17:40</td><td></td><td>Closing (Gabor Szabo)</td><td></td><td></td></tr>
+<tr class="lecture"><td>17:40-19:00</td><td></td><td>AUCTION</td><td></td><td></td></tr>
+</table>
+
+
+<a name="light"></a>
+<h2>Lightening talks</h2>
+<table border="1">
+<tr><td><TMPL_VAR talk_5></td></tr>
+<tr><td><TMPL_VAR talk_12></td></tr>
+<tr><td><TMPL_VAR talk_68></td></tr>
+<tr><td><TMPL_VAR talk_52></td></tr>
+<tr><td><TMPL_VAR talk_38></td></tr>
+<!--<tr><td><TMPL_VAR talk_></td></tr>-->
+</table>
+
+<p>
+The organizers keep the right to change the schedule before and during the 
+conference including removing talks.
+</p>
+
+<!--
 <p>This is a preliminary outline of the schedule
 </p>
 
@@ -48,6 +131,7 @@
   <li><a href="presentations.html?cat=other">Other</a>
 </ul>
 </p>
+-->
 
 
 <TMPL_INCLUDE NAME="footer.tmpl">



More information about the Yapcom-commit mailing list