mirror of
https://github.com/Frumph/comic-easel.git
synced 2026-02-04 02:51:20 +01:00
New archive options page, .. remind myself never to program while angry at the world, made a mistake with backwards compatibility.
This commit is contained in:
Frumph
@@ -44,6 +44,7 @@ if ( isset($_POST['_wpnonce']) && wp_verify_nonce($_POST['_wpnonce'], 'update-op
|
||||
$tab = 'general';
|
||||
update_option('comiceasel-config', $ceo_options);
|
||||
}
|
||||
|
||||
if ($_REQUEST['action'] == 'ceo_save_navigation') {
|
||||
|
||||
foreach (array(
|
||||
@@ -70,6 +71,26 @@ if ( isset($_POST['_wpnonce']) && wp_verify_nonce($_POST['_wpnonce'], 'update-op
|
||||
$tab = 'navigation';
|
||||
update_option('comiceasel-config', $ceo_options);
|
||||
}
|
||||
|
||||
if ($_REQUEST['action'] == 'ceo_save_archive') {
|
||||
|
||||
/* foreach (array(
|
||||
) as $key) {
|
||||
if (isset($_REQUEST[$key]))
|
||||
$ceo_options[$key] = wp_filter_nohtml_kses($_REQUEST[$key]);
|
||||
} */
|
||||
|
||||
foreach (array(
|
||||
'include_comics_in_blog_archive'
|
||||
) as $key) {
|
||||
if (!isset($_REQUEST[$key])) $_REQUEST[$key] = 0;
|
||||
$ceo_options[$key] = (bool)( $_REQUEST[$key] == 1 ? true : false );
|
||||
}
|
||||
|
||||
$tab = 'archive';
|
||||
update_option('comiceasel-config', $ceo_options);
|
||||
}
|
||||
|
||||
if ($tab) { ?>
|
||||
<div id="message" class="updated"><p><strong><?php _e('Comic Easel Settings SAVED!','comiceasel'); ?></strong></p></div>
|
||||
<script>function hidemessage() { document.getElementById('message').style.display = 'none'; }</script>
|
||||
@@ -82,7 +103,8 @@ if ( isset($_POST['_wpnonce']) && wp_verify_nonce($_POST['_wpnonce'], 'update-op
|
||||
<?php
|
||||
$tab_info = array(
|
||||
'general' => __('General', 'comiceasel'),
|
||||
'navigation' => __('Navigation', 'comiceasel')
|
||||
'navigation' => __('Navigation', 'comiceasel'),
|
||||
'archive' => __('Archive', 'comiceasel')
|
||||
);
|
||||
if (empty($tab)) { $tab = array_shift(array_keys($tab_info)); }
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Plugin Name: Comic Easel
|
||||
Plugin URI: http://comiceasel.com
|
||||
Description: Comic Easel allows you to incorporate a WebComic using the WordPress Media Library functionality with Navigation into almost all WordPress themes. With just a few modifications of adding injection do_action locations into a theme, you can have the theme of your choice display and manage a webcomic.
|
||||
Version: 1.0.11
|
||||
Version: 1.0.12
|
||||
Author: Philip M. Hofer (Frumph)
|
||||
Author URI: http://frumph.net/
|
||||
|
||||
@@ -298,7 +298,8 @@ function ceo_load_options($reset = false) {
|
||||
'thumbnail_size_for_direct_rss' => 'full',
|
||||
'thumbnail_size_for_archive' => 'large',
|
||||
'graphic_navigation_directory' => 'default',
|
||||
'disable_mininav' => false
|
||||
'disable_mininav' => false,
|
||||
'include_comics_in_blog_archive' => false
|
||||
) as $field => $value) {
|
||||
$ceo_config[$field] = $value;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
add_filter('request', 'ceo_rss_request'); // Add comics to the main RSS
|
||||
add_filter('the_content_feed','ceo_insert_comic_into_feed'); // Insert the comic image into the rss
|
||||
add_filter('the_excerpt_rss','ceo_insert_comic_into_feed');
|
||||
add_filter('the_content_archive', 'ceo_insert_comic_into_archive'); // Insert the comic into the archive and search pages
|
||||
add_filter('the_content', 'ceo_insert_comic_into_archive'); // Insert the comic into the archive and search pages
|
||||
add_filter('the_excerpt', 'ceo_insert_comic_into_archive');
|
||||
add_filter('previous_post_rel_link', 'ceo_change_prev_rel_link_two', $link); // change the rel links for comic pages
|
||||
add_filter('next_post_rel_link', 'ceo_change_next_rel_link_two', $link);
|
||||
@@ -64,7 +64,7 @@ function ceo_change_next_rel_link_two($link) {
|
||||
}
|
||||
|
||||
function ceo_query_post_type($query) {
|
||||
if ( ( is_tag() || is_archive()) && empty( $query->query_vars['suppress_filters'] ) ) {
|
||||
if ( ( is_tag() || (is_archive() && ceo_pluginfo('include_comics_in_blog_archive'))) && empty( $query->query_vars['suppress_filters'] ) ) {
|
||||
$post_type = get_query_var('post_type');
|
||||
if ( is_array($post_type) && !empty($post_type) ) {
|
||||
$post_type = array_merge($post_type, array('comic'));
|
||||
|
||||
Binary file not shown.
@@ -2,8 +2,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Comic Easel\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-07-05 04:12-0800\n"
|
||||
"PO-Revision-Date: 2012-07-05 04:12-0800\n"
|
||||
"POT-Creation-Date: 2012-07-05 11:07-0800\n"
|
||||
"PO-Revision-Date: 2012-07-05 11:07-0800\n"
|
||||
"Last-Translator: Philip M. Hofer (Frumph) <philip@frumph.net>\n"
|
||||
"Language-Team: Frumph Agencies <philip@frumph.net>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -17,7 +17,7 @@ msgstr ""
|
||||
"X-Poedit-SearchPath-0: ..\n"
|
||||
|
||||
#: ../ceo-admin.php:16
|
||||
#: ../ceo-config.php:126
|
||||
#: ../ceo-config.php:148
|
||||
msgid "Comic Easel"
|
||||
msgstr ""
|
||||
|
||||
@@ -42,39 +42,43 @@ msgstr ""
|
||||
msgid "Comic Easel Settings RESET!"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:74
|
||||
#: ../ceo-config.php:95
|
||||
msgid "Comic Easel Settings SAVED!"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:84
|
||||
#: ../ceo-config.php:105
|
||||
msgid "General"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:85
|
||||
#: ../ceo-config.php:106
|
||||
msgid "Navigation"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:126
|
||||
#: ../ceo-config.php:107
|
||||
msgid "Archive"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:148
|
||||
msgid "created, developed and maintained by"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:127
|
||||
#: ../ceo-config.php:149
|
||||
msgid "For technical assistance go to the"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:127
|
||||
#: ../ceo-config.php:149
|
||||
msgid "Frumph.NET Forums."
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:128
|
||||
#: ../ceo-config.php:150
|
||||
msgid "If you like the Comic Easel plugin, please donate. It will help in developing new features and versions."
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:154
|
||||
#: ../ceo-config.php:176
|
||||
msgid "French Translation by LiAn"
|
||||
msgstr ""
|
||||
|
||||
#: ../ceo-config.php:162
|
||||
#: ../ceo-config.php:184
|
||||
msgid "German Translation by Sarah Burrini"
|
||||
msgstr ""
|
||||
|
||||
@@ -356,7 +360,7 @@ msgstr ""
|
||||
msgid "Comic Easel Sidebar Location"
|
||||
msgstr ""
|
||||
|
||||
#: ../comiceasel.php:354
|
||||
#: ../comiceasel.php:355
|
||||
msgid "Comic Easel - Test Information"
|
||||
msgstr ""
|
||||
|
||||
@@ -489,6 +493,24 @@ msgstr ""
|
||||
msgid "Permanent Link:"
|
||||
msgstr ""
|
||||
|
||||
#: ../options/archive.php:11
|
||||
msgid "Archive Options"
|
||||
msgstr ""
|
||||
|
||||
#: ../options/archive.php:15
|
||||
msgid "Include the comics in the blog archive?"
|
||||
msgstr ""
|
||||
|
||||
#: ../options/archive.php:20
|
||||
msgid "When this is enabled, when you search through the year/date/month and other archiving WordPress functions, the comic will appear with the regular blog posts. This feature automatically works for all tags already."
|
||||
msgstr ""
|
||||
|
||||
#: ../options/archive.php:31
|
||||
#: ../options/general.php:130
|
||||
#: ../options/navigation.php:142
|
||||
msgid "Save Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../options/general.php:11
|
||||
msgid "Configuration"
|
||||
msgstr ""
|
||||
@@ -577,11 +599,6 @@ msgstr ""
|
||||
msgid "NOTE: Edit a post, click update on it for the feeds to refresh with new copies; to see changes."
|
||||
msgstr ""
|
||||
|
||||
#: ../options/general.php:130
|
||||
#: ../options/navigation.php:142
|
||||
msgid "Save Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../options/navigation.php:11
|
||||
msgid "Navigation Options"
|
||||
msgstr ""
|
||||
@@ -864,31 +881,31 @@ msgstr ""
|
||||
msgid "Comic Easel - Thumbnail"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:77
|
||||
#: ../widgets/thumbnail.php:81
|
||||
msgid "Which Chapter?"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:96
|
||||
#: ../widgets/thumbnail.php:100
|
||||
msgid "Get first in chapter instead?"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:97
|
||||
#: ../widgets/thumbnail.php:101
|
||||
msgid "Display a random Thumbnail?"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:98
|
||||
#: ../widgets/thumbnail.php:102
|
||||
msgid "*note: Random thumbnail overrides the get first in chapter option."
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:99
|
||||
#: ../widgets/thumbnail.php:103
|
||||
msgid "Display how many thumbnails?"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:100
|
||||
#: ../widgets/thumbnail.php:104
|
||||
msgid "Include comic title?"
|
||||
msgstr ""
|
||||
|
||||
#: ../widgets/thumbnail.php:101
|
||||
#: ../widgets/thumbnail.php:105
|
||||
msgid "Add centering html?"
|
||||
msgstr ""
|
||||
|
||||
|
||||
40
options/archive.php
Normal file
40
options/archive.php
Normal file
@@ -0,0 +1,40 @@
|
||||
<div id="comiceasel-archive">
|
||||
|
||||
<form method="post" id="myForm-archive" enctype="multipart/form-data">
|
||||
<?php wp_nonce_field('update-options') ?>
|
||||
|
||||
<div class="comiceasel-options">
|
||||
|
||||
<table class="widefat">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="3"><?php _e('Archive Options','comiceasel'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tr class="alternate">
|
||||
<th scope="row"><label for="include_comics_in_blog_archive"><?php _e('Include the comics in the blog archive?','comiceasel'); ?></label></th>
|
||||
<td>
|
||||
<input id="include_comics_in_blog_archive" name="include_comics_in_blog_archive" type="checkbox" value="1" <?php checked(true, $ceo_options['include_comics_in_blog_archive']); ?> />
|
||||
</td>
|
||||
<td>
|
||||
<?php _e('When this is enabled, when you search through the year/date/month and other archiving WordPress functions, the comic will appear with the regular blog posts. This feature automatically works for all tags already.','comiceasel'); ?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
<br />
|
||||
<div class="ceo-options-save">
|
||||
<div class="ceo-major-publishing-actions">
|
||||
<div class="ceo-publishing-action">
|
||||
<input name="ceo_save_config" type="submit" class="button-primary" value="<?php _e('Save Settings', 'comiceasel'); ?>" />
|
||||
<input type="hidden" name="action" value="ceo_save_archive" />
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
@@ -3,7 +3,7 @@ Contributors: frumph
|
||||
Tags: comiceasel, easel, webcomic, comic, webcomic
|
||||
Requires at least: 3.0
|
||||
Tested up to: 3.4
|
||||
Stable tag: 1.0.11
|
||||
Stable tag: 1.0.12
|
||||
Donate link: http://frumph.net
|
||||
License: GPLv3 or later
|
||||
License URI: http://www.gnu.org/licenses/gpl-3.0.html
|
||||
@@ -120,6 +120,9 @@ The comic navigation widget is only seen if you have the comic sidebar's enabled
|
||||
|
||||
|
||||
== Changelog ==
|
||||
= 1.0.12 =
|
||||
Never program while mad at the world ;/ apparently you make some mistakes in backwards compatibility.
|
||||
|
||||
= 1.0.11 =
|
||||
Removed URLRewrite /comic/#date#/ code since it was causing behavior problems
|
||||
Fixed the click to next and mini navigation to navigate per the setting in the config all chapters or just in chapter
|
||||
@@ -163,7 +166,7 @@ Updated: 05/26/2012 5:25pm Pacific
|
||||
|
||||
|
||||
== Upgrade Notice ==
|
||||
= 1.0.11 =
|
||||
= 1.0.12 =
|
||||
You should go to settings -> permalinks and click save again.
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user