From 76b23833ee1102bcefdf3d9db39e51f0030e5fc9 Mon Sep 17 00:00:00 2001
From: Andrew Powers <andrew@pagelines.com>
Date: Wed, 3 Jul 2013 19:36:06 -0700
Subject: [PATCH] Better activation and tab linking

---
 admin/actions.admin.php   |  2 +-
 editor/editor.account.php |  2 +-
 editor/js/pl.editor.js    | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/admin/actions.admin.php b/admin/actions.admin.php
index 076bbb5a..2039edca 100644
--- a/admin/actions.admin.php
+++ b/admin/actions.admin.php
@@ -7,7 +7,7 @@
  * Move users to front end after activation
  */
 if( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" )
-	wp_redirect( home_url() );
+	wp_redirect( apply_filters('pl_activate_url', home_url().'?tablink=account&tabsublink=welcome') );
 
 /**
  * Add Javascript for Layout Controls from the Layout UI class
diff --git a/editor/editor.account.php b/editor/editor.account.php
index ad04fbd7..23b8249b 100644
--- a/editor/editor.account.php
+++ b/editor/editor.account.php
@@ -13,7 +13,7 @@ function __construct(){
 
 	function toolbar( $toolbar ){
 		$toolbar['account'] = array(
-			'name'	=> 'PageLines',
+			'name'	=> 'Account',
 			'icon'	=> 'icon-pagelines',
 			'pos'	=> 110,
 		//	'type'	=> 'btn',
diff --git a/editor/js/pl.editor.js b/editor/js/pl.editor.js
index dc8a3068..015eb448 100644
--- a/editor/js/pl.editor.js
+++ b/editor/js/pl.editor.js
@@ -116,8 +116,7 @@
 
 				e.preventDefault()
 				
-				var that = this
-				,	tabLink =  $(this).data('tab-link') || ''
+				var tabLink =  $(this).data('tab-link') || ''
 				,	tabSubLink = $(this).data('stab-link')|| ''
 				
 				that.tabLink( tabLink, tabSubLink)
@@ -151,8 +150,9 @@
 				$( '[data-action="'+tabLink+'"]' )
 					.trigger('click')
 					
-				$('[data-tab-action="account"] a')
+				$('[data-tab-action="'+tabSubLink+'"] a')
 					.trigger('click')
+					
 				
 				return
 			}
@@ -221,10 +221,11 @@
 			$('.pl-toolbox .ui-tabs').tabs('destroy')
 
 			var activeTabSlug = selectedPanel.attr('data-tab-load')
-			, 	theATab = selectedPanel.find('[data-tab-action="'+activeTabSlug+'"]')
+			, 	theSlug = activeTabSlug || getURLParameter('tabsublink')
+			, 	theATab = selectedPanel.find('[data-tab-action="'+theSlug+'"]')
 			, 	activeIndex = theATab.parent().children('li').index( theATab )
 			, 	activeTab = (activeIndex > 1) ? activeIndex : 0
-		
+			
 		
 			if(activeTab == 0){