diff --git a/comicpress-config.php b/comicpress-config.php index 09b1b10..b7ca309 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -4,8 +4,9 @@ $comiccat = "3"; //BLOG CATEGORY - the WordPress ID of your blog category (default "1") -$blogcat = "4"; - +<<<<<<< .mine$blogcat = "4"; +=======$blogcat = "1"; +>>>>>>> .theirs //COMIC FOLDER - the folder your comics files are located in (default "comics") $comic_folder = "comics"; diff --git a/comicpress-options.php b/comicpress-options.php index 1c1ebd3..4f8dabb 100644 --- a/comicpress-options.php +++ b/comicpress-options.php @@ -6,19 +6,9 @@ function options() { } function comicpress_admin_page_head() { ?> - - - + + + -
- 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.
+ + + + + + + +
+
+ + + + +
+ 		+ + +
+ + + +
+
+
+
+