cvs: docweb /templates README /templates/all/www/shared footer.tpl.php header.tpl.php nav_projects.tpl.php

sean Sun Oct 31 13:01:34 2004 EDT Modified files: /docweb/templates README /docweb/templates/all/www/shared footer.tpl.php header.tpl.php nav_projects.tpl.php Log: removed short tags http://cvs.php.net/diff.php/docweb/templates/README?r1=1.1&r2=1.2&ty=u Index: docweb/templates/README diff -u docweb/templates/README:1.1 docweb/templates/README:1.2 --- docweb/templates/README:1.1 Wed Oct 27 12:43:01 2004 +++ docweb/templates/README Sun Oct 31 13:01:32 2004 @@ -1,5 +1,5 @@ Templates README -$Id: README,v 1.1 2004/10/27 16:43:01 sean Exp $ +$Id: README,v 1.2 2004/10/31 18:01:32 sean Exp $ This directory hierarchy contains very simple templates for the docweb templating system. @@ -46,6 +46,3 @@ template object), or $GLOBALS. Avoid this, and pass all required values as parameters. - As a convenience, templates may/should omit the PHP License header. - - As an additional convenience, short open tags are permitted in templates, - but only in "echo-shortcut" form (<?=$outputThis?>). This applies to - templates only. http://cvs.php.net/diff.php/docweb/templates/all/www/shared/footer.tpl.php?r1=1.1&r2=1.2&ty=u Index: docweb/templates/all/www/shared/footer.tpl.php diff -u docweb/templates/all/www/shared/footer.tpl.php:1.1 docweb/templates/all/www/shared/footer.tpl.php:1.2 --- docweb/templates/all/www/shared/footer.tpl.php:1.1 Wed Oct 27 12:43:01 2004 +++ docweb/templates/all/www/shared/footer.tpl.php Sun Oct 31 13:01:33 2004 @@ -1,13 +1,13 @@ </div> <div id="footer"> <p> - <a href="<?=$master?>copyright.php">&docweb.common.footer.copyright;</a> 2004 &docweb.common.footer.copyright-text;. + <a href="<?php echo $master; ?>copyright.php">&docweb.common.footer.copyright;</a> 2004 &docweb.common.footer.copyright-text;. </p> <p> - <a href="<?=$master?>credits.php">&docweb.common.footer.credits;</a> + <a href="<?php echo $master; ?>credits.php">&docweb.common.footer.credits;</a> | - <a href="<?=$master?>contact.php">&docweb.common.footer.contact;</a> + <a href="<?php echo $master; ?>contact.php">&docweb.common.footer.contact;</a> </p> </div> </body> -</html> \ No newline at end of file +</html> http://cvs.php.net/diff.php/docweb/templates/all/www/shared/header.tpl.php?r1=1.3&r2=1.4&ty=u Index: docweb/templates/all/www/shared/header.tpl.php diff -u docweb/templates/all/www/shared/header.tpl.php:1.3 docweb/templates/all/www/shared/header.tpl.php:1.4 --- docweb/templates/all/www/shared/header.tpl.php:1.3 Sat Oct 30 05:44:54 2004 +++ docweb/templates/all/www/shared/header.tpl.php Sun Oct 31 13:01:33 2004 @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$lang?>" lang="<?=$lang?>"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" lang="<?php echo $lang; ?>"> <head> - <title><?=$page_title?></title> - <meta http-equiv="Content-Type" content="text/html; charset=<?=$encoding?>" /> + <title><?php echo $page_title; ?></title> + <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $encoding; ?>" /> <meta http-equiv="Content-Script-Type" content="text/javascript" /> <meta http-equiv="Content-Style-Type" content="text/css" /> - <meta http-equiv="Content-Language" content="<?=$lang?>" /> - <link rel="shortcut icon" href="/images/favicon/<?=$project?>/favicon.ico" /> + <meta http-equiv="Content-Language" content="<?php echo $lang; ?>" /> + <link rel="shortcut icon" href="/images/favicon/<?php echo $project; ?>/favicon.ico" /> <style type="text/css"> @import url(/style/site.css); <?php @@ -18,24 +18,24 @@ </head> <body> <div id="header"> - <h1><?=$page_h1?></h1> + <h1><?php echo $page_h1; ?></h1> <div id="logos"> - <?=$projects?> + <?php echo $projects; ?> </div> </div> <div id="langs"> - <?=$languages?> + <?php echo $languages; ?> </div> <div id="page"> <div id="sidebar"> <div class="sidebox"> <dl> <dt>&docweb.common.header.currently-focused;</dt> - <dd><?=$projdisplay?> | <?=$langdisplay?></dd> + <dd><?php echo $projdisplay; ?> | <?php echo $langdisplay; ?></dd> <dt>&docweb.common.header.insite-context-nav;</dt> - <dd><?=$locallinks?></dd> + <dd><?php echo $locallinks; ?></dd> <dt>&docweb.common.header.offsite-context-nav;</dt> - <dd><?=$extlinks?></dd> + <dd><?php echo $extlinks; ?></dd> </dl> </div> </div> http://cvs.php.net/diff.php/docweb/templates/all/www/shared/nav_projects.tpl.php?r1=1.1&r2=1.2&ty=u Index: docweb/templates/all/www/shared/nav_projects.tpl.php diff -u docweb/templates/all/www/shared/nav_projects.tpl.php:1.1 docweb/templates/all/www/shared/nav_projects.tpl.php:1.2 --- docweb/templates/all/www/shared/nav_projects.tpl.php:1.1 Wed Oct 27 12:43:01 2004 +++ docweb/templates/all/www/shared/nav_projects.tpl.php Sun Oct 31 13:01:33 2004 @@ -1,7 +1,7 @@ - <a href="<?=get_insite_address('www')?>" class="logo logo-all">&docweb.common.all;</a> - <a href="<?=get_insite_address('php')?>" class="logo logo-php">&docweb.common.project.php;</a> - <a href="<?=get_insite_address('pear')?>" class="logo logo-pear">&docweb.common.project.pear;</a> - <a href="<?=get_insite_address('pecl')?>" class="logo logo-pecl">&docweb.common.project.pecl;</a> - <a href="<?=get_insite_address('gtk')?>" class="logo logo-gtk">&docweb.common.project.php-gtk;</a> - <a href="<?=get_insite_address('smarty')?>" class="logo logo-smarty">&docweb.common.project.smarty;</a> - <a href="<?=get_insite_address('livedocs')?>" class="logo logo-livedocs">&docweb.common.project.livedocs;</a> \ No newline at end of file + <a href="<?php echo get_insite_address('www'); ?>" class="logo logo-all">&docweb.common.all;</a> + <a href="<?php echo get_insite_address('php'); ?>" class="logo logo-php">&docweb.common.project.php;</a> + <a href="<?php echo get_insite_address('pear'); ?>" class="logo logo-pear">&docweb.common.project.pear;</a> + <a href="<?php echo get_insite_address('pecl'); ?>" class="logo logo-pecl">&docweb.common.project.pecl;</a> + <a href="<?php echo get_insite_address('gtk'); ?>" class="logo logo-gtk">&docweb.common.project.php-gtk;</a> + <a href="<?php echo get_insite_address('smarty'); ?>" class="logo logo-smarty">&docweb.common.project.smarty;</a> + <a href="<?php echo get_insite_address('livedocs'); ?>" class="logo logo-livedocs">&docweb.common.project.livedocs;</a>