[Yapcom-commit] rev 291 - in yapcom/trunk: . osdc_israel_2006
templates
svn at pti.co.il
svn at pti.co.il
Sun Jan 29 00:20:22 IST 2006
Author: gabor
Date: 2006-01-29 00:20:20 +0200 (Sun, 29 Jan 2006)
New Revision: 291
Modified:
yapcom/trunk/
yapcom/trunk/osdc_israel_2006/accessibility.tmpl
yapcom/trunk/osdc_israel_2006/banners.tmpl
yapcom/trunk/osdc_israel_2006/index.tmpl
yapcom/trunk/osdc_israel_2006/location.tmpl
yapcom/trunk/osdc_israel_2006/navigation.tmpl
yapcom/trunk/osdc_israel_2006/payment.tmpl
yapcom/trunk/osdc_israel_2006/why_attend.tmpl
yapcom/trunk/templates/registration.tmpl
Log:
fxing some test - patch by Amit Bendov
Property changes on: yapcom/trunk
___________________________________________________________________
Name: svk:merge
- 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:9800
+ 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:9801
Modified: yapcom/trunk/osdc_israel_2006/accessibility.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/accessibility.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/accessibility.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -4,14 +4,13 @@
On this conference we will try to provide facilities for people with disabilities.
The level of our support will depend on the number of people interested in it
and the availability of financing. <br />
-For the first part, if you would like to attend the conference and you have
+If you would like to attend the conference and you have
some disability that would normally keep you away, please contact
<a href="mailto:w1 at zak.co.il">Omer Zak</a>, the person responsible for
accessibility and discuss with him your needs. Later we will try to figure
out if we can fulfill those needs.
<br />
-Regarding the financing part, if you know organization that would be ready
-to help us finance the costs of this support, please let them contact
+If you know any organization that would be willing to help us finance the costs of this support, please let them contact
<a href="mailto:w1 at zak.co.il">Omer Zak</a>.
</p>
<TMPL_INCLUDE NAME="footer.tmpl">
Modified: yapcom/trunk/osdc_israel_2006/banners.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/banners.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/banners.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -8,7 +8,7 @@
<p>
<img src="html/front.png" /><br />
-by Amir Bendov
+by Amit Bendov
</p>
<hr />
Modified: yapcom/trunk/osdc_israel_2006/index.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/index.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/index.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -52,7 +52,6 @@
<tr><td>Location:</td><td><a href="http://www.netanya.ac.il/">Netanya Academic College</a></td></tr>
<tr><td>Price:</td><td>between 140-650 NIS (see details on the <a href="payment.html">participation fee and payment</a> page)</td></tr>
<tr><td>Registration:</td><td><a href="registration.html">registration is now open</a><br /></td></tr>
- <tr><td>Talks:</td><td>After <a href="registration.html">registration</a> submit your <a href="proposal.html">talk proposal</a><br /></td></tr>
</table>
<p></p>
@@ -61,7 +60,7 @@
<tr><td>
The conference has two mailing lists.
<br />
- Subscirbe to <a href="http://osdc.org.il/mailman/listinfo/osdc-news">OSDC Israel News list</a> to receive our announcements.
+ 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
Modified: yapcom/trunk/osdc_israel_2006/location.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/location.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/location.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -3,36 +3,49 @@
<p class="pageentry">Location</p>
<p>
- The Conference will be held in <a href="http://www.netanya.ac.il/">Netanya Academic College</a><br />
+The Conference will be held at the <a href="http://www.netanya.ac.il/">Netanya Academic College</a>.
+1 HaUniversita Street, Netanya.<br />
+For a printable map <a href="http://www.netanya.ac.il/pics/NAC_roadmap.pdf"> click here </a>
</p>
<p class="pageentry">Transportation</p>
<p class="pagesubentry">Train</p>
<p>
+The Netanya Academic College is only a short taxi ride from the
+<a href="http://www.israrail.org.il/">Netanya train station</a>.
</p>
+<!--
<p class="pagesubentry">Bus</p>
<p>
</p>
+-->
<p class="pagesubentry">Car</p>
<p>
-There is a huge and free parking slot in front of the campus.
+There is a huge and free parking slot in front of the campus that costs 10 NIS/day.
+In a few hundred meters distance there is plenty of free parking.
</p>
+<!--
<p class="pagesubentry">Flights</p>
<p>
</p>
+-->
<p class="pageentry">Accommodation</p>
<p>
-If you need accommodation, please contact the organizers so we can either help you directly
-or update this page with some more details.
+If you need help with accommodation, please contact the organizers so we can either help you directly
+or update this page with some more details. You might also want to ask directly on the
+<a href="http://osdc.org.il/mailman/listinfo/osdc-discuss">OSDC Israel Discussion list</a>.
+
</p>
+<!--
<p class="pageentry">General info</p>
<p>
</p>
+-->
<TMPL_INCLUDE NAME="footer.tmpl">
Modified: yapcom/trunk/osdc_israel_2006/navigation.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/navigation.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/navigation.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -1,16 +1,11 @@
<!--<a href="index.html"><img src="html/yapcom.gif" alt="Conference logo" /></a><br />-->
<TMPL_IF NAME="index"><b>Home</b><TMPL_ELSE><a href="index.html">Home</a></TMPL_IF><br />
<TMPL_IF NAME="why_attend"><b>Why Attend?</b><TMPL_ELSE><a href="why_attend.html">Why Attend?</a></TMPL_IF><br />
- <TMPL_IF NAME="milestones"><b>Milestones</b><TMPL_ELSE><a href="milestones.html">Milestones</a></TMPL_IF><br />
- <TMPL_IF NAME="news"><b>Old News</b><TMPL_ELSE><a href="news.html">Old News</a></TMPL_IF><br />
- <TMPL_IF NAME="pr"><b>PR</b><TMPL_ELSE><a href="pr.html">PR</a></TMPL_IF><br />
Participants<br />
- <TMPL_IF NAME="registration"> <b>Registration</b><TMPL_ELSE> <a href="registration.html">Registration</a></TMPL_IF><br />
- <TMPL_IF NAME="payment"> <b>Payment</b><TMPL_ELSE> <a href="payment.html">Payment</a></TMPL_IF><br />
+ <TMPL_IF NAME="registration"> <b>REGISTER</b><TMPL_ELSE> <a href="registration.html">REGISTER</a></TMPL_IF><br />
+ <TMPL_IF NAME="payment"> <b>PAY</b><TMPL_ELSE> <a href="payment.html">PAY</a></TMPL_IF><br />
<TMPL_IF NAME="list_people"> <b>List participants</b><TMPL_ELSE> <a href="list_people.html">List participants</a></TMPL_IF><br />
<TMPL_IF NAME="login"> <b>Login</b><TMPL_ELSE> <a href="login.html">Login</a></TMPL_IF><br />
- <TMPL_IF NAME="proposals"> <b>Submit a proposal</b><TMPL_ELSE> <a href="proposal.html">Submit a proposal</a></TMPL_IF><br />
- <TMPL_IF NAME="cfpenglish"> <b>English</b><TMPL_ELSE> <a href="call_for_paper.html">Call for Papers</a></TMPL_IF><br />
<TMPL_IF NAME="speakers"><b>Speakers</b><TMPL_ELSE><a href="speakers.html">Speakers</a></TMPL_IF><br />
<TMPL_IF NAME="presentations"><b>Presentations</b><TMPL_ELSE><a href="presentations.html">Presentations</a></TMPL_IF><br />
<!--
@@ -27,7 +22,15 @@
<TMPL_IF NAME="accessibility"><b>Accessibility</b><TMPL_ELSE><a href="accessibility.html">Accessibility</a></TMPL_IF><br />
<TMPL_IF NAME="sponsors"><b>Sponsors</b><TMPL_ELSE><a href="sponsors.html">Sponsors</a></TMPL_IF><br />
<TMPL_IF NAME="location"><b>Location</b><TMPL_ELSE><a href="location.html">Location</a></TMPL_IF><br />
+ <TMPL_IF NAME="banners"><b>Spread the word</b><TMPL_ELSE><a href="banners.html">Spread the word</a></TMPL_IF><br />
+ <hr class="partruler" />
+ <small> Using <a href="http://yapcom.pti.co.il/">yapcom</a> v<TMPL_VAR NAME="VERSION"> </small>
+<!--
+ <TMPL_IF NAME="milestones"><b>Milestones</b><TMPL_ELSE><a href="milestones.html">Milestones</a></TMPL_IF><br />
+ <TMPL_IF NAME="news"><b>Old News</b><TMPL_ELSE><a href="news.html">Old News</a></TMPL_IF><br />
+ <TMPL_IF NAME="pr"><b>PR</b><TMPL_ELSE><a href="pr.html">PR</a></TMPL_IF><br />
+ <TMPL_IF NAME="proposals"> <b>Submit a proposal</b><TMPL_ELSE> <a href="proposal.html">Submit a proposal</a></TMPL_IF><br />
+ <TMPL_IF NAME="cfpenglish"> <b>English</b><TMPL_ELSE> <a href="call_for_paper.html">Call for Papers</a></TMPL_IF><br />
<TMPL_IF NAME="other_conferences"><b>Other YAPCs</b><TMPL_ELSE><a href="other_conferences.html">Other Conferences</a></TMPL_IF><br />
- <TMPL_IF NAME="banners"><b>Banners</b><TMPL_ELSE><a href="banners.html">Banners</a></TMPL_IF><br />
- <hr class="partruler" />
- Using <a href="http://yapcom.pti.co.il/">yapcom</a> v<TMPL_VAR NAME="VERSION">
+-->
+
Modified: yapcom/trunk/osdc_israel_2006/payment.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/payment.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/payment.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -1,19 +1,16 @@
<TMPL_VALUE NAME="title" VALUE="Cost and Payment">
<TMPL_INCLUDE NAME="header.tmpl">
-<h1>Prices were reduced, check the new prices</h1>
+<h1>News: per popular request, we are now offering a one-day pass</h1>
<p>
<u>The full prices is 650 NIS/person.</u>
</p>
<p>
-We would like to encourage students, emplyees of non-profit organizations
-and other individual people to join the conference.
-As they probably won't get tax return on this fee and probably cannot
-afford the full price we give discount to them.
+We encourage students, non-profit, and other individuals to join the conference by offering a special price.
</p>
<table border="1">
<tr><td></td><td>Company paid</td><td>Privately paid</td></tr>
-<tr><td>Full fee:</td><td>650 NIS</td><td>290 NIS</td></tr>
-<tr><td>One-day pass discounted fee:</td><td>450 NIS</td><td>190 NIS</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>
Modified: yapcom/trunk/osdc_israel_2006/why_attend.tmpl
===================================================================
--- yapcom/trunk/osdc_israel_2006/why_attend.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/osdc_israel_2006/why_attend.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -5,8 +5,8 @@
<h2>Developers</h2>
<h3>Sharpen your pencil</h3>
-<p>In his book <cite>The Pragmatic Programmer</cite> development guru
-Dave Thomas recommends that you learn a new programming language once a year.
+<p>In his book <cite>The Pragmatic Programmer,</cite> development guru
+Dave Thomas recommends that you learn a new programming language every year.
Even if you don't use them, it'll make you a better programmer.
At OSDC, you'll be introduced not to one, but to several of the trendiest languages.</p>
<p>
Modified: yapcom/trunk/templates/registration.tmpl
===================================================================
--- yapcom/trunk/templates/registration.tmpl 2006-01-28 22:20:09 UTC (rev 290)
+++ yapcom/trunk/templates/registration.tmpl 2006-01-28 22:20:20 UTC (rev 291)
@@ -25,20 +25,17 @@
<tr><td>Mongers Group:</td><td><input size="40" name="mongers" value="<TMPL_VAR NAME="mongers">" /></td></tr>
-->
<tr><td>Bio:</td><td><textarea cols="60" rows="6" name="bio"><TMPL_VAR NAME="bio"></textarea></td></tr>
-<tr><td align="right"></td><td><input type="checkbox" name="hide" <TMPL_IF NAME="hide">checked="checked"</TMPL_IF> /> (Check here to hide from the list of registered users)</td></tr>
+<tr><td align="right"></td><td><input type="checkbox" name="hide" <TMPL_IF NAME="hide">checked="checked"</TMPL_IF> /> (Check here if you do NOT want to be publicly listed as registered users)</td></tr>
<tr><td> </td><td><input type="submit" name="submitbtn" value="Register" /></td></tr>
</table>
</form>
<p>
-Privacy Policy: We do our best to protect your information.
-Form the information you supply at the registration the following items will be shown
-on the website: <b>first and last name, home page, Bio</b>. you can hide even this by selecting the <b>hidden</b>
-field. On the name tags you get when you come to the confernce we display your name and company.
+Privacy Policy: We are doing our best to protect your information.
+Only the following items will be shown on the website: <b>first and last name, home page, Bio</b>.
+Check the <b>hidden</b> box, and you will not be listed at all.
+The name tags we will provide at the conference will have your name and company.
</p>
<p>
-The rest of the information is for our use. We will probably contact you several times via e-mail and maybe even
-via phone to find out if you are coming to the conference and if you are interested in receiving updates on other
-Open Source related events.
+The rest of the information is ONLY for internal use. We may contact you to find out if you are coming to the conference and if you are interested in receiving updates on other Open Source related events.
</p>
<TMPL_INCLUDE NAME="footer.tmpl">
-
More information about the Yapcom-commit
mailing list