Changeset 393

Timestamp:

02/11/2014 08:07:16 PM (12 years ago)

Author:

iandunn

Message:

Coming Soon Page: Ensure consistent styles regardless of current theme.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page

Files:

• TODO.txt (modified) (1 diff)
• classes/wordcamp-coming-soon-page.php (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/TODO.txt

@@ -1 +1 @@
 High priority:
-    make work consistently with any theme
     refactor get_contact_form_shortcode() once https://github.com/Automattic/jetpack/issues/102 is fixed
         if doesn't happen soon, then add admin notice if missing page w/ contact form or it's not published

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php

@@ -32 +32 @@
         }
         
-        // todo maybe need to exempt jetpack styles also - $exempt_stylesheets = array(  );
-        if ( $this->override_theme_template ) {
-            foreach( $GLOBALS['wp_styles']->queue as $stylesheet ) {
-                // todo removing fonts that we want - wp_dequeue_style( $stylesheet );
-            }
-        }
-
-        $twenty_thirteen_stylesheet = '/twentythirteen/style.css';
-        foreach( $GLOBALS['wp_theme_directories'] as $directory ) {
-            if ( is_file( $directory . $twenty_thirteen_stylesheet ) ) {
-                wp_register_style( 'twentythirteen-style-css', $directory . $twenty_thirteen_stylesheet );
-                wp_register_style( 'twentythirteen-fonts-css', '//fonts.googleapis.com/css?family=Source+Sans+Pro%3A300%2C400%2C700%2C300italic%2C400italic%2C700italic%7CBitter%3A400%2C700&subset=latin%2Clatin-ext' );
-                
-                // todo still isn't consistent between local and remote sandboxes
-            }
-        }
-        
-        wp_register_style(
+        $this->dequeue_all_stylesheets();
+        $this->register_twentythirteen_styles();
+
+        wp_enqueue_style(
             'wccsp-template',
             plugins_url( '/css/template-coming-soon.css', __DIR__ ),
-            array( 'twentythirteen-style-css', 'twentythirteen-fonts-css' ),
+            array( 'twentythirteen-fonts', 'genericons', 'twentythirteen-style' ),
             self::VERSION
         );
-        
-        wp_enqueue_style( 'wccsp-template' );
+    }
+
+    /**
+     * Dequeue all enqueued stylesheets
+     */
+    protected function dequeue_all_stylesheets() {
+        foreach( $GLOBALS['wp_styles']->queue as $stylesheet ) { 
+            wp_dequeue_style( $stylesheet );
+        }
+    }
+
+    /**
+     * Register TwentyThirteen's base styles
+     */
+    protected function register_twentythirteen_styles() {
+        $twentythirteen_uri = get_theme_root_uri( 'twentythirteen' ) . '/twentythirteen'; 
+        
+        if ( ! wp_style_is( 'twentythirteen-fonts', 'registered' ) ) {
+            wp_register_style( 'twentythirteen-fonts', '//fonts.googleapis.com/css?family=Source+Sans+Pro%3A300%2C400%2C700%2C300italic%2C400italic%2C700italic%7CBitter%3A400%2C700&subset=latin%2Clatin-ext', array(), null );
+        }
+
+        if ( ! wp_style_is( 'genericons', 'registered' ) ) {
+            wp_register_style( 'genericons', $twentythirteen_uri . '/fonts/genericons.css' );
+        }
+
+        if ( ! wp_style_is( 'twentythirteen-style', 'registered' ) ) {
+            wp_register_style( 'twentythirteen-style', $twentythirteen_uri . '/style.css' );
+        }
     }