Various V2 tweaks, add new panel to work on.

bearded-avenger · Jul 4, 2013 · 173daa1 · 173daa1
1 parent a6febe5
commit 173daa1
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 10 deletions.
diff --git a/admin/actions.options.php b/admin/actions.options.php
@@ -31,13 +31,13 @@ function pagelines_add_admin_menus() {
 
 	if(!pl_deprecate_v2()){
 
-		$_pagelines_options_page_hook = pagelines_insert_menu( PL_MAIN_DASH, __( 'Site Options', 'pagelines' ), 'edit_theme_options', 'pagelines', 'pagelines_build_option_interface' );
+		 $_pagelines_options_page_hook = pagelines_insert_menu( PL_MAIN_DASH, __( 'Site Options', 'pagelines' ), 'edit_theme_options', 'pagelines', 'pagelines_build_option_interface' );
 
 		$_pagelines_special_hook = pagelines_insert_menu( PL_MAIN_DASH, __( 'Page Options', 'pagelines' ), 'edit_theme_options', 'pagelines_special', 'pagelines_build_special' );
 
 		$_pagelines_templates_hook = pagelines_insert_menu( PL_MAIN_DASH, __( "Drag <span class='spamp'>&amp;</span> Drop", 'pagelines' ), 'edit_theme_options', 'pagelines_templates', 'pagelines_build_templates_interface' );
 
-		$_pagelines_ext_hook = pagelines_insert_menu( PL_MAIN_DASH, __( 'Extend', 'pagelines' ), 'edit_theme_options', PL_ADMIN_STORE_SLUG, 'pagelines_build_extension_interface' );
+		// $_pagelines_ext_hook = pagelines_insert_menu( PL_MAIN_DASH, __( 'Extend', 'pagelines' ), 'edit_theme_options', PL_ADMIN_STORE_SLUG, 'pagelines_build_extension_interface' );
 
 	} else {
 

diff --git a/editor/editor.account.php b/editor/editor.account.php
@@ -0,0 +1,41 @@
+<?php 
+
+
+class PLAccountPanel{
+
+	function __construct(){
+
+		add_filter('pl_toolbar_config', array(&$this, 'toolbar'));
+
+		$this->url = PL_PARENT_URL . '/editor';
+
+	}
+
+	function toolbar( $toolbar ){
+		$toolbar['account'] = array(
+			'name'	=> 'PageLines',
+			'icon'	=> 'icon-pagelines',
+			'pos'	=> 110,
+		//	'type'	=> 'btn',
+			'panel'	=> array(
+				'heading'	=> "<i class='icon-pagelines'></i> PageLines Account",
+				'welcome'	=> array(
+					'name'	=> 'Welcome!',
+					'icon'	=> 'icon-star'
+				),
+				'account'	=> array(
+					'name'	=> 'Your Account',
+					'icon'	=> 'icon-user'
+				),
+				'support'	=> array(
+					'name'	=> 'Support',
+					'icon'	=> 'icon-comments'
+				),
+			)
+		);
+
+		return $toolbar;
+	}
+
+
+}
diff --git a/editor/editor.admin.php b/editor/editor.admin.php
@@ -30,7 +30,7 @@ function admin_interface(){
 				'layout'	=> 'full',
 				'title'		=> __( 'DMS Header Scripts Fallback', 'pagelines' ),
 				'shortexp'	=> __( 'Use this to fix scripts if you change something that breaks the front end editor.', 'pagelines' ),
-			)
+			), 
 		);
 
 		return $d;

diff --git a/editor/editor.init.php b/editor/editor.init.php
@@ -57,7 +57,8 @@ function load_files(){
 		// Interfaces
 		require_once( PL_EDITOR . '/editor.xlist.php' );
 		require_once( PL_EDITOR . '/panel.code.php' );
-		require_once( PL_EDITOR . '/panel.live.php' );
+		//require_once( PL_EDITOR . '/panel.live.php' );
+		require_once( PL_EDITOR . '/editor.account.php' );
 		require_once( PL_EDITOR . '/panel.sections.php' );
 		require_once( PL_EDITOR . '/panel.extend.php' );
 		require_once( PL_EDITOR . '/panel.themes.php' );
@@ -128,7 +129,8 @@ function load_libs(){
 		$this->add_sections = new PageLinesSectionsPanel;
 		$this->extend_panel = new PageLinesExtendPanel;
 		$this->settings_panel = new PageLinesSettingsPanel;
-		$this->live_panel = new PageLinesLivePanel;
+	//	$this->live_panel = new PageLinesLivePanel;
+		$this->account_panel = new PLAccountPanel;
 		$this->themer = new EditorThemeHandler;
 
 		$this->code = new EditorCode( $this->draft );

diff --git a/editor/editor.interface.php b/editor/editor.interface.php
@@ -223,7 +223,7 @@ function pagelines_toolbox(){
 		<div class="toolbox-handle fix">
 
 			<ul class="unstyled controls">
-				<li ><span class="btn-toolbox btn-closer" title="Close [esc]"><i class="icon-remove-sign"></i></span></li>
+				<li ><span class="btn-toolbox btn-closer" title="Close [esc]"><i class="icon-remove"></i></span></li>
 
 				<?php
 
@@ -483,8 +483,9 @@ function free_version_note(){
 
 		<div class="alert alert-info">
 			<button type="button" class="close" data-dismiss="alert" href="#">&times;</button>
-		  	<strong><i class="icon-pro"></i> Upgrade To Pro!</strong> You are using the free version of PageLines DMS. Upgrade to Pro for tons of additional features.
+		  	<strong><i class="icon-pro"></i> Upgrade To Pro!</strong> You are using the basic version of PageLines DMS. Upgrade to Pro for tons of additional features and support.
 			<a href="http://www.pagelines.com/upgrade" class="btn btn-primary btn-mini" target="_blank">Upgrade Now</a>
+			or <a href="http://www.pagelines.com/upgrade" class="btn btn-mini" target="_blank">Learn More</a>
 		</div>
 
 		<?php return ob_get_clean();

diff --git a/editor/editor.settings.config.php b/editor/editor.settings.config.php
@@ -312,7 +312,7 @@ function advanced(){
 					'type'		=> 'check',
 					'label'		=> __( 'Enable v2 Compatibility Mode?', 'pagelines' ),
 					'title'		=> __( 'v2 Compatibility Mode', 'pagelines' ),
-					'help'		=> __( 'Use this option to enable v2 interfaces and options. You can then set which pages should use DMS and which pages should use v2. ', 'pagelines' ),				  
+					'help'		=> __( 'Use this option to enable v2 interfaces and options. Not all v2 options work in DMS due to specificity; but it allows you to reference your old settings as you are rebuilding your site using the DMS system.', 'pagelines' ),				  
 			)
 		);
 		return $settings;

diff --git a/less/pl-editor.less b/less/pl-editor.less
@@ -827,7 +827,7 @@
 					}
 					&.btn-closer,
 					&.btn-pl-toggle{
-						color: #999;
+
 						border-left: 1px solid transparent;
 						border-right: 1px solid transparent;
 						position: absolute;

diff --git a/sections/flipper/section.php b/sections/flipper/section.php
@@ -1,5 +1,5 @@
 <?php
- 	/*
+/*
 	Section: Flipper
 	Author: PageLines
 	Author URI: http://www.pagelines.com