Skip to content
This repository has been archived by the owner on Aug 20, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:DTrejo/csdug.cs.brown.edu
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Wallace committed Mar 31, 2011
2 parents 1ef9ead + 44c65e8 commit 4648042
Show file tree
Hide file tree
Showing 9 changed files with 218 additions and 218 deletions.
22 changes: 11 additions & 11 deletions 404.php
Expand Up @@ -2,17 +2,17 @@



<div class="post">
<h2>Page Not Found</h2>
<p>Looks like the page you're looking for isn't here anymore. Try browsing the <a href="">categories</a>, <a href="">archives</a>, or using the search box below.</p>
<?php include(TEMPLATEPATH . '/searchform.php'); ?>
</div> <!-- .post -->
<div class="post">

<h2>Page Not Found</h2>

<p>Looks like the page you're looking for isn't here anymore. Try browsing the <a href="">categories</a>, <a href="">archives</a>, or using the search box below.</p>

<?php include(TEMPLATEPATH . '/searchform.php'); ?>

</div> <!-- .post -->



<?php get_sidebar(); ?>

Expand Down
98 changes: 49 additions & 49 deletions archive.php
@@ -1,54 +1,54 @@
<?php get_header(); ?>

<?php if(have_posts()) : ?>
<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
<?php /* If this is a category archive */ if (is_category()) { ?>
<h4 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h4>
<?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
<h4 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h4>
<?php /* If this is a daily archive */ } elseif (is_day()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h4>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h4>
<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('Y'); ?></h4>
<?php /* If this is an author archive */ } elseif (is_author()) { ?>
<h4 class="pagetitle">Author Archive</h4>
<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
<h4 class="pagetitle">Blog Archives</h4>
<?php } ?>
<?php while(have_posts()) : the_post(); ?>

<div class="post" id="<?php the_ID(); ?>">
<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
<div class="entry">
<?php the_content(); ?>
</div>
</div> <!-- .post -->

<?php endwhile; else : ?>

<div class="post">
<h2>Page Not Found</h2>
<p>Looks like the page you're looking for isn't here anymore. Try browsing the <a href="">categories</a>, <a href="">archives</a>, or using the search box below.</p>
<?php include(TEMPLATEPATH.'/searhform.php'); ?>
</div> <!-- .post -->

<?php endif; ?>
<div class="navigation clear">
<div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
<div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>
<?php if(have_posts()) : ?>

<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
<?php /* If this is a category archive */ if (is_category()) { ?>
<h4 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h4>
<?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
<h4 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h4>
<?php /* If this is a daily archive */ } elseif (is_day()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h4>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h4>
<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
<h4 class="pagetitle">Archive for <?php the_time('Y'); ?></h4>
<?php /* If this is an author archive */ } elseif (is_author()) { ?>
<h4 class="pagetitle">Author Archive</h4>
<?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
<h4 class="pagetitle">Blog Archives</h4>
<?php } ?>

<?php while(have_posts()) : the_post(); ?>

<div class="post" id="<?php the_ID(); ?>">

<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>

<div class="entry">
<?php the_content(); ?>
</div>

</div> <!-- .post -->

<?php endwhile; else : ?>

<div class="post">

<h2>Page Not Found</h2>

<p>Looks like the page you're looking for isn't here anymore. Try browsing the <a href="">categories</a>, <a href="">archives</a>, or using the search box below.</p>

<?php include(TEMPLATEPATH.'/searhform.php'); ?>

</div> <!-- .post -->

<?php endif; ?>

<div class="navigation clear">
<div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
<div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
</div>

<?php get_sidebar(); ?>

Expand Down
120 changes: 60 additions & 60 deletions comments.php
@@ -1,71 +1,71 @@
<?php // Do not delete these lines
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
die ('Please do not load this page directly. Thanks!');
if (!empty($post->post_password)) { // if there's a password
if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { ?>
<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
<?php return;
}
}
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
die ('Please do not load this page directly. Thanks!');
if (!empty($post->post_password)) { // if there's a password
if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { ?>
<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
<?php return;
}
}
?>

<?php if ($comments) : ?>
<h3><?php comments_number('No Comments', 'One Comment', '% Comments' );?></h3>
<h3><?php comments_number('No Comments', 'One Comment', '% Comments' );?></h3>

<div class="comment-list">
<?php foreach ($comments as $comment) : ?>
<div id="comment-<?php comment_ID() ?>">
<div class="author">
<?php echo get_avatar( $comment, 64 ); ?>
<h3><?php comment_author_link() ?></h3>
<div class="comment-date"><?php comment_date('F jS, Y') ?></div>
</div>
<div class="comment">
<?php edit_comment_link('edit','',''); ?>
<?php if ($comment->comment_approved == '0') : echo "<p><em>Your comment is awaiting moderation.</em></p>"; endif; ?>
<?php comment_text() ?>
</div>
</div>
<?php endforeach; ?>
</div>
<div class="comment-list">
<?php foreach ($comments as $comment) : ?>
<div id="comment-<?php comment_ID() ?>">
<div class="author">
<?php echo get_avatar( $comment, 64 ); ?>
<h3><?php comment_author_link() ?></h3>
<div class="comment-date"><?php comment_date('F jS, Y') ?></div>
</div>
<div class="comment">
<?php edit_comment_link('edit','',''); ?>
<?php if ($comment->comment_approved == '0') : echo "<p><em>Your comment is awaiting moderation.</em></p>"; endif; ?>
<?php comment_text() ?>
</div>
</div>
<?php endforeach; ?>
</div>
<?php else : // this is displayed if there are no comments so far ?>
<?php if ('open' == $post->comment_status) : ?>
<?php else : ?>
<p class="nocomments">Comments are closed.</p>
<?php endif; ?>
<?php if ('open' == $post->comment_status) : ?>
<?php else : ?>
<p class="nocomments">Comments are closed.</p>
<?php endif; ?>
<?php endif; ?>

<?php if ('open' == $post->comment_status) : ?>
<div class="new-comment">
<h3>Leave a Reply</h3>
<div class="new-comment">
<h3>Leave a Reply</h3>

<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if ( $user_ID ) : ?>
<p>
Logged in as
<a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>.
<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a>
</p>
<?php else : ?>
<table><tr>
<td><label for="author">Name <?php if ($req) echo "(required)"; ?></label></td>
<td><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" /></td>
</tr><tr>
<td><label for="email">Email (will not be shared<?php if ($req) echo ", required"; ?>)</label></td>
<td><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" /></td>
</tr><tr>
<td><label for="url">Website</label></td>
<td><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /></td>
</tr></table>
<?php endif; ?>
<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
<p class="clearfix"><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" /></p>
<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
<?php do_action('comment_form', $post->ID); ?>
</form>
<?php endif; ?>
</div>
<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if ( $user_ID ) : ?>
<p>
Logged in as
<a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>.
<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a>
</p>
<?php else : ?>
<table><tr>
<td><label for="author">Name <?php if ($req) echo "(required)"; ?></label></td>
<td><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" /></td>
</tr><tr>
<td><label for="email">Email (will not be shared<?php if ($req) echo ", required"; ?>)</label></td>
<td><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" /></td>
</tr><tr>
<td><label for="url">Website</label></td>
<td><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /></td>
</tr></table>
<?php endif; ?>
<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
<p class="clearfix"><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" /></p>
<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
<?php do_action('comment_form', $post->ID); ?>
</form>
<?php endif; ?>
</div>
<?php endif; ?>
File renamed without changes.
32 changes: 16 additions & 16 deletions header.php
Expand Up @@ -2,25 +2,25 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head profile="http://gmpg.org/xfn/11">

<title><?php bloginfo('name'); ?> <?php wp_title(); ?></title>
<title><?php bloginfo('name'); ?> <?php wp_title(); ?></title>

<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats please -->
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats please -->

<link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/style.css" type="text/css" media="screen" />
<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
<link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/css/style.css" type="text/css" media="screen" />
<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />

<?php wp_head(); ?>
<?php wp_head(); ?>

</head>
<body>
<div class="nav">
<div class="content">
<div class="logo"><a href="<?php bloginfo('url'); ?>">CS DUG</a></div>
<a class="button" href="#">Student Projects</a>
<a class="button" href="#">Home</a>
</div>
</div>
<div class="nav">
<div class="content">
<div class="logo"><a href="<?php bloginfo('url'); ?>">CS DUG</a></div>
<a class="button" href="#">Student Projects</a>
<a class="button" href="#">Home</a>
</div>
</div>

0 comments on commit 4648042

Please sign in to comment.