From efee24cff912952fb3001c26d29a4f1827327db1 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Thu, 17 Sep 2009 15:45:30 -0700 Subject: [PATCH] subcontent-area and added layout-foot.php and layout-head.php to handle the referencing of the layouts Signed-off-by: Philip M. Hofer (Frumph) --- 404.php | 37 +------- archive-comic-calendar.php | 45 +--------- archive-comic-storyline-thumbs.php | 45 +--------- archive-comic-storyline.php | 45 +--------- archive-comic-year.php | 45 +--------- archive-comic.php | 45 +--------- archive.php | 45 +--------- archives.php | 45 +--------- author.php | 45 +--------- blog.php | 47 +--------- buystrip.php | 45 +--------- comicpress-options.php | 2 +- favicon.ico | Bin 1150 -> 0 bytes footer.php | 2 +- functions.php | 12 ++- functions/displayblogpost.php | 4 +- header.php | 13 +-- image.php | 45 +--------- index.php | 26 ++---- layout-foot.php | 22 +++++ layout-head.php | 26 ++++++ links.php | 45 +--------- page.php | 46 +--------- search-transcript.php | 46 +--------- search.php | 45 +--------- single.php | 21 +---- themepack/twopointfive/style.css | 21 ++--- widgets/menubar.php | 136 ++++++++++++++--------------- 28 files changed, 192 insertions(+), 809 deletions(-) delete mode 100644 favicon.ico create mode 100644 layout-foot.php create mode 100644 layout-head.php diff --git a/404.php b/404.php index 451346b..8c52180 100644 --- a/404.php +++ b/404.php @@ -1,22 +1,5 @@ - -
-
- - - - -
- - - -
-
- - - -
- + @@ -39,21 +22,5 @@
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php index 804f14c..4c4081f 100644 --- a/archive-comic-calendar.php +++ b/archive-comic-calendar.php @@ -4,32 +4,7 @@ Template Name: Comic Calendar Archive */ ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php index f6f2f35..8e510f0 100644 --- a/archive-comic-storyline-thumbs.php +++ b/archive-comic-storyline-thumbs.php @@ -4,32 +4,7 @@ Template Name: Comic Storyline with Thumbs */ ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
@@ -98,21 +73,5 @@ Template Name: Comic Storyline with Thumbs
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php index c7bd284..86e57bb 100644 --- a/archive-comic-storyline.php +++ b/archive-comic-storyline.php @@ -4,32 +4,7 @@ Template Name: Comic Storyline Archive */ ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
@@ -100,21 +75,5 @@ Template Name: Comic Storyline Archive
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive-comic-year.php b/archive-comic-year.php index 96dce09..0fb87f5 100644 --- a/archive-comic-year.php +++ b/archive-comic-year.php @@ -13,32 +13,7 @@ Template Name: Comic Year Archive if (empty($archive_year)) $archive_year = date('Y'); ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
@@ -73,21 +48,5 @@ Template Name: Comic Year Archive
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive-comic.php b/archive-comic.php index d762508..9ffece5 100644 --- a/archive-comic.php +++ b/archive-comic.php @@ -4,32 +4,7 @@ Template Name: Comic Archive */ ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
@@ -61,21 +36,5 @@ Template Name: Comic Archive
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archive.php b/archive.php index 22bd5df..6496a46 100644 --- a/archive.php +++ b/archive.php @@ -1,30 +1,5 @@ - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/archives.php b/archives.php index a5464b3..f34b872 100644 --- a/archives.php +++ b/archives.php @@ -4,32 +4,7 @@ Template Name: Archives */ ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
@@ -47,21 +22,5 @@ Template Name: Archives
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/author.php b/author.php index 6f64fb0..b841d4f 100644 --- a/author.php +++ b/author.php @@ -1,30 +1,5 @@ - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- +
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/blog.php b/blog.php index 9309f03..4c51b17 100644 --- a/blog.php +++ b/blog.php @@ -4,34 +4,9 @@ Template Name: Blog */ ?> - -
-
- - - - -
- - - -
-
- + - -
- - - - - - -
-
-
- - - - -
-
- - - -
- - -
-
-
+ \ No newline at end of file diff --git a/buystrip.php b/buystrip.php index 6b2cc33..590aeae 100644 --- a/buystrip.php +++ b/buystrip.php @@ -8,32 +8,7 @@ Templete Author Email: philip@frumph.net if (isset($_REQUEST['comic'])) $comicnum = (int)$_REQUEST['comic']; ?> - -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- + @@ -131,21 +106,5 @@ Templete Author Email: philip@frumph.net
- - - - -
-
- - - -
- - -
-
-
+ diff --git a/comicpress-options.php b/comicpress-options.php index 573463b..46d2cf8 100644 --- a/comicpress-options.php +++ b/comicpress-options.php @@ -425,7 +425,7 @@ function comicpress_admin() { case "comicpress-excerpt_or_content_search": ?> Would you like to have users see the entire content or just an excerpt when searching?

- +    diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 65aebf9a78afa8794c7d9bd51514e94161ebd19a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcma)*eN2;A6o+p+maf~9xphKrGwM+spRLM&2IU8-lwuP*;{*epWWoY676z2=0{ka=loNZQh; zqQ;&!Y!BL$7HEiwA%G9HIM$kS!{Zpep63! zRxisx4zT-+ha7bO$<}>A-YFPm_0BOe^MfpScLZzJMRfYjJ&`%&xz@~1ENgC3*$|+* zDL|U-Cv;0aXcu{iT6~>XQigbM`)y*=Z<3VxEmAY}4>pTwNtrSyt(OX?kF#BWkYo4o ztf?C@uS-R)-Du*@^YXGjlHb3A!EzDPk_u(&K5Wj!j24!?eU1zL_v!4qL#*WtV)jXu zQxUYFiD^MQrxi_XD~WHlq3WH{Gk17R)&@S=(S>Jdgt|sA&(Ezzyy{YMNAR_3Kc!z}*kMZ%p>HqN-ww&XvSy!V{%UWA4A8x2)Yko6Z@|sw;;W!^;*O9r}jnv9J z*u15NgJm6I{qUV2#d}*R*x5)yVI!Z~n>cjjJ4Q#x@ehwtvag+8pPis^S3~&z`@LK?&QV|KaUBMPYJMp{Di%j-%&DO)Z&zKOwZ*Y}dw( z$7pZA%!3CL3=fae+}uxneQ%hKj=`{A#!jCepwM2Y)=&0y{m3d(>sOc4lbc&bU*8ac zz(elc3oXCb;=E)wAIg^r#6^G+2moEK`-#^0LyJL7f zw{g3_XT^#VwSVNfPiiAGP4{o~Hm})i55>pZLq_Aar}pn(^Mtsi6XN_cLhRQ}5t%L0 MejJy3rABK10q%nF9RL6T diff --git a/footer.php b/footer.php index 15eea83..a237841 100644 --- a/footer.php +++ b/footer.php @@ -18,7 +18,7 @@
-
+
diff --git a/functions.php b/functions.php index 7047884..1570814 100644 --- a/functions.php +++ b/functions.php @@ -5,7 +5,7 @@ if (function_exists('id_get_comment_number')) { remove_filter('comments_number','id_get_comment_number'); } -$comicpress_version = '2.8.1.8'; +$comicpress_version = '2.8.1.9'; // Remove the wptexturizer from changing the quotes and squotes. // remove_filter('the_title', 'wptexturize'); @@ -767,4 +767,14 @@ function cp_copyright_year() { return $output; } +function comicpress_check_themepack_file($filename = '') { + global $themepack_directory; + if (empty($filename)) return false; + if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename) ) { + include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename); + return true; + } + return false; +} + ?> \ No newline at end of file diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php index efb75ac..8aac140 100644 --- a/functions/displayblogpost.php +++ b/functions/displayblogpost.php @@ -44,9 +44,7 @@ function display_blog_post() { comment_status) { - if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/commentlink.php') ) { - include(get_template_directory() . '/themepack/' .$themepack_directory. '/commentlink.php'); - } else { ?> + if (comicpress_check_themepack_file('commentlink.php') == false) { ?>
  No Comments ', '1 Comment ', '% Comments '); ?>
- @@ -38,7 +37,6 @@ > - @@ -46,14 +44,16 @@ -
-
+
+
-
-
+
+
+ + + + +
+ + +
+
+
diff --git a/layout-head.php b/layout-head.php new file mode 100644 index 0000000..9c5dd84 --- /dev/null +++ b/layout-head.php @@ -0,0 +1,26 @@ +
+
+ + + + +
+ + + +
+
+ + + +
+
+ + + + + + +
+
+ \ No newline at end of file diff --git a/links.php b/links.php index c29ef08..26689a9 100644 --- a/links.php +++ b/links.php @@ -4,32 +4,9 @@ Template Name: Links */ ?> + -
-
- - - - -
- - - -
-
- - - -
- - - - - - -
-
- ]*)>#', '
  • ', $bookmarks); $bookmarks = preg_replace('#
      ]*)>#', '
        ', $bookmarks); @@ -53,21 +30,5 @@ Template Name: Links
    • - - - - -
    -
    - - - -
    - - -
    -
    -
    + \ No newline at end of file diff --git a/page.php b/page.php index 6d69212..6bea46f 100644 --- a/page.php +++ b/page.php @@ -1,30 +1,5 @@ - -
    -
    - - - - -
    - - - -
    -
    - - - -
    - - - - - - -
    -
    - +
    @@ -47,22 +22,5 @@
    - - - - -
    -
    - - - -
    - - -
    - -
    -
    + \ No newline at end of file diff --git a/search-transcript.php b/search-transcript.php index 8b4ab98..c011af7 100644 --- a/search-transcript.php +++ b/search-transcript.php @@ -1,30 +1,5 @@ - -
    -
    - - - - -
    - - - -
    -
    - - - -
    - - - - - - -
    -
    - + post_count;
    - - - - -
    -
    - - - -
    - - -
    -
    -
    -
    + \ No newline at end of file diff --git a/search.php b/search.php index 3bc7c01..16dabb4 100644 --- a/search.php +++ b/search.php @@ -1,30 +1,5 @@ - -
    -
    - - - - -
    - - - -
    -
    - - - -
    - - - - - - -
    -
    - + post_count;
    - - - - -
    -
    - - - -
    - - -
    -
    -
    + \ No newline at end of file diff --git a/single.php b/single.php index 0d7fcb5..0e2d419 100644 --- a/single.php +++ b/single.php @@ -28,7 +28,8 @@ -
    +
    +
    @@ -76,21 +77,5 @@
    - - - - -
    -
    - - - -
    - - -
    -
    -
    + \ No newline at end of file diff --git a/themepack/twopointfive/style.css b/themepack/twopointfive/style.css index 13165a1..559d569 100644 --- a/themepack/twopointfive/style.css +++ b/themepack/twopointfive/style.css @@ -68,23 +68,24 @@ body { color: #fff; } -#page { - padding: 0 20px; - background: url('classic-background-narrow.png') top center repeat-y; -} -#page-wide { - padding: 0 20px; - background: url('classic-background-wide.png') top center repeat-y; -} - -#page-wrap { +#page, #page-wide { background: #ddd; border-left: solid 1px #000; border-right: solid 1px #000; border-bottom: solid 1px #000; } +#page-wrap { + padding: 0 10px; + background: url('classic-background-narrow.png') top center repeat-y; +} + +#page-wrap-wide { + padding: 0 10px; + background: url('classic-background-wide.png') top center repeat-y; +} + .page .narrowcolumn { padding-top: 5px; } #comic-head { diff --git a/widgets/menubar.php b/widgets/menubar.php index 7c6caed..33e9939 100644 --- a/widgets/menubar.php +++ b/widgets/menubar.php @@ -11,81 +11,79 @@ Author URI: http://webcomicplanet.com/ function comicpress_menubar() { - global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory; - if (file_exists(get_template_directory() . '/'.$themepack_directory.'/menubar.php') || function_exists('suckerfish')) { +global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory; + if (comicpress_check_themepack_file('menubar.php') == false) { if (function_exists('suckerfish')) { suckerfish(); - } else { - include(get_template_directory() . '/'.$themepack_directory.'/menubar.php'); - } - } else { ?> -