Load all admin stylesheets from the same function; add settings screen stylesheet

Author: sheabunge

css/edit-snippet.scss renamed to css/edit.scss

@@ -0,0 +1,8 @@
+
+.form-table th {
+	font-weight: normal;
+}
+
+#code_snippets_editor_preview .CodeMirror {
+	height: 200px;
+}

css/manage-snippets.scss renamed to css/manage.scss

@@ -84,6 +84,38 @@ function code_snippets_mu_menu_items( $menu_items ) {
 
 add_filter( 'mu_menu_items', 'code_snippets_mu_menu_items' );
 
+/**
+ * Enqueue the stylesheet for a snippet menu
+ *
+ * @since 2.2.0
+ * @uses wp_enqueue_style() To add the stylesheet to the queue
+ * @param string $hook The current page hook
+ */
+function code_snippets_enqueue_admin_stylesheet( $hook ) {
+	$pages = array( 'manage', 'add', 'edit', 'settings' );
+	$hooks = array_map( 'code_snippets_get_menu_hook', $pages );
+
+	/* Only load the stylesheet on the right snippets page */
+	if ( ! in_array( $hook, $hooks ) ) {
+		return;
+	}
+
+	$hooks = array_combine( $hooks, $pages );
+	$page = $hooks[ $hook ];
+
+	// add snippet page uses edit stylesheet
+	if ( 'add' === $page ) $page = 'edit';
+
+	wp_enqueue_style(
+		"code-snippets-$page",
+		plugins_url( "css/min/$page.css", CODE_SNIPPETS_FILE ),
+		false,
+		CODE_SNIPPETS_VERSION
+	);
+}
+
+add_action( 'admin_enqueue_scripts', 'code_snippets_enqueue_admin_stylesheet' );
+
 /**
  * Enqueue the icon stylesheet globally in the admin
  *

css/settings.scss

@@ -38,6 +38,8 @@ function code_snippets_add_single_menu() {
 		'code_snippets_render_single_menu'
 	);
 
+	add_action( 'load-' . $add_hook, 'code_snippets_load_single_menu' );
+
 	/* Check if we are currently editing a snippet */
 	if ( isset( $_REQUEST['page'] ) && code_snippets_get_menu_slug( 'edit' ) === $_REQUEST['page'] ) {
 
@@ -52,8 +54,6 @@ function code_snippets_add_single_menu() {
 
 		add_action( 'load-' . $edit_hook, 'code_snippets_load_single_menu' );
 	}
-
-	add_action( 'load-' . $add_hook, 'code_snippets_load_single_menu' );
 }
 
 add_action( 'admin_menu', 'code_snippets_add_single_menu', 5 );
@@ -337,15 +337,6 @@ function code_snippets_enqueue_codemirror() {
 		$codemirror_version
 	);
 
-	/* Plugin Assets */
-
-	wp_enqueue_style(
-		'code-snippets-edit',
-		plugins_url( 'css/min/edit-snippet.css', CODE_SNIPPETS_FILE ),
-		false,
-		CODE_SNIPPETS_VERSION
-	);
-
 	/* CodeMirror Theme */
 
 	$theme = code_snippets_get_setting( 'editor', 'theme' );
@@ -391,7 +382,4 @@ function code_snippets_enqueue_codemirror() {
 		array( 'code-snippets-tagit' ),
 		$tagit_version
 	);
-
-	/* Needed for resizable editor functionality */
-	wp_enqueue_script( 'jquery-ui-resizable' );
 }

includes/admin.php

@@ -67,9 +67,6 @@ function code_snippets_load_manage_menu() {
 		wp_die( __( 'You are not authorized to access this page.', 'code-snippets' ) );
 	}
 
-	/* Load stylesheet for this page */
-	add_action( 'admin_enqueue_scripts', 'code_snippets_manage_menu_assets' );
-
 	/* Create the snippet tables if they don't exist */
 	create_code_snippets_tables();
 
@@ -83,28 +80,6 @@ function code_snippets_load_manage_menu() {
 	$code_snippets_list_table->prepare_items();
 }
 
-/**
- * Enqueue the manage menu stylesheet
- *
- * @since 2.0
- * @uses wp_enqueue_style() To add the stylesheet to the queue
- * @param string $hook The current page hook, to be compared with the manage snippets page hook
- */
-function code_snippets_manage_menu_assets( $hook ) {
-
-	/* Only load the stylesheet on the manage snippets page */
-	if ( code_snippets_get_menu_hook() !== $hook ) {
-		return;
-	}
-
-	wp_enqueue_style(
-		'code-snippets-manage',
-		plugins_url( 'css/min/manage-snippets.css', CODE_SNIPPETS_FILE ),
-		false,
-		CODE_SNIPPETS_VERSION
-	);
-}
-
 /**
  * Handles saving the user's snippets per page preference
  *

includes/edit/edit.php

@@ -115,14 +115,14 @@ function example_custom_admin_footer_text( \$text ) {
 			} );
 
 						<?php break;
-						case 'checkbox': ?>
+					case 'checkbox': ?>
 
 			$( 'input[name="code_snippets_settings[editor][<?php echo $setting; ?>]"]' ).change( function () {
 				editor.setOption( '<?php echo $att_name; ?>', $(this).is(':checked') );
 			} );
 
 						<?php break;
-						case 'number': ?>
+					case 'number': ?>
 
 			$( 'input[name="code_snippets_settings[editor][<?php echo $setting; ?>]"]' ).change( function () {
 				editor.setOption( '<?php echo $att_name; ?>', $(this).val() );