Super duper modifications

updated template system
updated XML template
updated HTML template
masturbated

Changelog

@@ -1,3 +1,7 @@
+11-04-04
+	* changed the template system
+	* updated the html and xml template
+
 11-01-04
 	* added support for templates
 	* added xml template

kwotes-lib.pl

@@ -3,6 +3,22 @@
 # we use DBI, for it's sexy body
 use DBI;
 
+# template variables
+$HEADER			= "header";
+$FOOTER			= "footer";
+$CONTENT_DEFAULT	= "default-content";
+$CONTENT_ADD		= "add-kwote";
+$CONTENT_SEARCH		= "search";
+$BEFORE_LIST		= "before-list";
+$AFTER_LIST		= "after-list";
+$NAVIGATION		= "navigation";
+$NAVIGATION_NO_BACK	= "navigation-no-back";
+$NAVIGATION_NO_FORWARD	= "navigation-no-forward";
+$KWOTE_ODD		= "kwote-odd";
+$KWOTE_EVEN		= "kwote-even";
+$CONTENT_ERROR		= "error";
+$HTTP_HEADERS		= "http-headers";
+
 # database connection
 my $GLOBAL_DBH = undef;
 
@@ -326,13 +342,18 @@ sub xml_escape {
 }
 
 ##
-# Sends the HTML header
+# Returns the appropriate http headers based
-sub send_html_header {
+# on the template
-	print STDOUT "Content-type: text/html\n\n";
+sub get_template_headers {
+	my ($template) = @_;
+	open(IN, "templates/$template/$HTTP_HEADERS");
+	my $data = join("",<IN>);
+	close(IN);
+	return $data;
 }
 
 ##
-# Renders an HTML template
+# Wraps an HTML template
 sub wrap_template {
 	my ($template, $template_file, %vars) = @_;
 	open(IN,"templates/$template/$template_file");

kwotes.pl

@@ -45,13 +45,13 @@ $vars{TAG_LINE} = get_tagline();
 $vars{TEMPLATE_DIR} = "templates/$template";
 
 # send header
-send_html_header();
+print get_template_headers($template)."\n\n";
 
 ############
 # action: add (show add form)
 if ($action eq "add") {
 	$vars{TITLE} = "Add Kwote";
-	$main_content = wrap_template($template, "content-addform.html", %vars);
+	$main_content = wrap_template($template, $CONTENT_ADD, %vars);
 
 ############
 # action: doadd (add the kwote to the db)
@@ -60,7 +60,7 @@ if ($action eq "add") {
 	if ($FORM{"content"} eq "") {
 		$vars{TITLE} = "An Error Occured";
 		$vars{ERROR_MESSAGE} = "No text entered";
-		$main_content = wrap_template($template, "content-error.html",%vars);
+		$main_content = wrap_template($template, $CONTENT_ERROR, %vars);
 
 	} else {
 
@@ -72,13 +72,13 @@ if ($action eq "add") {
 		if (!defined($kid)) {
 			$vars{TITLE} = "An Error Occured";
 			$vars{ERROR_MESSAGE} = "Couldn't add kwote";
-			$main_content = wrap_template($template, "content-error.html",%vars);
+			$main_content = wrap_template($template, $CONTENT_ERROR, %vars);
 	
 		# all was good
 		} else {
 			$vars{TITLE} = "Kwote Added";
 			$vars{KWOTE_ID} = $kid;
-			$main_content = wrap_template($template, "content-addform-thanks.html", %vars);
+			$main_content = wrap_template($template, $CONTENT_ADD_THANKS, %vars);
 
 		}
 	}
@@ -95,7 +95,7 @@ if ($action eq "add") {
 	if (!defined($kwote)) {
 		$vars{TITLE} = "Kwote Does Not Exist";
 		$vars{ERROR_MESSAGE} = "That kwote does not exist";
-		$main_content = wrap_template($template, "content-error.html",%vars);
+		$main_content = wrap_template($template, $CONTENT_ERROR, %vars);
 
 	# all was good
 	} else {
@@ -105,7 +105,7 @@ if ($action eq "add") {
 		$vars{KWOTE_TEXT_XML}	= xml_escape($kwote->{'content'});
 		$vars{KWOTE_TEXT_PLAIN}	= $kwote->{'content'};
 		$vars{KWOTE_RATING}	= $kwote->{'rating'};
-		$main_content		= wrap_template($template, "content-show-kwote.html", %vars);
+		$main_content		= wrap_template($template, $KWOTE_EVEN, %vars);
 
 	}
 
@@ -172,35 +172,42 @@ if ($action eq "add") {
 	# forward, no back
 	if ($FORM{"o"} ne "random" && $start_index<=0 && @rows>=$max_returned 
 		&& ($start_index+$max_returned)<$max_records) {
-		$navigation_template = "content-list-navigate-no-back.html";
+		$navigation_template = $NAVIGATION_NO_BACK;
 	
 	# forward and back
 	} elsif ($FORM{"o"} ne "random" && $start_index>0 && @rows>=$max_returned 
 		&& ($start_index+$max_returned)<$max_records ) {
-		$navigation_template = "content-list-navigate.html";
+		$navigation_template = $NAVIGATION;
 	
 	# back only
 	} elsif ($FORM{"o"} ne "random" && $start_index>0 && @rows<$max_returned) {
-		$navigation_template = "content-list-navigate-no-forward.html";
+		$navigation_template = $NAVIGATION_NO_FORWARD;
 	}
 
 	# wrap the navigation template
 	$main_content .= wrap_template($template, $navigation_template, %vars);
 
+	# wrap up the "before list" template
+	$main_content .= wrap_template($template, $BEFORE_LIST, %vars);
+
 	# loop through the results
 	if (defined(@rows)) {
 		for (my $i=0; $i<@rows && ($i+$start_index)<$max_records; $i++) {
 			my $row = $rows[$i];
+			my $kwote_template = (($i % 2) != 0) ? $KWOTE_ODD : $KWOTE_EVEN;
 			$vars{KWOTE_ID}		= $row->{'id'};	
 			$vars{KWOTE_TEXT_HTML}	= html_escape($row->{'content'});
 			$vars{KWOTE_TEXT_XML}	= xml_escape($row->{'content'});
 			$vars{KWOTE_TEXT_PLAIN}	= $row->{'content'};
 			$vars{KWOTE_RATING}	= $row->{'rating'};
-			$main_content		.= wrap_template($template, "content-show-kwote.html", %vars);
+			$main_content		.= wrap_template($template, $kwote_template, %vars);
 		}
 		
 	}
 
+	# wrap up the "after list" template
+	$main_content .= wrap_template($template, $AFTER_LIST, %vars);
+
 	 # wrap the navigation template
 	$main_content .= wrap_template($template, $navigation_template, %vars);
 
@@ -208,7 +215,7 @@ if ($action eq "add") {
 # action: search (show the search page)
 } elsif ($action eq "search") {
 	$vars{TITLE} = "Search";
-	$main_content = wrap_template($template, "content-search.html", %vars);
+	$main_content = wrap_template($template, $CONTENT_SEARCH, %vars);
 
 ##########
 # action: love
@@ -228,11 +235,11 @@ if ($action eq "add") {
 # show the homepage
 } else {
 	$vars{TITLE} = "The Better kwote Database";
-	$main_content = wrap_template($template, "content-default.html", %vars);
+	$main_content = wrap_template($template, $CONTENT_DEFAULT, %vars);
-		
+	
 }
 
 # finish the HTML
-render_template($template, "header.html", %vars);
+render_template($template, $HEADER, %vars);
 print STDOUT $main_content;
-render_template($template, "footer.html", %vars);
+render_template($template, $FOOTER, %vars);

templates/default/http-headers

@@ -0,0 +1,2 @@
+Content-Type: text/html
+

templates/default/kwote-even

@@ -0,0 +1,16 @@
+		<div class="kwote-even">
+			<span class="kwote-id"><a href="?action=show&amp;id=${KWOTE_ID}">#${KWOTE_ID}</a></span>
+			<span class="vote-controls">
+				<a	href="?action=hate&amp;kid=${KWOTE_ID}"
+					onclick="vote(${KWOTE_ID},'hate'); return false;"
+					id="hate${KWOTE_ID}">-</a>
+				<span id="rating${KWOTE_ID}">${KWOTE_RATING}</span>
+				<a	href="?action=love&amp;kid=${KWOTE_ID}"
+					onclick="vote(${KWOTE_ID},'love'); return false"
+					id="love${KWOTE_ID}">+</a>
+			</span>
+			
+			<div class="kwote-content">
+				${KWOTE_TEXT_HTML}
+			</div>
+		</div>

templates/default/kwote-odd

@@ -1,4 +1,4 @@
-		<div class="kwote">
+		<div class="kwote-odd">
 			<span class="kwote-id"><a href="?action=show&amp;id=${KWOTE_ID}">#${KWOTE_ID}</a></span>
 			<span class="vote-controls">
 				<a	href="?action=hate&amp;kid=${KWOTE_ID}"

templates/default/kwotes.css

@@ -62,12 +62,19 @@ a img
 }
 
 /* Kwotes */
-.kwote
+.kwote-odd
 {
 	position: relative;
 	margin-bottom: 10px;
 }
 
+.kwote-even
+{
+	position: relative;
+	margin-bottom: 10px;
+	background-color: #e9e9e9;
+}
+
 .kwote-id
 {
 	float: left;

templates/xml/add-kwote

@@ -0,0 +1,5 @@
+	<message>
+		There isn't an add kwote page for the xml 
+		template because it is intended to be used 
+		by non human processes
+	</message>

templates/xml/add-kwote-thanks

@@ -0,0 +1,2 @@
+
+	<kwote-added id="${KWOTE_ID}" />

templates/xml/after-list

@@ -0,0 +1,2 @@
+
+	</kwotes>

templates/xml/before-list

@@ -0,0 +1,2 @@
+	<kwotes>
+

templates/xml/content-addform-thanks.html

@@ -1 +0,0 @@
-<kwote-added id="${KWOTE_ID" />

templates/xml/content-error.html

@@ -1,3 +0,0 @@
-
-<error>${ERROR_MESSAGE}</error>
-

templates/xml/content-show-kwote.html

@@ -1,3 +0,0 @@
-	<kwote id="${KWOTE_ID}" rating="${KWOTE_RATING}">
-		${KWOTE_TEXT_XML}
-	</kwote>

templates/xml/default-content

@@ -0,0 +1,4 @@
+	<message>
+		The XML template doesn't have a default content
+	</message>
+

templates/xml/error

@@ -0,0 +1,4 @@
+	<message>
+		${ERROR_MESSAGE}
+	</message>
+

templates/xml/footer

@@ -1,5 +1,3 @@
 
-
 </kwotes.org>
 
-

templates/xml/header

@@ -2,8 +2,9 @@
 	
 	<site>
 		<name>${SITE_NAME}</name>
-		<tag-line>${TAG_LINE}</tag-line>
+		<tagline>${TAG_LINE}</tagline>
 		<kwote-count>${KWOTE_COUNT}</kwote-count>
 		<deleted-kwote-count>${KWOTE_BACKUP_COUNT}</deleted-kwote-count>
 	</site>
-
+	
+	

templates/xml/http-headers

@@ -0,0 +1,2 @@
+Content-type: text/xml
+

templates/xml/kwote-even

@@ -0,0 +1,2 @@
+
+		<kwote id="${KWOTE_ID}"><![CDATA[${KWOTE_TEXT_XML}]]></kwote>

templates/xml/kwote-odd

@@ -0,0 +1 @@
+		<kwote id="${KWOTE_ID}"><![CDATA[${KWOTE_TEXT_XML}]]></kwote>

templates/xml/search

@@ -0,0 +1,4 @@
+	<message>
+		There is no search form for the xml template
+	</message>
+