diff --git a/admin.css b/admin.css
index 5199a48..3c63c93 100644
--- a/admin.css
+++ b/admin.css
@@ -14,3 +14,16 @@
.fixed .column-expires {
width: 12%;
}
+
+.nav-tab-content {
+ display: none;
+}
+.form-table th small {
+ display: block;
+ clear: both;
+ color: #999;
+}
+.form-table td label {
+ display: block;
+ clear:both;
+}
\ No newline at end of file
diff --git a/admin.js b/admin.js
index e69de29..2b6d574 100644
--- a/admin.js
+++ b/admin.js
@@ -0,0 +1,20 @@
+jQuery(function($){
+
+ // Admin page tabs
+ var $tabs = $('.nav-tab-wrapper'),
+ $panels = $('.nav-tab-content'),
+ currentHash = window.location.hash;
+
+ $tabs.on('click', 'a', function(e){
+ var hash = $(this).attr('href').replace('#tab-', '#tab-content-'); // prevents page scrolling if hash is present
+ $panels.hide().filter(hash).show();
+ $tabs.find('a').removeClass('nav-tab-active').filter($(this)).addClass('nav-tab-active');
+ });
+ $tabs.find( currentHash ? 'a[href="'+currentHash+'"]' : ':first').trigger('click');
+
+ // Fix input-inside-label glitch
+ $panels.on('click', 'input[type=text]', function(e){
+ e.preventDefault();
+ })
+
+});
\ No newline at end of file
diff --git a/dependency-minification.php b/dependency-minification.php
index 60c8c91..7f4ae98 100644
--- a/dependency-minification.php
+++ b/dependency-minification.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: Dependency Minification
* Description: Concatenates and minifies scripts and stylesheets. Please install and activate scribu's Proper Network Activation plugin before activating this plugin network-wide.
- * Version: 0.9.7
+ * Version: 1.0
* Author: X-Team
* Author URI: http://x-team.com/wordpress/
* Text Domain: dependency-minification
@@ -28,1010 +28,277 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class Dependency_Minification {
- static $options = array();
- protected static $minified_count = 0;
- static $admin_page_hook;
-
- const DEFAULT_ENDPOINT = '_minify';
- const CRON_MINIFY_ACTION = 'minify_dependencies';
- const CACHE_KEY_PREFIX = 'depmin_cache_';
- const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)';
- const AJAX_ACTION = 'dependency_minification';
- const ADMIN_PAGE_SLUG = 'dependency-minification';
- const ADMIN_PARENT_PAGE = 'tools.php';
-
- static $query_vars = array(
- 'depmin_handles',
- 'depmin_src_hash',
- 'depmin_ver_hash',
- 'depmin_file_ext',
- );
-
- static function setup() {
- self::$options = apply_filters( 'dependency_minification_options', array_merge(
- array(
- 'endpoint' => self::DEFAULT_ENDPOINT,
- 'default_exclude_remote_dependencies' => true,
- 'cache_control_max_age_cache' => 2629743, // 1 month in seconds
- 'cache_control_max_age_error' => 60 * 60, // 1 hour, to try minifying again
- 'allow_not_modified_responses' => true, // only needs to be true if not Akamaized and max-age is short
- 'admin_page_capability' => 'edit_theme_options',
- 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
- 'disable_if_wp_debug' => true,
- ),
- self::$options
- ) );
-
- $is_frontend = ! (
- is_admin()
- ||
- in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) )
- );
- if ( $is_frontend ) {
- add_filter( 'print_scripts_array', array( __CLASS__, 'filter_print_scripts_array' ) );
- add_filter( 'print_styles_array', array( __CLASS__, 'filter_print_styles_array' ) );
- }
- add_action( 'init', array( __CLASS__, 'hook_rewrites' ) );
- add_action( self::CRON_MINIFY_ACTION, array( __CLASS__, 'minify' ), 10, 4 );
- add_action( 'admin_menu', array( __CLASS__, 'admin_menu' ) );
- add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) );
- add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_enqueue_scripts' ) );
- add_action( 'wp_ajax_' . self::AJAX_ACTION, array( __CLASS__, 'admin_ajax_handler' ) );
- add_filter( 'plugin_action_links', array( __CLASS__, 'admin_plugin_action_links' ), 10, 2 );
- }
-
- static function hook_rewrites() {
- add_filter( 'query_vars', array( __CLASS__, 'filter_query_vars' ) );
- add_action( 'pre_get_posts', array( __CLASS__, 'handle_request' ) );
- self::add_rewrite_rule();
- }
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) exit;
- static function get_rewrite_regex() {
- return sprintf( '^%s/%s', self::$options['endpoint'], self::FILENAME_PATTERN );
- }
+/**
+ * Main Dependency Minification plugin class.
+ *
+ * @since 0.1
+ */
+class Dependency_Minification {
- static function add_rewrite_rule() {
- $regex = self::get_rewrite_regex();
- $redirect = 'index.php?';
- for ( $i = 0; $i < count( self::$query_vars ); $i += 1 ) {
- $redirect .= sprintf( '%s=$matches[%d]&', self::$query_vars[$i], $i + 1 );
- }
- add_rewrite_rule( $regex, $redirect, 'top' );
- }
+ /**
+ * @var float
+ * @since 1.0
+ */
+ const VERSION = '1.0';
- static function remove_rewrite_rule() {
- $regex = self::get_rewrite_regex();
- global $wp_rewrite;
- unset( $wp_rewrite->extra_rules_top[ $regex ] );
- }
-
- protected static $is_footer = array(
- 'scripts' => false,
- 'styles' => false,
- );
+ /*** Properties ***********************************************************/
/**
- * register_activation_hook
+ * @var DepMin_Admin
+ * @since 1.0
*/
- static function activate() {
- self::setup();
- self::add_rewrite_rule();
- flush_rewrite_rules();
- }
+ public static $admin;
/**
- * register_deactivation_hook
+ * @var DepMin_Options
+ * @since 1.0
*/
- static function deactivate() {
- self::remove_rewrite_rule();
- flush_rewrite_rules();
- }
+ public static $options;
/**
- * @filter query_vars
+ * @var DepMin_Handler
+ * @since 1.0
*/
- static function filter_query_vars( $query_vars ) {
- return array_merge( $query_vars, self::$query_vars );
- }
+ public static $handler;
/**
- * @filter print_styles_array
+ * @var DepMin_Collation
+ * @since 1.0
*/
- static function filter_print_styles_array( $handles ) {
- $handles = self::filter_print_dependency_array( $handles, 'styles' );
- return $handles;
- }
+ public static $collation;
/**
- * @filter print_scripts_array
+ * @var array
+ * @since 1.0
*/
- static function filter_print_scripts_array( $handles ) {
- $handles = self::filter_print_dependency_array( $handles, 'scripts' );
- return $handles;
- }
+ public static $query_vars = array(
+ 'depmin_handles',
+ 'depmin_src_hash',
+ 'depmin_ver_hash',
+ 'depmin_file_ext',
+ );
+
+ /*** Methods **************************************************************/
/**
- * @action admin_enqueue_scripts
+ * @access private
+ * @return void
+ * @since 1.0
*/
- static function admin_enqueue_scripts( $hook ) {
- if ( $hook !== self::$admin_page_hook ) {
- return;
- }
- $meta = get_plugin_data( __FILE__ );
- wp_enqueue_script( 'depmin-admin', plugin_dir_url( __FILE__ ) . 'admin.js', array( 'jquery' ), $meta['Version'] );
- wp_enqueue_style( 'depmin-admin', plugin_dir_url( __FILE__ ) . 'admin.css', array(), $meta['Version'] );
+ private function load_includes() {
+
+ // Load the helpers functions.
+ require self::path( 'inc/helpers.php' );
+
}
/**
- * @action admin_menu
+ * @access private
+ * @return void
+ * @since 1.0
*/
- static function admin_menu() {
- self::$admin_page_hook = add_submenu_page(
- self::ADMIN_PARENT_PAGE,
- __( 'Dependency Minification', 'dependency-minification' ),
- __( 'Dep. Minification', 'dependency-minification' ),
- self::$options['admin_page_capability'],
- self::ADMIN_PAGE_SLUG,
- array( __CLASS__, 'admin_page' )
- );
+ private function setup_actions() {
+
+ DepMin_Minify::hook_cron_action();
+ add_action( 'init', array( __CLASS__, 'add_rewrite_rules' ) );
+ add_filter( 'query_vars', array( __CLASS__, 'filter_query_vars' ) );
+
}
/**
- * @action admin_notices
+ * @access private
+ * @return void
+ * @since 1.0
*/
- static function admin_notices() {
- // Show a notice to notify user that pretty urls is disabled, hence the plugin won't work
- if ( empty( $GLOBALS['wp_rewrite']->permalink_structure ) ) {
- ?>
-
-
%1$s: %2$s',
- __( 'Dependency Minification', 'dependency-minification' ),
- sprintf(
- __( 'Pretty permalinks are not enabled in your %1$s, which is required for this plugin to operate. Select something other than Default (e.g. ?p=123)', 'dependency-minification' ),
- sprintf(
- '%2$s',
- admin_url( 'options-permalink.php' ),
- __( 'Permalinks Settings', 'dependency-minification' )
- )
- )
- );
- ?>
-
+
+
+
+
+
+
+
+
+
+
+ page_tab_content_status() ?>
+
+ page_tab_content_settings() ?>
+
+
+
%1$s: %2$s',
+ __( 'Dependency Minification', 'dependency-minification' ),
+ sprintf(
+ __( 'Pretty permalinks are not enabled in your %1$s, which is required for this plugin to operate. Select something other than Default (e.g. ?p=123)', 'dependency-minification' ),
+ sprintf(
+ '%2$s',
+ admin_url( 'options-permalink.php' ),
+ __( 'Permalinks Settings', 'dependency-minification' )
+ )
+ )
+ ); // xss ok
+ ?>
+