Permalink
Browse files

Update various functions. Add footer widgets

  • Loading branch information...
1 parent e126531 commit ac39d96441e240fecc9f5227dce09815e8da8cf3 @mindctrl committed Feb 3, 2012
Showing with 224 additions and 206 deletions.
  1. +3 −0 .gitignore
  2. +4 −4 404.php
  3. +1 −2 README.md
  4. +9 −9 archive.php
  5. +3 −3 author.php
  6. +14 −14 comments.php
  7. +2 −2 content-page.php
  8. +9 −9 content-single.php
  9. +11 −11 content.php
  10. +10 −3 footer.php
  11. +22 −13 functions.php
  12. +5 −5 header.php
  13. +11 −11 image.php
  14. +24 −24 inc/template-tags.php
  15. +80 −80 inc/theme-options/theme-options.php
  16. +6 −6 inc/tweaks.php
  17. +2 −2 index.php
  18. +3 −3 search.php
  19. +3 −3 searchform.php
  20. +2 −2 sidebar.php
View
@@ -34,3 +34,6 @@ nbproject
.svn
.CVS
.idea
+docs/
+less/
+js/tests/
View
@@ -14,26 +14,26 @@
<article id="post-0" class="post error404 not-found">
<header class="entry-header">
- <h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
+ <h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'alienship' ); ?></h1>
</header>
<div class="entry-content">
- <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', '_s' ); ?></p>
+ <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'alienship' ); ?></p>
<?php get_search_form(); ?>
<?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
<div class="widget">
- <h2 class="widgettitle"><?php _e( 'Most Used Categories', '_s' ); ?></h2>
+ <h2 class="widgettitle"><?php _e( 'Most Used Categories', 'alienship' ); ?></h2>
<ul>
<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
</ul>
</div>
<?php
/* translators: %1$s: smilie */
- $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', '_s' ), convert_smilies( ':)' ) ) . '</p>';
+ $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'alienship' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
?>
View
@@ -14,14 +14,13 @@ TO DO LIST
+ Level 3 dropdowns do not work as expected
+ Clean up code
+ Separate loop from markup
-+ Footer widgets
+ Shortcodes for buttons, labels, tables, alerts, wells/panels, scaffolding, modals, tooltips, popovers, tabs...
++ Featured slider/carousel
+ Theme options page
+ Options to include each JS plugin/feature
+ Header image option
+ Color options
+ Configurable footer text
-+ Featured slider/carousel
+ Layout options for index, archive, etc. List, Tile, etc.
+ Breadcrumbs
+ Option to hide "Comments Closed" message
View
@@ -20,25 +20,25 @@
<h1 class="page-title">
<?php
if ( is_category() ) {
- printf( __( 'Category Archives: %s', '_s' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+ printf( __( 'Category Archives: %s', 'alienship' ), '<span>' . single_cat_title( '', false ) . '</span>' );
} elseif ( is_tag() ) {
- printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+ printf( __( 'Tag Archives: %s', 'alienship' ), '<span>' . single_tag_title( '', false ) . '</span>' );
} elseif ( is_author() ) {
- printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+ printf( __( 'Author Archives: %s', 'alienship' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
} elseif ( is_day() ) {
- printf( __( 'Daily Archives: %s', '_s' ), '<span>' . get_the_date() . '</span>' );
+ printf( __( 'Daily Archives: %s', 'alienship' ), '<span>' . get_the_date() . '</span>' );
} elseif ( is_month() ) {
- printf( __( 'Monthly Archives: %s', '_s' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
+ printf( __( 'Monthly Archives: %s', 'alienship' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
} elseif ( is_year() ) {
- printf( __( 'Yearly Archives: %s', '_s' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
+ printf( __( 'Yearly Archives: %s', 'alienship' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
} else {
- _e( 'Archives', '_s' );
+ _e( 'Archives', 'alienship' );
}
?>
@@ -82,11 +82,11 @@
<article id="post-0" class="post no-results not-found">
<header class="entry-header">
- <h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
+ <h1 class="entry-title"><?php _e( 'Nothing Found', 'alienship' ); ?></h1>
</header><!-- .entry-header -->
<div class="entry-content">
- <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '_s' ); ?></p>
+ <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'alienship' ); ?></p>
<?php get_search_form(); ?>
</div><!-- .entry-content -->
</article><!-- #post-0 -->
View
@@ -25,7 +25,7 @@
?>
<header class="page-header">
- <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
+ <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'alienship' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</header>
<?php
@@ -57,11 +57,11 @@
<article id="post-0" class="post no-results not-found">
<header class="entry-header">
- <h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
+ <h1 class="entry-title"><?php _e( 'Nothing Found', 'alienship' ); ?></h1>
</header><!-- .entry-header -->
<div class="entry-content">
- <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', '_s' ); ?></p>
+ <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'alienship' ); ?></p>
<?php get_search_form(); ?>
</div><!-- .entry-content -->
</article><!-- #post-0 -->
View
@@ -4,7 +4,7 @@
*
* The area of the page that contains both current comments
* and the comment form. The actual display of comments is
- * handled by a callback to _s_comment() which is
+ * handled by a callback to alienship_comment() which is
* located in the functions.php file.
*
* @package Alien Ship
@@ -13,7 +13,7 @@
?>
<div id="comments">
<?php if ( post_password_required() ) : ?>
- <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', '_s' ); ?></p>
+ <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'alienship' ); ?></p>
</div><!-- #comments -->
<?php
/* Stop the rest of comments.php from being processed,
@@ -29,36 +29,36 @@
<?php if ( have_comments() ) : ?>
<h2 id="comments-title">
<?php
- printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), '_s' ),
+ printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'alienship' ),
number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
?>
</h2>
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav id="comment-nav-above">
- <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', '_s' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
+ <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'alienship' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'alienship' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'alienship' ) ); ?></div>
</nav>
<?php endif; // check for comment navigation ?>
<ol class="commentlist">
<?php
/* Loop through and list the comments. Tell wp_list_comments()
- * to use _s_comment() to format the comments.
+ * to use alienship_comment() to format the comments.
* If you want to overload this in a child theme then you can
- * define _s_comment() and that will be used instead.
- * See _s_comment() in _s/functions.php for more.
+ * define alienship_comment() and that will be used instead.
+ * See alienship_comment() in alienship/functions.php for more.
*/
- wp_list_comments( array( 'callback' => '_s_comment' ) );
+ wp_list_comments( array( 'callback' => 'alienship_comment' ) );
?>
</ol>
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav id="comment-nav-below">
- <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', '_s' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
+ <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'alienship' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'alienship' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'alienship' ) ); ?></div>
</nav>
<?php endif; // check for comment navigation ?>
@@ -68,7 +68,7 @@
// If comments are closed and there are no comments, let's leave a little note, shall we?
if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
- <p class="nocomments"><?php _e( 'Comments are closed.', '_s' ); ?></p>
+ <p class="nocomments"><?php _e( 'Comments are closed.', 'alienship' ); ?></p>
<?php endif; ?>
<?php comment_form(); ?>
View
@@ -14,7 +14,7 @@
<div class="entry-content">
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'alienship' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'alienship' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-content -->
</article><!-- #post-<?php the_ID(); ?> -->
View
@@ -10,37 +10,37 @@
<h1 class="entry-title"><?php the_title(); ?></h1>
<div class="entry-meta">
- <?php _s_posted_on(); ?>
+ <?php alienship_posted_on(); ?>
</div><!-- .entry-meta -->
</header><!-- .entry-header -->
<div class="entry-content">
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'alienship' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<footer class="entry-meta">
<?php
/* translators: used between list items, there is a space after the comma */
- $category_list = get_the_category_list( __( ', ', '_s' ) );
+ $category_list = get_the_category_list( __( ', ', 'alienship' ) );
/* translators: used between list items, there is a space after the comma */
$tag_list = get_the_tag_list( '', ', ' );
- if ( ! _s_categorized_blog() ) {
+ if ( ! alienship_categorized_blog() ) {
// This blog only has 1 category so we just need to worry about tags in the meta text
if ( '' != $tag_list ) {
- $meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' );
+ $meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'alienship' );
} else {
- $meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' );
+ $meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'alienship' );
}
} else {
// But this blog has loads of categories so we should probably display them here
if ( '' != $tag_list ) {
- $meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' );
+ $meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'alienship' );
} else {
- $meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' );
+ $meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'alienship' );
}
} // end check for categories on this blog
@@ -54,6 +54,6 @@
);
?>
- <?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
+ <?php edit_post_link( __( 'Edit', 'alienship' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-meta -->
</article><!-- #post-<?php the_ID(); ?> -->
View
@@ -7,11 +7,11 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header">
- <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', '_s' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'alienship' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
<?php if ( 'post' == get_post_type() ) : ?>
<div class="entry-meta">
- <?php _s_posted_on(); ?>
+ <?php alienship_posted_on(); ?>
</div><br /><!-- .entry-meta -->
<?php endif; ?>
</header><!-- .entry-header -->
@@ -22,42 +22,42 @@
</div><!-- .entry-summary -->
<?php else : ?>
<div class="entry-content">
- <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', '_s' ) ); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'alienship' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'alienship' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php endif; ?>
<footer class="entry-meta">
<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
<?php
/* translators: used between list items, there is a space after the comma */
- $categories_list = get_the_category_list( __( ', ', '_s' ) );
- if ( $categories_list && _s_categorized_blog() ) :
+ $categories_list = get_the_category_list( __( ', ', 'alienship' ) );
+ if ( $categories_list && alienship_categorized_blog() ) :
?>
<span class="cat-links">
- <?php printf( __( 'Posted in %1$s', '_s' ), $categories_list ); ?>
+ <?php printf( __( 'Posted in %1$s', 'alienship' ), $categories_list ); ?>
</span>
<span class="sep"> | </span>
<?php endif; // End if categories ?>
<?php
/* translators: used between list items, there is a space after the comma */
- $tags_list = get_the_tag_list( '', __( ', ', '_s' ) );
+ $tags_list = get_the_tag_list( '', __( ', ', 'alienship' ) );
if ( $tags_list ) :
?>
<span class="tag-links">
- <?php printf( __( 'Tagged %1$s', '_s' ), $tags_list ); ?>
+ <?php printf( __( 'Tagged %1$s', 'alienship' ), $tags_list ); ?>
</span>
<span class="sep"> | </span>
<?php endif; // End if $tags_list ?>
<?php endif; // End if 'post' == get_post_type() ?>
<?php if ( comments_open() || ( '0' != get_comments_number() && ! comments_open() ) ) : ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'alienship' ), __( '1 Comment', 'alienship' ), __( '% Comments', 'alienship' ) ); ?></span>
<span class="sep"> | </span>
<?php endif; ?>
- <?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
+ <?php edit_post_link( __( 'Edit', 'alienship' ), '<span class="edit-link">', '</span>' ); ?>
<br /><br />
</footer><!-- #entry-meta -->
</article><!-- #post-<?php the_ID(); ?> -->
View
@@ -12,9 +12,14 @@
</div><!-- #main -->
<footer id="colophon" role="contentinfo">
- <div class="site-info">
- <?php echo 'Copyright &copy; ' . date('Y') . ' ' . get_bloginfo('name') . '. All Rights Reserved.'; ?>
- </div><!-- .site-info -->
+ <!-- <article id="footerwidget" class="container-fluid"> -->
+ <?php dynamic_sidebar("Footer"); ?>
+
+ <div class="row-fluid">
+ <div class="site-info">
+ <?php echo 'Copyright &copy; ' . date('Y') . ' ' . get_bloginfo('name') . '. All Rights Reserved.'; ?>
+ </div><!-- .site-info -->
+ </div><!-- row -->
</footer><!-- #colophon -->
</div><!-- #page -->
@@ -26,6 +31,8 @@
// jQuery("ul#menu-main-menu li.dropdown a").addClass("dropdown-toggle");
jQuery("[id^=menu-] li.dropdown a").addClass("dropdown-toggle");
jQuery("ul.sub-menu li a").removeClass("dropdown-toggle");
+// jQuery("ul.sub-menu li").removeClass("dropdown");
+// jQuery("ul.sub-menu li ul.sub-menu").siblings('a').addClass("dropdown-toggle");
});
</script>
<script type="text/javascript">
Oops, something went wrong.

0 comments on commit ac39d96

Please sign in to comment.