Compare commits

..

No commits in common. "main" and "popmenu" have entirely different histories.

2 changed files with 51 additions and 147 deletions

View File

@ -29,72 +29,4 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
<?php get_footer(); <?php get_footer(); ?>
function arl_kottke_archives($month_separator = ' ', $month_format = 'M')
{
/*
This function was originally a plugin, GPL2, information below:
Plugin Name: Kottke Style Archive
Version: 0.3
Plugin URI: http://www.lattimore.id.au/projects/wordpress/plugins/kottke-style-archives/
Author: Alistair Lattimore
Author URI: http://www.lattimore.id.au
Description: Displays an archive of posts in the same style to http://www.kottke.org/everfresh.
*/
global $wpdb;
$output = "";
$year = "";
$sql = "SELECT DATE_FORMAT(post_date, '%Y') AS Year, ";
$sql .= "DATE_FORMAT(post_date, '%m') AS Month ";
$sql .= "FROM $wpdb->posts ";
$sql .= "WHERE DATE_FORMAT(post_date, '%Y') <> '0000'";
$sql .= " AND post_status = 'publish'";
$sql .= " AND post_type = 'post' ";
$sql .= "GROUP BY DATE_FORMAT(post_date, '%Y'), DATE_FORMAT(post_date, '%m') ";
$sql .= "ORDER BY DATE_FORMAT(post_date, '%Y') DESC, DATE_FORMAT(post_date, '%m') ASC;";
$months = $wpdb->get_results($sql);
if (!empty($months))
{
foreach ($months as $month)
{
// Add in the year heading
if (($year == "") || ($year != $month->Year))
{
if (strlen($output))
{
$output .= "<br />\n<strong>" . $month->Year . ":</strong>&nbsp;";
}
else
{
$output .= "\n<strong>" . $month->Year . ":</strong>&nbsp;";
}
}
// Add in the monthly archive links
if ($year == $month->Year)
$output .= $month_separator;
$output .= '<a href="' . get_month_link($month->Year, $month->Month) . '">' . date($month_format, mktime(0, 0, 0, $month->Month, 1, $month->Year)) . '</a>';
$year = $month->Year;
}
}
else
{
$output = "<p>None available</p>\n";
}
print $output;
}
?>

View File

@ -12,6 +12,11 @@ function melville_theme_styles(){
} }
add_action( 'wp_enqueue_scripts', 'melville_theme_styles' ); add_action( 'wp_enqueue_scripts', 'melville_theme_styles' );
//include 'plugins/drop-caps/wp_drop_caps.php';
if (!function_exists('arl_kottke_archives')) {
include 'plugins/arl_kottke_archives.php';
}
/** /**
* Set the content width based on the theme's design and stylesheet. * Set the content width based on the theme's design and stylesheet.
* *
@ -151,92 +156,59 @@ function melville_remove_gallery_css( $css ) {
add_filter( 'gallery_style', 'melville_remove_gallery_css' ); add_filter( 'gallery_style', 'melville_remove_gallery_css' );
if ( ! function_exists( 'melville_comment' ) ) : if ( ! function_exists( 'melville_comment' ) ) :
/** /**
* Template for comments and pingbacks. * Template for comments and pingbacks.
* *
* To override this walker in a child theme without modifying the comments template * To override this walker in a child theme without modifying the comments template
* simply create your own twentyten_comment(), and that function will be used instead. * simply create your own twentyten_comment(), and that function will be used instead.
* *
* Used as a callback by wp_list_comments() for displaying the comments. * Used as a callback by wp_list_comments() for displaying the comments.
* *
* @since Twenty Ten 1.0 * @since Twenty Ten 1.0
* */
* @param WP_Comment $comment The comment object. function melville_comment( $comment, $args, $depth ) {
* @param array $args An array of arguments. @see get_comment_reply_link() $GLOBALS['comment'] = $comment;
* @param int $depth The depth of the comment. switch ( $comment->comment_type ) :
*/ case '' :
function melville_comment( $comment, $args, $depth ) { ?>
$GLOBALS['comment'] = $comment; <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
switch ( $comment->comment_type ) :
case '':
case 'comment':
?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
<div id="comment-<?php comment_ID(); ?>"> <div id="comment-<?php comment_ID(); ?>">
<div class="comment-author vcard"> <div class="comment-author vcard">
<?php echo get_avatar( $comment, 40 ); ?> <?php echo get_avatar( $comment, 40 ); ?>
<?php <?php printf( __( '%s <span class="says">said:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
/* translators: %s: Author display name. */ </div><!-- .comment-author .vcard -->
printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); <?php if ( $comment->comment_approved == '0' ) : ?>
?> <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
</div><!-- .comment-author .vcard -->
<?php
$commenter = wp_get_current_commenter();
if ( $commenter['comment_author_email'] ) {
$moderation_note = __( 'Your comment is awaiting moderation.', 'twentyten' );
} else {
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.', 'twentyten' );
}
?>
<?php if ( '0' == $comment->comment_approved ) : ?>
<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
<br /> <br />
<?php endif; ?> <?php endif; ?>
<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"> <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
<?php <?php
/* translators: 1: Date, 2: Time. */ /* translators: 1: date, 2: time */
printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); printf( __( '%1$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
?> ?>
</a> </div><!-- .comment-meta .commentmetadata -->
<?php
edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
?>
</div><!-- .comment-meta .commentmetadata -->
<div class="comment-body"><?php comment_text(); ?></div> <div class="comment-body"><?php comment_text(); ?></div>
<div class="reply"> <div class="reply">
<?php <?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
comment_reply_link( </div><!-- .reply -->
array_merge( </div><!-- #comment-## -->
$args,
array(
'depth' => $depth,
'max_depth' => $args['max_depth'],
)
)
);
?>
</div><!-- .reply -->
</div><!-- #comment-## -->
<?php <?php
break; break;
case 'pingback': case 'pingback' :
case 'trackback': case 'trackback' :
?> ?>
<li class="post pingback"> <li class="post pingback">
<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p> <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'twentyten'), ' ' ); ?></p>
<?php <?php
break; break;
endswitch; endswitch;
} }
endif; endif;
/** /**
* Removes the default styles that are packaged with the Recent Comments widget. * Removes the default styles that are packaged with the Recent Comments widget.
* *