github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Uh trying to figure this merge crap out 

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-17 16:53:28 -08:00
parent 14fa039813
commit e8f938775f
5 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archive.php
View File

@ -121,7 +121,7 @@
the_excerpt();
} ?>
<div class="post-extras">
<div class="tags">
<div class="post-tags">
<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
</div>
<div class="clear"></div>

29
footer.php
View File

@ -9,10 +9,31 @@
<?php get_sidebar('footer'); ?>
<?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?>
<p>
<span class="footer-copyright"><?php echo cp_copyright(); ?> <?php if (empty($wpmu_version)) { ?><?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?><span class="footer-pipe"> | </span><?php } ?></span>
<span class="footer-powered"><?php bloginfo('name'); ?> <?Php _e('Powered by','comicpress'); ?> <a href="http://wordpress.org/">WordPress</a> <?php _e('with','comicpress'); ?> <a href="http://comicpress.org/">ComicPress</a><span class="footer-pipe"> | </span></span>
<span class="footer-subscribe">Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a><span class="footer-pipe"> | </span></span>
<span class="footer-uptotop"><a href="#outside" onclick="scrollup(); return false;"><?php _e('Back to Top &uarr;','comicpress'); ?></a></span>
<span class="footer-copyright">
<?php echo cp_copyright(); ?>
<?php if (empty($wpmu_version)) {
$authorfirstname = get_the_author_meta('firstname',1);
$authorlastname = get_the_author_meta('lastname',1);
$blogname = get_bloginfo('title');
if ( $authorfirstname != "" ) {
echo $authorfirstname." ".$authorlastname;
} else {
echo $blogname;
}
} ?>
</span>
<span class="footer-powered">
<span class="footer-pipe">|</span>
<?php _e('Powered by','comicpress'); ?> <a href="http://wordpress.org/">WordPress</a> <?php _e('with','comicpress'); ?> <a href="http://comicpress.org/">ComicPress</a>
</span>
<span class="footer-subscribe">
<span class="footer-pipe">|</span>
Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS</a>
</span>
<span class="footer-uptotop">
<span class="footer-pipe">|</span>
<a href="#outside" onclick="scrollup(); return false;"><?php _e('Back to Top &uarr;','comicpress'); ?></a>
</span>
<!-- <?php echo get_num_queries() ?> queries. <?php timer_stop(1) ?> seconds. -->
</p>
<?php } ?>

2
search-transcript.php
View File

@ -35,7 +35,7 @@ $count = $tmp_search->post_count;
<div class="clear"></div>
</div>
<div class="post-extras">
<div class="tags">
<div class="post-tags">
<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
</div>
<div class="clear"></div>

2
search.php
View File

@ -90,7 +90,7 @@
the_excerpt();
} ?>
<div class="post-extras">
<div class="tags">
<div class="post-tags">
<?php the_tags(__('&#9492; Tags:','comicpress'),', ','<br />'); ?>
</div>
<div class="clear"></div>

20
style.css
View File

@ -830,10 +830,17 @@ ul.children {
}
.archive-dropdown {
width: 192px;
margin-left: 4px;
margin: 0 0 0 4px;
padding: 2px;
}
.widget_search #s-search, .widget_comicpress_search_transcripts #s-transcript {
width: 155px;
margin-left: 4px;
}
/* CALENDAR */
#wp-calendar-wrap {
@ -1329,8 +1336,12 @@ li.pingback div p, li.trackback div p {
line-height: 25px;
}
#paginav .paginav-pages {
padding-right: 10px;
}
#paginav a {
padding: 0px 10px 0 10px;
padding: 0px 10px;
display: block;
}
@ -1349,15 +1360,10 @@ li.pingback div p, li.trackback div p {
}
#paginav .paginav-current, #paginav .current {
padding: 0px 10px 0 10px;
font-size: larger;
padding: 0px 10px;
font-weight: bold;
}
#paginav li:hover a {
color: #ff0000;
}
/* Tool Tips (ComicPress Rascal) */
.tt a {