From 626c1af3df9e6888d7d837601b991e848bf81e0c Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Fri, 4 Sep 2009 08:39:27 -0700 Subject: [PATCH] 2.8.1 Refresh. Signed-off-by: Philip M. Hofer (Frumph) --- comicpress-config.php | 8 +- comicpress-options-config.php | 5 ++ comicpress-options.php | 152 ++++++++++++++++++++-------------- functions.php | 9 +- functions/displaycomic.php | 6 +- header.php | 9 +- index.php | 11 ++- sidebar-header.php | 4 +- single.php | 15 ++-- widgets/menubar.php | 23 ++--- 10 files changed, 140 insertions(+), 102 deletions(-) diff --git a/comicpress-config.php b/comicpress-config.php index ff2bd9a..0f610cc 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -1,19 +1,19 @@ "default", "type" => "comicpress-calendar_directory"), + array( + "id" => "comicpress-disable_dynamic_menubar_links", + "default" => "no", + "type" => "comicpress-disable_dynamic_menubar_links"), + array("type" => "close") ); diff --git a/comicpress-options.php b/comicpress-options.php index 2f47574..ce2dd79 100644 --- a/comicpress-options.php +++ b/comicpress-options.php @@ -78,9 +78,10 @@ function comicpress_admin() {
Theme Style
-
General Settings
+
General
Index Page
-
Post Options
+
Post
+
Menubar
Custom Header
Buy Print
@@ -143,63 +144,6 @@ function comicpress_admin() { - - Enable Search Form in Menubar?

- - -    - - - - Searchforms can be fun when you have something to search for. - - - - - - Enable RSS Link in Menubar?

- - -    - - - - It's a link, it links to the RSS. It does *not* link to your the winning lottory numbers. - - - - - - Enable mini navigation buttons in the Menubar?

- - -    - - - - Mini Navigation arrows reside on the right side of the menubar, just the previous and next arrows. - - - - - - Contact Link in Menubar

Setting to "Yes" will put [ CONTACT ] in the menubar and associate it with your admin's email. - - -    - - - - You can also create a links category called "menulinks" and whatever link you add to that will appear in the menubar. - - - - Enable Sidebar CSS?

Enabling this will use the standard CSS styling of the sidebars for all the widget areas.

@@ -621,7 +565,95 @@ function comicpress_admin() {
- + + +
diff --git a/functions.php b/functions.php index a8a2fba..8409f98 100644 --- a/functions.php +++ b/functions.php @@ -28,8 +28,8 @@ if (!empty($wpmu_version)) { 'comicsarchive_path' => 'archive_comic_folder', 'archive_comic_width' => 'archive_comic_width', 'rss_comic_width' => 'rss_comic_width', - 'blog_postcount' => 'blog_postcount') as $option => $variable_name) { - $variables_to_extract[$variable_name] = get_option("comicpress-${option}"); + 'blog_postcount' => 'blog_postcount') as $options => $variable_name) { + $variables_to_extract[$variable_name] = get_option("comicpress-${options}"); } extract($variables_to_extract); @@ -82,7 +82,8 @@ if (get_option('upload_path') !== false) { 'enable_navigation_in_menubar' => 'enable_navigation_in_menubar', 'disable_lrsidebars_frontpage' => 'disable_lrsidebars_frontpage', 'calendar_directory' => 'calendar_directory', - 'contact_in_menubar' => 'contact_in_menubar' ) as $options => $variable_name) { + 'contact_in_menubar' => 'contact_in_menubar', + 'disable_dynamic_menubar_links' => 'disable_dynamic_menubar_links' ) as $options => $variable_name) { $variables_to_extract[$variable_name] = get_option("comicpress-${options}"); } @@ -106,8 +107,6 @@ global $cp_theme_style; return false; } -require_once(get_template_directory() . '/functions/userpages.php'); - // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. require_once(get_template_directory() . '/widgets/control-panel.php'); diff --git a/functions/displaycomic.php b/functions/displaycomic.php index e9a917a..576d08f 100644 --- a/functions/displaycomic.php +++ b/functions/displaycomic.php @@ -20,14 +20,12 @@ function display_comic() { ?> - - - +

Get Flash!

Get Adobe Flash player

- +
-

-
- + +

+
+ + +
diff --git a/index.php b/index.php index 030b74e..ebd02d0 100644 --- a/index.php +++ b/index.php @@ -23,12 +23,11 @@ while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>
-
- - - -
-
+
+
+
+
+
diff --git a/sidebar-header.php b/sidebar-header.php index 52c8017..14af939 100644 --- a/sidebar-header.php +++ b/sidebar-header.php @@ -1,7 +1,7 @@ - + - + diff --git a/single.php b/single.php index bfd983f..357e7b5 100644 --- a/single.php +++ b/single.php @@ -18,14 +18,13 @@ -
-
- - - -
-
-
+
+
+
+
+
+
+
diff --git a/widgets/menubar.php b/widgets/menubar.php index 8b86399..5da98c5 100644 --- a/widgets/menubar.php +++ b/widgets/menubar.php @@ -11,7 +11,7 @@ Author URI: http://webcomicplanet.com/ function comicpress_menubar() { - global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar; + global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links; if (file_exists(get_template_directory() . '/custom-menubar.php') || function_exists('suckerfish')) { if (function_exists('suckerfish')) { suckerfish(); @@ -49,15 +49,18 @@ function comicpress_menubar() { ]*)>#', '
  • ', $menulinks); - $menulinks = preg_replace('#
      ]*)>#', '', $menulinks); - $menulinks = str_replace('
    ', '', $menulinks); - $bookmarkargs = - $bookmarks = wp_list_bookmarks('echo=0&title_li=&categorize=1&title_before=&title_after=&exclude_name=menubar'); - $bookmarks = preg_replace('#
  • ]*)>#', '
  • ', $bookmarks); - $bookmarks = preg_replace('#
      ]*)>#', '
        ', $bookmarks); - $listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li='); + $menulinks = wp_list_bookmarks('echo=0&title_li=&categorize=0&title_before=&title_after=&category_name=menubar'); + $menulinks = preg_replace('#
      • ]*)>#', '
      • ', $menulinks); + $menulinks = preg_replace('#
          ]*)>#', '', $menulinks); + $menulinks = str_replace('
        ', '', $menulinks); + $bookmarkargs = + $bookmarks = wp_list_bookmarks('echo=0&title_li=&categorize=1&title_before=&title_after=&exclude_name=menubar'); + $bookmarks = preg_replace('#
      • ]*)>#', '
      • ', $bookmarks); + $bookmarks = preg_replace('#
          ]*)>#', '
            ', $bookmarks); + $listpages = ''; + if ($disable_dynamic_menubar_links != 'yes') { + $listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li='); + } if (!empty($bookmarks)) { $listpages = str_replace('Links', 'Links