[prev] [thread] [next] [lurker] [Date index for 2003/12/4]
Author: jon
Date: 2003-12-04 16:35:33 +0200 (Thu, 04 Dec 2003)
New Revision: 109
Added:
yapcom/trunk/cgi/2004
Removed:
yapcom/trunk/cgi/yapc.pl
Modified:
yapcom/trunk/README
yapcom/trunk/db/config.sample
yapcom/trunk/lib/YAPC/Config.pm
yapcom/trunk/lib/YAPC/Organizer.pm
yapcom/trunk/templates/header.tmpl
yapcom/trunk/templates/navigation.tmpl
Log:
more paths and config params for previous change
Modified: yapcom/trunk/README
===================================================================
--- yapcom/trunk/README 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/README 2003-12-04 14:35:33 UTC (rev 109)
@@ -12,8 +12,8 @@
- perl Makefile.PL
- check the path of perl in cgi/yapc.pl, and t/*.t
- change the file db/config (sample is provided). Change at least
-CGI_PATH, SITE_DIR, SITE_EMAIL, and SITE_ADMIN. Each line in the config
-file MUST be:
+CGI_PATH, FILES_PATH, HTML_PATH, DOCS_PATH, SITE_DIR, SITE_EMAIL, and
+SITE_ADMIN. Each line in the config file MUST be:
KEY = VAL
@@ -24,6 +24,9 @@
stripped. Valid KEY's (and defaults) are:
CGI_PATH (/YAPC/2004)
+ FILES_PATH (/YAPC_files)
+ HTML_PATH (/YAPC_html)
+ DOCS_PATH (/YAPC_docs)
SITE_DIR (/home/gabor/projects/perl/perl.org.il/YAPC/dev)
SITE_EMAIL (yapc@xxxx.xxx.xx)
SITE_ADMIN (gabor@xxx.xx.xx) * multiple
Added: yapcom/trunk/cgi/2004
===================================================================
--- yapcom/trunk/cgi/2004 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/cgi/2004 2003-12-04 14:35:33 UTC (rev 109)
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+# -d:ptkdb
+# -T
+# -d:ptkdb
+sub BEGIN {
+ $ENV{'DISPLAY'} = "localhost:0.0";
+}
+
+use FindBin;
+
+use warnings;
+use strict;
+use lib ("$FindBin::Bin/../lib");
+use YAPC::Organizer;
+
+my $webapp = YAPC::Organizer->new();
+$webapp->run();
+
Property changes on: yapcom/trunk/cgi/2004
___________________________________________________________________
Name: svn:executable
+ *
Deleted: yapcom/trunk/cgi/yapc.pl
===================================================================
--- yapcom/trunk/cgi/yapc.pl 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/cgi/yapc.pl 2003-12-04 14:35:33 UTC (rev 109)
@@ -1,18 +0,0 @@
-#!/usr/bin/perl
-# -d:ptkdb
-# -T
-# -d:ptkdb
-sub BEGIN {
- $ENV{'DISPLAY'} = "localhost:0.0";
-}
-
-use FindBin;
-
-use warnings;
-use strict;
-use lib ("$FindBin::Bin/../lib");
-use YAPC::Organizer;
-
-my $webapp = YAPC::Organizer->new();
-$webapp->run();
-
Modified: yapcom/trunk/db/config.sample
===================================================================
--- yapcom/trunk/db/config.sample 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/db/config.sample 2003-12-04 14:35:33 UTC (rev 109)
@@ -1,4 +1,7 @@
CGI_PATH = /jon/2004
+FILES_PATH = /jonfiles
+HTML_PATH = /jonhtml
+DOCS_PATH = /jondocs
SITE_DIR = /home/jon/Yapcom/yapcom/trunk
SITE_EMAIL = jon@xxxxxx.xx.xx
SITE_ADMINS = jon@xxxxxx.xx.xx
Modified: yapcom/trunk/lib/YAPC/Config.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Config.pm 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/lib/YAPC/Config.pm 2003-12-04 14:35:33 UTC (rev 109)
@@ -3,7 +3,7 @@
use strict;
use warnings;
our (@STORAGE, $dir, $db_dir, $db_file, $TIMEOUT, $templates_dir, $email_address, $cgi_path);
-our (@proposal_languages, @proposal_lengths, @admins);
+our (@proposal_languages, @proposal_lengths, @admins, $docs_path, $html_path, $files_path);
my %config;
if (open CONFIG, "$FindBin::Bin/../db/config") {
@@ -15,6 +15,9 @@
$dir = $config{'SITE_DIR'} || "/home/gabor/projects/perl/perl.org.il/YAPC/dev";
$email_address = $config{'SITE_EMAIL'} || 'yapc@xxxx.xxx.xx';
$cgi_path = $config{'CGI_PATH'} || '/YAPC/2004';
+$files_path = $config{'FILES_PATH'} || '/YAPC_files';
+$html_path = $config{'HTML_PATH'} || '/YAPC_html';
+$docs_path = $config{'DOCS_PATH'} || '/YAPC_docs';
# list of e-mail address of administrators whom will have extra rights
@admins = ($config{'SITE_ADMINS'}) ? split /[\s,]+/, $config{'SITE_ADMINS'} : qw(gabor@xxx.xx.xx);
Modified: yapcom/trunk/lib/YAPC/Organizer.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Organizer.pm 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/lib/YAPC/Organizer.pm 2003-12-04 14:35:33 UTC (rev 109)
@@ -16,6 +16,9 @@
my $templates_dir = $YAPC::Config::templates_dir;
my $cgi_path = $YAPC::Config::cgi_path;
+my $files_path = $YAPC::Config::files_path;
+my $html_path = $YAPC::Config::html_path;
+my $docs_path = $YAPC::Config::docs_path;
use base 'CGI::Application';
use Data::Dumper; # for playing with debugging
@@ -311,6 +314,9 @@
}
};
$h{'cgi_path'} = $cgi_path;
+ $h{'files_path'} = $files_path;
+ $h{'html_path'} = $html_path;
+ $h{'docs_path'} = $docs_path;
# eval, because sub dies if template doesn't exists
my $t;
Modified: yapcom/trunk/templates/header.tmpl
===================================================================
--- yapcom/trunk/templates/header.tmpl 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/templates/header.tmpl 2003-12-04 14:35:33 UTC (rev 109)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">;
-<?xml-stylesheet href="/jonfiles/style.css" type="text/css"?>
+<?xml-stylesheet href="<TMPL_VAR NAME="files_path">/style.css" type="text/css"?>
<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <link rel="stylesheet" href="/jonfiles/style.css" type="text/css" />
+ <link rel="stylesheet" href="<TMPL_VAR NAME="files_path">/style.css" type="text/css" />
<meta name="Keywords" content="YAPC, Perl, perl , Conference ,conference, Israel, 2004" />
<meta name="Description" content="YAPC::Israel::2004 Homepage" />
<title>Jon YAPC::Israel::2004 - <TMPL_VAR NAME="title"></title>
Modified: yapcom/trunk/templates/navigation.tmpl
===================================================================
--- yapcom/trunk/templates/navigation.tmpl 2003-12-04 14:21:09 UTC (rev 108)
+++ yapcom/trunk/templates/navigation.tmpl 2003-12-04 14:35:33 UTC (rev 109)
@@ -1,4 +1,4 @@
- <a href="<TMPL_VAR NAME="cgi_path">/index.html"><img src="/jonfiles/yapsi.gif" alt="YAPC::Israel::2004 logo" /></a><br />
+ <a href="<TMPL_VAR NAME="cgi_path">/index.html"><img src="<TMPL_VAR NAME="files_path">/yapsi.gif" alt="YAPC::Israel::2004 logo" /></a><br />
<TMPL_IF NAME="index"><b>Home</b><TMPL_ELSE><a href="<TMPL_VAR NAME="cgi_path">/index.html">Home</a></TMPL_IF><br />
<TMPL_IF NAME="milestones"><b>Milestones</b><TMPL_ELSE><a href="<TMPL_VAR NAME="cgi_path">/milestones.html">Milestones</a></TMPL_IF><br />
<TMPL_IF NAME="news"><b>Old News</b><TMPL_ELSE><a href="<TMPL_VAR NAME="cgi_path">/news.html">Old News</a></TMPL_IF><br />
@@ -7,11 +7,11 @@
<TMPL_IF NAME="list_people"> <b>List participants</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="cgi_path">/list_people.html">List participants</a></TMPL_IF><br />
<TMPL_IF NAME="login"> <b>Personal information</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="cgi_path">/login.html">Personal information</a></TMPL_IF><br />
Call for Participation<br />
- <TMPL_IF NAME="cfpenglish"> <b>English</b><TMPL_ELSE> <a href="/jonhtml/announcement.html">English</a></TMPL_IF><br />
- <TMPL_IF NAME="cfphebrew"> <b>Hebrew</b><TMPL_ELSE> <a href="/jonhtml/announcement-il.html">Hebrew</a></TMPL_IF><br />
+ <TMPL_IF NAME="cfpenglish"> <b>English</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="html_path">/announcement.html">English</a></TMPL_IF><br />
+ <TMPL_IF NAME="cfphebrew"> <b>Hebrew</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="html_path">/announcement-il.html">Hebrew</a></TMPL_IF><br />
Call for Papers<br />
- <TMPL_IF NAME="callfphebrew"> <b>Hebrew (.doc)</b><TMPL_ELSE> <a href="/jondocs/announcement_call_for_papers_hebrew.doc">Hebrew (.doc)</a></TMPL_IF><br />
- <TMPL_IF NAME="callfpenglish"> <b>English (.doc)</b><TMPL_ELSE> <a href="/jondocs/announcement_call_for_papers_english.doc">English (.doc)</a></TMPL_IF><br />
+ <TMPL_IF NAME="callfphebrew"> <b>Hebrew (.doc)</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="docs_path">/announcement_call_for_papers_hebrew.doc">Hebrew (.doc)</a></TMPL_IF><br />
+ <TMPL_IF NAME="callfpenglish"> <b>English (.doc)</b><TMPL_ELSE> <a href="<TMPL_VAR NAME="docs_path">/announcement_call_for_papers_english.doc">English (.doc)</a></TMPL_IF><br />
<TMPL_IF NAME="speakers"><b>Speakers</b><TMPL_ELSE><a href="<TMPL_VAR NAME="cgi_path">/speakers.html">Speakers</a></TMPL_IF><br />
<TMPL_IF NAME="presentations"><b>Presentations</b><TMPL_ELSE><a href="<TMPL_VAR NAME="cgi_path">/presentations.html">Presentations</a></TMPL_IF><br />
Slides<br />
Generated at 17:15 on 04 Dec 2003 by mariachi 0.51