|
From: Kristian K?h. <is...@us...> - 2004-03-24 20:12:57
|
Update of /cvsroot/php-blog/serendipity/templates/newspaper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13799/templates/newspaper Modified Files: layout.php Log Message: - Introduce a variable enablePopup governing the use of window.open and target= in Comment-(Link) and for the Comments and Trackback windows (default is enabled, to be compatible). - Fix newspaper layout (Illegal syntax, missing '}', introduce use of fetchLimit parameter, make layout capable of 3 column layout, make layout variable width (previously statically 750px, - Delete spurious windows line endings, fix indentation Index: layout.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- layout.php 21 Mar 2004 16:35:33 -0000 1.8 +++ layout.php 24 Mar 2004 20:02:16 -0000 1.9 @@ -1,35 +1,36 @@ <?php - ########################################################################## -# serendipity - another blogger... # +# serendipity - another blogger... # ########################################################################## # # # (c) 2003 Jannis Hermanns <J...@ha...> # -# http://www.jannis.to/programming/serendipity.html # +# Kristian Köhntopp fucked it up # +# http://www.jannis.to/programming/serendipity.html # # # ########################################################################## + $OPENSHADOW = '<table cellspacing="0" width="100%" cellpadding="0" style="padding:0px"> - <tr> - <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;"> - '; + <tr> + <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;"> +'; $CLOSESHADOW = '</td> - <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td> - </tr> - <tr> - <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td> - <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td> - </tr> - </table> - '; + <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td> + </tr> + <tr> + <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td> + <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td> + </tr> + </table> +'; ?> -<table width="750" cellspacing="10"> - <tr> - <td colspan="2" width="100%" class="serendipityBanner"> - <div id="serendipity_banner"> - <h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlentities($serendipity['blogTitle']); ?></a></h1> - <h2> +<table width="100%" cellspacing="4" border="0"> + <tr> + <td colspan="3" width="100%" class="serendipityBanner"> + <div id="serendipity_banner"> + <h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlentities($serendipity['blogTitle']); ?></a></h1> + <h2> <?php $sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription']; if (strlen($sub)) { @@ -40,53 +41,48 @@ ?> </h2> - </div> - </td> - </tr> - <tr> - <td width="150" valign="top" align="left" class="serendipitySideBar" style=" border-left: 1px dotted #ABABAB; - border-top: 1px dotted #ABABAB; - border-right: 1px dotted #ABABAB; - border-bottom: 1px dotted #ABABAB; - background-color:#FCFFF9; -"> - - <?php - serendipity_plugin_api::generate_plugins('left', 'span'); -serendipity_plugin_api::generate_plugins('right', 'span'); - ?> - - </td> - <td width="100%" valign="top" align="left" class="serendipityContent"> - <?=$OPENSHADOW?> - <?php - if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) { - $serendipity["GET"]["range"] = date("Ymd"); + </div> + </td> + </tr> + <tr> + <td width="150" valign="top" align="left" class="serendipitySideBar"> + <?php + serendipity_plugin_api::generate_plugins('left', 'span'); +// serendipity_plugin_api::generate_plugins('right', 'span'); + ?> + + </td> + <td width="100%" valign="top" align="left" class="serendipityContent"> + <?=$OPENSHADOW?> + <?php + if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) { + $serendipity["GET"]["range"] = date("Ymd"); + } // The main area - switch ($serendipity["GET"]["action"]) { + switch ($serendipity["GET"]["action"]) { - // User wants to read the diary - case "read": + // User wants to read the diary + case "read": if (isset($serendipity['GET']['id'])) { serendipity_printEntries(array(serendipity_fetchEntry("id", $serendipity['GET']['id'])), 1); } else { - serendipity_printEntries(serendipity_fetchEntries($serendipity["GET"]["range"])); + serendipity_printEntries(serendipity_fetchEntries($serendipity["GET"]["range"])); } break; // User searches case "search": - $r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]); - if ( strlen($serendipity["GET"]["searchTerm"]) <= 3 ) { - echo SEARCH_TOO_SHORT; - break; - } - - if ($r === true) { - echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']); - break; - } + $r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]); + if ( strlen($serendipity["GET"]["searchTerm"]) <= 3 ) { + echo SEARCH_TOO_SHORT; + break; + } + + if ($r === true) { + echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']); + break; + } echo sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity["GET"]["searchTerm"], count($r)); serendipity_printEntries($r); break; @@ -99,11 +95,17 @@ // Welcome screen or whatever default: - serendipity_printEntries(serendipity_fetchEntries(null, true, 5)); + serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit'] )); } ?> - <?=$CLOSESHADOW?> - </td> - </tr> + <?=$CLOSESHADOW?> + </td> + <td valign="top" align="left" class="serendipitySideBar"> + <?php +// serendipity_plugin_api::generate_plugins('left', 'span'); + serendipity_plugin_api::generate_plugins('right', 'span'); + ?> + + </td> + </tr> </table> -<font size="1">© 2003 <a href="http://www.jannis.to">Jannis Hermanns</a><br /><?php @include("/www/apache/htdocs/textads.txt");?></font> |
