Skip to content

Commit

Permalink
MKDWEB-19 Correct naming, mkdevops.se -> www.mkdevops.se` (#9)
Browse files Browse the repository at this point in the history 
This resolves bug #9, addressing the following:
1. renamed all package references from "`mkdevops.se`" to "`www.mkdevops.se`"
2. renamed all function prefixes from Underscores template from "`mkdevops_se_...`" to "`www_mkdevops_se_...`"
3. renamed other filenames/symbols called "`mkdevops-se`" to cover the full name "`www-mkdevops-se`"
  • Loading branch information
@mblomdahl
mblomdahl committed Aug 27, 2022
1 parent af5faca commit b5ebb0d
Show file tree
Hide file tree
Showing 26 changed files with 140 additions and 140 deletions.
12 changes: 6 additions & 6 deletions 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://codex.wordpress.org/Creating_an_Error_404_Page
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

get_header();
Expand All @@ -14,11 +14,11 @@

<section class="error-404 not-found">
<header class="page-header">
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'mkdevops-se' ); ?></h1>
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'www-mkdevops-se' ); ?></h1>
</header><!-- .page-header -->

<div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'mkdevops-se' ); ?></p>
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'www-mkdevops-se' ); ?></p>

<?php
get_search_form();
Expand All @@ -27,7 +27,7 @@
?>

<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'mkdevops-se' ); ?></h2>
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'www-mkdevops-se' ); ?></h2>
<ul>
<?php
wp_list_categories(
Expand All @@ -45,8 +45,8 @@

<?php
/* translators: %1$s: smiley */
$mkdevops_se_archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'mkdevops-se' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$mkdevops_se_archive_content" );
$www_mkdevops_se_archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'www-mkdevops-se' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$www_mkdevops_se_archive_content" );

the_widget( 'WP_Widget_Tag_Cloud' );
?>
Expand Down
2 changes: 1 addition & 1 deletion archive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

get_header();
Expand Down
16 changes: 8 additions & 8 deletions comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

/*
Expand All @@ -28,18 +28,18 @@
?>
<h2 class="comments-title">
<?php
$mkdevops_se_comment_count = get_comments_number();
if ( '1' === $mkdevops_se_comment_count ) {
$www_mkdevops_se_comment_count = get_comments_number();
if ( '1' === $www_mkdevops_se_comment_count ) {
printf(
/* translators: 1: title. */
esc_html__( 'One thought on &ldquo;%1$s&rdquo;', 'mkdevops-se' ),
esc_html__( 'One thought on &ldquo;%1$s&rdquo;', 'www-mkdevops-se' ),
'<span>' . wp_kses_post( get_the_title() ) . '</span>'
);
} else {
printf(
printf(
/* translators: 1: comment count number, 2: title. */
esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', $mkdevops_se_comment_count, 'comments title', 'mkdevops-se' ) ),
number_format_i18n( $mkdevops_se_comment_count ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', $www_mkdevops_se_comment_count, 'comments title', 'www-mkdevops-se' ) ),
number_format_i18n( $www_mkdevops_se_comment_count ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
'<span>' . wp_kses_post( get_the_title() ) . '</span>'
);
}
Expand All @@ -65,7 +65,7 @@
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() ) :
?>
<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'mkdevops-se' ); ?></p>
<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'www-mkdevops-se' ); ?></p>
<?php
endif;

Expand Down
8 changes: 4 additions & 4 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

?>

<footer id="colophon" class="site-footer">
<div class="site-info">
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'mkdevops-se' ) ); ?>">
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'www-mkdevops-se' ) ); ?>">
<?php
/* translators: %s: CMS name, i.e. WordPress. */
printf( esc_html__( 'Proudly powered by %s', 'mkdevops-se' ), 'WordPress' );
printf( esc_html__( 'Proudly powered by %s', 'www-mkdevops-se' ), 'WordPress' );
?>
</a>
<span class="sep"> | </span>
<?php
/* translators: 1: Theme name, 2: Theme author. */
printf( esc_html__( 'Theme: %1$s by %2$s.', 'mkdevops-se' ), 'mkdevops-se', '<a href="http://underscores.me/">Underscores.me</a>' );
printf( esc_html__( 'Theme: %1$s by %2$s.', 'www-mkdevops-se' ), 'www-mkdevops-se', '<a href="http://underscores.me/">Underscores.me</a>' );
?>
</div><!-- .site-info -->
</footer><!-- #colophon -->
Expand Down
42 changes: 21 additions & 21 deletions functions.php
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* mkdevops.se functions and definitions
* www.mkdevops.se functions and definitions
*
* @link https://developer.wordpress.org/themes/basics/theme-functions/
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

if ( ! defined( '_S_VERSION' ) ) {
Expand All @@ -19,14 +19,14 @@
* runs before the init hook. The init hook is too late for some features, such
* as indicating support for post thumbnails.
*/
function mkdevops_se_setup() {
function www_mkdevops_se_setup() {
/*
* Make theme available for translation.
* Translations can be filed in the /languages/ directory.
* If you're building a theme based on mkdevops.se, use a find and replace
* to change 'mkdevops-se' to the name of your theme in all the template files.
* If you're building a theme based on www.mkdevops.se, use a find and replace
* to change 'www-mkdevops-se' to the name of your theme in all the template files.
*/
load_theme_textdomain( 'mkdevops-se', get_template_directory() . '/languages' );
load_theme_textdomain( 'www-mkdevops-se', get_template_directory() . '/languages' );

// Add default posts and comments RSS feed links to head.
add_theme_support( 'automatic-feed-links' );
Expand All @@ -49,7 +49,7 @@ function mkdevops_se_setup() {
// This theme uses wp_nav_menu() in one location.
register_nav_menus(
array(
'menu-1' => esc_html__( 'Primary', 'mkdevops-se' ),
'menu-1' => esc_html__( 'Primary', 'www-mkdevops-se' ),
)
);

Expand All @@ -74,7 +74,7 @@ function mkdevops_se_setup() {
add_theme_support(
'custom-background',
apply_filters(
'mkdevops_se_custom_background_args',
'www_mkdevops_se_custom_background_args',
array(
'default-color' => 'ffffff',
'default-image' => '',
Expand All @@ -100,7 +100,7 @@ function mkdevops_se_setup() {
)
);
}
add_action( 'after_setup_theme', 'mkdevops_se_setup' );
add_action( 'after_setup_theme', 'www_mkdevops_se_setup' );

/**
* Set the content width in pixels, based on the theme's design and stylesheet.
Expand All @@ -109,45 +109,45 @@ function mkdevops_se_setup() {
*
* @global int $content_width
*/
function mkdevops_se_content_width() {
$GLOBALS['content_width'] = apply_filters( 'mkdevops_se_content_width', 640 );
function www_mkdevops_se_content_width() {
$GLOBALS['content_width'] = apply_filters( 'www_mkdevops_se_content_width', 640 );
}
add_action( 'after_setup_theme', 'mkdevops_se_content_width', 0 );
add_action( 'after_setup_theme', 'www_mkdevops_se_content_width', 0 );

/**
* Register widget area.
*
* @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar
*/
function mkdevops_se_widgets_init() {
function www_mkdevops_se_widgets_init() {
register_sidebar(
array(
'name' => esc_html__( 'Sidebar', 'mkdevops-se' ),
'name' => esc_html__( 'Sidebar', 'www-mkdevops-se' ),
'id' => 'sidebar-1',
'description' => esc_html__( 'Add widgets here.', 'mkdevops-se' ),
'description' => esc_html__( 'Add widgets here.', 'www-mkdevops-se' ),
'before_widget' => '<section id="%1$s" class="widget %2$s">',
'after_widget' => '</section>',
'before_title' => '<h2 class="widget-title">',
'after_title' => '</h2>',
)
);
}
add_action( 'widgets_init', 'mkdevops_se_widgets_init' );
add_action( 'widgets_init', 'www_mkdevops_se_widgets_init' );

/**
* Enqueue scripts and styles.
*/
function mkdevops_se_scripts() {
wp_enqueue_style( 'mkdevops-se-style', get_stylesheet_uri(), array(), _S_VERSION );
wp_style_add_data( 'mkdevops-se-style', 'rtl', 'replace' );
function www_mkdevops_se_scripts() {
wp_enqueue_style( 'www-mkdevops-se-style', get_stylesheet_uri(), array(), _S_VERSION );
wp_style_add_data( 'www-mkdevops-se-style', 'rtl', 'replace' );

wp_enqueue_script( 'mkdevops-se-navigation', get_template_directory_uri() . '/js/navigation.js', array(), _S_VERSION, true );
wp_enqueue_script( 'www-mkdevops-se-navigation', get_template_directory_uri() . '/js/navigation.js', array(), _S_VERSION, true );

if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
wp_enqueue_script( 'comment-reply' );
}
}
add_action( 'wp_enqueue_scripts', 'mkdevops_se_scripts' );
add_action( 'wp_enqueue_scripts', 'www_mkdevops_se_scripts' );

/**
* Implement the Custom Header feature.
Expand Down
12 changes: 6 additions & 6 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

?>
Expand All @@ -28,7 +28,7 @@
<body <?php body_class(); ?>>
<?php wp_body_open(); ?>
<div id="page" class="site">
<a class="skip-link screen-reader-text" href="#primary"><?php esc_html_e( 'Skip to content', 'mkdevops-se' ); ?></a>
<a class="skip-link screen-reader-text" href="#primary"><?php esc_html_e( 'Skip to content', 'www-mkdevops-se' ); ?></a>

<header id="masthead" class="site-header">
<div class="site-branding">
Expand All @@ -43,15 +43,15 @@
<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
<?php
endif;
$mkdevops_se_description = get_bloginfo( 'description', 'display' );
if ( $mkdevops_se_description || is_customize_preview() ) :
$www_mkdevops_se_description = get_bloginfo( 'description', 'display' );
if ( $www_mkdevops_se_description || is_customize_preview() ) :
?>
<p class="site-description"><?php echo $mkdevops_se_description; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
<p class="site-description"><?php echo $www_mkdevops_se_description; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
<?php endif; ?>
</div><!-- .site-branding -->

<nav id="site-navigation" class="main-navigation">
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'mkdevops-se' ); ?></button>
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'www-mkdevops-se' ); ?></button>
<?php
wp_nav_menu(
array(
Expand Down
18 changes: 9 additions & 9 deletions inc/custom-header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,39 @@
*
* @link https://developer.wordpress.org/themes/functionality/custom-headers/
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

/**
* Set up the WordPress core custom header feature.
*
* @uses mkdevops_se_header_style()
* @uses www_mkdevops_se_header_style()
*/
function mkdevops_se_custom_header_setup() {
function www_mkdevops_se_custom_header_setup() {
add_theme_support(
'custom-header',
apply_filters(
'mkdevops_se_custom_header_args',
'www_mkdevops_se_custom_header_args',
array(
'default-image' => '',
'default-text-color' => '000000',
'width' => 1000,
'height' => 250,
'flex-height' => true,
'wp-head-callback' => 'mkdevops_se_header_style',
'wp-head-callback' => 'www_mkdevops_se_header_style',
)
)
);
}
add_action( 'after_setup_theme', 'mkdevops_se_custom_header_setup' );
add_action( 'after_setup_theme', 'www_mkdevops_se_custom_header_setup' );

if ( ! function_exists( 'mkdevops_se_header_style' ) ) :
if ( ! function_exists( 'www_mkdevops_se_header_style' ) ) :
/**
* Styles the header image and text displayed on the blog.
*
* @see mkdevops_se_custom_header_setup().
* @see www_mkdevops_se_custom_header_setup().
*/
function mkdevops_se_header_style() {
function www_mkdevops_se_header_style() {
$header_text_color = get_header_textcolor();

/*
Expand Down
22 changes: 11 additions & 11 deletions inc/customizer.php
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php
/**
* mkdevops.se Theme Customizer
* www.mkdevops.se Theme Customizer
*
* @package mkdevops.se
* @package www.mkdevops.se
*/

/**
* Add postMessage support for site title and description for the Theme Customizer.
*
* @param WP_Customize_Manager $wp_customize Theme Customizer object.
*/
function mkdevops_se_customize_register( $wp_customize ) {
function www_mkdevops_se_customize_register( $wp_customize ) {
$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
Expand All @@ -20,26 +20,26 @@ function mkdevops_se_customize_register( $wp_customize ) {
'blogname',
array(
'selector' => '.site-title a',
'render_callback' => 'mkdevops_se_customize_partial_blogname',
'render_callback' => 'www_mkdevops_se_customize_partial_blogname',
)
);
$wp_customize->selective_refresh->add_partial(
'blogdescription',
array(
'selector' => '.site-description',
'render_callback' => 'mkdevops_se_customize_partial_blogdescription',
'render_callback' => 'www_mkdevops_se_customize_partial_blogdescription',
)
);
}
}
add_action( 'customize_register', 'mkdevops_se_customize_register' );
add_action( 'customize_register', 'www_mkdevops_se_customize_register' );

/**
* Render the site title for the selective refresh partial.
*
* @return void
*/
function mkdevops_se_customize_partial_blogname() {
function www_mkdevops_se_customize_partial_blogname() {
bloginfo( 'name' );
}

Expand All @@ -48,14 +48,14 @@ function mkdevops_se_customize_partial_blogname() {
*
* @return void
*/
function mkdevops_se_customize_partial_blogdescription() {
function www_mkdevops_se_customize_partial_blogdescription() {
bloginfo( 'description' );
}

/**
* Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
*/
function mkdevops_se_customize_preview_js() {
wp_enqueue_script( 'mkdevops-se-customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), _S_VERSION, true );
function www_mkdevops_se_customize_preview_js() {
wp_enqueue_script( 'www-mkdevops-se-customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), _S_VERSION, true );
}
add_action( 'customize_preview_init', 'mkdevops_se_customize_preview_js' );
add_action( 'customize_preview_init', 'www_mkdevops_se_customize_preview_js' );
Loading

0 comments on commit b5ebb0d

Please sign in to comment.