Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Name Changing #8

Merged
merged 7 commits into from
Mar 3, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Name Change
  • Loading branch information
Chris Wynn authored and Chris Wynn committed Mar 3, 2017
commit eca12ccb05450df6d7041c4c8439e8c51d54faea
2 changes: 1 addition & 1 deletion archive-projectupdates.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<?php endwhile; ?>

<?php joints_page_navi(); ?>
<?php disciple_tools_page_navi(); ?>

<?php else : ?>

Expand Down
3 changes: 2 additions & 1 deletion archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@

<!-- To see additional archive styles, visit the /parts directory -->
<?php get_template_part( 'parts/loop', 'archive' ); ?>


<?php endwhile; ?>

<?php joints_page_navi(); ?>
<?php disciple_tools_page_navi(); ?>

<?php else : ?>

Expand Down
12 changes: 6 additions & 6 deletions assets/functions/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function disable_default_dashboard_widgets() {
*/

// RSS Dashboard Widget
function joints_rss_dashboard_widget() {
function disciple_tools_rss_dashboard_widget() {
if(function_exists('fetch_feed')) {
include_once(ABSPATH . WPINC . '/feed.php'); // include the required file
$feed = fetch_feed('http:https://jointswp.com/feed/rss/'); // specify the source feed
Expand All @@ -47,8 +47,8 @@ function joints_rss_dashboard_widget() {
}

// Calling all custom dashboard widgets
function joints_custom_dashboard_widgets() {
wp_add_dashboard_widget('joints_rss_dashboard_widget', __('Custom RSS Feed (Customize in admin.php)', 'disciple_tools'), 'joints_rss_dashboard_widget');
function disciple_tools_custom_dashboard_widgets() {
wp_add_dashboard_widget('disciple_tools_rss_dashboard_widget', __('Custom RSS Feed (Customize in admin.php)', 'disciple_tools'), 'disciple_tools_rss_dashboard_widget');
/*
Be sure to drop any other created Dashboard Widgets
in this function and they will all load.
Expand All @@ -57,13 +57,13 @@ function joints_custom_dashboard_widgets() {
// removing the dashboard widgets
add_action('admin_menu', 'disable_default_dashboard_widgets');
// adding any custom widgets
add_action('wp_dashboard_setup', 'joints_custom_dashboard_widgets');
add_action('wp_dashboard_setup', 'disciple_tools_custom_dashboard_widgets');

/************* CUSTOMIZE ADMIN *******************/
// Custom Backend Footer
function joints_custom_admin_footer() {
function disciple_tools_custom_admin_footer() {
_e('<span id="footer-thankyou">Developed by <a href="#" target="_blank">Your Site Name</a></span>.', 'disciple_tools');
}

// adding it to the admin area
add_filter('admin_footer_text', 'joints_custom_admin_footer');
add_filter('admin_footer_text', 'disciple_tools_custom_admin_footer');
28 changes: 14 additions & 14 deletions assets/functions/cleanup.php
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<?php

// Fire all our initial functions at the start
add_action('after_setup_theme','joints_start', 16);
add_action('after_setup_theme','disciple_tools_start', 16);

function joints_start() {
function disciple_tools_start() {

// launching operation cleanup
add_action('init', 'joints_head_cleanup');
add_action('init', 'disciple_tools_head_cleanup');

// remove pesky injected css for recent comments widget
add_filter( 'wp_head', 'joints_remove_wp_widget_recent_comments_style', 1 );
add_filter( 'wp_head', 'disciple_tools_remove_wp_widget_recent_comments_style', 1 );

// clean up comment styles in the head
add_action('wp_head', 'joints_remove_recent_comments_style', 1);
add_action('wp_head', 'disciple_tools_remove_recent_comments_style', 1);

// clean up gallery output in wp
add_filter('gallery_style', 'joints_gallery_style');
add_filter('gallery_style', 'disciple_tools_gallery_style');

// adding sidebars to Wordpress
add_action( 'widgets_init', 'joints_register_sidebars' );
add_action( 'widgets_init', 'disciple_tools_register_sidebars' );

// cleaning up excerpt
add_filter('excerpt_more', 'joints_excerpt_more');
add_filter('excerpt_more', 'disciple_tools_excerpt_more');

} /* end joints start */

//The default wordpress head is a mess. Let's clean it up by removing all the junk we don't need.
function joints_head_cleanup() {
function disciple_tools_head_cleanup() {
// Remove category feeds
// remove_action( 'wp_head', 'feed_links_extra', 3 );
// Remove post and comment feeds
Expand All @@ -48,27 +48,27 @@ function joints_head_cleanup() {
} /* end Joints head cleanup */

// Remove injected CSS for recent comments widget
function joints_remove_wp_widget_recent_comments_style() {
function disciple_tools_remove_wp_widget_recent_comments_style() {
if ( has_filter('wp_head', 'wp_widget_recent_comments_style') ) {
remove_filter('wp_head', 'wp_widget_recent_comments_style' );
}
}

// Remove injected CSS from recent comments widget
function joints_remove_recent_comments_style() {
function disciple_tools_remove_recent_comments_style() {
global $wp_widget_factory;
if (isset($wp_widget_factory->widgets['WP_Widget_Recent_Comments'])) {
remove_action('wp_head', array($wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style'));
}
}

// Remove injected CSS from gallery
function joints_gallery_style($css) {
function disciple_tools_gallery_style($css) {
return preg_replace("!<style type='text/css'>(.*?)</style>!s", '', $css);
}

// This removes the annoying […] to a Read More link
function joints_excerpt_more($more) {
function disciple_tools_excerpt_more($more) {
global $post;
// edit here if you like
return '<a class="excerpt-read-more" href="'. get_permalink($post->ID) . '" title="'. __('Read', 'disciple_tools') . get_the_title($post->ID).'">'. __('... Read more &raquo;', 'disciple_tools') .'</a>';
Expand All @@ -86,7 +86,7 @@ function remove_sticky_class($classes) {
add_filter('post_class','remove_sticky_class');

//This is a modified the_author_posts_link() which just returns the link. This is necessary to allow usage of the usual l10n process with printf()
function joints_get_the_author_posts_link() {
function disciple_tools_get_the_author_posts_link() {
global $authordata;
if ( !is_object( $authordata ) )
return false;
Expand Down
2 changes: 1 addition & 1 deletion assets/functions/comments.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
// Comment Layout
function joints_comments($comment, $args, $depth) {
function disciple_tools_comments($comment, $args, $depth) {
$GLOBALS['comment'] = $comment; ?>
<li <?php comment_class('panel'); ?>>
<div class="media-object">
Expand Down
14 changes: 7 additions & 7 deletions assets/functions/login.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php
// Calling your own login css so you can style it
function joints_login_css() {
wp_enqueue_style( 'joints_login_css', get_template_directory_uri() . '/assets/css/login.css', false );
function disciple_tools_login_css() {
wp_enqueue_style( 'disciple_tools_login_css', get_template_directory_uri() . '/assets/css/login.css', false );
}

// changing the logo link from wordpress.org to your site
function joints_login_url() { return home_url(); }
function disciple_tools_login_url() { return home_url(); }

// changing the alt text on the logo to show your site name
function joints_login_title() { return get_option('blogname'); }
function disciple_tools_login_title() { return get_option('blogname'); }

// calling it only on the login page
add_action( 'login_enqueue_scripts', 'joints_login_css', 10 );
add_filter('login_headerurl', 'joints_login_url');
add_filter('login_headertitle', 'joints_login_title');
add_action( 'login_enqueue_scripts', 'disciple_tools_login_css', 10 );
add_filter('login_headerurl', 'disciple_tools_login_url');
add_filter('login_headertitle', 'disciple_tools_login_title');
14 changes: 7 additions & 7 deletions assets/functions/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
);

// The Top Menu
function joints_top_nav() {
if(function_exists('DRM_Plugin_not')){
function disciple_tools_top_nav() {
if(class_exists('Disciple_Toolsx')){
return;
} else {
wp_nav_menu(array(
Expand All @@ -33,8 +33,8 @@ function start_lvl(&$output, $depth = 0, $args = Array() ) {
}

// The Off Canvas Menu
function joints_off_canvas_nav() {
if(function_exists('DRM_Plugin_not')){
function disciple_tools_off_canvas_nav() {
if(class_exists('Disciple_Toolsx')){
return;
} else {
wp_nav_menu(array(
Expand All @@ -58,7 +58,7 @@ function start_lvl(&$output, $depth = 0, $args = Array() ) {
}

// The Footer Menu
function joints_footer_links() {
function disciple_tools_footer_links() {
wp_nav_menu(array(
'container' => 'false', // Remove nav container
'menu' => __( 'Footer Links', 'disciple_tools' ), // Nav name
Expand All @@ -70,7 +70,7 @@ function joints_footer_links() {
} /* End Footer Menu */

// Header Fallback Menu
function joints_main_nav_fallback() {
function disciple_tools_main_nav_fallback() {
wp_page_menu( array(
'show_home' => true,
'menu_class' => '', // Adding custom nav class
Expand All @@ -83,7 +83,7 @@ function joints_main_nav_fallback() {
}

// Footer Fallback Menu
function joints_footer_links_fallback() {
function disciple_tools_footer_links_fallback() {
/* You can put a default here if you like */
}

Expand Down
2 changes: 1 addition & 1 deletion assets/functions/page-navi.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
// Numeric Page Navi (built into the theme by default)
function joints_page_navi($before = '', $after = '') {
function disciple_tools_page_navi($before = '', $after = '') {
global $wpdb, $wp_query;
$request = $wp_query->request;
$posts_per_page = intval(get_query_var('posts_per_page'));
Expand Down
4 changes: 2 additions & 2 deletions assets/functions/related-posts.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
// Related Posts Function, matches posts by tags - call using joints_related_posts(); )
function joints_related_posts() {
// Related Posts Function, matches posts by tags - call using disciple_tools_related_posts(); )
function disciple_tools_related_posts() {
global $post;
$tag_arr = '';
$tags = wp_get_post_tags( $post->ID );
Expand Down
2 changes: 1 addition & 1 deletion assets/functions/sidebar.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
// SIDEBARS AND WIDGETIZED AREAS
function joints_register_sidebars() {
function disciple_tools_register_sidebars() {
register_sidebar(array(
'id' => 'sidebar1',
'name' => __('Sidebar 1', 'disciple_tools'),
Expand Down
6 changes: 3 additions & 3 deletions assets/functions/theme-support.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

// Adding WP Functions & Theme Support
function joints_theme_support() {
function disciple_tools_theme_support() {

// Add WP Thumbnail Support
add_theme_support( 'post-thumbnails' );
Expand Down Expand Up @@ -40,8 +40,8 @@ function joints_theme_support() {
);

// Set the maximum allowed width for any content in the theme, like oEmbeds and images added to posts.
$GLOBALS['content_width'] = apply_filters( 'joints_theme_support', 1200 );
$GLOBALS['content_width'] = apply_filters( 'disciple_tools_theme_support', 1200 );

} /* end theme support */

add_action( 'after_setup_theme', 'joints_theme_support' );
add_action( 'after_setup_theme', 'disciple_tools_theme_support' );
2 changes: 1 addition & 1 deletion comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<?php endif; // Check for comment navigation. ?>

<ol class="commentlist">
<?php wp_list_comments('type=comment&callback=joints_comments'); ?>
<?php wp_list_comments('type=comment&callback=disciple_tools_comments'); ?>
</ol>

<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
Expand Down
2 changes: 1 addition & 1 deletion footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-footer" class="row">
<div class="large-12 medium-12 columns">
<nav role="navigation">
<?php joints_footer_links(); ?>
<?php disciple_tools_footer_links(); ?>
</nav>
</div>
<div class="large-12 medium-12 columns">
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<?php endwhile; ?>

<?php joints_page_navi(); ?>
<?php disciple_tools_page_navi(); ?>

<?php else : ?>

Expand Down
2 changes: 1 addition & 1 deletion parts/content-offcanvas.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="off-canvas position-right" id="off-canvas" data-off-canvas>
<?php joints_off_canvas_nav(); ?>
<?php disciple_tools_off_canvas_nav(); ?>
</div>
3 changes: 2 additions & 1 deletion parts/loop-archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</section> <!-- end article section -->

<footer class="article-footer">
<?php get_template_part( 'parts/content', 'byline' ); ?>
<?php get_template_part( 'parts/content', 'pray' ); ?>
<?php print Disciple_Tools()->test ?>
</footer> <!-- end article footer -->
</article> <!-- end article -->
2 changes: 1 addition & 1 deletion parts/nav-offcanvas-topbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</ul>
</div>
<div class="top-bar-right show-for-medium">
<?php joints_top_nav(); ?>
<?php disciple_tools_top_nav(); ?>
</div>
<div class="top-bar-right float-right show-for-small-only">
<ul class="menu">
Expand Down
2 changes: 1 addition & 1 deletion parts/nav-title-bar.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
</ul>
</div>
<div class="top-bar-right">
<?php joints_top_nav(); ?>
<?php disciple_tools_top_nav(); ?>
</div>
</div>
2 changes: 1 addition & 1 deletion parts/nav-topbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
</ul>
</div>
<div class="top-bar-right">
<?php joints_top_nav(); ?>
<?php disciple_tools_top_nav(); ?>
</div>
</div>
2 changes: 1 addition & 1 deletion search.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<?php endwhile; ?>

<?php joints_page_navi(); ?>
<?php disciple_tools_page_navi(); ?>

<?php else : ?>

Expand Down
6 changes: 3 additions & 3 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/******************************************************************
Theme Name: JointsWP - Sass
Theme URI: http:https://www.disciple_tools.com
Theme Name: Disciple Tools
Theme URI: http:https://disciple.tools
Description:
Author: Your Name Here
Author: Chasm Solutions
Author URI: http:https://www.yoururlhere.com
Version: 4.0
License: GNU General Public License & MIT
Expand Down
2 changes: 1 addition & 1 deletion taxonomy-custom_cat.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<?php endwhile; ?>

<?php joints_page_navi(); ?>
<?php disciple_tools_page_navi(); ?>

<?php else : ?>

Expand Down