diff options
author | Dries Buytaert <dries@buytaert.net> | 2006-08-31 07:21:43 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2006-08-31 07:21:43 +0000 |
commit | dd3cf3be65e7f31b82b442aaf159a2120699a359 (patch) | |
tree | e0b670342eab3ada06c661b06e54b26463336fe9 /themes/engines | |
parent | 2cc7b8cceab297aaf83ea42c0f3e30eaee731cbd (diff) | |
download | brdo-dd3cf3be65e7f31b82b442aaf159a2120699a359.tar.gz brdo-dd3cf3be65e7f31b82b442aaf159a2120699a359.tar.bz2 |
- Patch #81619 by m3avrck: clean up default phpTemplates.
Diffstat (limited to 'themes/engines')
-rw-r--r-- | themes/engines/phptemplate/block.tpl.php | 6 | ||||
-rw-r--r-- | themes/engines/phptemplate/box.tpl.php | 8 | ||||
-rw-r--r-- | themes/engines/phptemplate/comment.tpl.php | 22 | ||||
-rw-r--r-- | themes/engines/phptemplate/node.tpl.php | 32 |
4 files changed, 48 insertions, 20 deletions
diff --git a/themes/engines/phptemplate/block.tpl.php b/themes/engines/phptemplate/block.tpl.php index ca670dbbd..3df046fca 100644 --- a/themes/engines/phptemplate/block.tpl.php +++ b/themes/engines/phptemplate/block.tpl.php @@ -1,4 +1,8 @@ -<div class="<?php print "block block-$block->module" ?>" id="<?php print "block-$block->module-$block->delta"; ?>"> +<div id="block-<?php print $block->module-$block->delta; ?>" class="block block-<?php print $block->module ?>"> + +<?php if ($block->subject): ?> <h2><?php print $block->subject ?></h2> +<?php endif;?> + <div class="content"><?php print $block->content ?></div> </div> diff --git a/themes/engines/phptemplate/box.tpl.php b/themes/engines/phptemplate/box.tpl.php index 56667e767..84d810cf0 100644 --- a/themes/engines/phptemplate/box.tpl.php +++ b/themes/engines/phptemplate/box.tpl.php @@ -1,6 +1,8 @@ <div class="box"> - <?php if ($title): ?> - <h2 class="title"><?php print $title ?></h2> - <?php endif; ?> + +<?php if ($title): ?> + <h2><?php print $title ?></h2> +<?php endif; ?> + <div class="content"><?php print $content ?></div> </div> diff --git a/themes/engines/phptemplate/comment.tpl.php b/themes/engines/phptemplate/comment.tpl.php index d9dc3fd36..c7211b9bf 100644 --- a/themes/engines/phptemplate/comment.tpl.php +++ b/themes/engines/phptemplate/comment.tpl.php @@ -1,12 +1,20 @@ <div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ($comment->status == COMMENT_NOT_PUBLISHED) ? ' comment-unpublished' : ''; ?> clear-block"> - <?php if ($comment->new) : ?> + <?php print $picture ?> + +<?php if ($comment->new) : ?> <a id="new"></a> <span class="new"><?php print $new ?></span> - <?php endif; ?> +<?php endif; ?> - <div class="title"><?php print $title ?></div> - <?php print $picture ?> - <div class="author"><?php print $submitted ?></div> - <div class="content"><?php print $content ?></div> - <div class="links"><?php print $links ?></div> + <h3><?php print $title ?></h3> + + <div class="submitted"> + <?php print $submitted ?> + </div> + + <div class="content"> + <?php print $content ?> + </div> + + <?php print $links ?> </div> diff --git a/themes/engines/phptemplate/node.tpl.php b/themes/engines/phptemplate/node.tpl.php index 6da685329..872ea0c29 100644 --- a/themes/engines/phptemplate/node.tpl.php +++ b/themes/engines/phptemplate/node.tpl.php @@ -1,15 +1,29 @@ -<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?> clear-block"> - <?php if ($page == 0): ?> - <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2> +<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clear-block"> + +<?php print $picture ?> + +<?php if ($page == 0): ?> + <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2> +<?php endif; ?> + + <div class="meta"> + <?php if ($submitted): ?> + <span class="submitted"><?php print $submitted ?></span> <?php endif; ?> - <?php print $picture ?> - <div class="info"><?php print $submitted ?><span class="terms"><?php print $terms ?></span></div> + <?php if ($terms): ?> + <span class="terms"><?php print $terms ?></span> + <?php endif;?> + </div> + <div class="content"> <?php print $content ?> </div> - <?php if ($links): ?> - <div class="links"><?php print $links ?></div> - <?php endif; ?> -</div> +<?php + if ($links) { + print $links; + } +?> + +</div>
\ No newline at end of file |