[Yapcom-commit] rev 296 - in yapcom/trunk: . osdc_israel_2006

[svn at pti.co.il]

Author: gabor
Date: 2006-01-31 21:59:06 +0200 (Tue, 31 Jan 2006)
New Revision: 296

Added:
   yapcom/trunk/osdc_israel_2006/mailinglists.tmpl
Modified:
   yapcom/trunk/
   yapcom/trunk/osdc_israel_2006/payment.tmpl
   yapcom/trunk/osdc_israel_2006/schedule.tmpl
Log:
fix typo, add page regarding mailinglists, 
enable HaMakor and ISOC discount for the rest of the payments.




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

Added: yapcom/trunk/osdc_israel_2006/mailinglists.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/mailinglists.tmpl	2006-01-31 08:43:31 UTC (rev 295)
+++ yapcom/trunk/osdc_israel_2006/mailinglists.tmpl	2006-01-31 19:59:06 UTC (rev 296)
@@ -0,0 +1,16 @@
+<TMPL_VALUE NAME="title" VALUE="Mailing lists of OSDC Israel">
+<TMPL_INCLUDE NAME="header.tmpl">
+
+<table>
+   <tr><td>
+   The conference has two mailing lists.
+   <br />
+   Subscribe to <a href="http://osdc.org.il/mailman/listinfo/osdc-news">OSDC Israel News list</a> to receive our announcements. 
+   Even if you cannot attend this conference you should register not to miss the next one.<br />
+   <br />
+   Use the <a href="http://osdc.org.il/mailman/listinfo/osdc-discuss">OSDC Israel Discussion list</a> if you have any questions, want to arrange
+   transportation to and from the conference or want to find a place to stay during.<br />
+   </td></tr>
+</table>
+<TMPL_INCLUDE NAME="footer.tmpl">
+

Modified: yapcom/trunk/osdc_israel_2006/payment.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/payment.tmpl	2006-01-31 08:43:31 UTC (rev 295)
+++ yapcom/trunk/osdc_israel_2006/payment.tmpl	2006-01-31 19:59:06 UTC (rev 296)
@@ -11,11 +11,9 @@
 <tr><td></td><td>Company paid</td><td>Privately paid</td></tr>
 <tr><td>Regular (Three days):</td><td>650 NIS</td><td>290 NIS</td></tr>
 <tr><td>One-day only:</td><td>450 NIS</td><td>190 NIS</td></tr>
-<!--
-<tr><td>Early bird HaMakor members discounted fee:</td><td></td><td>140 NIS</td></tr>
-<tr><td>Early bird ISOC-IL members discounted fee:</td><td></td><td>140 NIS</td></tr>
-<tr><td>Early bird HaMakor and ISOC-IL members fee:</td><td></td><td>90 NIS</td></tr>
--->
+<tr><td>HaMakor members fee:</td><td></td><td>240 NIS</td></tr>
+<tr><td>ISOC-IL members fee:</td><td></td><td>240 NIS</td></tr>
+<tr><td>HaMakor and ISOC-IL members fee:</td><td></td><td>190 NIS</td></tr>
 </table>
 <ul>
 <!--

Modified: yapcom/trunk/osdc_israel_2006/schedule.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/schedule.tmpl	2006-01-31 08:43:31 UTC (rev 295)
+++ yapcom/trunk/osdc_israel_2006/schedule.tmpl	2006-01-31 19:59:06 UTC (rev 296)
@@ -28,7 +28,7 @@
 <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="lecture"><td>09:40-10:40</td><td></td><td><a href="#light">Lightning 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>
@@ -68,7 +68,7 @@
 
 
 <a name="light"></a>
-<h2>Lightening talks</h2>
+<h2>Lightning talks</h2>
 <table border="1">
 <tr><td><TMPL_VAR talk_5></td></tr>
 <tr><td><TMPL_VAR talk_12></td></tr>
@@ -100,7 +100,7 @@
   <ul>
    <li>Audrey "autrijus" Tang</li>
    <li>Separate tracks</li>
-   <li>16:00-17:00 Lightening talks</li>
+   <li>16:00-17:00 Lightning talks</li>
    <li>18:00-22:00 Conference Dinner</li>
   </ul>
  </li>