Merge branch 'master' of github.com:inboundnow/inbound-pro

core/cta/classes/class.menus.php

@@ -2,19 +2,19 @@
 
 class CTA_Menus {
 
-	public static function __construct() {
+	public function __construct() {
 		self::load_hooks();
 	}
-	
+
 	public static function load_hooks() {
 		add_action('admin_menu', array( __CLASS__ , 'add_sub_menus' ) );
 	}
-	
+
 	public static function add_sub_menus() {
 		if ( !current_user_can('manage_options')) {
 			return;
 		}
-	
+
 		add_submenu_page('edit.php?post_type=wp-call-to-action', __( 'Forms' , 'cta' ), __( 'Manage Forms' , 'cta' ) , 'manage_options', 'inbound-forms-redirect',100);
 
 		add_submenu_page('edit.php?post_type=wp-call-to-action', __( 'Templates' , 'cta' ) , __( 'Manage Templates' , 'cta' ) , 'manage_options', 'wp_cta_manage_templates','wp_cta_manage_templates',100);
@@ -24,7 +24,7 @@ public static function add_sub_menus() {
 		/* Add settings page for frontend editor */
 		add_submenu_page('edit.php?post_type=wp-call-to-action', __( 'Editor' , 'cta' ), __( 'Editor' , 'cta' ) , 'manage_options', 'wp-cta-frontend-editor', 'wp_cta_frontend_editor_screen');
 	}
-	
+
 }
 
 $CTA_Menus = new CTA_Menus();

core/cta/shared/classes/class.welcome.php

@@ -12,7 +12,7 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
-if(!defined('INBOUND_NOW_PATH')) { define('INBOUND_NOW_PATH', WP_PLUGIN_DIR . '/inbound-now-pro'); }
+if(!defined('INBOUND_NOW_PATH')) { define('INBOUND_NOW_PATH', WP_PLUGIN_DIR . '/_inbound-pro'); }
 /**
  * Inbound_Now_Welcome Class
  *
@@ -129,7 +129,7 @@ public function quick_start_screen() {
 		//$test = get_transient('_inboundnow_zapier_activation_redirect', true, 30 );
 
 		$current_view = $_GET['page'];
-		if (function_exists( 'is_plugin_active' ) && is_plugin_active('inbound-now-pro/inbound-now-pro.php')) {
+		if (function_exists( 'is_plugin_active' ) && is_plugin_active('_inbound-pro/inbound-pro.php')) {
 			//echo 'Pro on';
 			$dir = INBOUND_NOW_PATH . '/components/'. $plugin_slug . '/welcome/';
 

core/landing-pages/.gitignore

@@ -0,0 +1,11 @@
+.DS_Store
+/shared/_DelSyncFiles/
+
+/deploy.sh
+shared/languages/landing-pages/.tx/CONFIG
+shared/languages/landing-pages/get-translations.bat
+.tx
+/shared/languages/landing-pages/*.bat
+shared/.SyncIgnore
+shared/languages/leads/_get-translations.bat
+shared/languages/calls-to-action/_get-translations.bat

core/landing-pages/.travis.yml

@@ -0,0 +1,51 @@
+# Travis CI Configuration File
+
+# Tell Travis CI we're using PHP
+language: php
+
+# PHP version used in first build configuration.
+php:
+    - "5.5"
+
+# WordPress version used in first build configuration.
+env:
+    - WP_VERSION=master
+
+# Next we define our matrix of additional build configurations to test against.
+# The versions listed above will automatically create our first configuration,
+# so it doesn't need to be re-defined below.
+
+# WP_VERSION specifies the tag to use. The way these tests are configured to run
+# requires at least WordPress 3.8. Specify "master" to test against SVN trunk.
+
+# Note that Travis CI supports listing these above to automatically build a
+# matrix of configurations, but we're being nice here by manually building a
+# total of four configurations even though we're testing 4 versions of PHP
+# along with 2 versions of WordPress (which would build 8 configs otherwise).
+# This takes half as long to run while still providing adequate coverage.
+
+matrix:
+  include:
+    - php: "5.3"
+      env: WP_VERSION=master
+    - php: "5.4"
+      env: WP_VERSION=3.8.1
+    - php: "5.2"
+      env: WP_VERSION=3.8.1
+
+# Clones WordPress and configures our testing environment.
+before_script:
+    - export PLUGIN_SLUG=$(basename $(pwd))
+    - git clone --depth=50 --branch="$WP_VERSION" git://develop.git.wordpress.org/ /tmp/wordpress
+    - cd ..
+    - mv "$PLUGIN_SLUG" "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
+    - cd /tmp/wordpress
+    - mysql -e "CREATE DATABASE wordpress_tests;" -uroot
+    - cp wp-tests-config-sample.php wp-tests-config.php
+    - sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
+    - sed -i "s/yourusernamehere/travis/" wp-tests-config.php
+    - sed -i "s/yourpasswordhere//" wp-tests-config.php
+    - cd "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
+    - ls -l
+
+script: phpunit