From a5aba8de19fc2b96b12622f53a67117c605749ef Mon Sep 17 00:00:00 2001 From: Seaton Jiang Date: Sun, 12 Apr 2020 08:45:36 +0800 Subject: [PATCH] chore: replace the default resource url (#207) --- 404.php | 6 +-- footer.php | 4 +- header.php | 6 +-- .../includes/class-options-interface.php | 6 +-- inc/theme-article.php | 12 ++--- inc/theme-core.php | 47 ++++++++++--------- inc/theme-options.php | 26 +++++----- inc/theme-setting.php | 4 +- inc/theme-shortcode.php | 36 +++++++------- inc/theme-widgets.php | 16 +++---- index.php | 6 +-- pages/page-smilies.php | 44 ++++++++--------- pages/page-toolbar.php | 4 +- 13 files changed, 109 insertions(+), 108 deletions(-) diff --git a/404.php b/404.php index ce8e81b..40aa785 100644 --- a/404.php +++ b/404.php @@ -3,7 +3,7 @@ * 404 模板 * @author Seaton Jiang * @license MIT License - * @version 2020.03.14 + * @version 2020.04.12 */ get_header(); ?> @@ -13,9 +13,9 @@ get_header(); ?>
diff --git a/footer.php b/footer.php index 4785213..87e8f5c 100644 --- a/footer.php +++ b/footer.php @@ -3,7 +3,7 @@ * 主题页脚 * @author Seaton Jiang * @license MIT License - * @version 2020.03.17 + * @version 2020.04.12 */ ?>
@@ -17,7 +17,7 @@
- +
diff --git a/header.php b/header.php index 2eb5703..8deec2e 100644 --- a/header.php +++ b/header.php @@ -3,7 +3,7 @@ * 主题页眉 * @author Seaton Jiang * @license MIT License - * @version 2020.03.14 + * @version 2020.04.12 */ ?> @@ -59,9 +59,9 @@
diff --git a/inc/options-framework/includes/class-options-interface.php b/inc/options-framework/includes/class-options-interface.php index 80cb781..5943916 100755 --- a/inc/options-framework/includes/class-options-interface.php +++ b/inc/options-framework/includes/class-options-interface.php @@ -226,7 +226,7 @@ class Options_Framework_Interface global $wp_version; $version = $wp_version; $output .= '
- +

' . __('基础信息', 'kratos') . '

  • ' . __('PHP 版本：', 'kratos') . PHP_VERSION . '
    • @@ -247,10 +247,10 @@ class Options_Framework_Interface

    ' . __('版权声明', 'kratos') . '

    ' . __('主题源码使用 MIT 协议 进行许可，说明文档使用 CC BY-NC-ND 4.0 进行许可。', 'kratos') . '

    ' . __('打赏支持', 'kratos') . '

    - +

    ' . __('项目的发展需要您的支持和鼓励，打赏时请确认作者姓名为姜学栋', 'kratos') . '

    ' . __('赞助商', 'kratos') . '

    - +
'; break; diff --git a/inc/theme-article.php b/inc/theme-article.php index 6e94e3a..a91ef5e 100644 --- a/inc/theme-article.php +++ b/inc/theme-article.php @@ -3,7 +3,7 @@ * 文章相关函数 * @author Seaton Jiang * @license MIT License - * @version 2020.02.23 + * @version 2020.04.12 */ // 文章链接添加 target 和 rel @@ -124,9 +124,9 @@ function post_thumbnail() echo ''; } else { if (!kratos_option('g_postthumbnail')) { - $img = get_template_directory_uri() . '/assets/img/default.jpg'; + $img = ASSET_PATH . '/assets/img/default.jpg'; } else { - $img = kratos_option('g_postthumbnail', get_template_directory_uri() . '/assets/img/default.jpg'); + $img = kratos_option('g_postthumbnail', ASSET_PATH . '/assets/img/default.jpg'); } echo ''; } @@ -200,7 +200,7 @@ function pagelist($range = 5) // 文章评论 function comment_scripts() { - wp_enqueue_script('comment', get_template_directory_uri() . '/assets/js/comments.min.js', array(), THEME_VERSION); + wp_enqueue_script('comment', ASSET_PATH . '/assets/js/comments.min.js', array(), THEME_VERSION); wp_localize_script('comment', 'ajaxcomment', array( 'ajax_url' => admin_url('admin-ajax.php'), 'order' => get_option('comment_order'), @@ -305,7 +305,7 @@ $defaults = array('add_below' => 'comment', 'respond_id' => 'respond', 'reply_te // 文章评论表情 function custom_smilies_src($img_src, $img, $siteurl) { - return get_bloginfo('template_directory') . '/assets/img/smilies/' . $img; + return ASSET_PATH . '/assets/img/smilies/' . $img; } add_filter('smilies_src', 'custom_smilies_src', 1, 10); @@ -360,7 +360,7 @@ function get_wpsmiliestrans() global $output; $wpsmilies = array_unique($wpsmiliestrans); foreach ($wpsmilies as $alt => $src_path) { - $output .= ''; + $output .= ''; } return $output; } diff --git a/inc/theme-core.php b/inc/theme-core.php index b3c3487..2526b1e 100644 --- a/inc/theme-core.php +++ b/inc/theme-core.php @@ -3,9 +3,20 @@ * 核心函数 * @author Seaton Jiang * @license MIT License - * @version 2020.03.17 + * @version 2020.04.12 */ +if (kratos_option('g_cdn', false)) { + $cdn_array = array( + 'maocloud' => 'https://n3.cdn.vtrois.com/kratos/' . THEME_VERSION, + 'jsdelivr' => 'https://cdn.jsdelivr.net/gh/vtrois/kratos@' . THEME_VERSION, + ); + $asset_path = $cdn_array[kratos_option('g_cdn_n3', 'maocloud')]; +} else { + $asset_path = get_template_directory_uri(); +} +define('ASSET_PATH', $asset_path); + // 自动跳转主题设置 function init_theme() { @@ -27,42 +38,32 @@ add_action('after_setup_theme', 'theme_languages'); // 资源加载 function theme_autoload() { - if (kratos_option('g_cdn', false)) { - $cdn_array = array( - 'maocloud' => 'https://n3.cdn.vtrois.com/kratos/' . THEME_VERSION, - 'jsdelivr' => 'https://cdn.jsdelivr.net/gh/vtrois/kratos@' . THEME_VERSION, - ); - $dir = $cdn_array[kratos_option('g_cdn_n3', 'maocloud')]; - } else { - $dir = get_template_directory_uri(); - } - if (!is_admin()) { // css - wp_enqueue_style('bootstrap', $dir . '/assets/css/bootstrap.min.css', array(), '4.4.1'); - wp_enqueue_style('kicon', $dir . '/assets/css/iconfont.min.css', array(), THEME_VERSION); - wp_enqueue_style('layer', $dir . '/assets/css/layer.min.css', array(), '3.1.1'); + wp_enqueue_style('bootstrap', ASSET_PATH . '/assets/css/bootstrap.min.css', array(), '4.4.1'); + wp_enqueue_style('kicon', ASSET_PATH . '/assets/css/iconfont.min.css', array(), THEME_VERSION); + wp_enqueue_style('layer', ASSET_PATH . '/assets/css/layer.min.css', array(), '3.1.1'); if (kratos_option('g_animate', false)) { - wp_enqueue_style('animate', $dir . '/assets/css/animate.min.css', array(), '3.7.2'); + wp_enqueue_style('animate', ASSET_PATH . '/assets/css/animate.min.css', array(), '3.7.2'); } if (kratos_option('g_fontawesome', false)) { - wp_enqueue_style('fontawesome', $dir . '/assets/css/fontawesome.min.css', array(), '5.13.0'); + wp_enqueue_style('fontawesome', ASSET_PATH . '/assets/css/fontawesome.min.css', array(), '5.13.0'); } - wp_enqueue_style('kratos', $dir . '/assets/css/kratos.min.css', array(), THEME_VERSION); + wp_enqueue_style('kratos', ASSET_PATH . '/assets/css/kratos.min.css', array(), THEME_VERSION); wp_enqueue_style('custom', get_template_directory_uri() . '/custom/custom.css', array(), THEME_VERSION); // js wp_deregister_script('jquery'); - wp_enqueue_script('jquery', $dir . '/assets/js/jquery.min.js', array(), '3.4.1', false); - wp_enqueue_script('bootstrap', $dir . '/assets/js/bootstrap.min.js', array(), '4.4.1', true); - wp_enqueue_script('layer', $dir . '/assets/js/layer.min.js', array(), '3.1.1', true); - wp_enqueue_script('kratos', $dir . '/assets/js/kratos.min.js', array(), THEME_VERSION, true); + wp_enqueue_script('jquery', ASSET_PATH . '/assets/js/jquery.min.js', array(), '3.4.1', false); + wp_enqueue_script('bootstrap', ASSET_PATH . '/assets/js/bootstrap.min.js', array(), '4.4.1', true); + wp_enqueue_script('layer', ASSET_PATH . '/assets/js/layer.min.js', array(), '3.1.1', true); + wp_enqueue_script('kratos', ASSET_PATH . '/assets/js/kratos.min.js', array(), THEME_VERSION, true); wp_enqueue_script('custom', get_template_directory_uri() . '/custom/custom.js', array(), THEME_VERSION, true); $data = array( 'site' => home_url(), 'directory' => get_stylesheet_directory_uri(), - 'alipay' => kratos_option('g_donate_alipay', get_template_directory_uri() . '/assets/img/donate.png'), - 'wechat' => kratos_option('g_donate_wechat', get_template_directory_uri() . '/assets/img/donate.png'), + 'alipay' => kratos_option('g_donate_alipay', ASSET_PATH . '/assets/img/donate.png'), + 'wechat' => kratos_option('g_donate_wechat', ASSET_PATH . '/assets/img/donate.png'), 'repeat' => __('您已经赞过了', 'kratos'), 'thanks' => __('感谢您的支持', 'kratos'), 'donate' => __('打赏作者', 'kratos'), diff --git a/inc/theme-options.php b/inc/theme-options.php index c799629..d505fcf 100644 --- a/inc/theme-options.php +++ b/inc/theme-options.php @@ -3,7 +3,7 @@ * 主题选项 * @author Seaton Jiang * @license MIT License - * @version 2020.03.17 + * @version 2020.04.12 */ function getrobots() @@ -94,7 +94,7 @@ function kratos_options() $options[] = array( 'name' => __('静态资源加速', 'kratos'), 'desc' => __('开启静态资源加速（CSS、JS、Font）', 'kratos'), - 'std' => '0', + 'std' => '1', 'id' => 'g_cdn', 'type' => 'checkbox', ); @@ -186,7 +186,7 @@ function kratos_options() $options[] = array( 'id' => 's_wechat_url', - 'std' => get_template_directory_uri() . '/assets/img/wechat.png', + 'std' => ASSET_PATH . '/assets/img/wechat.png', 'type' => 'upload', 'class' => 'hidden', 'type' => 'upload', @@ -195,7 +195,7 @@ function kratos_options() $options[] = array( 'name' => __('404 页面图片', 'kratos'), 'id' => 'g_404', - 'std' => get_template_directory_uri() . '/assets/img/404.jpg', + 'std' => ASSET_PATH . '/assets/img/404.jpg', 'type' => 'upload', ); @@ -208,7 +208,7 @@ function kratos_options() 'name' => __('分享图片', 'kratos'), 'desc' => __('搜索引擎或者社交工具分享首页时抓取的图片', 'kratos'), 'id' => 'seo_shareimg', - 'std' => get_template_directory_uri() . '/assets/img/default.jpg', + 'std' => ASSET_PATH . '/assets/img/default.jpg', 'type' => 'upload', ); @@ -279,7 +279,7 @@ function kratos_options() 'desc' => __('当文章中没有图片并且没有设置特色图时在首页显示', 'kratos'), 'id' => 'g_postthumbnail', 'class' => 'hidden', - 'std' => get_template_directory_uri() . '/assets/img/default.jpg', + 'std' => ASSET_PATH . '/assets/img/default.jpg', 'type' => 'upload', ); @@ -287,7 +287,7 @@ function kratos_options() 'name' => __('无内容图片', 'kratos'), 'desc' => __('当搜索不到文章或文章分类中没有文章时显示', 'kratos'), 'id' => 'g_nothing', - 'std' => get_template_directory_uri() . '/assets/img/nothing.svg', + 'std' => ASSET_PATH . '/assets/img/nothing.svg', 'type' => 'upload', ); @@ -329,7 +329,7 @@ function kratos_options() $options[] = array( 'name' => __('支付宝二维码', 'kratos'), 'id' => 'g_donate_alipay', - 'std' => get_template_directory_uri() . '/assets/img/donate.png', + 'std' => ASSET_PATH . '/assets/img/donate.png', 'type' => 'upload', 'class' => 'hidden', 'type' => 'upload', @@ -338,7 +338,7 @@ function kratos_options() $options[] = array( 'name' => __('微信二维码', 'kratos'), 'id' => 'g_donate_wechat', - 'std' => get_template_directory_uri() . '/assets/img/donate.png', + 'std' => ASSET_PATH . '/assets/img/donate.png', 'type' => 'upload', 'class' => 'hidden', 'type' => 'upload', @@ -352,7 +352,7 @@ function kratos_options() $options[] = array( 'name' => __('个人头像', 'kratos'), 'id' => 'a_gravatar', - 'std' => get_template_directory_uri() . '/assets/img/gravatar.png', + 'std' => ASSET_PATH . '/assets/img/gravatar.png', 'type' => 'upload', ); @@ -453,7 +453,7 @@ function kratos_options() $options[] = array( 'name' => __('图片导航', 'kratos'), 'id' => 'top_img', - 'std' => get_template_directory_uri() . '/assets/img/background.png', + 'std' => ASSET_PATH . '/assets/img/background.png', 'class' => 'hidden', 'type' => 'upload', ); @@ -681,7 +681,7 @@ function kratos_options() $options[] = array( 'id' => 's_singletop_url', 'class' => 'hidden', - 'std' => get_template_directory_uri() . '/assets/img/ad.png', + 'std' => ASSET_PATH . '/assets/img/ad.png', 'type' => 'upload', ); @@ -701,7 +701,7 @@ function kratos_options() $options[] = array( 'id' => 's_singledown_url', 'class' => 'hidden', - 'std' => get_template_directory_uri() . '/assets/img/ad.png', + 'std' => ASSET_PATH . '/assets/img/ad.png', 'type' => 'upload', ); diff --git a/inc/theme-setting.php b/inc/theme-setting.php index a183d1c..23686d8 100644 --- a/inc/theme-setting.php +++ b/inc/theme-setting.php @@ -3,7 +3,7 @@ * 站点相关函数 * @author Seaton Jiang * @license MIT License - * @version 2020.03.18 + * @version 2020.04.12 */ // 标题配置 @@ -119,7 +119,7 @@ function share_thumbnail_url() if (!empty($strResult[1])) { $img = $strResult[1][0]; } else { - $img = kratos_option('seo_shareimg', get_template_directory_uri() . '/assets/img/default.jpg'); + $img = kratos_option('seo_shareimg', ASSET_PATH . '/assets/img/default.jpg'); } } return $img; diff --git a/inc/theme-shortcode.php b/inc/theme-shortcode.php index 8283ce0..19298b2 100644 --- a/inc/theme-shortcode.php +++ b/inc/theme-shortcode.php @@ -3,7 +3,7 @@ * 文章短代码 * @author Seaton Jiang * @license MIT License - * @version 2020.03.14 + * @version 2020.04.12 */ function h2title($atts, $content = null, $code = "") @@ -223,22 +223,22 @@ function register_button($buttons) function add_plugin($plugin_array) { - $plugin_array['h2title'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['kbd'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['mark'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['striped'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['bdbtn'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['music'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['vqq'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['youtube'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['bilibili'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['success'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['info'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['warning'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['danger'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['successbox'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['infoboxs'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['warningbox'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; - $plugin_array['dangerbox'] = get_bloginfo('template_url') . '/assets/js/buttons/more.js'; + $plugin_array['h2title'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['kbd'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['mark'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['striped'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['bdbtn'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['music'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['vqq'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['youtube'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['bilibili'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['success'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['info'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['warning'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['danger'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['successbox'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['infoboxs'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['warningbox'] = ASSET_PATH . '/assets/js/buttons/more.js'; + $plugin_array['dangerbox'] = ASSET_PATH . '/assets/js/buttons/more.js'; return $plugin_array; } diff --git a/inc/theme-widgets.php b/inc/theme-widgets.php index f94d703..642e142 100644 --- a/inc/theme-widgets.php +++ b/inc/theme-widgets.php @@ -3,7 +3,7 @@ * 侧栏小工具 * @author Seaton Jiang * @license MIT License - * @version 2020.02.23 + * @version 2020.04.12 */ // 添加小工具 @@ -77,8 +77,8 @@ class widget_ad extends WP_Widget { wp_enqueue_script('media-upload'); wp_enqueue_media(); - wp_enqueue_script('widget_scripts', get_template_directory_uri() . '/assets/js/widget.min.js', array('jquery')); - wp_enqueue_style('widget_css', get_template_directory_uri() . '/assets/css/widget.min.css', array()); + wp_enqueue_script('widget_scripts', ASSET_PATH . '/assets/js/widget.min.js', array('jquery')); + wp_enqueue_style('widget_css', ASSET_PATH . '/assets/css/widget.min.css', array()); } public function widget($args, $instance) @@ -146,15 +146,15 @@ class widget_about extends WP_Widget { wp_enqueue_script('media-upload'); wp_enqueue_media(); - wp_enqueue_script('widget_scripts', get_template_directory_uri() . '/assets/js/widget.min.js', array('jquery')); - wp_enqueue_style('widget_css', get_template_directory_uri() . '/assets/css/widget.min.css', array()); + wp_enqueue_script('widget_scripts', ASSET_PATH . '/assets/js/widget.min.js', array('jquery')); + wp_enqueue_style('widget_css', ASSET_PATH . '/assets/css/widget.min.css', array()); } public function widget($args, $instance) { $introduce = kratos_option('a_about', __('保持饥渴的专注，追求最佳的品质', 'kratos')); - $avatar = kratos_option('a_gravatar', get_template_directory_uri() . '/assets/img/gravatar.png'); - $background = !empty($instance['background']) ? $instance['background'] : get_stylesheet_directory_uri() . '/assets/img/about-background.png'; + $avatar = kratos_option('a_gravatar', ASSET_PATH . '/assets/img/gravatar.png'); + $background = !empty($instance['background']) ? $instance['background'] : ASSET_PATH . '/assets/img/about-background.png'; echo '
'; echo '
'; @@ -179,7 +179,7 @@ class widget_about extends WP_Widget public function form($instance) { - $background = !empty($instance['background']) ? $instance['background'] : get_stylesheet_directory_uri() . '/assets/img/about-background.png'; + $background = !empty($instance['background']) ? $instance['background'] : ASSET_PATH . '/assets/img/about-background.png'; ?>

diff --git a/index.php b/index.php index e7d72d3..1f9f400 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * 首页模板 * @author Seaton Jiang * @license MIT License - * @version 2020.03.14 + * @version 2020.04.12 */ get_header(); ?> @@ -26,9 +26,9 @@ get_header(); ?>

diff --git a/pages/page-smilies.php b/pages/page-smilies.php index 78ff1a8..a0b4795 100644 --- a/pages/page-smilies.php +++ b/pages/page-smilies.php @@ -3,27 +3,27 @@ * 表情图标 * @author Seaton Jiang * @license MIT License - * @version 2020.02.15 + * @version 2020.04.12 */ $smilies = ' - - - - - - - - - - - - - - - - - - - - -'; \ No newline at end of file + + + + + + + + + + + + + + + + + + + + +'; \ No newline at end of file diff --git a/pages/page-toolbar.php b/pages/page-toolbar.php index 8dd5ab4..17a49a0 100644 --- a/pages/page-toolbar.php +++ b/pages/page-toolbar.php @@ -3,12 +3,12 @@ * 文章工具栏 * @author Seaton Jiang * @license MIT License - * @version 2020.03.14 + * @version 2020.04.12 */ ?>
- +