Changeset 962489

Timestamp:

08/08/2014 03:55:46 PM (11 years ago)

Author:

noticesoftware

Message:

v2.1.5 - Custom Headlines - Prompt Controls - v4.0 Check

Location:

roost-for-bloggers

Files:

• assets/screenshot-1.jpg (modified) (previous)
• assets/screenshot-2.jpg (modified) (previous)
• assets/screenshot-3.jpg (modified) (previous)
• assets/screenshot-4.jpg (added)
• assets/screenshot-5.jpg (added)
• assets/screenshot-6.jpg (added)
• tags/2.1.5 (added)
• tags/2.1.5/includes (added)
• tags/2.1.5/includes/class-roost-api.php (added)
• tags/2.1.5/includes/class-roost-bbpress.php (added)
• tags/2.1.5/includes/class-roost-core.php (added)
• tags/2.1.5/layout (added)
• tags/2.1.5/layout/admin.php (added)
• tags/2.1.5/layout/css (added)
• tags/2.1.5/layout/css/rooststyle.css (added)
• tags/2.1.5/layout/images (added)
• tags/2.1.5/layout/images/roost-arrow-white.png (added)
• tags/2.1.5/layout/images/roost-arrow.png (added)
• tags/2.1.5/layout/images/roost-icon-25.png (added)
• tags/2.1.5/layout/images/roost-plugin-sprite.png (added)
• tags/2.1.5/layout/images/roost-red-logo.png (added)
• tags/2.1.5/layout/images/roost_logo.png (added)
• tags/2.1.5/layout/images/roost_thumb.png (added)
• tags/2.1.5/layout/js (added)
• tags/2.1.5/layout/js/roostGoogleFont.js (added)
• tags/2.1.5/layout/js/roostbbp.js (added)
• tags/2.1.5/layout/js/roostscript.js (added)
• tags/2.1.5/readme.txt (added)
• tags/2.1.5/roost.php (added)
• tags/2.1.5/uninstall.php (added)
• trunk/includes/class-roost-api.php (modified) (5 diffs)
• trunk/includes/class-roost-bbpress.php (modified) (26 diffs)
• trunk/includes/class-roost-core.php (modified) (29 diffs)
• trunk/layout/admin.php (modified) (20 diffs)
• trunk/layout/css/rooststyle.css (modified) (40 diffs)
• trunk/layout/js/roostGoogleFont.js (modified) (1 diff)
• trunk/layout/js/roostbbp.js (modified) (1 diff)
• trunk/layout/js/roostscript.js (modified) (1 diff)
• trunk/readme.txt (modified) (7 diffs)
• trunk/roost.php (modified) (2 diffs)
• trunk/uninstall.php (added)

roost-for-bloggers/trunk/includes/class-roost-api.php

@@ -9 +9 @@
     public static function roost_remote_request( $remote_data ) {
         $auth_creds = '';
-        if ( !empty( $remote_data['appkey'] ) ) {
+        if ( ! empty( $remote_data['appkey'] ) ) {
             $auth_creds = 'Basic ' . base64_encode( $remote_data['appkey'] .':'.$remote_data['appsecret'] );
         }
@@ -46 +46 @@
         );
         $response = self::roost_remote_request( $remote_data );
-        return $response;   
+        return $response;
     }
     
@@ -64 +64 @@
         );
         $response = self::decode_data( $remote_data );
-        return $response;       
+        return $response;
     }
 
@@ -114 +114 @@
         }
 
-        if( !empty( $remote_content ) ) {
+        if ( ! empty( $remote_content ) ) {
             $remote_data = array(
                 'method' => 'PUT',
@@ -131 +131 @@
             'alert' => $alert,
         );
-        if( null === $remote_content['alert'] ) {
+        if ( null === $remote_content['alert'] ) {
             $remote_content['alert'] = '';
         }

roost-for-bloggers/trunk/includes/class-roost-bbpress.php

@@ -9 +9 @@
             'enabled' => $roost_settings['bbPress'],
         );
-        if( class_exists( 'bbPress' ) ) {
+        if ( class_exists( 'bbPress' ) ) {
             $bbPress['present'] = true;
         }
@@ -16 +16 @@
     
     public function __construct() {
-        add_action( 'wp_enqueue_scripts', array( $this, 'load_roost_bbp_scripts' ), 1 );
-
-        add_action( 'wp_ajax_roost_bbp_subscribe', array( $this, 'roost_bbp_ajax_subscription' ) );
-        add_action( 'wp_ajax_nopriv_roost_bbp_subscribe', array( $this, 'roost_bbp_ajax_subscription' ) );
-        add_action( 'wp_ajax_roost_bbp_unsubscribe', array( $this, 'roost_bbp_ajax_subscription' ) );
-        add_action( 'wp_ajax_nopriv_roost_bbp_unsubscribe', array( $this, 'roost_bbp_ajax_subscription' ) );
-
-        add_action( 'bbp_theme_before_reply_form_submit_wrapper', array( $this, 'roost_bbp_reply_subscription' ) );
-        add_action( 'bbp_theme_before_topic_form_submit_wrapper', array( $this, 'roost_bbp_reply_subscription' ) );
-        add_action( 'bbp_template_before_single_topic', array( $this, 'roost_bbp_topic_subscription' ) );        
-        add_action( 'bbp_template_before_single_forum', array( $this, 'roost_bbp_forum_subscription' ) );
-        add_action( 'bbp_get_request', array( $this, 'roost_bbp_subscriptions_handler' ), 1 );
-        add_action( 'bbp_new_reply', array( $this, 'roost_bbp_subscriptions_handler' ), 1 );
-        add_action( 'bbp_edit_reply', array( $this, 'roost_bbp_subscriptions_handler' ), 1 );
-        add_action( 'bbp_new_topic', array( $this, 'roost_bbp_subscriptions_handler' ), 1 );
-        add_action( 'bbp_edit_topic', array( $this, 'roost_bbp_subscriptions_handler' ), 1 );
-        
-        add_action( 'bbp_new_reply', array( $this, 'roost_bbp_notify_subscribers' ), 11, 5 );
-        add_action( 'bbp_new_topic', array( $this, 'roost_bbp_notify_subscribers' ), 11, 5 );
-
-        add_action( 'bbp_delete_reply', array( $this, 'roost_bbp_remove_all_subscriptions' ) );
-        add_action( 'bbp_delete_topic', array( $this, 'roost_bbp_remove_all_subscriptions' ) );
-        add_action( 'bbp_delete_forum', array( $this, 'roost_bbp_remove_all_subscriptions' ) );
-    }
-
-    public function load_roost_bbp_scripts() {
+        //blank
+    }
+
+    public static function init() {
+        add_action( 'wp_enqueue_scripts', array( __CLASS__, 'load_roost_bbp_scripts' ), 1 );
+
+        add_action( 'wp_ajax_roost_bbp_subscribe', array( __CLASS__, 'roost_bbp_ajax_subscription' ) );
+        add_action( 'wp_ajax_nopriv_roost_bbp_subscribe', array( __CLASS__, 'roost_bbp_ajax_subscription' ) );
+        add_action( 'wp_ajax_roost_bbp_unsubscribe', array( __CLASS__, 'roost_bbp_ajax_subscription' ) );
+        add_action( 'wp_ajax_nopriv_roost_bbp_unsubscribe', array( __CLASS__, 'roost_bbp_ajax_subscription' ) );
+
+        add_action( 'bbp_theme_before_reply_form_submit_wrapper', array( __CLASS__, 'roost_bbp_reply_subscription' ) );
+        add_action( 'bbp_theme_before_topic_form_submit_wrapper', array( __CLASS__, 'roost_bbp_reply_subscription' ) );
+        add_action( 'bbp_template_before_single_topic', array( __CLASS__, 'roost_bbp_topic_subscription' ) );
+        add_action( 'bbp_template_before_single_forum', array( __CLASS__, 'roost_bbp_forum_subscription' ) );
+        add_action( 'bbp_get_request', array( __CLASS__, 'roost_bbp_subscriptions_handler' ), 1 );
+        add_action( 'bbp_new_reply', array( __CLASS__, 'roost_bbp_subscriptions_handler' ), 1 );
+        add_action( 'bbp_edit_reply', array( __CLASS__, 'roost_bbp_subscriptions_handler' ), 1 );
+        add_action( 'bbp_new_topic', array( __CLASS__, 'roost_bbp_subscriptions_handler' ), 1 );
+        add_action( 'bbp_edit_topic', array( __CLASS__, 'roost_bbp_subscriptions_handler' ), 1 );
+        
+        add_action( 'bbp_new_reply', array( __CLASS__, 'roost_bbp_notify_subscribers' ), 11, 5 );
+        add_action( 'bbp_new_topic', array( __CLASS__, 'roost_bbp_notify_subscribers' ), 11, 5 );
+
+        add_action( 'bbp_delete_reply', array( __CLASS__, 'roost_bbp_remove_all_subscriptions' ) );
+        add_action( 'bbp_delete_topic', array( __CLASS__, 'roost_bbp_remove_all_subscriptions' ) );
+        add_action( 'bbp_delete_forum', array( __CLASS__, 'roost_bbp_remove_all_subscriptions' ) );
+    }
+
+    public static function load_roost_bbp_scripts() {
         wp_enqueue_script( 'roostbbpjs', ROOST_URL . 'layout/js/roostbbp.js', array('jquery'), Roost::$roost_version, false );
     }
     
-    public function roost_bbp_reply_subscription( $post ) {
+    public static function roost_bbp_reply_subscription( $post ) {
         global $post;
         $roost_bbp_subscriptions = get_post_meta( $post->ID, 'roost_bbp_subscription', true );
@@ -56 +60 @@
         <script>
             jQuery(document).ready(function($) {
-                setTimeout(function(){
-                    if(window.roostEnabled){
-                        jQuery('.roost-bbp-reply-subscription-wrap').show();
-                        jQuery('#roost-bbp-device-token').val(window.roostToken);                        
-                        <?php
-                            if ( !empty( $roost_bbp_subscriptions ) ) {
+                setTimeout( function() {
+                    if ( window.roostEnabled ){
+                        jQuery( '.roost-bbp-reply-subscription-wrap' ).show();
+                        jQuery( '#roost-bbp-device-token' ).val( window.roostToken );
+                        <?php
+                            if ( ! empty( $roost_bbp_subscriptions ) ) {
                                 $reply_bbp_subscriptions = json_encode( $roost_bbp_subscriptions );
                         ?>
                                 var registrations = <?php echo( $reply_bbp_subscriptions ); ?>;
-                                if (typeof registrations[window.roostToken] !== 'undefined') {
-                                    if(registrations[window.roostToken] === true) {
-                                        jQuery('.roost-bbp-reply-subscription').prop('checked', true);
+                                if ( 'undefined' !== typeof registrations[window.roostToken] ) {
+                                    if ( true ==== registrations[window.roostToken] ) {
+                                        jQuery( '.roost-bbp-reply-subscription' ).prop( 'checked', true );
                                     }
                                 }
@@ -74 +78 @@
                         ?>
                     }
-                }, 1500);
+                }, 1500 );
             });
         </script>
@@ -80 +84 @@
     }
 
-    public function roost_bbp_topic_subscription( $post ) {
+    public static function roost_bbp_topic_subscription( $post ) {
         global $post;
         $post_id = $post->ID;
@@ -95 +99 @@
                 var subscribeWrap = $('#roost-subscribe-<?php echo( $post_id ); ?>');
                 <?php
-                    if ( !empty( $roost_bbp_subscriptions ) ) {
+                    if ( ! empty( $roost_bbp_subscriptions ) ) {
                         $reply_bbp_subscriptions = json_encode( $roost_bbp_subscriptions );
                 ?>
                         var registrations = <?php echo( $reply_bbp_subscriptions ); ?>;
-                <?php        
+                <?php
                     } else {
                 ?>
@@ -108 +112 @@
                 
                 setTimeout(function(){
-                    if(window.roostEnabled){
-                        if (typeof registrations[window.roostToken] !== 'undefined') {
-                            if(registrations[window.roostToken] === true) {
-                                subscribeLink.text('Unsubscribe from Push Notifications');
-                                subscribeLink.data('action', 'roost_bbp_unsubscribe');
+                    if ( window.roostEnabled ){
+                        if ( 'undefined' !== typeof registrations[window.roostToken] ) {
+                            if ( true === registrations[window.roostToken] ) {
+                                subscribeLink.text( 'Unsubscribe from Push Notifications' );
+                                subscribeLink.data( 'action', 'roost_bbp_unsubscribe' );
                             }
                         } else {
-                            subscribeLink.text('Subscribe with Push Notifications');
-                            subscribeLink.data('action', 'roost_bbp_subscribe');
+                            subscribeLink.text( 'Subscribe with Push Notifications' );
+                            subscribeLink.data( 'action', 'roost_bbp_subscribe' );
                         }
                         <?php
-                            if( true === bbp_is_subscriptions_active() && true === is_user_logged_in() ) {
-                        ?>
-                            subscribeWrap.detach().appendTo('#subscription-toggle').show();
-                            subscribeWrap.prepend(' | ');
-                        <?php
-                            } else if( true === bbp_is_favorites_active() && true === is_user_logged_in() ) {
-                        ?>
-                            subscribeWrap.detach();                        
-                            subscribeWrap.appendTo('.bbp-header .bbp-reply-content').append(' | ').wrap("<div id='subscription-toggle'></div>").show();
+                            if ( true === bbp_is_subscriptions_active() && true === is_user_logged_in() ) {
+                        ?>
+                            subscribeWrap.detach().appendTo( '#subscription-toggle' ).show();
+                            subscribeWrap.prepend( ' | ' );
+                        <?php
+                            } else if ( true === bbp_is_favorites_active() && true === is_user_logged_in() ) {
+                        ?>
+                            subscribeWrap.detach();
+                            subscribeWrap.appendTo( '.bbp-header .bbp-reply-content' ).append( ' | ' ).wrap( "<div id='subscription-toggle'></div>" ).show();
                         <?php
                             } else {
                         ?>
                             subscribeWrap.detach();
-                            subscribeWrap.appendTo('.bbp-header .bbp-reply-content').wrap("<div id='subscription-toggle'></div>").show();
+                            subscribeWrap.appendTo( '.bbp-header .bbp-reply-content' ).wrap( "<div id='subscription-toggle'></div>" ).show();
                         <?php
                             }
@@ -139 +143 @@
                 }, 1500);
 
-                subscribeLink.on('click', function(e){
+                subscribeLink.on( 'click', function( e ){
                     e.preventDefault();
                     var data = {
@@ -146 +150 @@
                         roostToken: window.roostToken,
                         postID: subscribeLink.data('post'),
-                    };                    
-                    if(subscribeLink.data('action') === 'roost_bbp_subscribe'){
-                        subscribeLink.text('Unsubscribe from Push Notifications');
-                        subscribeLink.data('action', 'roost_bbp_unsubscribe');
-                    } else {
-                        subscribeLink.text('Subscribe with Push Notifications');
-                        subscribeLink.data('action', 'roost_bbp_subscribe');
-                    }
-
-                    $.post(ajaxurl, data, function(response) {
+                    };
+                    if ( 'roost_bbp_subscribe' === subscribeLink.data( 'action' ) ){
+                        subscribeLink.text( 'Unsubscribe from Push Notifications' );
+                        subscribeLink.data( 'action', 'roost_bbp_unsubscribe' );
+                    } else {
+                        subscribeLink.text( 'Subscribe with Push Notifications' );
+                        subscribeLink.data( 'action', 'roost_bbp_subscribe' );
+                    }
+
+                    $.post( ajaxurl, data, function( response ) {
 
                     });
@@ -164 +168 @@
     }
     
-    function roost_bbp_ajax_subscription() {
+    public static function roost_bbp_ajax_subscription() {
         $post_id = $_POST['postID'];
         self::roost_bbp_subscriptions_handler( $post_id );
@@ -170 +174 @@
     }
     
-    public function roost_bbp_forum_subscription( $post ) {
+    public static function roost_bbp_forum_subscription( $post ) {
         global $post;
         $post_id = $post->ID;
@@ -185 +189 @@
                 var subscribeWrap = $('#roost-subscribe-<?php echo( $post_id ); ?>');
                 <?php
-                    if ( !empty( $roost_bbp_subscriptions ) ) {
+                    if ( ! empty( $roost_bbp_subscriptions ) ) {
                         $reply_bbp_subscriptions = json_encode( $roost_bbp_subscriptions );
                 ?>
                         var registrations = <?php echo( $reply_bbp_subscriptions ); ?>;
-                <?php        
+                <?php
                     } else {
                 ?>
@@ -198 +202 @@
                 
                 setTimeout(function(){
-                    if(window.roostEnabled){
-                        if (typeof registrations[window.roostToken] !== 'undefined') {
-                            if(registrations[window.roostToken] === true) {
-                                subscribeLink.text('Unsubscribe from Push Notifications');
-                                subscribeLink.data('action', 'roost_bbp_unsubscribe');
+                    if ( window.roostEnabled ){
+                        if ( 'undefined' !== typeof registrations[window.roostToken] ) {
+                            if ( true === registrations[window.roostToken] ) {
+                                subscribeLink.text( 'Unsubscribe from Push Notifications' );
+                                subscribeLink.data( 'action', 'roost_bbp_unsubscribe' );
                             }
                         } else {
-                            subscribeLink.text('Subscribe with Push Notifications');
-                            subscribeLink.data('action', 'roost_bbp_subscribe');
+                            subscribeLink.text( 'Subscribe with Push Notifications' );
+                            subscribeLink.data( 'action', 'roost_bbp_subscribe' );
                         }
                         <?php
-                            if( true === bbp_is_subscriptions_active() && true === is_user_logged_in() ) {
-                        ?>
-                            subscribeWrap.detach().appendTo('#subscription-toggle').show();
-                            subscribeWrap.prepend(' | ');
+                            if ( true === bbp_is_subscriptions_active() && true === is_user_logged_in() ) {
+                        ?>
+                            subscribeWrap.detach().appendTo( '#subscription-toggle' ).show();
+                            subscribeWrap.prepend( ' | ' );
                         <?php
                             } else {
                         ?>
-                            subscribeWrap.wrap("<div id='subscription-toggle'></div>").show();
+                            subscribeWrap.wrap( "<div id='subscription-toggle'></div>" ).show();
                         <?php
                             }
@@ -223 +227 @@
                 }, 1500);
 
-                subscribeLink.on('click', function(e){
+                subscribeLink.on( 'click', function( e ){
                     e.preventDefault();
                     var data = {
-                        link: subscribeLink.attr('href'),
-                        action: subscribeLink.data('action'),
+                        link: subscribeLink.attr( 'href' ),
+                        action: subscribeLink.data( 'action' ),
                         roostToken: window.roostToken,
-                        postID: subscribeLink.data('post'),
-                    };                    
-                    if(subscribeLink.data('action') === 'roost_bbp_subscribe'){
-                        subscribeLink.text('Unsubscribe from Push Notifications');
-                        subscribeLink.data('action', 'roost_bbp_unsubscribe');
-                    } else {
-                        subscribeLink.text('Subscribe with Push Notifications');
-                        subscribeLink.data('action', 'roost_bbp_subscribe');
-                    }
-
-                    $.post(ajaxurl, data, function(response) {
+                        postID: subscribeLink.data( 'post' ),
+                    };
+                    if ( 'roost_bbp_subscribe' === subscribeLink.data( 'action' ) ){
+                        subscribeLink.text( 'Unsubscribe from Push Notifications' );
+                        subscribeLink.data( 'action', 'roost_bbp_unsubscribe' );
+                    } else {
+                        subscribeLink.text( 'Subscribe with Push Notifications' );
+                        subscribeLink.data( 'action', 'roost_bbp_subscribe' );
+                    }
+
+                    $.post( ajaxurl, data, function( response ) {
 
                     });
@@ -248 +252 @@
     }
     
-    public function roost_bbp_subscriptions_handler( $post_id ) {
-        if( isset( $_POST['roostToken'] ) ) {
+    public static function roost_bbp_subscriptions_handler( $post_id ) {
+        if ( isset( $_POST['roostToken'] ) ) {
             $action = $_POST['action'];
             $roost_device_token = $_POST['roostToken'];
-        } elseif( isset( $_POST['roost-bbp-device-token'] ) ) {
+        } elseif ( isset( $_POST['roost-bbp-device-token'] ) ) {
             $action = false;
             $roost_device_token = $_POST['roost-bbp-device-token'];
@@ -259 +263 @@
         }
 
-        if( ( !empty( $roost_device_token ) ) && ( false === $action ) ) {
-            if( isset( $_POST['roost-bbp-subscription'] ) ) {
+        if ( ( ! empty( $roost_device_token ) ) && ( false === $action ) ) {
+            if ( isset( $_POST['roost-bbp-subscription'] ) ) {
                 $roost_bbp_subscription = true;
             } else {
@@ -267 +271 @@
 
             $subscriptions = get_post_meta( $post_id, 'roost_bbp_subscription', true );
-            if( !empty( $subscriptions )  ) {
+            if ( ! empty( $subscriptions )  ) {
                 if ( isset( $subscriptions[$roost_device_token] ) ) {
-                    if( true === $roost_bbp_subscription ) {
+                    if ( true === $roost_bbp_subscription ) {
                         return;
                     } else {
@@ -275 +279 @@
                     }
                 } else {
-                    if( true === $roost_bbp_subscription ) {
+                    if ( true === $roost_bbp_subscription ) {
                         $subscriptions[$roost_device_token] = $roost_bbp_subscription;
                     }
@@ -287 +291 @@
         }
 
-        if( ( !empty( $roost_device_token ) ) && ( 'roost_bbp_subscribe' === $action ) ) {
+        if ( ( ! empty( $roost_device_token ) ) && ( 'roost_bbp_subscribe' === $action ) ) {
             $subscriptions = get_post_meta( $post_id, 'roost_bbp_subscription', true );
-            if( !empty( $subscriptions )  ) {
+            if ( ! empty( $subscriptions )  ) {
                 $subscriptions[$roost_device_token] = true;
             } else {
@@ -299 +303 @@
         }
 
-        if( ( !empty( $roost_device_token ) ) && ( 'roost_bbp_unsubscribe' === $action ) ) {
+        if ( ( ! empty( $roost_device_token ) ) && ( 'roost_bbp_unsubscribe' === $action ) ) {
             $subscriptions = get_post_meta( $post_id, 'roost_bbp_subscription', true );
             unset( $subscriptions[$roost_device_token] );
             update_post_meta( $post_id, 'roost_bbp_subscription', $subscriptions );
-        }        
-    }
-    
-    public function roost_bbp_remove_all_subscriptions( $action ) {
+        }
+    }
+    
+    public static function roost_bbp_remove_all_subscriptions( $action ) {
         delete_post_meta( $action, 'roost_bbp_subscription' );
     }
     
-    public function roost_bbp_notify_subscribers( $reply_id, $topic_id, $forum_id, $anonymous_data, $reply_author = 0 ) {
+    public static function roost_bbp_notify_subscribers( $reply_id, $topic_id, $forum_id, $anonymous_data, $reply_author = 0 ) {
         $topic_id = bbp_get_topic_id( $topic_id );
         $forum_id = bbp_get_forum_id( $forum_id );
@@ -320 +324 @@
         $topic_title   = bbp_get_topic_title( $topic_id );
         $topic_url     = get_permalink( $topic_id );
-        if( isset( $_POST['bbp_reply_to'] ) ) {
+        if ( isset( $_POST['bbp_reply_to'] ) ) {
             $reply_to_id = $_POST['bbp_reply_to'];
         }
@@ -330 +334 @@
         $message = 'New Post in ' . $topic_title;
         
-        if( !empty( $reply_to_id ) ) {
+        if ( ! empty( $reply_to_id ) ) {
             $reply_subscriptions = get_post_meta( $reply_to_id, 'roost_bbp_subscription', true );
         }
@@ -337 +341 @@
         $forum_subscriptions = get_post_meta( $forum_id, 'roost_bbp_subscription', true );
 
-        if( !empty( $reply_subscriptions ) ) {
+        if ( ! empty( $reply_subscriptions ) ) {
             $device_tokens = array();
             foreach( $reply_subscriptions as $token => $active ) {
@@ -344 +348 @@
         }
         
-        if( !empty( $topic_subscriptions ) ) {
-            if( empty( $device_tokens ) ) {
+        if ( ! empty( $topic_subscriptions ) ) {
+            if ( empty( $device_tokens ) ) {
                 $device_tokens = array();
             }
@@ -353 +357 @@
         }
 
-        if( !empty( $forum_subscriptions ) ) {
-            if( empty( $device_tokens ) ) {
+        if ( ! empty( $forum_subscriptions ) ) {
+            if ( empty( $device_tokens ) ) {
                 $device_tokens = array();
             }
@@ -362 +366 @@
         }
         
-        if( empty( $device_tokens) ) {
+        if ( empty( $device_tokens) ) {
             return;
         }
         Roost_API::send_notification( $message, $topic_url, null, $app_key, $app_secret, $device_tokens );
-    }    
+    }
 }

roost-for-bloggers/trunk/includes/class-roost-core.php

@@ -3 +3 @@
 class Roost {
 
-    public function __construct() {
-        $this->add_actions();
-    }
-    
-    public static function init() {
-        self::install();
-    }   
-
-    public static $roost_version = '2.1.4';
-    
-    protected static $database_version = 1407;
-    
+    public static $roost_version = '2.1.5';
+
+    protected static $database_version = 1408;
+
     public static function site_url() {
         return get_option( 'siteurl' );
     }
-    
+
     public static function registration_url() {
         $tld = 'https://go.goroost.com/signup?returnURL=';
-        $admin_path = admin_url('admin.php?page=roost-web-push');
+        $admin_path = admin_url( 'admin.php?page=roost-web-push' );
         $url = $tld . urlencode( $admin_path . '&source=wpplugin' );
         return $url;
@@ -28 +20 @@
     public static function login_url( $sso ) {
         $tld = 'https://go.goroost.com/login?returnURL=';
-        $admin_path = admin_url('admin.php?page=roost-web-push');
+        $admin_path = admin_url( 'admin.php?page=roost-web-push' );
         $url = $tld . urlencode( $admin_path );
         $url = $url . '&oauth=' . $sso;
         return $url;
     }
-    
+
     public static function roost_settings() {
-        return get_option('roost_settings');   
-    }
-    
-    public static function install() {
+        return get_option( 'roost_settings' );
+    }
+
+    public function __construct() {
+        //blank
+    }
+
+    public static function init() {
+        self::add_actions();
         $roost_settings = self::roost_settings();
-        
+        if ( empty( $roost_settings ) || ( self::$roost_version !== $roost_settings['version'] ) ) {
+            self::install( $roost_settings );
+        }
+    }
+
+    public static function install( $roost_settings ) {
         if ( empty( $roost_settings ) ) {
             $roost_settings = array(
@@ -48 +50 @@
                 'autoPush' => 0,
                 'bbPress' => 1,
-            );          
-            add_option('roost_settings', $roost_settings);
+                'database_version' => self::$database_version,
+                'prompt_min' => 0,
+                'prompt_visits' => 1,
+                'prompt_event' => 0,
+            );
+            add_option( 'roost_settings', $roost_settings );
         }
-        if( self::$roost_version !== $roost_settings['version'] ) {
+        if ( self::$roost_version !== $roost_settings['version'] ) {
             self::update( $roost_settings );
         }
-        self::roost_activated();
     }
 
     public static function update( $roost_settings ) {
         $roost_settings['version'] = self::$roost_version;
-        update_option('roost_settings', $roost_settings);        
-        if( empty( $roost_settings['database_version'] ) || $roost_settings['database_version'] < self::$database_version ) {
+        update_option( 'roost_settings', $roost_settings );
+        if ( empty( $roost_settings['database_version'] ) || $roost_settings['database_version'] < self::$database_version ) {
             self::update_database( $roost_settings );
         }
@@ -66 +71 @@
     
     protected static function update_database( $roost_settings ) {
-        if( empty( $roost_settings['database_version'] ) ) {
-            $roost_settings['database_version'] = 1407;
-            if( empty( $roost_settings['bbPress'] ) ) {
+        if ( empty( $roost_settings['database_version'] ) || ( 1407 === $roost_settings['database_version'] ) ) {
+            if ( empty( $roost_settings['bbPress'] ) ) {
                 $roost_settings['bbPress'] = 1;
             }
-        }
+            $roost_settings['prompt_min'] = 0;
+            $roost_settings['prompt_visits'] = 1;
+            $roost_settings['prompt_event'] = 0;
+        }
+        $roost_settings['database_version'] = self::$database_version;
         update_option('roost_settings', $roost_settings);
     }
-    
-    public static function roost_activated() {
-        add_option('roost_do_redirect', true);
-    }
-
-    public function activate_redirect() {
-        if ( get_option('roost_do_redirect', false) ) {
-            delete_option('roost_do_redirect');
-            if( !isset( $_GET['activate-multi'] ) ){
+
+    public static function activate_redirect() {
+        $redirect_state = get_option( 'roost_redirected' );
+        if ( empty( $redirect_state ) ) {
+            update_option( 'roost_redirected', true );
+            if ( ! isset( $_GET['activate-multi'] ) ){
                 wp_redirect( admin_url( 'admin.php?page=roost-web-push' ) );
                 exit;
@@ -88 +93 @@
         }
     }
-    
-    public static function uninstall(){
-        delete_option('roost_settings');
-        delete_post_meta_by_key( 'roostOverride' );
-        delete_post_meta_by_key( 'roostForce' );
-        delete_post_meta_by_key( 'roost_bbp_subscription' );
-    }
-
-    public function add_actions() {
-        add_action( 'transition_post_status', array( $this, 'build_note' ), 10, 3 );
-        add_action( 'post_submitbox_misc_actions', array( $this, 'note_override' ) );
-        add_action( 'wp_head', array( $this, 'byline' ), 1 );
-        add_action( 'wp_footer', array( $this, 'roostJS' ) );
-        add_action( 'save_post', array( $this, 'save_post_meta_roost' ) );
-        add_filter( 'clean_url', array( $this, 'add_async' ), 2, 1 );
-        add_action( 'wp_ajax_graph_reload', array( $this, 'graph_reload' ) );
-        add_action( 'wp_ajax_nopriv_graph_reload', array( $this, 'graph_reload' ) );
-        add_action( 'wp_ajax_subs_check', array( $this, 'subs_check' ) );
-        add_action( 'wp_ajax_nopriv_subs_check', array( $this, 'subs_check' ) );
-        
+
+    public static function add_actions() {
+        add_action( 'wp_head', array( __CLASS__, 'byline' ), 1 );
+        add_action( 'wp_footer', array( __CLASS__, 'roostJS' ) );
+        add_filter( 'clean_url', array( __CLASS__, 'add_async' ), 2, 1 );
+                
         if ( is_admin() ) {
-            add_filter( 'plugin_action_links_roost-for-bloggers/roost.php', array( $this, 'add_action_links' ) );
-            add_action( 'admin_init', array( $this, 'activate_redirect' ) );
-            add_action( 'admin_init', array( $this, 'roost_logout' ) );
-            add_action( 'admin_init', array( $this, 'manual_send' ) );
-            add_action( 'admin_notices', array( $this, 'setup_notice' ) );
+            add_filter( 'plugin_action_links_roost-for-bloggers/roost.php', array( __CLASS__, 'add_action_links' ) );
+            add_action( 'admin_init', array( __CLASS__, 'activate_redirect' ) );
+            add_action( 'admin_init', array( __CLASS__, 'roost_logout' ) );
+            add_action( 'admin_init', array( __CLASS__, 'roost_save_settings' ) );
+            add_action( 'admin_init', array( __CLASS__, 'manual_send' ) );
+            add_action( 'admin_notices', array( __CLASS__, 'setup_notice' ) );
             add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_scripts' ) );
-            add_action( 'admin_menu', array( $this, 'admin_menu_add' ) );
-        }
-    }
-
-    public function add_action_links ( $links ) {
+            add_action( 'admin_menu', array( __CLASS__, 'admin_menu_add' ) );
+            add_action( 'wp_ajax_graph_reload', array( __CLASS__, 'graph_reload' ) );
+            add_action( 'wp_ajax_remove_headline', array( __CLASS__, 'remove_headline' ) );
+            add_action( 'wp_ajax_subs_check', array( __CLASS__, 'subs_check' ) );
+            add_action( 'wp_ajax_nopriv_subs_check', array( __CLASS__, 'subs_check' ) );
+            add_action( 'post_submitbox_misc_actions', array( __CLASS__, 'note_override' ) );
+            add_action( 'add_meta_boxes_post', array( __CLASS__, 'custom_note_text' ) );
+            add_action( 'save_post', array( __CLASS__, 'save_post_meta_roost' ) );
+            add_action( 'transition_post_status', array( __CLASS__, 'build_note' ), 10, 3 );
+        }
+    }
+
+    public static function add_action_links ( $links ) {
         $rlink = array(
             '<a href="' . admin_url( 'admin.php?page=roost-web-push' ) . '">Go to Plugin</a>',
@@ -126 +126 @@
     }
 
-    public function add_async( $url ) {
+    public static function add_async( $url ) {
         if ( false === strpos( $url, '#async' ) ) {
             return $url;
@@ -136 +136 @@
     }
 
-    public function byline() {
+    public static function byline() {
         $byline = "<!-- Push notifications for this website enabled by Roost. Support for Safari, Firefox, and Chrome Browser Push. (v ". self::$roost_version .") - http://goroost.com/ -->";
         echo "\n${byline}\n";
     }
 
-    public function roostJS() {
+    public static function roostJS() {
         $roost_settings = self::roost_settings();
         $app_key = $roost_settings['appKey'];
+        if ( ! empty( $app_key ) ) {
     ?>
-        <script>var _roost = _roost || [];_roost.push(['appkey','<?php echo( $app_key ); ?>']);</script><noscript><a href="https://goroost.com/site-contact?noscript&appkey=<?php echo($app_key); ?>" title="Contact Us" target="_blank">Questions or feedback? Need help?</a> powered by <a href="https://goroost.com" title="Roost Web Push">Roost - Push notifications for websites</a></noscript><script src="//cdn.goroost.com/js/roost.js" async></script>
+            <script>var _roost = _roost || [];_roost.push(['appkey','<?php echo( $app_key ); ?>']);</script><noscript><a href="https://goroost.com/site-contact?noscript&appkey=<?php echo( $app_key ); ?>" title="Contact Us" target="_blank">Questions or feedback? Need help?</a> powered by <a href="https://goroost.com" title="Roost Web Push">Roost - Push notifications for websites</a></noscript><script src="//cdn.goroost.com/js/roost.js" async></script>
+        <?php
+            if ( ( true === $roost_settings['prompt_min'] ) || ( true === $roost_settings['prompt_event'] ) ) {
+        ?>
+                <script>
+                    _roost.push( [ 'autoprompt', false ] );
+                    <?php
+                        if ( true == $roost_settings['prompt_min'] ) {
+                    ?>
+                        _roost.push( [ 'minvisits', <?php echo( $roost_settings['prompt_visits'] ); ?> ] );
+                    <?php
+                        }
+                        if ( true === $roost_settings['prompt_event'] ) {
+                    ?>
+                            ( function( $ ) {
+                                $( '.roost-prompt-wp' ).on( 'click', function( e ) {
+                                    e.preventDefault();
+                                    _roost.prompt();
+                                });
+                                _roost.push(['onload', function(data){
+                                    if ( false === data.promptable ) {
+                                        $( '.roost-prompt-wp' ).hide();
+                                    }
+                                }]);
+                                _roost.push(['onresult', function(data){
+                                    if ( true === data.registered ) {
+                                        $( '.roost-prompt-wp' ).hide();
+                                    }
+                                }]);
+                            })( jQuery );
+                    <?php
+                        }
+                    ?>
+                </script>
     <?php
-    }
-    
+            }
+        }
+    }
+
     public static function setup_notice() {
         global $hook_suffix;
@@ -156 +192 @@
         $app_key = $roost_settings['appKey'];
 
-        if ( !$app_key && ( $hook_suffix !== $roost_page ) ) {
+        if ( ! $app_key && ( $hook_suffix !== $roost_page ) ) {
     ?>
-        <div class="updated" id="roostSetupNotice">
-            <div id="roostNoticeLogo">
+        <div class="updated" id="roost-setup-notice">
+            <div id="roost-notice-logo">
                 <img src="<?php echo( ROOST_URL . 'layout/images/roost_logo.png' ) ?>" />
             </div>
-            <div id="roostNoticeText">
+            <div id="roost-notice-text">
                 <p>
                     Thanks for installing the Roost plugin! You’re almost finished with<br />setup, all you need to do is create an account and login.
                 </p>
             </div>
-            <div id="roostNoticeTarget">
-                <a href="<?php echo( admin_url( 'admin.php?page=roost-web-push' ) ); ?>" id="roostNoticeCTA" >
-                    <span id="roostNoticeCTAHighlight"></span>
+            <div id="roost-notice-target">
+                <a href="<?php echo( admin_url( 'admin.php?page=roost-web-push' ) ); ?>" id="roost-notice-CTA" >
+                    <span id="roost-notice-CTA-highlight"></span>
                     Finish Setup
                 </a>
             </div>
-        </div>    
+        </div>
     <?php
-        } else if ( !$app_key && ( $hook_suffix === $roost_page ) ) {
+        } else if ( ! $app_key && ( $hook_suffix === $roost_page ) ) {
             $api_check = Roost_API::api_check();
             if ( is_wp_error( $api_check ) ) {
@@ -185 +221 @@
     }
 
-    public function admin_menu_add(){
+    public static function admin_menu_add(){
         add_menu_page(
             'Roost Web Push',
@@ -194 +230 @@
             ROOST_URL . 'layout/images/roost_thumb.png'
         );
-    }    
+    }
 
     public static function admin_scripts() {
@@ -201 +237 @@
         $roost_settings = self::roost_settings();
         $app_key = $roost_settings['appKey'];
-        if ( !empty( $app_key ) ) {
+        if ( ! empty( $app_key ) ) {
             wp_enqueue_style( 'morrisstyle', '//s3.amazonaws.com/roost/plugins/morris-0.4.3.min.css', '', self::$roost_version );
-            wp_enqueue_script( 'morrisscript', '//s3.amazonaws.com/roost/plugins/morris-0.4.3.min.js', array('jquery', 'raphael'), self::$roost_version );
-            wp_enqueue_script( 'raphael', '//s3.amazonaws.com/roost/plugins/raphael-min-2.1.0.js', array('jquery'), self::$roost_version );
-            wp_enqueue_script( 'roostscript', ROOST_URL . 'layout/js/roostscript.js', array('jquery'), self::$roost_version, true );
+            wp_enqueue_script( 'morrisscript', '//s3.amazonaws.com/roost/plugins/morris-0.4.3.min.js', array( 'jquery', 'raphael' ), self::$roost_version );
+            wp_enqueue_script( 'raphael', '//s3.amazonaws.com/roost/plugins/raphael-min-2.1.0.js', array( 'jquery' ), self::$roost_version );
+            wp_enqueue_script( 'roostscript', ROOST_URL . 'layout/js/roostscript.js', array( 'jquery' ), self::$roost_version, true );
         }
     }
@@ -220 +256 @@
         $roost_settings['autoPush'] = $form_data['autoPush'];
         $roost_settings['bbPress'] = $form_data['bbPress'];
+        $roost_settings['prompt_min'] = $form_data['prompt_min'];
+        $roost_settings['prompt_visits'] = $form_data['prompt_visits'];
+        $roost_settings['prompt_event'] = $form_data['prompt_event'];
         update_option('roost_settings', $roost_settings);
     }
 
-    public function save_post_meta_roost( $post_id ) {
-        if ( ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) || empty( $_POST['hiddenRooster'] ) ) {
+    public static function save_post_meta_roost( $post_id ) {
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || empty( $_POST['hiddenRooster'] ) ) {
             return false;
         } else {
             $no_note = get_post_meta( $post_id, 'roostOverride', true );
             $send_note = get_post_meta( $post_id, 'roostForce', true );
-            if ( isset( $_POST['roostOverride'] ) && !$no_note ) {
+            if ( isset( $_POST['roostOverride'] ) && ! $no_note ) {
                 $override_setting = $_POST['roostOverride'];
-                add_post_meta($post_id, 'roostOverride', $override_setting, true);
-            } elseif ( !isset( $_POST['roostOverride'] ) && $no_note ) {
+                add_post_meta( $post_id, 'roostOverride', $override_setting, true );
+            } elseif ( ! isset( $_POST['roostOverride'] ) && $no_note ) {
                 delete_post_meta( $post_id, 'roostOverride' );
             }
-            if ( isset( $_POST['roostForce'] ) && !$send_note ) {
+            if ( isset( $_POST['roostForce'] ) && ! $send_note ) {
                 $override_setting = $_POST['roostForce'];
                 add_post_meta( $post_id, 'roostForce', $override_setting, true );
-            } elseif ( !isset( $_POST['roostForce'] ) && $send_note ) {
+            } elseif ( ! isset( $_POST['roostForce'] ) && $send_note ) {
                 delete_post_meta( $post_id, 'roostForce' );
+            }
+            if ( isset( $_POST['custom-note-text'] ) ) {
+                update_post_meta( $post_id, 'roost_custom_note_text', $_POST['custom-note-text'] );
             }
         }
@@ -257 +299 @@
     }
 
-    public function build_note( $new_status, $old_status, $post ) {
-        if ( $new_status != $old_status && !empty( $post ) ) {
+    public static function build_note( $new_status, $old_status, $post ) {
+        if ( $new_status != $old_status && ! empty( $post ) ) {
             $post_type = get_post_type( $post );
             if ( 'post' === $post_type && 'publish' === $new_status ) {
@@ -267 +309 @@
                 $auto_push = $roost_settings['autoPush'];
                 
-                if ( !empty( $app_key ) ) { 
+                if ( ! empty( $app_key ) ) {
                     if ( ( 'publish' === $new_status && 'future' === $old_status ) || empty( $_POST['hiddenRooster'] ) ) {
                         $override = get_post_meta( $post_id, 'roostOverride', true );
@@ -275 +317 @@
                             $override = $_POST['roostOverride'];
                         }
-                        if( isset( $_POST['roostForce'] ) ) {
+                        if ( isset( $_POST['roostForce'] ) ) {
                             $send_note = $_POST['roostForce'];
                         }
                     }
                 }
-                if ( ( 1 == $auto_push || !empty( $send_note ) ) && !empty( $app_key ) ) {
+                if ( ( 1 == $auto_push || ! empty( $send_note ) ) && ! empty( $app_key ) ) {
                     if ( empty( $override ) ) {
-                        $alert = get_the_title( $post_id );
+                        if ( ! empty( $_POST['custom-note-text'] ) && strlen( $_POST['custom-note-text'] ) > 3 ) {
+                            $alert = $_POST['custom-note-text'];
+                        } else {
+                            $alert = get_the_title( $post_id );
+                        }
                         $url = wp_get_shortlink( $post_id );
-                        if ( has_post_thumbnail($post_id)) {
-                            $raw_image = wp_get_attachment_image_src(get_post_thumbnail_id($post_id));
+                        if ( has_post_thumbnail( $post_id ) ) {
+                            $raw_image = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ) );
                             $image_url = $raw_image[0];
                         } else {
                             $image_url = null;
                         }
-                        Roost_API::send_notification($alert, $url, $image_url, $app_key, $app_secret, null );
+                        Roost_API::send_notification( $alert, $url, $image_url, $app_key, $app_secret, null );
                     }
                 }
@@ -297 +343 @@
     }
 
-    public function note_override(){
+    public static function note_override() {
         global $post;
         if ( 'post' === $post->post_type ) {
-            if ( 'publish' == $post->post_status ) {
-                $check_hidden = true;   
-            }          
+            if ( 'publish' === $post->post_status ) {
+                $check_hidden = true;
+            }
             $roost_settings = self::roost_settings();
             $app_key = $roost_settings['appKey'];
             $auto_push = $roost_settings['autoPush'];
-            if ( !empty( $app_key ) ) {
-                printf('<div class="misc-pub-section misc-pub-section-last" id="roost-post-checkboxes" %s >', ( isset( $check_hidden ) ) ? "style='display:none;'":"" );
+            if ( ! empty( $app_key ) ) {
+                printf('<div class="misc-pub-section misc-pub-section-last" id="roost-post-checkboxes" %s >', ( isset( $check_hidden ) ) ? 'style="display:none;"' : '' );
                 $pid = get_the_ID();
-                if( 1 == $auto_push ) {
+                if ( 1 == $auto_push ) {
                     $checked = get_post_meta($pid, 'roostOverride', true);
-                    printf('<label><input type="checkbox" value="1" id="roost-override-checkbox" name="roostOverride" %s />', ( !empty( $checked ) ) ? "checked":"" );
+                    printf('<label><input type="checkbox" value="1" id="roost-override-checkbox" name="roostOverride" %s />', ( ! empty( $checked ) ) ? 'checked="checked"' : '' );
                     echo '<strong>Do NOT</strong> send notification with <strong>Roost</strong></label>';
                 } else {
                     $checked = get_post_meta($pid, 'roostForce', true);
-                    printf('<label><input type="checkbox" value="1" id="roost-forced-checkbox" name="roostForce" %s />', ( !empty( $checked ) ) ? "checked":"" );
+                    printf('<label><input type="checkbox" value="1" id="roost-forced-checkbox" name="roostForce" %s />', ( ! empty( $checked ) ) ? 'checked="checked"' : '' );
                     echo '<strong>Send</strong> notification with <strong>Roost</strong></label>';
                 }
@@ -323 +369 @@
         }
     }
-    
+    
+    public static function custom_note_text( $post ) {
+        if ( 'publish' !== $post->post_status ) {
+            $custom_note_text = get_post_meta( $post->ID, 'roost_custom_note_text', true );
+    ?>
+        <div id="custom-note">
+            <span id="custom-note-text-trigger" ><strong>Roost Web Push - </strong>
+                <?php
+                    if ( ! empty( $custom_note_text ) ) {
+                ?>
+                    <span class="roost-headline-cage">Push Headline: <i><?php echo( $custom_note_text ); ?></i> - <a class="roost-headline" data-action="change">Change</a> / <a class="roost-headline" data-action="remove" data-id="<?php echo( $post->ID ); ?>">Remove</a></span>
+                <?php
+                    } else {
+                ?>
+                    <a class="roost-headline" data-action="change">Use Custom Text for your Push Notification</a>
+                <?php
+                    }
+                ?>
+            </span>
+            <input type="text" id="custom-note-text" placeholder="Enter Custom Headline for your Notification" name="custom-note-text" value="<?php echo( ! empty( $custom_note_text ) ? $custom_note_text : '' ); ?>" />
+        </div>
+    <?php
+        }
+    }
+
     public static function complete_login( $logged_in, $site ) {
-        if ( !empty( $logged_in ) ) {
+        if ( ! empty( $logged_in ) ) {
             if ( true === $logged_in['success'] ) {
                 if ( count( $logged_in['apps'] ) > 1 ){
@@ -337 +407 @@
                 }
             }
-        } elseif ( !empty( $site ) ) {
+        } elseif ( ! empty( $site ) ) {
             $site_key = $site[0];
             $site_secret = $site[1];
@@ -348 +418 @@
         $response = array();
 
-        if ( !empty( $form_keys ) ) {
+        if ( ! empty( $form_keys ) ) {
             self::update_keys( $form_keys );
             $response['status'] = true;
@@ -363 +433 @@
     }
 
-    public function graph_reload() {
+    public static function graph_reload() {
         $roost_settings = self::roost_settings();
         $app_key = $roost_settings['appKey'];
@@ -374 +444 @@
         $roost_graph_data = json_encode( $roost_graph_data );
         echo $roost_graph_data;
-        die();                
-    }
-    
-    public function subs_check() {
+        die();
+    }
+
+    public static function remove_headline() {
+        $post_id = $_POST['postID'];
+        update_post_meta( $post_id, 'roost_custom_note_text', '' );
+        die();
+    }
+
+    public static function subs_check() {
         $roost_settings = self::roost_settings();
         $app_key = $roost_settings['appKey'];
@@ -387 +463 @@
     }
 
-    public function roost_logout() {
+    public static function roost_logout() {
         if ( isset( $_POST['clearkey'] ) ) {
             $form_keys = array(
@@ -401 +477 @@
         }
     }
+
+    public static function roost_save_settings() {
+        if ( isset( $_POST['savesettings'] ) ) {
+            $roost_settings = self::roost_settings();
+
+            $app_key = $roost_settings['appKey'];
+            $app_secret = $roost_settings['appSecret'];
+
+            $roost_server_settings = Roost_API::get_server_settings( $app_key, $app_secret );
+
+            $autoPush = false;
+            $bbPress = false;
+            $prompt_min = false;
+            $prompt_visits = 1;
+            $prompt_event = false;
+
+            if ( isset( $_POST['autoPush'] ) ) {
+                $autoPush = true;
+            }
+            if ( isset( $_POST['bbPress'] ) ) {
+                $bbPress = true;
+            }
+            if ( isset( $_POST['promptmin'] ) ) {
+                $prompt_min = true;
+            }
+            if ( isset( $_POST['promptvisits'] ) ) {
+                if ( '0' === $_POST['promptvisits'] ) {
+                    $prompt_visits = 1;
+                } else {
+                    $prompt_visits = $_POST['promptvisits'];
+                }
+            }
+            if ( isset( $_POST['promptevent'] ) ) {
+                $prompt_event = true;
+            }
+
+            $form_data = array(
+                'autoPush' => $autoPush,
+                'bbPress' => $bbPress,
+                'prompt_min' => $prompt_min,
+                'prompt_visits' => $prompt_visits,
+                'prompt_event' => $prompt_event,
+            );
+            self::update_settings( $form_data );
+            Roost_API::save_remote_settings( $app_key, $app_secret, $roost_server_settings, $_POST );
+            $status = 'Settings Saved.';
+            $status = urlencode( $status );
+            wp_redirect( admin_url( 'admin.php?page=roost-web-push' ) . '&status=' . $status );
+            exit;
+        }
+    }
     
-    public function manual_send() {
+    public static function manual_send() {
         if ( isset( $_POST['manualtext'] ) ) {
             $manual_text = $_POST['manualtext'];
@@ -426 +553 @@
             wp_redirect( admin_url( 'admin.php?page=roost-web-push' ) . '&status=' . $status );
             exit;
-        }        
+        }
     }
 
@@ -432 +559 @@
         $roost_settings = self::roost_settings();
                 
-        if ( empty( $roost_settings ) ) {
-            self::install();
-        } else {
-            $app_key = $roost_settings['appKey'];
-            $app_secret = $roost_settings['appSecret'];
-        }
-        
-        if ( !empty( $app_key ) ) {
+        $app_key = $roost_settings['appKey'];
+        $app_secret = $roost_settings['appSecret'];
+
+        if ( ! empty( $app_key ) ) {
             $roost_active_key = true;
             $bbPress_active = Roost_bbPress::bbPress_active();
@@ -446 +569 @@
         }
         
-        if ( !empty( $app_key ) && empty( $roost_server_settings ) ) {
-            $roost_server_settings = Roost_API::get_server_settings( $app_key, $app_secret );   
+        if ( ! empty( $app_key ) && empty( $roost_server_settings ) ) {
+            $roost_server_settings = Roost_API::get_server_settings( $app_key, $app_secret );
             $roost_stats = Roost_API::get_stats( $app_key, $app_secret );
         }
@@ -457 +580 @@
             $response = self::complete_login( $logged_in, null );
             $first_time = $response['firstTime'];
-            $roost_server_settings = $response['server_settings'];  
+            $roost_server_settings = $response['server_settings'];
             $roost_stats = $response['stats'];
             $roost_active_key = true;
@@ -467 +590 @@
             $logged_in = Roost_API::login( $roost_user, $roost_pass, null );
             $response = self::complete_login( $logged_in, null );
-            if( empty( $response['status'] ) ) {
+            if ( empty( $response['status'] ) ) {
                 $roost_sites = $response;
             } else {
-                if( !empty( $response['firstTime'] ) ) {
+                if ( ! empty( $response['firstTime'] ) ) {
                     $first_time = $response['firstTime'];
-                    $roost_server_settings = $response['server_settings'];  
+                    $roost_server_settings = $response['server_settings'];
                     $roost_stats = $response['stats'];
                     $roost_active_key = true;
@@ -486 +609 @@
             $response = self::complete_login( null, $site );
             $first_time = $response['firstTime'];
-            $roost_server_settings = $response['server_settings'];  
+            $roost_server_settings = $response['server_settings'];
             $roost_stats = $response['stats'];
             $roost_active_key = true;
         }
-
         if ( isset( $_GET['status'] ) ) {
             $status = urldecode( $_GET['status'] );
         }
         
-        if ( isset( $_POST['savesettings'] ) ) {    
-            $autoPush = false;
-            $bbPress = false;
-            
-            if ( isset( $_POST['autoPush'] ) ) {
-                $autoPush = true;
-            }
-            if ( isset( $_POST['bbPress'] ) ) {
-                $bbPress = true;
-            }
-            
-            $form_data = array(
-                'autoPush' => $autoPush,
-                'bbPress' => $bbPress,
-            );
-            self::update_settings( $form_data );
-
-            Roost_API::save_remote_settings( $app_key, $app_secret, $roost_server_settings, $_POST );
-            $roost_server_settings = Roost_API::get_server_settings( $app_key, $app_secret );   
-            $roost_stats = Roost_API::get_stats( $app_key, $app_secret );
-            $status = 'Settings Saved.';
-        }
-        
-        require_once( dirname( plugin_dir_path( __FILE__ ) ) . '/layout/admin.php');        
+        require_once( dirname( plugin_dir_path( __FILE__ ) ) . '/layout/admin.php' );
     }
 }

roost-for-bloggers/trunk/layout/admin.php

@@ -1 +1 @@
 <div id="rooster">
     <div id="roost-header">
-        <?php if( $roost_active_key ){ ?>
+        <?php if ( $roost_active_key ) { ?>
             <div class="roost-wrapper">
-                <div id="roost-header-right">   
+                <div id="roost-header-right">
                     <form action="" method="post">
-                        <input type="Submit" id="roostLogOut" class="type-submit" name="clearkey" value="Log Out" />
+                        <input type="Submit" id="roost-log-out" name="clearkey" value="Log Out" />
                     </form>
                     <span id="roost-username">
-                        <span id="roostUserLogo">
+                        <span id="roost-user-logo">
                             <?php echo get_avatar($roost_server_settings['ownerEmail'], 25 ); ?>
                         </span>
@@ -17 +17 @@
                 </div>
                 <img src="<?php echo ROOST_URL; ?>layout/images/roost-red-logo.png" />
-                <?php if( $roost_active_key ) { ?>
+                <?php if ( $roost_active_key ) { ?>
                     <div id="roost-site-name"><?php echo( $roost_server_settings['name'] ); ?></div>
                 <?php } ?>
@@ -23 +23 @@
         <?php } ?>
     </div>
-    <?php if ( !empty( $first_time ) ) { ?>
+    <?php if ( ! empty( $first_time ) ) { ?>
         <div class="updated roost-wrapper" id="roost-first-time-setup">
-            <div id="roostNoticeText">
+            <div id="roost-notice-text">
                 <h3>Welcome to Roost, the plugin is up and running!</h3>
                 <h4>Your site visitors can now opt-in to receive notifications from you. ( Safari / Mavericks only right now )</h4>
             </div>
-            <div id="roostNoticeTarget">
-                <a href="#" id="roostNoticeCTA" ><span id="roostNoticeCTAHighlight"></span>Dismiss</a>
+            <div id="roost-notice-target">
+                <a href="#" id="roost-notice-CTA" ><span id="roost-notice-CTA-highlight"></span>Dismiss</a>
             </div>
         </div>
@@ -38 +38 @@
     <?php } ?>
         <!--BEGIN ADMIN TABS-->
-        <?php if( $roost_active_key ) { ?>
+        <?php if ( $roost_active_key ) { ?>
 
             <div id="roost-tabs" class="roost-wrapper">
@@ -49 +49 @@
         <?php } ?>
         <!--END ADMIN TABS-->
-        <div id="roost-pre-wrap" class="<?php echo( !empty( $roost_active_key ) ? 'roost-white':''); ?>">
+        <div id="roost-pre-wrap" class="<?php echo( ! empty( $roost_active_key ) ? 'roost-white':''); ?>">
             <div id="roost-main-wrapper">
                     <!--BEGIN USER LOGIN SECTION-->
-                    <?php if( !$roost_active_key ) { ?>
+                    <?php if ( ! $roost_active_key ) { ?>
                         <form action="" method="post">
                             <div id="roost-login-wrapper">
-                                <?php if( empty( $roost_sites ) ){ ?>
+                                <?php if ( empty( $roost_sites ) ){ ?>
                                     <div id="roost-signup-wrapper">
                                         <div id="roost-signup-inner">
@@ -81 +81 @@
                                         <div class="roost-login-input">
                                             <span class="roost-label">Email:</span>
-                                            <input name="roostuserlogin" type="text" class="type-text roost-control-login" value="<?php echo isset($_POST['roostuserlogin']) ? $_POST['roostuserlogin'] : '' ?>" size="50" tabindex="1" />
+                                            <input name="roostuserlogin" type="text" class="roost-control-login" value="<?php echo isset($_POST['roostuserlogin']) ? $_POST['roostuserlogin'] : '' ?>" size="50" tabindex="1" />
                                         </div>
                                         <div class="roost-login-input">
                                             <!--PASSWORD-->
                                             <span class="roost-label">Password:</span>
-                                            <input name="roostpasslogin" type="password" class="type-text roost-control-login" value="<?php echo isset($_POST['roostpasslogin']) ? $_POST['roostpasslogin'] : '' ?>" size="50" tabindex="2" />
-                                        </div>
-                                        <?php if( isset( $roost_sites ) ) { ?>
+                                            <input name="roostpasslogin" type="password" class="roost-control-login" value="<?php echo isset($_POST['roostpasslogin']) ? $_POST['roostpasslogin'] : '' ?>" size="50" tabindex="2" />
+                                        </div>
+                                        <?php if ( isset( $roost_sites ) ) { ?>
                                             <!--CONFIGS-->
                                             <div class="roost-login-input">
@@ -104 +104 @@
                                                     ?>
                                                 </select>
-                                                <span class="roostDisclaimer">
+                                                <span class="roost-disclaimer">
                                                     To switch configurations after you log in, you will need to log out and choose a different configuration.
                                                 </span>
                                             </div>
-                                        <?php } ?>              
+                                        <?php } ?>
                                     </div>
                                     <div class="roost-primary-footer">
                                         <input type="hidden" id="roost-timezone-offset" name="roost-timezone-offset" value="" />
-                                        <input type="Submit" class="type-submit" id="roost-middle-save" name="<?php echo isset($roost_sites) ? 'roostconfigselect' : 'roostlogin' ?>" value="<?php echo isset( $roost_sites ) ? 'Choose Site' : 'Login' ?>" tabindex="3" />
+                                        <input type="submit" id="roost-middle-save" class="roost-login" name="<?php echo isset($roost_sites) ? 'roostconfigselect' : 'roostlogin' ?>" value="<?php echo isset( $roost_sites ) ? 'Choose Site' : 'Login' ?>" tabindex="3" />
                                         <?php submit_button( 'Cancel', 'delete', 'cancel', false, array( 'tabindex' => '4' ) ); ?>
                                         <span class="left-link"><a href="https://go.goroost.com/login?forgot=true" target="_blank">forget password?</a></span>
@@ -139 +139 @@
 
                     <!--BEGIN ALL TIME STATS SECTION-->
-                    <?php if( $roost_active_key ) { ?>
+                    <?php if ( $roost_active_key ) { ?>
                         <div id="roost-activity" class="roost-admin-section">
                             <div id="roost-all-stats">
@@ -150 +150 @@
                                         </div>
                                         <div class="roost-stats-metric">
-                                            <span class="roost-stat"><?php echo(number_format($roost_stats['messages'])); ?></span>
+                                            <span class="roost-stat"><?php echo(number_format($roost_stats['notifications'])); ?></span>
                                             <hr />
                                             <span class="roost-stat-label">Total notifications sent to your subscribers</span>
@@ -166 +166 @@
 
                     <!--BEGIN RECENT ACTIVITY SECTION-->
-                    <?php if( $roost_active_key ) { ?>
+                    <?php if ( $roost_active_key ) { ?>
                             <div class="roost-section-wrapper">
                                 <div class="roost-section-heading" id="roost-chart-heading">
@@ -198 +198 @@
                                             <div id="roost-curtain-notice">Graphs will appear once you have some subscribers.</div>
                                         </div>
-                                        <div id="roostchart_dynamic" class="roostStats">
+                                        <div id="roostchart-dynamic" class="roostStats">
                                         </div>
                                     </div>
@@ -208 +208 @@
 
                     <!--BEGIN MANUAL PUSH SECTION-->
-                    <?php if( $roost_active_key ) { ?>
+                    <?php if ( $roost_active_key ) { ?>
                         <form action="" method="post" id="manual-push-form">
                             <div id="roost-manual-push" class="roost-admin-section">
@@ -220 +220 @@
                                                         <div class="roost-label">Notification text:</div>
                                                         <div class="roost-input-wrapper">
-                                                            <span id="roostManualNoteCount"><span id="roostManualNoteCountInt">0</span> / 70 (reccommended)</span>
-                                                            <input name="manualtext" type="text" class="type-text roost-control-secondary" id="roostManualNote" value="" size="50" />
+                                                            <span id="roost-manual-note-count"><span id="roost-manual-note-count-int">0</span> / 70 (reccommended)</span>
+                                                            <input name="manualtext" type="text" class="roost-control-secondary" id="roost-manual-note" value="" size="50" />
                                                             <span class="roost-input-caption">Enter the text for the notification you would like to send your subscribers.</span>
                                                         </div>
@@ -228 +228 @@
                                                         <div class="roost-label">Notification link:</div>
                                                         <div class="roost-input-wrapper">
-                                                            <input name="manuallink" type="text" class="type-text roost-control-secondary" value="" size="50" />
+                                                            <input name="manuallink" type="text" class="roost-control-secondary" value="" size="50" />
                                                             <span class="roost-input-caption">Enter a website link (URL) that your subscribers will be sent to upon clicking the notification.</span>
                                                         </div>
                                                     </div>
-                                                    <input type="Submit" class="type-submit roost-control-secondary" name="manualpush" id="manualpush" value="Send notification" />
+                                                    <input type="Submit" class="roost-control-secondary" name="manualpush" id="manualpush" value="Send notification" />
                                                 </div>
                                             </div>
@@ -241 +241 @@
                         </form>
                     <?php } ?>
-                    <!--END MANUAL PUSH SECTION-->  
+                    <!--END MANUAL PUSH SECTION-->
 
                     <!--BEGIN SETTINGS SECTION-->
-                    <?php if( $roost_active_key ) { ?>
+                    <?php if ( $roost_active_key ) { ?>
                         <form action="" method="post">
                             <div id="roost-settings" class="roost-admin-section">
@@ -250 +250 @@
                                     <span class="roost-section-heading">Settings</span>
                                     <div class="roost-section-content roost-section-secondary">
-                                        <div class="roost-no-collapse"> 
-                                            <div id="roost-block">
+                                        <div class="roost-no-collapse">
+                                            <div class="roost-block <?php if ( ! empty( $roost_settings['prompt_event'] ) ) { echo( 'roost-settings-top-floor' ); } ?>">
                                                 <div class="roost-setting-wrapper">
-
                                                     <span class="roost-label">Auto Push:</span>
-                                                    <input type="checkbox" name="autoPush" class="roost-control-secondary" value="1" <?php if(!empty($roost_settings['autoPush'])){ echo('checked');} ?> />
+                                                    <input type="checkbox" name="autoPush" class="roost-control-secondary" value="1" <?php if ( ! empty( $roost_settings['autoPush'] ) ) { echo( "checked='checked'" ); } ?> />
                                                     <span class="roost-setting-caption">Automatically send a push notification to your subscribers every time you publish a new post.</span>
                                                 </div>
                                                 <div class="roost-setting-wrapper">
                                                     <span class="roost-label">Activate all Roost features:</span>
-                                                    <input type="checkbox" name="autoUpdate" class="roost-control-secondary" value="1" <?php if( true == $roost_server_settings['autoUpdate'] ){ echo( 'checked' ); } ?> />
+                                                    <input type="checkbox" name="autoUpdate" class="roost-control-secondary" value="1" <?php if ( true == $roost_server_settings['autoUpdate'] ){ echo( "checked='checked'" ); } ?> />
                                                     <span class="roost-setting-caption">This will automatically activate current and future features as they are added to the plugin.</span>
 
@@ -266 +265 @@
                                                 <div class="roost-setting-wrapper">
                                                     <span class="roost-label">bbPress Push Notifications:</span>
-                                                    <input type="checkbox" name="bbPress" class="roost-control-secondary" value="1" <?php if( true == $roost_settings['bbPress'] ){ echo( 'checked' ); } ?> <?php echo( !empty( $bbPress_active['present'] ) ? '':'disabled' ); ?> />
-                                                    <span class="roost-setting-caption">Extends subscriptions for bbPress forums, topics, and replies to allow subscribing via push notifications if site is viewed in a push capable browser.</span>
-
-                                                </div>
-                                                <input type="Submit" class="type-submit roost-control-secondary" id="roost-middle-save" name="savesettings" value="Save Settings" />                              
+                                                    <input type="checkbox" name="bbPress" class="roost-control-secondary" value="1" <?php if ( true == $roost_settings['bbPress'] ){ echo( 'checked="checked"' ); } ?> <?php echo( ! empty( $bbPress_active['present'] ) ? '' : 'disabled="disabled"' ); ?> />
+                                                    <span class="roost-setting-caption">Extends subscriptions for bbPress forums, topics, and replies to allow subscribing via push notifications.</span>
+                                                </div>
+                                                <div class="roost-setting-wrapper">
+                                                    <span class="roost-label long-label">Notification prompt options:</span>
+                                                    <input type="checkbox" name="promptmin" id="prompt-min" value="1" <?php if ( ! empty( $roost_settings['prompt_min'] ) ) { echo( 'checked="checked"' ); } ?> />
+                                                    <span class="roost-setting-caption" id="roost-settings-lift">Prompt visitors for notifications after they visit the site <input name="promptvisits" type="text" id="roost-min-visits" value="<?php echo( $roost_settings['prompt_visits'] ); ?>" <?php echo( ! empty( $roost_settings['prompt_min'] ) ? '' : 'disabled="disabled"' ); ?>/>times.</span>
+                                                </div>
+                                                <div class="roost-setting-wrapper">
+                                                    <span class="roost-label"></span>
+                                                    <input type="checkbox" name="promptevent" id="prompt-event" value="1" <?php if ( ! empty( $roost_settings['prompt_event'] ) ) { echo( 'checked="checked"' ); } ?> />
+                                                    <span class="roost-setting-caption">Prompt visitors for notifications once they complete an action (clicking a button or link).</span>
+                                                    <div id="roost-event-hints">
+                                                        <div>
+                                                            &bull; Assign the class <span class="roost-code">"roost-prompt-wp"</span> to any element to prompt the visitor on click.
+                                                            <span id="roost-hint-code-line">Example: <span class="roost-code">&lt;a href="#" class="roost-prompt-wp"&gt;Receive Desktop Notifications&lt;/a&gt;</span></span>
+                                                        </div>
+
+                                                        &bull; You could also create a <a href="<?php echo( admin_url( 'nav-menus.php' ) ); ?>">menu item</a> and add the same class, to trigger the prompt.
+                                                    </div>
+                                                    <span id="roost-event-hints-disclaimer">*Links or buttons with this class will be hidden to visitors already subscribed, or using a browser that does not support push notifications.</span>
+                                                </div>
+
+                                                <input type="Submit" class="roost-control-secondary" id="roost-settings-save" name="savesettings" value="Save Settings" />
                                             </div>
                                         </div>
@@ -279 +297 @@
                     <?php } ?>
                     <!--END SETTINGS SECTION-->
-                <div id="roostSupportTag">Have Questions, Comments, or Need a Hand? Hit us up at <a href="mailto:[email protected]" target="_blank">[email protected]</a> We're Here to Help.</div>
+                <div id="roost-support-tag">Have Questions, Comments, or Need a Hand? Hit us up at <a href="mailto:[email protected]" target="_blank">[email protected]</a> We're Here to Help.</div>
             </div>
         </div>
     <script>
-        (function($){
-            $('#rooster-status-close').click(function() {
-                $('#rooster-status').css('display', 'none');
+        (function( $ ){
+            $( '#rooster-status-close' ).click( function() {
+                $( '#rooster-status' ).css( 'display', 'none' );
             });
-            $('#roostNoticeCTA').click(function(e) {
+            $( '#roost-notice-CTA' ).click(function( e ) {
                 e.preventDefault();
-                $('#roost-first-time-setup').css('display', 'none');
+                $( '#roost-first-time-setup' ).css( 'display', 'none' );
             });
             var timeZoneOffset = new Date().getTimezoneOffset();
-            $('#roost-timezone-offset').val(timeZoneOffset);
-            
-            <?php if( $roost_active_key ) { ?>
-                $('.chart-range-toggle, .chart-metric-toggle').on('click', function(){
-                    $(this).parent().find('.active').removeClass('active');
-                    $(this).addClass('active');
+            $( '#roost-timezone-offset' ).val( timeZoneOffset );
+            <?php if ( $roost_active_key ) { ?>
+                $( '.chart-range-toggle, .chart-metric-toggle' ).on( 'click', function() {
+                    $( this ).parent().find( '.active' ).removeClass( 'active' );
+                    $( this ).addClass( 'active' );
                 });
-            <?php if( 0 !== $roost_stats['registrations'] ) { ?>
-                    $('#roost-curtain').hide();
+            <?php if ( 0 !== $roost_stats['registrations'] ) { ?>
+                    $( '#roost-curtain' ).hide();
                     var chart;
                     var data = {
-                        type: $('.chart-range-toggle.active span').data('type'),
-                        range: $('.chart-range-toggle.active span').data('range'),
-                        value: $('.chart-metric-toggle.active span').data('value'),
+                        type: $( '.chart-range-toggle.active span' ).data( 'type' ),
+                        range: $( '.chart-range-toggle.active span' ).data( 'range' ),
+                        value: $( '.chart-metric-toggle.active span' ).data( 'value' ),
                         offset: new Date().getTimezoneOffset(),
                         action: 'graph_reload',
                     };
-
-                    $('.chart-reload').on('click', function(e){
+                    $( '.chart-reload' ).on( 'click', function( e ) {
                         e.preventDefault();
-                        $("#roostchart_dynamic").html("");
-
+                        $( '#roostchart-dynamic' ).html( "" );
                         data = {
-                            type: $('.chart-range-toggle.active span').data('type'),
-                            range: $('.chart-range-toggle.active span').data('range'),
-                            value: $('.chart-metric-toggle.active span').data('value'),
+                            type: $( '.chart-range-toggle.active span' ).data( 'type' ),
+                            range: $( '.chart-range-toggle.active span' ).data( 'range' ),
+                            value: $( '.chart-metric-toggle.active span' ).data( 'value' ),
                             offset: new Date().getTimezoneOffset(),
                             action: 'graph_reload',
                         };
 
-                        graphDataRequest(data);
+                        graphDataRequest( data );
                     });
-
-                    function graphDataRequest(data) {
-                        $.post(ajaxurl, data, function(response) {
+                    function graphDataRequest( data ) {
+                        $.post( ajaxurl, data, function( response ) {
                             var data = $.parseJSON( response );
-                            loadGraph(data);
+                            loadGraph( data );
                         });
                     }
-
-                    function loadGraph(data) {
-                        $('roostchart_dynamic').html('');
-
+                    function loadGraph( data ) {
+                        $( '#roostchart-dynamic' ).html( '' );
                         chart = new Morris.Bar({
-                            element: 'roostchart_dynamic',
+                            element: $( '#roostchart-dynamic' ),
                             data: data,
-                            barColors: ["#e25351"],
+                            barColors: ['#e25351'],
                             xkey: 'label',
                             ykeys: ['value'],
@@ -347 +359 @@
                         });
                     }
-
-                    $(window).resize(function() {
+                    $( window ).resize( function() {
                         chart.redraw();
                     });
-                    graphDataRequest(data);
+                    graphDataRequest( data );
                 <?php } ?>
-            
             <?php } ?>
-        })(jQuery);
-        <?php if( isset( $roost_sites ) ){ ?>
-            jQuery(".roost-control-login").attr("disabled", "disabled");
-        <?php } ?>      
-        <?php if( $roost_active_key ) { ?>
-            (function($){
+        })( jQuery );
+        <?php if ( isset( $roost_sites ) ){ ?>
+            jQuery( '.roost-control-login' ).attr( 'disabled', 'disabled' );
+        <?php } ?>
+        <?php if ( $roost_active_key ) { ?>
+            (function( $ ){
                 function confirmMessage() {
-                    if ( !confirm( "Are you sure you would like to send a notification?" ) ) {
+                    if ( ! confirm( 'Are you sure you would like to send a notification?' ) ) {
                         return false;
                     } else {
@@ -368 +378 @@
                     }
                 }
-                $('#manualpush').on('click', function(e) {
+                $( '#manualpush' ).on( 'click', function( e ) {
                     e.preventDefault();
                     var subscribers = <?php echo $roost_stats['registrations']; ?>;
-                    if( 0 === subscribers ) {
+                    if ( 0 === subscribers ) {
                         var resub;
-                        $.post(ajaxurl, { action: 'subs_check' }, function(response) {
+                        $.post( ajaxurl, { action: 'subs_check' }, function( response ) {
                             var response = $.parseJSON( response );
                             resub = response;
-                            if( 0 === resub ) {
+                            if ( 0 === resub ) {
                                 alert('You must have one visitor subscribed to your site to send notifications');
                                 return;
                             } else {
-                                if( true === confirmMessage() ) {
-                                     $('#manualpush').unbind('click').trigger('click');
+                                if ( true === confirmMessage() ) {
+                                     $( '#manualpush' ).unbind( 'click' ).trigger( 'click' );
                                 }
                             }
                         });
                     } else {
-                        if( true === confirmMessage() ) {
-                             $('#manualpush').unbind('click').trigger('click');
+                        if ( true === confirmMessage() ) {
+                             $( '#manualpush' ).unbind( 'click' ).trigger( 'click' );
                         }
                     }
                 });
-            })(jQuery);
+            })( jQuery );
         <?php } ?>
-        <?php if( empty( $roost_sites ) ){ ?>
-            (function($){
-                if( $('#roost-login-wrapper').length ) {
-                    var signup = $('#roost-signup-wrapper');
-                    var signin = $('#roost-signin-wrapper');
-
+        <?php if ( empty( $roost_sites ) ){ ?>
+            (function( $ ){
+                if ( $( '#roost-login-wrapper' ).length ) {
+                    var signup = $( '#roost-signup-wrapper' );
+                    var signin = $( '#roost-signin-wrapper' );
                     signin.hide();
-
-                    $('.roost-signup').on('click', function() {
+                    $( '.roost-signup' ).on( 'click', function() {
                         signup.toggle();
                         signin.toggle();
                     });
                 }
-            })(jQuery);
-        <?php } ?>        
+            })( jQuery );
+        <?php } ?>
     </script>
 </div>

roost-for-bloggers/trunk/layout/css/rooststyle.css

@@ +1 @@
+#rooster {
+    margin: 0 0 0 -19px;
+    background: #f1f1f1;
+    color: #5c686f;
+    font-family: 'Open Sans', sans-serif;
+}
+
 #rooster a,
 #rooster a:link,
@@ -12 +19 @@
 }
 
-#rooster .roost-signup {
-    cursor: pointer;
-}
-
 #adminmenu li.current .wp-menu-image img,
 #adminmenu li.wp-not-current-submenu .wp-menu-image img {
@@ -21 +24 @@
 }
 
-hr {
-    height: 1px;
-    background: #d4d7d9;
-    border: 0;
-    margin: 15px 0 20px;
-}
-
-.type-submit {
+#rooster input,
+#rooster select {
+    font-family: 'Open Sans', sans-serif;
+}
+
+#rooster .roost-signup {
+    cursor: pointer;
+}
+
+.roost-login,
+.roost-section-secondary input[type="submit"] {
+    width: 94px;
+    padding: 5px 0 6px;
+    border: 1px solid;
+    border-radius: 3px;
+    border-color: #0074a2;
+    background: #2ea2cc;
+    box-shadow: none;
     font-size: 13px;
-    border-radius: 3px;
-    background: #2ea2cc;
-    color: #fff;
-    box-shadow: none;
-    border: 1px solid;
-    border-color: #0074a2;
-    padding: 5px 0 6px;
-    width: 94px;
+    color: #ffffff;
     cursor: pointer;
 }
@@ -46 +52 @@
 }
 
-input.type-text {
+#rooster input[type="text"] {
     width: 340px;
     height: 36px;
     padding: 0 10px;
-    font-family: 'Open Sans', sans-serif;
 }
 
@@ -61 +66 @@
 }
 
-#roost-manual-send-wrapper .type-text {
+#roost-manual-send-wrapper input[type="text"] {
     display:block;
     width: 837px;
@@ -67 +72 @@
 }
 
-#roost-send-with-link,
-#roost-send-no-link {
-
-}
-
-#roost-send-no-link .roost-input-text {
-
-}
-
 #rooster select {
     margin: 5px 0 0;
     cursor: pointer;
-    font-family: 'Open Sans', sans-serif;
-}
-
-#rooster {
-    margin: 0 0 0 -19px;
-    background: #f1f1f1;
-    color: #5c686f;
-    font-family: 'Open Sans', sans-serif;
 }
 
 #roost-header {
     display:inline-block;
+    width: 100%;
+    height: 36px;
     position:relative;
-    height: 36px;
-    width: 100%;
     margin-top: 7px;
     padding: 16px 0 0 0;
@@ -99 +87 @@
 
 #roost-header-right {
+    width: 550px;
     float: right;
-    width: 550px;
     margin: 5px;
 }
 
+#roost-username,
+#roost-log-out {
+    font-size: 15px;
+    color: #666666;
+}
+
 #roost-username {
-    color: #666666;
-    font-size: 15px;
-    margin-top: -4px;
-    font-family: 'Open Sans', sans-serif;
     display: inline-block;
     width: 425px;
     float: right;
+    margin-top: -4px;
     margin-right: 20px;
     text-align: right;
 }
 
-#roostLogOut {
-    color: #666666;
+#roost-log-out {
+    display: block;
+    width: 90px;
+    float: right;
+    padding: 5px 0 6px;
+    border: 1px solid #cccccc;
+    border-radius: 3px;
+    box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
+    font-weight:600;
     background: #f7f7f7;
-    font-family: 'Open Sans', sans-serif;
-    font-weight:600;
-    font-size: 15px;
-    border: 1px solid #cccccc;
-    box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-    border-radius: 3px;
-    width: 90px;
-    display: block;
-    float: right;
 }
 
 .roost-wrapper {
     margin: 0 auto;
-/*
-    width: 1066px;
-*/
     width: 1000px;
 }
@@ -144 +130 @@
 
 #roost-main-wrapper {
-    margin: -1px auto 0;
-/*
-    width: 1066px;
-*/
     width: 1000px;
     min-height: 800px;
     position: relative;
     top: 5px;
+    margin: -1px auto 0;
 }
 
 #roost-signin-wrapper {
-    background: #fff;
     width: 366px;
     margin: 100px auto;
+    background: #ffffff;
     box-shadow: 0px 1px 3px rgba(0,0,0,0.2);
 }
@@ -168 +151 @@
 
 #roost-primary-logo img {
+    width: 72px;
     height: 40px;
-    width: 72px;
     margin-top: 12px;
 }
 
 .roost-primary-heading {
-    background: #fafafa;
     height: 35px;
-    text-align: center;
     padding: 19px 30px;
     border-bottom: 1px solid #d4d7d9;   
+    background: #fafafa;
+    text-align: center;
 }
 
 .roost-primary-footer {
+    height: 35px;
+    padding: 14px 30px 20px;
     background: #fff;
-    height: 35px;
     text-align: center;
-    padding: 14px 30px 20px;
 }
 
@@ -191 +174 @@
     display: inline-block;
     width: 100%;
+    position: relative;
     margin: 10px 0;
-    position: relative;
-}
-
-#roost-signin-wrapper input.type-text {
+}
+
+#roost-signin-wrapper input[type="text"],
+#roost-signin-wrapper input[type="password"] {
     width: 214px;
     height: 26px;
@@ -202 +186 @@
 }
 
+#roost-signin-wrapper input[type="password"] {
+    padding-left: 10px;
+}
+
 #roost-signin-wrapper select {
     width: 100%;
 }
 
-.roostDisclaimer {
-    font-family: 'Open Sans', sans-serif;
+.roost-disclaimer {
+    display: inline-block;
+    width: 290px;
+    margin: 5px 0 0 5px;
     font-size: 11px;
     font-style: italic;
-    display: inline-block;
-    width: 290px;
-    margin: 5px 0 0 5px;
 }
 
@@ -218 +205 @@
 .roost-secondary-cta {
     display: block;
+    font-size: 13px;
 }
 
 .roost-primary-cta {
-    font-size: 13px;
-    font-family: 'Open Sans', sans-serif;
+    margin-bottom: 10px;
     font-weight: 600;
     line-height: 10px;
     color: #222222;
-    margin-bottom: 10px;
 }
 
 .roost-secondary-cta {
-    font-size: 13px;
-    color: #666666;
-    font-family: 'Open Sans', sans-serif;
     font-weight: 400;
     font-style: italic;
+    color: #666666;
 }
 
 .roost-section-wrapper {
+    margin: 25px 0;
+    border: 1px solid #e5e5e5;
     background: #fafafa;
-    border: 1px solid #e5e5e5;
-    margin: 25px 0;
     box-shadow: 0px 3px 5px rgba(0,0,0,0.2);
 }
 
 .roost-section-heading {
-    color: #222222;
+    display: inline-block;
     width: 100%;
-    display: inline-block;
+    height: 17px;
     position: relative;
-    height: 17px;
     padding: 15px 0 10px 5px;
+    background-color: #fafafa;
     font-size: 14px;
     letter-spacing: 0.1em;
     text-indent: 13px;
-    background-color: #fafafa;
+    color: #222222;
 }
 
@@ -267 +251 @@
 }
 
-.roost-section-secondary .type-submit {
+.roost-section-secondary input[type="submit"] {
+    width: 130px !important;
     float: right;
-    width: 130px;
     margin:2px 0 0 0;
 }
 
 #roost-all-stats {
+    margin: 32px 0 0;
     padding: 0;
-    margin: 32px 0 0;
 }
 
@@ -283 +267 @@
 
 .roost-no-collapse {
+    display: inline-block;
+    width: 956px;
     position: relative;
-    width: 956px;
-    display: inline-block;      
 }
 
 #roost-registration-points {
     list-style: none;
-    font-family: 'Open Sans', sans-serif;
     font-size: 13px;
 }
@@ -306 +289 @@
 
 .roost-step {
-    color: #fff;
-    background: #e25351;
-    display: inline-block;
-    padding: 10px 9px 8px 9px;
+    display: inline-block;
     width: 18px;
     height: 18px;
     position: relative;
+    margin-right: 10px;
+    padding: 10px 9px 8px 9px;
+    background: #e25351;
     border-radius: 20px;
     text-indent: 5px;
-    margin-right: 10px;
+    color: #fff;
 }
 
@@ -334 +317 @@
 
 .roost-input-text {
+    display:inline-block;
     width:100%;
+    height:71px;
     position:relative;
-    display:inline-block;
-    height:71px;
 }
 
 .roost-input-text .roost-label,
-#roost-block .roost-label {
+.roost-block .roost-label {
+    display: block;
     width: 110px;
+    float:left;
     margin-right: 14px;
-    display: block;
-    float:left;
-}
-
-#roost-block .roost-label {
+}
+
+.roost-block .roost-label {
     width:  175px;
     margin-right: 25px;
@@ -355 +338 @@
 }
 
+.roost-block .roost-label.long-label {
+    font-size: 12px;
+}
+
+#roost-settings-save {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    margin-bottom: 25px;
+}
+
+#roost-event-hints {
+    display: none;
+    width: 664px;
+    height: 102px;
+    position: relative;
+    float: right;
+    top: 10px;
+    padding: 23px 30px 30px 30px;
+    border: 1px solid #e9e9e9;
+    background: #ffffff;
+    box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2);
+}
+
+.roost-code {
+    display: inline-block;
+    padding: 5px 10px;
+    background: #f0f0f0;
+    font-family: monospace;
+    color: #000000;
+    text-align: center;
+}
+
+#roost-hint-code-line {
+    display: block;
+    margin-top: 7px;
+    margin-bottom: 25px;
+    text-indent: 5px;
+}
+
+#roost-event-hints-disclaimer {
+    display: none;
+    width: 630px;
+    position: relative;
+    float: right;
+    top: 21px;
+    right: 65px;
+    font-size: 12px;
+    font-style: italic;
+}
+
+.roost-block {
+    display: inline-block;
+    width: 100%;
+    height: 288px;
+    position:relative;
+    padding: 15px 0 0;
+}
+
 .roost-input-caption {
+    display:block;
+    margin-top: 5px;
     font-style:italic;
     font-size:13px;
-    display:block;
-    margin-top: 5px;
     text-indent: 5px;
 }
@@ -376 +418 @@
 }
 
-.roost-setting-wrapper:nth-child(2) {
-    margin-bottom: 30px;   
-}
-
-.roost-setting-wrapper:nth-child(3) {
-    margin-bottom: 8px;
-}
-
 .roost-setting-wrapper input {
+    position: relative;
     float: left;
     top: 5px;
     margin-right: 10px;
-    position: relative;
 }
 
 .roost-setting-caption {
+    display:block;
+    width: 725px;
+    float:left;
     font-style:italic;
-    width: 725px;
-    display:block;
-    float:left;
+}
+
+#roost-settings-lift {
+    position: relative;
+    top: -5px;
 }
 
@@ -402 +441 @@
     margin: 4px 0 1px 5px;
     font-size: 13px;
-    font-family: 'Open Sans', sans-serif;
     font-weight: 600;
 }
 
-#roost-block {
-    display: inline-block;
-    width: 100%;
-    position:relative;
-    height: 258px;
-    padding: 15px 0 0;
+input[type="text"]#roost-min-visits {
+    width: 36px;
+    height: 28px;
+    position: relative;
+    float: none;
+    top: 0px;
+    left: 4px;
+    text-align: center;
 }
 
@@ -419 +459 @@
 
 #rooster-status {
+    width: 966px;
+    margin: 15px auto;
+    padding: 17px 20px;
+    border-left: 4px solid #7ad03a;
     background: #fff;
-    width: 966px;
+    font-size: 13px;
     color: #222222;
-    font-size: 13px;
-    padding: 17px 20px;
-    margin: 15px auto;
-    display: block;
-/*  border-left: 4px solid rgb(226, 83, 81); */
-    border-left: 4px solid #7ad03a;
 }
 
 #rooster-status-text {
+    display: inline-block;
     width: 910px;
-    display: inline-block;
 }
 
 #rooster-status-close {
-    font-family: 'Open Sans', sans-serif;
-    color: rgb(46, 162, 204);
+    display: inline-block;
     height: 16px;
     position: relative;
-    display: inline-block;
+    float: right;
+    color: rgb(46, 162, 204);
     cursor: pointer;
-    float: right;
 }
 
@@ -452 +489 @@
 .rooster-custom-script {
     width: 220px;
+    height: 75px;
     padding: 10px;
-    height: 75px;
 }
 
 .roost-text-pinch {
+    display: inline-block;  
     width: 200px;
     margin-top: 50px;
-    display: inline-block;  
-}
-#roostUserLogo {
+}
+#roost-user-logo {
     display: inline-block;
+    height: 24px;
+    position:relative;
     top: 7px;
-    position:relative;
+    margin-right: 15px;
     border-radius: 3px;
-    height: 24px;
-    margin-right: 15px
-}
-
-#roostUserLogo img {
+}
+
+#roost-user-logo img {
     border-radius: 3px;
     cursor: pointer;
@@ -476 +513 @@
 
 .roost-stats-metric {
-    background: #fafafa;
+    width: 328px;
+    height: 95px;
+    position: relative;
+    float: left;
+    top: -6px;
     margin-right: 5px;
-    display: block;
-    height: 95px;
-    width: 328px;
-    float: left;
     padding: 50px 0;
     border: 1px solid #eeeeee;
-    position: relative;
-    top: -6px;
+    background: #fafafa;
 }
 
@@ -493 +529 @@
 
 .roost-stats-metric hr {
+    width: 40px;
+    height: 2px;
+    position: relative;
     margin: 0 auto;
-    height: 2px;
-    width: 40px;
+    border: 0;
     background: #e8ebeb;
-    display: block;
-    position: relative;
     top: 35px;
 }
 
 .roost-stat {
-    color: #666666;
     display:block;
+    font-size: 63px;
     text-align:center;
     font-weight: 300;
-    font-size: 63px;
+    color: #666666;
 }
 
@@ -513 +549 @@
     display:block;
     width: 215px;
+    position: relative;
+    top: 27px;
+    margin: 25px auto 0;
+    font-size: 15px;
     line-height: 18px;
-    font-size: 15px;
-    margin: 25px auto 0;
     text-align:center;
     color: #666666;
-    position: relative;
-    top: 27px;
 }
 
@@ -530 +566 @@
 }
 
-#roostManualNote {
+#roost-manual-note {
     padding: 0 179px 0 10px;
 }
 
-#roostManualNoteCount {
+#roost-manual-note-count {
     display: block;
     position: absolute;
+    top: 5px;
     right: 0;
-    top: 5px;
     font-weight: 700;
     color: #CCCCCC;
 }
 
-#roostManualNoteCountInt.roostWarning {
+#roost-manual-note-count-int.roostWarning {
     color: #D54E21;
 }
 
-#roostSupportTag {
+#roost-support-tag {
     text-align: center;
 }
 
-.updated#roostSetupNotice,
+.updated#roost-setup-notice,
 .updated#roost-first-time-setup {
+    min-width: 800px;
     height: 90px;
-    min-width: 800px;
+    position: relative;
+    margin: 15px 0 25px 0;
     border: none;
-    position: relative;
-    display: block;
-    margin: 15px 0 25px 0;
+    border-radius: 5px;
+    background: #e66d6b; /* Old browsers */
+    background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e66d6b), color-stop(100%,#e25351));
+    background: -webkit-linear-gradient(left, #e66d6b 0%,#e25351 100%);
+    background: -o-linear-gradient(left, #e66d6b 0%,#e25351 100%);
+    background: -ms-linear-gradient(left, #e66d6b 0%,#e25351 100%);
+    background: linear-gradient(to right, #e66d6b 0%,#e25351 100%);
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
     overflow: hidden;
-    background: #e66d6b; /* Old browsers */
-    background: -moz-linear-gradient(left, #e66d6b 0%, #e25351 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e66d6b), color-stop(100%,#e25351)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(left, #e66d6b 0%,#e25351 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(left, #e66d6b 0%,#e25351 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(left, #e66d6b 0%,#e25351 100%); /* IE10+ */
-    background: linear-gradient(to right, #e66d6b 0%,#e25351 100%); /* W3C */
-    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
-    border-radius: 5px;
 }
 
@@ -581 +615 @@
 
 .updated#roost-first-time-setup h3 {
+    margin: 22px 0 -10px 0;
     font-size: 15px;
     font-weight: 600;
-    margin: 22px 0 -10px 0;
 }
 
@@ -591 +625 @@
 }
 
-#roostNoticeLogo {
-    display: block;
-    float: left;
+#roost-notice-logo {
     width: 123px;
     height: 100%;
+    float: left;
     border-right: 1px solid #c45d5b;
 }
 
-#roostNoticeLogo img {
+#roost-notice-logo img {
     width: 75px;
+    position: relative;
     top: 26px;
     left: 18px;
-    position: relative;
-}
-
-#roostNoticeText {
-    display: block;
-    float: left;
-    color: #fff;
+}
+
+#roost-notice-text {
     width: 510px;
     height: 100%;
     position: relative;
+    float: left;
     border-left: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-#roostNoticeText p {
-    font-family: 'Open Sans', sans-serif;
+    color: #ffffff;
+}
+
+#roost-notice-text p {
+    margin-left: 14px;
+    padding: 17px;
     font-size: 14px;
-    padding: 17px;
-    margin-left: 14px;
-}
-
-#roost-first-time-setup #roostNoticeText {
-    border: 0;
+}
+
+#roost-first-time-setup #roost-notice-text {
     width: auto;
     padding-left: 35px;
-}
-
-#roostNoticeTarget {
+    border: 0;
+}
+
+#roost-notice-target {
     width: 155px;
+    height: 100%;
+    float: left;
+}
+
+a#roost-notice-CTA,
+a#roost-notice-CTA:link,
+a#roost-notice-CTA:active {
     display: block;
-    float: left;
-    height: 100%;
-}
-
-a#roostNoticeCTA,
-a#roostNoticeCTA:link,
-a#roostNoticeCTA:active {
-    text-align: center;
-    display: block;
-    color: #fff;
     width: 96px;
     height: 22px;
-    background-color: #c24846;
+    position: relative;
+    top: 31px;
+    left: 25px;
     border: 1px solid #963836;
     border-radius: 2px;
-    position: relative;
-    top: 31px;
-    left: 25px;
+    background-color: #c24846;
     box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);
+    text-align: center;
+    color: #ffffff;
+    text-decoration: none;
     overflow: hidden;
+    outline: 0;
+}
+
+a#roost-notice-CTA:visited {
     text-decoration: none;
-    outline: 0;
-}
-
-a#roostNoticeCTA:visited {
-    text-decoration: none;
-    color: #fff;
+    color: #ffffff;
     outline: 0
 }
 
-#roostNoticeCTAHighlight {
+#roost-notice-CTA-highlight {
     display: block;
+    width: 100px;
     height: 1px;
+    position: relative;
     margin-bottom: 2px;
-    width: 100px;
-    position: relative;
     background-color: rgba(255, 255, 255, 0.2);
 }
 
-a#roostNoticeCTA:hover {
+a#roost-notice-CTA:hover {
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
 
-#roost-first-time-setup #roostNoticeTarget {
+#roost-first-time-setup #roost-notice-target {
     float: right;
 }
@@ -684 +714 @@
     margin: 100px auto 50px;
     padding: 80px;
-    color: #fff;
     background: rgb(230,109,107);
     background: -moz-linear-gradient(top,  rgb(230,109,107) 0%, rgb(226,89,87) 100%);
@@ -692 +721 @@
     background: -ms-linear-gradient(top,  rgb(230,109,107) 0%,rgb(226,89,87) 100%);
     background: linear-gradient(to bottom,  rgb(230,109,107) 0%,rgb(226,89,87) 100%);
+    color: #ffffff;
 }
 
 #roost-signup-wrapper h2 {
-    color: #fff;
+    margin: 40px auto 23px;
+    color: #ffffff;
     font-size: 35px;
     font-weight: 300;
-    margin: 40px auto 23px;
 }
 
@@ -708 +738 @@
 #roost-bottom-right {
     position: absolute;
+    right: 42px;
     bottom: 11px;
-    color: #f2b1b1;
     font-size: 15px;
     font-weight: 300;
-    right: 42px;
+    color: #f2b1b1;
 }
 
 #roost-bottom-right .roost-signup {
-    color: #fff;
+    margin-left: 11px;
+    color: #ffffff;
     font-weight: 600;
-    margin-left: 11px;
 }
 
 #roost-signup-inner {
     display: inline-block;
-    position: relative;
     width: 100%;
     height: 100%;
+    position: relative;
 }
 
 #roost-create-account {
+    display: inline-block;
+    width: 163px;
+    height: 25px;
     position: absolute;
     bottom: 0;
     left: 0;
-    display: inline-block;
+    padding: 10px 10px 5px;
+    border-radius: 5px;
     background-color: #883736;
+    font-size: 14px;
+    font-weight: 600;
     text-align: center;
-    border-radius: 5px;
-    font-weight: 600;
-    padding: 10px 10px 5px;
-    height: 25px;
-    color: #fff !important;
+    color: #ffffff !important;
     text-decoration: none !important;
-    width: 163px;
-    font-size: 14px;
     text-indent: 13px;
 }
@@ -758 +788 @@
 
 #roost-api-error {
+    position: relative;
+    top: 75px;
     padding: 12px 10px;
-    position: relative;
-    top: 75px;
 }
 
 #roost-sso {
+    height: 58px;
     background: #f7f7f7;
-    height: 58px;
 }
 
@@ -779 +809 @@
 
 #roost-sso a {
+    display: block;
+    width: 58px;
     height: 58px;
-    width: 58px;
-    display: block;
-}
-
-.roost-sso-option {
 }
 
@@ -797 +824 @@
 .roost-sso-option .roost-plugin-image {
     display: block;
+    position: relative;
+    top: 19px;
     margin: 0 auto;
     text-indent: -999em;
-    position: relative;
-    top: 19px;
 }
 
 #roost-sso-facebook {
-    background-position: -32px -86px;
     width: 9px;
     height: 20px;
     top: 18px;
+    background-position: -32px -86px;
 }
 
@@ -815 +842 @@
 
 #roost-sso-twitter {
-    background-position: 0px -88px;
     width: 23px;
     height: 18px;
+    background-position: 0px -88px;
 }
 
@@ -825 +852 @@
 
 #roost-sso-google {
-    background-position: -49px -86px;
     width: 24px;
     height: 20px;
+    background-position: -49px -86px;
 }
 
@@ -835 +862 @@
 
 #roost-tabs {
-    display: block;
     height: 50px;
 }
 
 #roost-tabs li {
-    color: #666666;
     display: inline-block;
-    list-style: none;
+    height: 27px;
+    position: relative;
+    z-index: 10;
     float: left;
-    cursor: pointer;
-    height: 27px;
+    margin: 15px 10px 10px 0;
     padding: 8px 15px 0 15px;
-    font-size: 15px;
-    background-color: #e4e4e4;
-    text-align: center;
-    margin: 15px 10px 10px 0;
     border: 1px solid #cccccc;
     border-bottom: 0;
+    background-color: #e4e4e4;
+    list-style: none;
+    font-size: 15px;
+    text-align: center;
     font-weight: 600;
+    color: #666666;
+    cursor: pointer;
+}
+
+#roost-tabs li.active {
+    position: relative;
+    z-index: 50;
+    background-color: #fff;
+}
+
+#roost-pre-wrap {
     position: relative;
     z-index: 10;
 }
 
-#roost-tabs li.active {
+#roost-pre-wrap.roost-white {
+    border-top: 1px solid #cccccc;
     background-color: #fff;
-    position: relative;
-    z-index: 50;
-}
-
-#roost-pre-wrap {
-    position: relative;
-    z-index: 10;
-}
-
-#roost-pre-wrap.roost-white {
-    background-color: #fff;
-    border-top: 1px solid #cccccc;
 }
 
 #roost-site-name {
+    display: inline-block;
+    position: absolute;
+    margin-left: 24px;
+    padding: 10px 24px;
     border-left: 1px solid #d3d6d7;
-    display: inline-block;
-    padding: 10px 24px;
-    margin-left: 24px;
+    font-size: 15px;
     text-align: center;
-    position: absolute;
-    font-family: 'Open Sans', sans-serif;
-    font-size: 15px;
 }
 
 #roost-chart-heading {
     height: 45px;
+    padding: 25px 0;
     background: #f1f1f1;
-    padding: 25px 0;
     text-indent: 29px;
 }
 
-#roostchart_dynamic {
+#roostchart-dynamic {
     height: 250px;
 }
@@ -898 +923 @@
 #roost-time-period {
     position: absolute;
-    display: block;
+    top: 30px;
     right: 30px;
-    top: 30px;
 }
 
 .chart-range-toggle {
+    margin-right: -6px;
+    padding: 5px 10px;
+    border: 1px solid #cccccc;
     background: #f7f7f7;
+    font-size: 13px;
     color: #666666;
-    font-size: 13px;
-    border: 1px solid #cccccc;
+    text-align: center;
     cursor: pointer;
-    text-align: center;
-    padding: 5px 10px;
-    margin-right: -6px;
 }
 
@@ -919 +943 @@
 
 .chart-range-toggle:first-of-type {
+    border-right: 0;
     border-radius: 3px 0 0 3px;
-    border-right: 0;
 }
 
 .chart-range-toggle:last-of-type {
+    margin-right: 0;
+    border-left: 0;
     border-radius: 0 3px 3px 0;
-    border-left: 0;
-    margin-right: 0;
 }
 
 #roost-metric-options {
-    display: block;
     height: 27px;
     position: absolute;
+    bottom: 14px;
     left: 30px;
-    bottom: 14px;
 }
 
 .chart-metric-toggle {
+    height: 22px;
+    position: relative;
+    z-index: 10;
     float: left;
+    margin-right: 10px;
+    padding: 5px 10px 0;
+    border-bottom: 0;
+    border: 1px solid #cccccc;
+    background-color: #e4e4e4;
     font-size: 13px;
     color: #666666;
-    cursor: pointer;
-    height: 22px;
-    padding: 5px 10px 0;
-    background-color: #e4e4e4;
     text-align: center;
-    border: 1px solid #cccccc;
-    border-bottom: 0;
-    position: relative;
-    z-index: 10;
     text-indent: 0;
     letter-spacing: 0;
-    margin-right: 10px;
+    cursor: pointer;
 }
 
@@ -960 +983 @@
 
 .chart-metric-toggle.active {
+    position: relative;
+    z-index: 50;
+    border-bottom: none;
     background-color: #fafafa;
-    position: relative;
-    z-index: 50;
 }
 
 #roost-curtain {
+    display: inline-block;
+    width: 100%;
     height: 100%;
-    display: inline-block;
     position: absolute;
-    background: #fafafa;
-    width: 100%;
     top: 0;
     left: 0;
+    background: #fafafa;
 }
 
 #roost-curtain-notice {
+    width: 375px;
+    height: 5px;
+    position: relative;
+    top: 100px;
     margin: 0 auto;
-    position: relative;
-    top: 100px;
+    padding: 10px 0 25px;
+    border-radius: 15px;
     background: #e4e4e4;
     color: #666666;
-    border-radius: 15px;
-    padding: 10px 0 25px;
-    height: 5px;
     text-align: center;
-    width: 375px;
     opacity: 0.8;
 }
@@ -991 +1015 @@
 #roost-recent-activity {
     height: 275px;
+    position: relative;
+    z-index: 25;
     border-top: 1px solid #cccccc;
-    position: relative;
-    z-index: 25;
-}
+}
+
+#custom-note,
+#custom-note input {
+    display: none;
+    margin-top: 5px;
+}
+
+#custom-note-text-trigger {
+    display: block;
+    margin: 10px 0 0 10px;
+    color: #666666;
+}
+
+#custom-note a {
+    cursor: pointer;
+}
+
+#custom-note i {
+    font-size: 11px;
+}
+
+#custom-note input {
+    width: 100%;
+    margin-top: 0;
+    padding: 10px 10px 5px;
+}

roost-for-bloggers/trunk/layout/js/roostGoogleFont.js

@@ -3 +3 @@
   };
   (function() {
-    var wf = document.createElement('script');
+    var wf = document.createElement( 'script' );
     wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
       '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
     wf.type = 'text/javascript';
     wf.async = 'true';
-    var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(wf, s);
+    var s = document.getElementsByTagName( 'script' )[0];
+    s.parentNode.insertBefore( wf, s );
   })();

roost-for-bloggers/trunk/layout/js/roostbbp.js

@@ -1 @@
-window._roostCallback = function(data){
-    if(data.registered){
-        if(data.enabled){
+window._roostCallback = function( data ) {
+    if ( data.registered ) {
+        if ( data.enabled ) {
             roostToken = data.deviceToken;
             roostEnabled = data.enabled;

roost-for-bloggers/trunk/layout/js/roostscript.js

@@ -1 @@
-(function($) {
-    var $roostAdmin = $('.roost-admin-section');    
+(function( $ ) {
+    var $roostAdmin = $( '.roost-admin-section' );
     $roostAdmin.hide();
-    $('#roost-activity').show();
-        
-    $('#roost-tabs li').on('click', function(){
-        $(this).parent().find('.active').removeClass('active');
-        $(this).addClass('active');
-        var index = $(this).index();
-        if(index === 0) {
+    $( '#roost-activity' ).show();
+    $( '#roost-tabs li' ).on( 'click', function() {
+        $( this ).parent().find( '.active' ).removeClass( 'active' );
+        $( this ).addClass( 'active' );
+        var index = $( this ).index();
+        if( 0 === index ) {
             $roostAdmin.hide();
-            $('#roost-activity').show();
-        } else if (index === 1) {
+            $( '#roost-activity' ).show();
+        } else if ( 1 === index ) {
             $roostAdmin.hide();
-            $('#roost-manual-push').show();
+            $( '#roost-manual-push' ).show();
         } else {
-            $roostAdmin.hide();            
-            $('#roost-settings').show();
+            $roostAdmin.hide();
+            $( '#roost-settings' ).show();
         }
     });
-
-    var roostInput = $('#roostManualNote');
-    var roostCount = $('#roostManualNoteCountInt');
+    var roostInput = $( '#roost-manual-note' );
+    var roostCount = $( '#roost-manual-note-count-int' );
     var roostLimit = 70;
-
-    roostInput.keyup(function() {
-        var n = this.value.replace(/{.*?}/g, '').length;
+    roostInput.keyup( function() {
+        var n = this.value.replace( /{.*?}/g, '' ).length;
         if ( n > ( roostLimit - 11 ) ){
-            if(!roostCount.hasClass('roostWarning')){
-                roostCount.addClass('roostWarning');   
+            if( ! roostCount.hasClass( 'roostWarning' ) ) {
+                roostCount.addClass( 'roostWarning' );
             }
         } else if ( n < roostLimit - 10 ) {
-            if(roostCount.hasClass('roostWarning')){
-                roostCount.removeClass('roostWarning');   
+            if( roostCount.hasClass( 'roostWarning' ) ) {
+                roostCount.removeClass( 'roostWarning' );
             }
         }
         roostCount.text( 0 + n );
-    }).triggerHandler('keyup');
-})(jQuery);
+    }).triggerHandler( 'keyup' );
+    if ( $( '#prompt-event' ).is( ':checked' ) ) {
+        $( '#roost-event-hints' ).css( 'display', 'inline-block' ).show();
+        $( '.roost-block' ).height( '483px' );
+        $( '#roost-event-hints-disclaimer' ).show();
+    }
+    $( '#prompt-event' ).change( function () {
+        $( '#roost-event-hints' ).slideToggle( 100 );
+        var height = $( '.roost-block' ).height();
+        if ( 483 === height ) {
+            $( '.roost-block' ).animate({
+                height: 288,
+            }, 150 );
+            $( '#roost-event-hints-disclaimer' ).hide();
+        } else {
+            $( '.roost-block' ).animate({
+                height: 483,
+            }, 150 );
+            $( '#roost-event-hints-disclaimer' ).show();
+        }
+    });
+    $( '#prompt-min' ).change( function () {
+        $( '#roost-min-visits' ).attr( 'disabled', ! this.checked );
+    });
+    $( '#custom-note' ).remove().insertAfter( '#post-body #title' ).show();
+    $( '#custom-note-text-trigger' ).on( 'click', 'a', function() {
+        var $this = $(this);
+        var action = $this.data( 'action' );
+        if ( 'change' === action ) {
+            $( '#custom-note-text-trigger' ).fadeOut( 100, function() {
+                $( '#custom-note-text' ).fadeIn( 100 );
+            });
+        } else {
+            var data = {
+                postID: $this.data('id'),
+                action: 'remove_headline',
+            };
+            $.post( ajaxurl, data, function() {
+                $( '#custom-note-text' ).val( '' );
+                $( '.roost-headline-cage' ).fadeOut( 100, function() {
+                    $( '.roost-headline-cage' ).html( '<a class="roost-headline" data-action="change">Use Custom Text for your Push Notification</a>' ).fadeIn( 150 );
+                });
+            });
+        }
+    });
+})( jQuery );

roost-for-bloggers/trunk/readme.txt

@@ -3 +3 @@
 Tags: safari, push, push notifications, web push notifications, Mavericks, mobile, web push, roost, roost.me, roost_me, goroost, goroost.com Post, plugin, admin, posts, page, links, widget, ajax, social, wordpress, dashboard, news, notifications, services
 Requires at least: 3.8
-Tested up to: 3.9.1
-Stable tag: 2.1.4
+Tested up to: 4.0
+Stable tag: 2.1.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 
 * **Safari Web Push** - Take advantage of web push (Desktop Push Notifications) on OS X Mavericks.
+* **Notification Prompt Controls** - Decide how and when the subscription prompt is shown to your visitors.
+* **Custom Notification Headlines** - Set a custom headline for your notification to be used instead of a post title.
 * **bbPress Subscriptions** - Allows site visitors to subscribe to forums, topics, or individual messages when posting replies.
 * **Detailed Analytics** - *Charts* with detailed metrics about your visitors straight to your WordPress dashboard.
@@ -25 +27 @@
 **Free** Roost account included. No setup fees, no surprises, and no limitations on your site visitors.
 
-[vimeo http://vimeo.com/99195697]
+[youtube http://www.youtube.com/watch?v=DxElgkUsrCA]
 
 == Installation ==
@@ -46 +48 @@
 To use Safari Web Push, simply activate the *Roost for Bloggers* plugin. When your site is viewed in a push-enabled browser, the browser will prompt for permission. No additional setup is needed.
 
+**Notification Prompt Control**
+Control how and when you display the subscription prompt to your site visitors. From the settings tab, you can set a minimum number of visits, or create a link or button to trigger the prompt. When a button or link is used, if the browser is not able to receive push notifications, we will automatically hide the link or button.
+
+**Custom Notification Headlines**
+Use custom text for your notification headline by setting it underneath the standard post title when creating your content. If you set a custom headline, it will be used for your notification. Not setting a headline will default to your post title.
+
 **bbPress**
 With the bbPress extension for Roost, an additional subscribe option will appear next to the default bbPress subscription links. (This does NOT replace traditional subscription methods, only adds a new browser push channel.) Options include Forum subscriptions, Topic subscriptions, and subscribing to your individual posts. Notifications are sent about new content **only** to the visitors that have subscribed to the forum, topic, or post.
@@ -76 +84 @@
 
 = Do I need and Apple Developer Account or Google Play Developer account? =
-Nope. We've got you covered.
+Nah. We've got you covered.
 
 = Do you support Google Chrome or Firefox for desktop push? =
@@ -82 +90 @@
 
 = Do my readers / subscribers have to create an account with Roost? =
-Nope. We have a patent-pending *zero-configuration* installation process for the Roost app. When a person hits your subscription link, the are sent to the Roost page on their device's app store, and prompted for install. Once installed and opened, a person is sent directly back to the page they were viewing on your site.
+Nope. Just you.
 
 
 == Screenshots ==
 
-1. Create your Roost Account. (It's Free!)
-2. Log in to your Roost Account.
-3. Roost plugin from the Wordpress dashboard showing analytics, manual push, and settings.
+1. One-Click to subscribe for visitors to your site. Easy peasy!
+2. Notifications will be delivered in the top-right corner of your subscribers screen.
+3. Create your Roost Account. (It's Free!)
+4. Or log in to your existing Roost account.
+5. Roost plugin from the WordPress dashboard showing analytics.
+6. Powerful control on how your visitors can subscribe and how your notifications are sent.
 
 == Changelog ==
+= 2.1.5 =
+* Control for Prompt - auto prompt, after number of visits, off, on button / link click
+* Added custom headline option for notification when publishing a post
+* Cleared for takeoff with WordPress v4.0
+* Bugfix - Roost JS now only loaded if logged into plugin.
+* Bugfix - Total notifications sent in dashboard now really total notifications *Palm to Face*
+* Code Cleanup
+
 = 2.1.4 =
 * Bugfix - Fixed bug that prevented stats from displaying when WordPress admin accessed via HTTPS
@@ -174 +193 @@
 
 == Upgrade Notice ==
+= 2.1.5 =
+* Added prompt control and option for custom text on notifications when publishing a post. Also, pre-check compatible with WordPress v4.0
+
 = 2.1.4 =
 * Bugfix - Fixed bug that prevented stats from displaying when WordPress admin accessed via HTTPS

roost-for-bloggers/trunk/roost.php

@@ -4 +4 @@
  * Plugin URI: http://goroost.com/
  * Description: Drive traffic to your website with Safari Mavericks push notifications and Roost.
- * Version: 2.1.4
+ * Version: 2.1.5
  * Author: Roost
  * Author URI: http://goroost.com
@@ -16 +16 @@
 require_once( plugin_dir_path( __FILE__ ) . 'includes/class-roost-bbpress.php' );
 
-$roost = new Roost();
+Roost::init();
+
 $bbPress_active = Roost_bbPress::bbPress_active();
-
-if( !empty( $bbPress_active['present'] ) && !empty( $bbPress_active['enabled'] ) ) {
-    $roost_bbp = new Roost_bbPress();
+if ( ! empty( $bbPress_active['present'] ) && ! empty( $bbPress_active['enabled'] ) ) {
+    Roost_bbPress::init();
 }
-
-register_activation_hook( __FILE__, array( 'ROOST', 'init' ) );
-register_uninstall_hook( __FILE__, array( 'ROOST', 'uninstall' ) );