From 4c7cbab9bd824de2080d10b7491a58d0cfcdd297 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Fri, 27 Nov 2009 22:04:48 -0700 Subject: [PATCH 1/6] More options styling... :) Moved the .css out of the js folder to the options folder. --- comicpress-config.php | 4 +- comicpress-options.php | 51 +- js/{tabbed => }/tabbed_pages.js | 0 options/archivesearchoptions.php | 90 ++- options/generaloptions.php | 22 +- options/indexoptions.php | 10 +- .../tabbed_pages.css => options/options.css | 32 +- options/postoptions.php | 584 +++++++++--------- options/themestyle.php | 136 ++-- 9 files changed, 464 insertions(+), 465 deletions(-) rename js/{tabbed => }/tabbed_pages.js (100%) rename js/tabbed/tabbed_pages.css => options/options.css (83%) diff --git a/comicpress-config.php b/comicpress-config.php index 9fbbd05..43e4c38 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -1,10 +1,10 @@ - - - + + + -
- ComicPress 2.9 [ ]. Tyler Martin John Bintz Philip M. Hofer (Frumph) Danny Burleson.
- - - - - - - -
-
- - - - -
- 		- - -
- - - -
-
-
- - - - -
-

Archive and Search Page Options

- +
+
+ + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + - - - - - - - diff --git a/options/generaloptions.php b/options/generaloptions.php index d7d6f23..c3225a2 100644 --- a/options/generaloptions.php +++ b/options/generaloptions.php @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -90,7 +90,7 @@ foreach ($dirs_to_search as $dir) { $gnav_directories = array_merge($gnav_directories,glob("${dir}/images/nav/*")); } ?> - - + @@ -126,7 +126,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/options/indexoptions.php b/options/indexoptions.php index 4fabcf9..6b86550 100644 --- a/options/indexoptions.php +++ b/options/indexoptions.php @@ -8,11 +8,11 @@
Archive & Search Page Options
+
+ /> + /> + 		+ full content or just an excerpt when viewing the archives?','comicpress'); ?> +
+
+ /> + /> + 		+ full content or just an excerpt when searching?','comicpress'); ?> +
+ + + + Newest to Oldest will display your posts starting with the most recent. Oldest to Newest will start with the first entry in the category, tag, or date range (e.g., Selecting May 20XX will start with May 1, not May 31st.)','comicpress'); ?> +
- -    - - - full content or just an excerpt when viewing the archives?','comicpress'); ?> -
- -    - - - full content or just an excerpt when searching?','comicpress'); ?> -
+ - Newest to Oldest will display your posts starting with the most recent. Oldest to Newest will start with the first entry in the category, tag, or date range (e.g., Selecting May 20XX will start with May 1, not May 31st.)','comicpress'); ?> -
- - +
/>
/>
/>
/>
/>
/>
/>
+
/>
/>
/>
- + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/js/tabbed/tabbed_pages.css b/options/options.css similarity index 83% rename from js/tabbed/tabbed_pages.css rename to options/options.css index ccd36d3..c032a97 100644 --- a/js/tabbed/tabbed_pages.css +++ b/options/options.css @@ -137,6 +137,11 @@ font-size: 14px; display: block; text-align: right; } + +#comicpress-options table.widefat label.inline-label { +display: inline; +} + #comicpress-options table.widefat select { width: 100%; } @@ -146,14 +151,35 @@ margin-bottom: 10px; border-bottom: none; } -#comicpress-options table.widefat th.scope { +#comicpress-options table.widefat th { width: 200px; } -#comicpress-options table.widefat th.scope label { +#comicpress-options table.widefat th label { color: #21759b; +text-align: left; } -#comicpress-options table.widefat th.scope label:hover { +#comicpress-options table.widefat th label:hover { color: #d54e21; +} + +#comicpress-options table.widefat th, #comicpress-options table.widefat td { +vertical-align: middle; +} +#comicpress-version-title { +font-family: 'Georgia', serif; +font-size: 48px; +letter-spacing: -2px; +margin: 0; +padding: 30px 0 5px 0; +font-variant: small-caps; +} + + #comicpress-version-title a { + color: #333; + } + +div.show .cpadmin-footer img{ + float: none; } \ No newline at end of file diff --git a/options/postoptions.php b/options/postoptions.php index f12a1b0..1564194 100644 --- a/options/postoptions.php +++ b/options/postoptions.php @@ -3,309 +3,293 @@ -
-

Post

-
PostBlog
/>
/>
/>
/>
- - - - - - - - - - - - - - - - - - - - - - - - +
-
- /> - - -
- /> - - -
- /> - - -
- /> - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Post
+ /> + + +
+ /> + + +
+ /> + + +
+ /> + + +
+ + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -
Authors/Avatars/Moods
+ /> + + +
+ + '0', 'show' => 'display_name', 'selected' => $comicpress_options['author_column_one']); + $selected = wp_dropdown_users($args); + $selected = preg_replace('#]*)>#', ' - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- /> - - -

-
- 		- -

-
- 		- -
- /> - - http://gravatar.com. -
+ +
+ + '0', 'show' => 'display_name', 'selected' => $comicpress_options['author_column_two']); + $selected = wp_dropdown_users($args); + $selected = preg_replace('#]*)>#', ' + +
+ /> + + http://gravatar.com. +
+ /> + + http://gravatar.com. +
+ + + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
Calendar
+ + + + +
+ /> + + +
+ /> + + +
-
- /> - - http://gravatar.com. -

-
- - 		-
-

-
- - 		- -
- + + + + + + + + + + + + + + + + +
Tags/Categories
+ /> + + +
+ /> + + +
+ + + + + + + + + + + + + + + + + + + + + + +
Pages & Blog Loop
+ /> + + +
+ /> + + +
+ /> + + +
+ + + +
+
+
+ + +
+
+
+
-
-

Calendar

- - - - - - - - - - - - - - - - - - - - -

-
- - 		- -
- /> - - -
- /> - - -
-
- -
-

Tags/Categories

- - - - - - - - - - - - - - -


- /> - - -
- /> - - -
-
- -
-

Pages & Blog Loop

- - - - - - - - - - - - - - - - - - - - -
- /> - - -
- /> - - -


- /> - - -
-
- - - \ No newline at end of file + + \ No newline at end of file diff --git a/options/themestyle.php b/options/themestyle.php index 4971cca..f7db1e4 100644 --- a/options/themestyle.php +++ b/options/themestyle.php @@ -7,57 +7,93 @@
-
- + + + + - -
- - - - - - - - - - - - -
Layout

- - 		- ComicPress Theme Style - - Comic Strip - 2 Column and Single Panel - 2 Column themes default width: 780px. -

- Comic Strip - 3 Column, Single Panel - 3 Column, and Graphic Novel themes default width: 980px. -
- -
- -
+
-
-
-
- - -
-
-
-
- - - -
+ + + + + + + + + + + +
Layout
+ + + ComicPress Theme Style + + Comic Strip - 2 Column and Single Panel - 2 Column themes default width: 780px. +

+ Comic Strip - 3 Column, Single Panel - 3 Column, and Graphic Novel themes default width: 980px. +
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + +
+ +
+ + [ ]
+ Tyler Martin John Bintz Philip M. Hofer (Frumph) Danny Burleson.
+ + + + + + + +
+
+ + + + +
+ 		+ + +
+ + + +
+
+
+
+ From 83abc7aeee3f1963e57c5a18610d160e1fb12123 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sat, 28 Nov 2009 00:38:44 -0800 Subject: [PATCH 2/6] fix for links page showing the menubar, moved the pw ad space in blog and the blog sidebar to under comic blog post on the index page Signed-off-by: Philip M. Hofer (Frumph) --- comicpress-config.php | 6 +++--- index.php | 22 +++++++++++----------- links.php | 4 +++- style.css | 1 + 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/comicpress-config.php b/comicpress-config.php index 9fbbd05..09b1b10 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -1,10 +1,10 @@ +?> \ No newline at end of file diff --git a/index.php b/index.php index b5f5a88..93a8c12 100644 --- a/index.php +++ b/index.php @@ -48,17 +48,7 @@
- -
-
- -
-
- + have_posts()) : $comicFrontpage->the_post(); display_comic_post(); $comicFrontPage->is_single = true; @@ -66,6 +56,16 @@ if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['dis endwhile; ?> + +
+
+ +
+
+ + + +
diff --git a/links.php b/links.php index c0c9df0..bc44f8b 100644 --- a/links.php +++ b/links.php @@ -7,7 +7,9 @@ Template Name: Links term_id; + $bookmarks = wp_list_bookmarks('echo=0&categorize=1&exclude_category='.$linkcatid); $bookmarks = preg_replace('#
  • ]*)>#', '
  • ', $bookmarks); $bookmarks = preg_replace('#
      ]*)>#', '
        ', $bookmarks); ?> diff --git a/style.css b/style.css index f64fbf0..5148486 100644 --- a/style.css +++ b/style.css @@ -229,6 +229,7 @@ h3, h3 a { } #menu { + text-transform: capitalize; padding: 0; margin: 0; list-style: none; From b68d55f6883ac463a6be080f1b17bb12daed9fd9 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sat, 28 Nov 2009 00:44:40 -0800 Subject: [PATCH 3/6] fix for comicpress-config.php Signed-off-by: Philip M. Hofer (Frumph) --- comicpress-config.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/comicpress-config.php b/comicpress-config.php index b7ca309..e21900b 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -4,9 +4,8 @@ $comiccat = "3"; //BLOG CATEGORY - the WordPress ID of your blog category (default "1") -<<<<<<< .mine$blogcat = "4"; -=======$blogcat = "1"; ->>>>>>> .theirs +$blogcat = "1"; + //COMIC FOLDER - the folder your comics files are located in (default "comics") $comic_folder = "comics"; From 64f69e974e4d8b7e9ba3055f88665581d86fefca Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Sat, 28 Nov 2009 18:30:31 -0700 Subject: [PATCH 4/6] Admin styling continues... almost there... --- options/archivesearchoptions.php | 64 ++++++----- options/buyprintoptions.php | 176 ++++++++++++++++--------------- options/customheaderoptions.php | 86 ++++++++------- options/generaloptions.php | 10 +- options/indexoptions.php | 2 +- options/membersoptions.php | 79 ++++++++------ options/menubaroptions.php | 145 +++++++++++++------------ options/options.css | 62 +++++++---- options/themestyle.php | 5 +- 9 files changed, 349 insertions(+), 280 deletions(-) diff --git a/options/archivesearchoptions.php b/options/archivesearchoptions.php index 4975b56..a4ec982 100644 --- a/options/archivesearchoptions.php +++ b/options/archivesearchoptions.php @@ -8,14 +8,16 @@ - + - + + + + + + +
        Archive & Search Page OptionsArchive & Search Results
        -
        - /> - /> + +
        + /> + /> +
        		full content or just an excerpt when viewing the archives?','comicpress'); ?> @@ -23,15 +25,17 @@
        -
        - /> - /> + +
        + /> + /> +
        		full content or just an excerpt when searching?','comicpress'); ?>
        + + + +
        + +
    • + +
    +
    +
    + + +
    +
    +
    +
    - - - - - - - - - - - - - - - - + + diff --git a/options/buyprintoptions.php b/options/buyprintoptions.php index 37a21e7..3e32d0f 100644 --- a/options/buyprintoptions.php +++ b/options/buyprintoptions.php @@ -3,92 +3,96 @@
    -
    -

    Custom Header Options

    - +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    -
    - -     		-
    - -
    -
    - -     		-
    -
    -
    - http://yourdomain.com/?p=233
    - http://yourdomain.com/shop/
    - /?p=233
    - /shop/
    -
    - /> - - -
    - - - -
    - -
    - - - -
    - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + +
    + + + +
    +
    +
    + http://yourdomain.com/?p=233
    + http://yourdomain.com/shop/
    + /?p=233
    + /shop/ +
    + /> + + +
    + + + +
    + + +
    + + + +
    + + +
    + +
    + +
    +
    +
    + + +
    +
    +
    +
    - - - -
    - \ No newline at end of file + + diff --git a/options/customheaderoptions.php b/options/customheaderoptions.php index d5e47a5..429f757 100644 --- a/options/customheaderoptions.php +++ b/options/customheaderoptions.php @@ -3,47 +3,55 @@
    -
    -

    Custom Header Options

    - - - - - - - - - - -
    - /> - - Appearance. Allows you to add your own header image and customize or hide the default text.','comicpress'); ?> -
    -
    -
    -
    - Usage:

    Edit the user with Dashboard -> Users -> Authors & Users and flag the user you want to be a member with the option at the bottom.

    -

    Inside posts, add [members] content you only want members to see [/members]

    -

    When setting a 'members' category, you *cannot* use an existing comic category, uncategorized, or blog category!

    -

    You MUST create a whole new category and called it "members", then you select that category here and create a page called "Members" or something equivelant and associate the Member's Only template to it.

    -

    This will make it so that that category is only seen as blogposts inside that area and not anywhere else on the site unless the user has the members flag.

    -
    -
    - - + diff --git a/options/menubaroptions.php b/options/menubaroptions.php index b8c3fa7..802b18c 100644 --- a/options/menubaroptions.php +++ b/options/menubaroptions.php @@ -3,73 +3,82 @@
    -
    -

    Main

    - +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - /> - - -
    - /> - - -
    - /> - - -
    - /> - - -
    - /> - - Contact button to the Menubar associated with your admin email. You can also create a links category called Menubar and whatever links you add to that will appear in the Menubar.','comicpress'); ?> -
    - /> - - menubar (you will need to create this category if it does not already exist) to create custom links on the Menubar (mostly used for making graphic images as links). Otherwise, ALL published pages will appear automatically.','comicpress'); ?> -
    -
    - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Menubar
    + /> + + +
    + /> + + +
    + /> + + +
    + /> + + +
    + /> + + Contact button to the Menubar associated with your admin email. You can also create a links category called Menubar and whatever links you add to that will appear in the Menubar.','comicpress'); ?> +
    + /> + + menubar (you will need to create this category if it does not already exist) to create custom links on the Menubar (mostly used for making graphic images as links). Otherwise, ALL published pages will appear automatically.','comicpress'); ?> +
    + + + +
    +
    +
    + + +
    +
    +
    +
    +
    - + + diff --git a/options/options.css b/options/options.css index c032a97..e2465ea 100644 --- a/options/options.css +++ b/options/options.css @@ -116,6 +116,7 @@ div.show img { } #comicpress-options-save { + margin-bottom: 15px; border-width: 0 1px 1px 1px; border-style: solid; border-color: #dfdfdf; @@ -130,56 +131,79 @@ div.show img { } #comicpress-options table.widefat thead tr th { -font-size: 14px; + font-size: 14px; } #comicpress-options table.widefat label { -display: block; -text-align: right; + display: block; + text-align: right; } #comicpress-options table.widefat label.inline-label { -display: inline; + display: inline; } #comicpress-options table.widefat select { -width: 100%; + width: 100%; } #comicpress-options table.widefat { -margin-bottom: 10px; -border-bottom: none; + margin-bottom: 10px; + border-bottom: none; } #comicpress-options table.widefat th { -width: 200px; + width: 200px; +} + +#comicpress-options table.widefat th input{ +margin: 1px; +padding: 3px; +width: 100%; +} + +#comicpress-options table.widefat th .radio input{ +margin: 0; +padding: 0; +width: auto; } #comicpress-options table.widefat th label { -color: #21759b; -text-align: left; + color: #21759b; + text-align: left; } #comicpress-options table.widefat th label:hover { -color: #d54e21; + color: #d54e21; } #comicpress-options table.widefat th, #comicpress-options table.widefat td { -vertical-align: middle; + vertical-align: middle; } #comicpress-version-title { -font-family: 'Georgia', serif; -font-size: 48px; -letter-spacing: -2px; -margin: 0; -padding: 30px 0 5px 0; -font-variant: small-caps; + font-family: 'Georgia', serif; + font-size: 48px; + letter-spacing: -2px; + margin: 0; + padding: 30px 0 5px 0; + font-variant: small-caps; } #comicpress-version-title a { color: #333; } +#comicpress-version-number { + font-family: monospace; + font-size: 16px; + letter-spacing: 8px; +} + +#comicpress-options .radio { + padding-top: 5px; + text-align: right; +} + div.show .cpadmin-footer img{ float: none; -} \ No newline at end of file +} diff --git a/options/themestyle.php b/options/themestyle.php index f7db1e4..3bb387d 100644 --- a/options/themestyle.php +++ b/options/themestyle.php @@ -17,7 +17,7 @@ - + @@ -63,7 +63,7 @@
    - [ ]
    +
    []
    Tyler Martin John Bintz Philip M. Hofer (Frumph) Danny Burleson.
    Layout
    @@ -96,4 +96,3 @@ - From 7058c3a50d9250015a7fb9d3114ff0f00cb25853 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sun, 29 Nov 2009 04:40:02 -0800 Subject: [PATCH 5/6] Template edits Signed-off-by: Philip M. Hofer (Frumph) --- archive-comic-calendar.php | 2 ++ archive-comic-year.php | 2 ++ archive-comic.php | 3 ++- buystrip.php | 2 +- links.php | 5 +++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php index 7b30b7b..de70428 100644 --- a/archive-comic-calendar.php +++ b/archive-comic-calendar.php @@ -161,6 +161,8 @@ foreach ( $years as $year ) { + ', '

    ') ?> +
    diff --git a/archive-comic-year.php b/archive-comic-year.php index 3b54152..32857ea 100644 --- a/archive-comic-year.php +++ b/archive-comic-year.php @@ -34,6 +34,8 @@ if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
    +
    + ', '

    ') ?>
    | get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC"); diff --git a/archive-comic.php b/archive-comic.php index a0fa4ec..7f87573 100644 --- a/archive-comic.php +++ b/archive-comic.php @@ -36,7 +36,8 @@ Template Name: Comic Archive
    - + ', '

    ') ?> +
    diff --git a/buystrip.php b/buystrip.php index d37d951..9e7ffdf 100644 --- a/buystrip.php +++ b/buystrip.php @@ -110,8 +110,8 @@ Template Version: 2.14 '

    '.__('Pages:','comicpress').' ', 'after' => '

    ', 'next_or_number' => 'number')) ?> +
    ', '

    ') ?> -
    diff --git a/links.php b/links.php index bc44f8b..7218986 100644 --- a/links.php +++ b/links.php @@ -28,6 +28,11 @@ Template Name: Links

    +
    + +
    +
    + ', '

    ') ?>
      From ff0d7d94d672bb715de741f3fbd5ce067f798b5f Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sun, 29 Nov 2009 04:42:55 -0800 Subject: [PATCH 6/6] Pushing as 2.9.0.3 Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 867d5cd..7bcfc2d 100644 --- a/functions.php +++ b/functions.php @@ -75,7 +75,7 @@ function comicpress_load_options() { global $comicpress_options; $comicpress_options = get_option('comicpress_options'); if (empty($comicpress_options)) { - $comicpress_options['comicpress_version'] = '2.9.0.2'; + $comicpress_options['comicpress_version'] = '2.9.0.3'; foreach (array( 'disable_comic_frontpage' => false, @@ -153,7 +153,7 @@ function comicpress_load_options() { add_option('comicpress_options', $comicpress_options, '', 'yes'); // update_option('comicpress_options', $comicpress_options); } - $comicpress_options['comicpress_version'] = '2.9.0.2'; + $comicpress_options['comicpress_version'] = '2.9.0.3'; update_option('comicpress_options', $comicpress_options); return $comicpress_options; }