Permalink
Browse files

Merge branch 'master' of github.com:scac/scac-themes

Conflicts:
	themes/scacseattle.org/sass/church.css.sass
	themes/scacseattle.org/sass/footer.css.sass
	themes/scacseattle.org/sass/sidebars.css.sass
	themes/scacseattle.org/sass/style.css.sass
	themes/scacseattle.org/sass/visit.css.sass
	themes/scacseattle.org/style.css
  • Loading branch information...
2 parents 9e10265 + 55f8eaa commit 659415c125debb1151db2403f9cff7431cf312a6 Justin Louie committed Dec 31, 2012
@@ -1,57 +1,57 @@
-<?php
-/**
- * The template for displaying Archive pages.
- *
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
- *
- * @package _s
- * @since _s 1.0
- */
-
-get_header(); ?>
-
- <section id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
-
-
- <header class="page-header">
- <h1 class="page-title">Sermons @ SCAC</h1>
-
- </header><!-- .page-header -->
-
- <div class="sermon-series-listings-container">
-
- <table class="sermon-series-listings">
- <tr>
- <?php
- if ( 'ct_sermon' == get_post_type() ) :
- global $nggdb;
- $taxonomy = 'sermon_series';
- $terms = get_terms($taxonomy);
- foreach ($terms as $k => $term) {
- $current_series = get_the_term_list('', 'sermon_series');
- ?>
- <td>
- <?php
- if(isset($nggdb)){
- $img = $nggdb->find_image($term->slug);
- }
- ?>
- <div class="series-img-container"><a href="<?php echo get_term_link($term); ?>"><img src="<?php echo $img->imageURL; ?>"></a></div>
- <div class="series-img-link"><a href="<?php echo get_term_link($term); ?>"><?php echo $term->name; ?></a></div>
- <div class="series-img-descripton"><?php echo $img->description; ?></div>
- </td>
- <?php
- if(($k+1)%3 == 0)
- echo "</tr><tr>"; //make a new row every 3rd sermon
- }
- endif;
- ?>
- </tr>
- </table>
- </div>
- </div><!-- #content .site-content -->
- </section><!-- #primary .content-area -->
-
-<?php get_sidebar('sermons'); ?>
+<?php
+/**
+ * The template for displaying Archive pages.
+ *
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package _s
+ * @since _s 1.0
+ */
+
+get_header(); ?>
+
+ <section id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
+
+
+ <header class="page-header">
+ <h1 class="page-title">Sermons</h1>
+
+ </header><!-- .page-header -->
+
+ <div class="sermon-series-listings-container">
+
+ <table class="sermon-series-listings">
+ <tr>
+ <?php
+ if ( 'ct_sermon' == get_post_type() ) :
+ global $nggdb;
+ $taxonomy = 'sermon_series';
+ $terms = get_terms($taxonomy);
+ foreach ($terms as $k => $term) {
+ $current_series = get_the_term_list('', 'sermon_series');
+ ?>
+ <td>
+ <?php
+ if(isset($nggdb)){
+ $img = $nggdb->find_image($term->slug);
+ }
+ ?>
+ <div class="series-img-container"><a href="<?php echo get_term_link($term); ?>"><img src="<?php echo $img->imageURL; ?>"></a></div>
+ <div class="series-img-link"><a href="<?php echo get_term_link($term); ?>"><?php echo $term->name; ?></a></div>
+ <div class="series-img-descripton"><?php echo $img->description; ?></div>
+ </td>
+ <?php
+ if(($k+1)%3 == 0)
+ echo "</tr><tr>"; //make a new row every 3rd sermon
+ }
+ endif;
+ ?>
+ </tr>
+ </table>
+ </div>
+ </div><!-- #content .site-content -->
+ </section><!-- #primary .content-area -->
+
+<?php get_sidebar('sermons'); ?>
<?php get_footer(); ?>
@@ -1,78 +1,78 @@
-<?php
-/**
- * The template for displaying the footer.
- *
- * Contains the closing of the id=main div and all content after
- *
- * @package _s
- * @since _s 1.0
- */
-?>
-
- </div><!-- #main .site-main -->
-
- <footer id="colophon" class="site-footer clearfix" role="contentinfo">
-
- <div class="links-container clearfix">
- <ul>
- <li class="listing-headers">
- <a href="<?php echo home_url("/church/our-vision/"); ?>" class="footer-main-link">Church</a>
- <ul class="footer-listings">
- <?php
- $page = get_page_by_title('church');
- wp_list_pages(array(
- 'title_li' => '',
- 'child_of' => $page->ID,
- ));
- ?>
- </ul>
- </li>
- <li class="listing-headers">
- <a href="<?php echo home_url("/visit/"); ?>" class="footer-main-link">Visit</a>
- </li>
- <li class="listing-headers">
- <a href="<?php echo home_url("/ministries/"); ?>" class="footer-main-link">Ministries</a>
- <ul class="footer-listings">
- <?php
- $page = get_page_by_title('ministries');
- wp_list_pages(array(
- 'title_li' => '',
- 'child_of' => $page->ID,
- ));
- ?>
- </ul>
- </li>
- <li class="listing-headers">
- <a href="<?php echo home_url("/sermons/"); ?>" class="footer-main-link">Sermons</a>
- <ul class="footer-listings">
- <?php
- $taxonomy = 'sermon_series';
- $terms = get_terms($taxonomy);
- for($i=0;$i < 5; $i++) :
- $term = $terms[$i];
- ?>
- <li class="page_item <?php echo ($global_term->slug == $term->slug ? "current_page_item" : ""); ?>">
- <a href="<?php echo get_term_link($term); ?>"><span class="active-box"></span><?php echo $term->name; ?></a>
- </li>
- <?php
- endfor;
- ?>
- </ul>
- </li>
- </ul>
-
- </div>
-
- <p class="copyright">© 2012 Seattle Chinese Alliance Church.</p>
-
- <div class="social-btns">
- <a href="https://twitter.com/scac_em" target="_blank"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/bird_twitter.png" width="47px" height="47px" border="0"></a>
- <a href="http://www.facebook.com/groups/2209756221/" target="_blank" class="fb-btn"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/fb_logo.png" width="30px" height="31px" border="0"></a>
- </div>
- </footer><!-- #colophon .site-footer -->
-</div><!-- #page .hfeed .site -->
-
-<?php wp_footer(); ?>
-
-</body>
-</html>
+<?php
+/**
+ * The template for displaying the footer.
+ *
+ * Contains the closing of the id=main div and all content after
+ *
+ * @package _s
+ * @since _s 1.0
+ */
+?>
+
+ </div><!-- #main .site-main -->
+
+ <footer id="colophon" class="site-footer clearfix" role="contentinfo">
+
+ <div class="links-container clearfix">
+ <ul>
+ <li class="listing-headers">
+ <a href="<?php echo home_url("/church/our-vision/"); ?>" class="footer-main-link">Church</a>
+ <ul class="footer-listings">
+ <?php
+ $page = get_page_by_title('church');
+ wp_list_pages(array(
+ 'title_li' => '',
+ 'child_of' => $page->ID,
+ ));
+ ?>
+ </ul>
+ </li>
+ <li class="listing-headers">
+ <a href="<?php echo home_url("/visit/"); ?>" class="footer-main-link">Visit</a>
+ </li>
+ <li class="listing-headers">
+ <a href="<?php echo home_url("/ministries/"); ?>" class="footer-main-link">Ministries</a>
+ <ul class="footer-listings">
+ <?php
+ $page = get_page_by_title('ministries');
+ wp_list_pages(array(
+ 'title_li' => '',
+ 'child_of' => $page->ID,
+ ));
+ ?>
+ </ul>
+ </li>
+<!-- <li class="listing-headers">
+ <a href="<?php echo home_url("/sermons/"); ?>" class="footer-main-link">Sermons</a>
+ <ul class="footer-listings">
+ <?php
+ $taxonomy = 'sermon_series';
+ $terms = get_terms($taxonomy);
+ for($i=0;$i < 5; $i++) :
+ $term = $terms[$i];
+ ?>
+ <li class="page_item <?php echo ($global_term->slug == $term->slug ? "current_page_item" : ""); ?>">
+ <a href="<?php echo get_term_link($term); ?>"><span class="active-box"></span><?php echo $term->name; ?></a>
+ </li>
+ <?php
+ endfor;
+ ?>
+ </ul>
+ </li> -->
+ </ul>
+
+ </div>
+
+ <p class="copyright">© 2012 Seattle Chinese Alliance Church.</p>
+
+ <div class="social-btns">
+ <a href="https://twitter.com/scac_em" target="_blank"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/bird_twitter.png" width="47px" height="47px" border="0"></a>
+ <a href="http://www.facebook.com/groups/2209756221/" target="_blank" class="fb-btn"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/fb_logo.png" width="30px" height="31px" border="0"></a>
+ </div>
+ </footer><!-- #colophon .site-footer -->
+</div><!-- #page .hfeed .site -->
+
+<?php wp_footer(); ?>
+
+</body>
+</html>
Oops, something went wrong.

0 comments on commit 659415c

Please sign in to comment.