[php-blog-cvs] serendipity/templates/newspaper layout.php,1.4,1.5

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1:/tmp/cvs-serv5913/templates/newspaper

Modified Files:
	layout.php 
Log Message:
Random title is now moved out of there, both left- and rightsidebar are located on the left side.

if you think this confuses anyone, change it before the release.

apart from that, feel free to release. contact sterling or garvin to make a
release, i'm now going to berlin. have a nice weekend.


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- layout.php	12 Sep 2003 17:22:20 -0000	1.4
+++ layout.php	1 Oct 2003 15:31:03 -0000	1.5
@@ -28,10 +28,18 @@
 	<tr>
 		<td colspan="2" width="100%" class="serendipityBanner">
 			<div id="serendipity_banner">
-				<h1><?= htmlentities($serendipity['blogTitle']) ?></h1>
-			<h2><?php
-                                include("/www/apache/htdocs/diary.jannis.to/randomtitle.php");
-			?></h2>
+				<h1><?php echo htmlentities($serendipity['blogTitle']); ?></h1>
+			<h2>
+<?php
+$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
+if (strlen($sub)) {
+?>
+    <h2><?php echo $sub ?></h2>
+<?php
+}
+?>
+
+</h2>
 			</div>	
 		</td>
 	</tr>
@@ -45,6 +53,7 @@
 			
 			<?php
 				serendipity_plugin_api::generate_plugins('left', 'span');
+serendipity_plugin_api::generate_plugins('right', 'span');
 			?>
 			
 		</td>