runActions( "displayUnderground" );
$this->displayUnderground();
?>
@@ -198,7 +218,7 @@ function displayHeader()
function displayUnderground()
{
- //sub classes should overload this method or rely on js to move things around (if have to)
+ //sub classes should overload this method or rely on js to move things around (if they have to)
}
function displayFooter()
@@ -265,6 +285,11 @@ function displayToolbar()
_framework() );
diff --git a/lava/_classes/lavaPages.php b/lava/_classes/lavaPages.php
index 0cd22ec..8765479 100644
--- a/lava/_classes/lavaPages.php
+++ b/lava/_classes/lavaPages.php
@@ -40,7 +40,8 @@ function lavaConstruct()
$this->addStyle( $this->_slug( "dropkick" ), "lava/_static/dropkick.css" );
$this->addStyle( $this->_slug( "codemirror" ), "lava/_static/codemirror/codemirror.css" );
$this->addStyle( $this->_slug( "codemirror-theme" ), "lava/_static/codemirror/codemirror.theme.css" );
- $this->addStyle( $this->_slug( "colorpicker-theme" ), "lava/_static/colorpicker/colorpicker.css" );
+ $this->addStyle( $this->_slug( "lobster" ), "http://fonts.googleapis.com/css?family=Lobster" );
+ //$this->addStyle( $this->_slug( "colorpicker-theme" ), "lava/_static/colorpicker/colorpicker.css" );
$this->addScript( $this->_slug( "lavaScripts" ), "lava/_static/scripts.js", array( "jquery" ) );
$this->addScript( $this->_slug( "dropkick" ), "lava/_static/dropkick.js", array( "jquery" ) );
@@ -52,7 +53,8 @@ function lavaConstruct()
$this->addScript( $this->_slug( "jquery-iframe-transport" ), "lava/_static/jquery.iframe-transport.js", array( "jquery" ) );
$this->addScript( $this->_slug( "codemirror" ), "lava/_static/codemirror/codemirror.js" );
$this->addScript( $this->_slug( "codemirror-css" ), "lava/_static/codemirror/codemirror.css.js" );
- $this->addScript( $this->_slug( "colorpicker" ), "lava/_static/colorpicker/colorpicker.js" );
+ $this->addScript( $this->_slug( "colorpicker" ), "lava/_static/autoResize.js", array( "jquery" ) );
+ //$this->addScript( $this->_slug( "colorpicker" ), "lava/_static/colorpicker/colorpicker.js" );
add_action( "admin_enqueue_scripts", array( $this, "registerIncludes" ) );
diff --git a/lava/_classes/lavaPlugin.php b/lava/_classes/lavaPlugin.php
index b029924..1e6bf74 100644
--- a/lava/_classes/lavaPlugin.php
+++ b/lava/_classes/lavaPlugin.php
@@ -33,7 +33,7 @@ class lavaPlugin
*
* @since 1.0.0
*/
- function __construct( $pluginFile, $pluginName, $pluginVersion )
+ function __construct( $pluginFile, $pluginName, $pluginVersion, $loadVendor = true )
{
$this->pluginFile = $pluginFile;
$this->pluginName = $pluginName;
@@ -51,6 +51,11 @@ function __construct( $pluginFile, $pluginName, $pluginVersion )
}
$this->_misc();//initialise this class
+ if( $loadVendor ) {
+ require_once( dirname( $pluginFile ) . "/vendor.php" );
+ $className = $this->_slug( "vendor" );
+ $this->pluginVendor = $this->_new( $className );
+ }
}
/**
@@ -70,6 +75,11 @@ function __autoload( $className )
{
include_once( dirname( __FILE__ ) . "/{$className}.php" );
}
+
+ if( file_exists( dirname( $this->_file() ) . "/_classes/{$className}.php" ) AND !class_exists( $className ) )//don't want to include the file if it doesn't exist
+ {
+ include_once( dirname( $this->_file() ) . "/_classes/{$className}.php" );
+ }
}
@@ -221,7 +231,7 @@ function _handle( $what, $reset )
}
else
{
- return $this->$pointer;
+ return $this->$pointer->getThis();
}
}
diff --git a/lava/_classes/lavaSetting.php b/lava/_classes/lavaSetting.php
index 22f5536..0eb62d9 100644
--- a/lava/_classes/lavaSetting.php
+++ b/lava/_classes/lavaSetting.php
@@ -79,9 +79,20 @@ function setType( $type )
case "colour"://that's more like it
//no support for alpha channels at this time
$this->setDefault( "#FFFFFF", false );
+ $this->addTag( "reset-to-default" );
break;
case "password":
$this->setDefault( "password" );
+ $this->addTag( "reset-to-default" );
+ break;
+ case "timeperiod":
+ $this->addTag( "reset-to-default" );
+ break;
+ case "image":
+ $this->addTag( "reset-to-default" );
+ break;
+ case "textarea":
+ $this->addTag( "reset-to-default" );
break;
}
return $this->_settings( false );
@@ -466,16 +477,16 @@ function getClasses( $format = false )
{
$classes = array();
- $classes[] = "setting";
- $classes[] = "clearfix";
+ $classes["setting"] = "setting";
+ $classes["clearfix"] = "clearfix";
foreach( $this->tags as $tag )
{
- $classes[] = "tag-{$tag}";
+ $classes["tag-{$tag}"] = "tag-{$tag}";
}
$type = $this->getType();
- $classes[] = "type-{$type}";
+ $classes["type-{$type}"] = "type-{$type}";
$classes = $this->runFilters( "settingClasses", $classes );
@@ -661,6 +672,8 @@ function doSetting()
$settingID = "setting-cntr_{$pluginSlug}-{$settingWho}-{$settingKey}";
$settingStart = "
";
+
+ $settingAbsElements = $this->runFilters( "settingAbsElements", '' );
$statusIndicator = '
';
$preSettingStart = '
';
$settingName = "
$name $help";
@@ -684,8 +697,9 @@ function doSetting()
$settingFull =
"
$settingStart
+ $settingAbsElements
$statusIndicator
-
+
$preSettingStart
$settingName
$preSettingEnd
@@ -780,7 +794,7 @@ function doSettingControl( $type = "default" )
break;
case "password":
- $settingControl = "
";
+ $settingControl = "
";
break;
case "timeperiod":
diff --git a/lava/_classes/lavaSettings.php b/lava/_classes/lavaSettings.php
index 5a1c462..78f164f 100644
--- a/lava/_classes/lavaSettings.php
+++ b/lava/_classes/lavaSettings.php
@@ -212,6 +212,8 @@ function getCache( $who )
function putCache( $who, $cache)
{
$this->settingCache[ $who ] = $cache;
+
+ return $this;
}
function updateCache( $who = "*" )
@@ -228,6 +230,8 @@ function updateCache( $who = "*" )
{
$this->updateOption( $this->_slug( $who ), $this->settingCache[ $who ] );
}
+
+ return $this;
}
function config( $key, $default = null )
@@ -255,7 +259,6 @@ function updateOption( $option, $value )
{
return update_site_option( $option, $value );
}
- update_option( "test", "bob" );
return update_option( $option, $value );
}
}
diff --git a/lava/_classes/lavaSettingsCallback.php b/lava/_classes/lavaSettingsCallback.php
index c91f3ba..0a65dd3 100644
--- a/lava/_classes/lavaSettingsCallback.php
+++ b/lava/_classes/lavaSettingsCallback.php
@@ -37,7 +37,7 @@ function lavaConstruct()
//settingActions
$hookTag = "settingActions";
add_filter( $this->_slug( "{$hookTag}-type/password" ), array( $this, "addShowPassword" ) );
- add_filter( $this->_slug( "{$hookTag}" ), array( $this, "addResetToDefault" ) );
+ add_filter( $this->_slug( "{$hookTag}-tag/reset-to-default" ), array( $this, "addResetToDefault" ) );
//settingControl
$hookTag = "settingControl";
@@ -131,7 +131,7 @@ function addTimePeriodSelector( $settingControl, $theSetting )
}
$settingControl .= '
'.
'
'.
@@ -157,7 +157,7 @@ function addPasswordWrapper( $settingControl, $theSetting )
$placeholder = 'placeholder="'. $theSetting->getProperty( "placeholder" ) .'"';
$settingControl = '';
return $settingControl;
@@ -183,7 +183,7 @@ function addTextWrapper( $settingControl, $theSetting )
$placeholder = 'placeholder="'. $theSetting->getProperty( "placeholder" ) .'"';
$settingControl = '';
return $settingControl;
}
@@ -321,7 +321,7 @@ function addTextareaUx( $settingControl, $theSetting ) {
$settingVars = $theSetting->getVars();
extract( $settingVars );
- $settingControl = '';
+ $settingControl = '';
return $settingControl;
}
diff --git a/lava/_classes/lavaSettingsPage.php b/lava/_classes/lavaSettingsPage.php
index c1931db..b3565b3 100644
--- a/lava/_classes/lavaSettingsPage.php
+++ b/lava/_classes/lavaSettingsPage.php
@@ -8,7 +8,6 @@ function loadPage()
{
$this->saveSettings();
$this->resetSettings();
- add_action( $this->_slug( "toolbar" ), array($this, "toolbarButtons") );
$this->addAction( "toolbarButtons" );
//queue notifications
//do redirect
diff --git a/lava/_classes/lavaSkins.php b/lava/_classes/lavaSkins.php
index 0830b59..ab7fb8c 100644
--- a/lava/_classes/lavaSkins.php
+++ b/lava/_classes/lavaSkins.php
@@ -42,7 +42,7 @@ function lavaConstruct()
$this->_settings()
->addSetting( 'skin', 'skins' )
->setType( 'skin' )
- ->setName( __( 'Current skin', $this->_framework() ) )
+ ->setName( __( 'Select a skin', $this->_framework() ) )
->setDefault( 'default' );
}
diff --git a/lava/_classes/lavaSkinsCallback.php b/lava/_classes/lavaSkinsCallback.php
index 657e9dd..db57bc9 100644
--- a/lava/_classes/lavaSkinsCallback.php
+++ b/lava/_classes/lavaSkinsCallback.php
@@ -57,10 +57,27 @@ function lavaConstruct()
function addSkinsUx( $settingControl, $theSetting )
{
+ extract( $theSetting->getVars() );
$settingControl = '' . $settingControl . '
';
- $settingControl .= '
' . __( "Change Skin", $this->_framework() ) . '
-
-
-
- runActions( "skinRibbons" ) ?>
-
-
-
" />
-
- _framework() ) ?>
- _framework() ) ?>
- _framework() ) ?>
-
-
getName() ?> by getAuthor() ?>
-
-
-
-
" data-ajax-nonce="_slug( "data_source" ) ); ?>">
+
+
+
+ _framework() ) ?>">_framework() ) ?>
+ _framework() ) ?>">_framework() ) ?>
+
+
\ No newline at end of file
diff --git a/lava/_classes/lavaTables.php b/lava/_classes/lavaTables.php
new file mode 100644
index 0000000..f90e20e
--- /dev/null
+++ b/lava/_classes/lavaTables.php
@@ -0,0 +1,49 @@
+getContext() ) ) {
+ return $this->getContext();
+ }
+ return $this;
+ }
+
+ function addTable( $slug ) {
+ if( !array_key_exists( $slug, $this->tables ) ) {
+ $args = array(
+ $slug
+ );
+ $this->tables[ $slug ] = $this->_new( "lavaTable", $args );
+ }
+ $this->lavaContext( $this->tables[ $slug ] );
+ return $this->tables[ $slug ]->withinContext( $this ); //return table object but tell it to remember who its parent is and pass on any method calls not intented for it
+ }
+
+ function fetchTable( $slug ) {
+ $this->clearContext();
+ if( array_key_exists($slug, $this->tables) ) {
+ $this->setContext( $this->tables[ $slug ] );
+ }
+
+ return $this;
+ }
+
+ function tableExists( $slug ) {
+ if( array_key_exists($slug, $this->tables) ) {
+ return true;
+ }
+ return false;
+ }
+}
+?>
\ No newline at end of file
diff --git a/lava/_static/autoResize.js b/lava/_static/autoResize.js
new file mode 100644
index 0000000..b82f942
--- /dev/null
+++ b/lava/_static/autoResize.js
@@ -0,0 +1,274 @@
+/*
+ * jQuery.fn.autoResize 1.14
+ * --
+ * https://github.com/padolsey/jQuery.fn.autoResize
+ * --
+ * This program is free software. It comes without any warranty, to
+ * the extent permitted by applicable law. You can redistribute it
+ * and/or modify it under the terms of the Do What The Fuck You Want
+ * To Public License, Version 2, as published by Sam Hocevar. See
+ * http://sam.zoy.org/wtfpl/COPYING for more details. */
+
+(function($){
+
+ var uid = 'ar' + +new Date,
+
+ defaults = autoResize.defaults = {
+ onResize: function(){},
+ onBeforeResize: function(){return 123},
+ onAfterResize: function(){return 555},
+ animate: {
+ duration: 200,
+ complete: function(){}
+ },
+ extraSpace: 50,
+ minHeight: 'original',
+ maxHeight: 500,
+ minWidth: 'original',
+ maxWidth: 500
+ };
+
+ autoResize.cloneCSSProperties = [
+ 'lineHeight', 'textDecoration', 'letterSpacing',
+ 'fontSize', 'fontFamily', 'fontStyle', 'fontWeight',
+ 'textTransform', 'textAlign', 'direction', 'wordSpacing', 'fontSizeAdjust',
+ 'paddingTop', 'paddingLeft', 'paddingBottom', 'paddingRight', 'width'
+ ];
+
+ autoResize.cloneCSSValues = {
+ position: 'absolute',
+ top: -9999,
+ left: -9999,
+ opacity: 0,
+ overflow: 'hidden'
+ };
+
+ autoResize.resizableFilterSelector = [
+ 'textarea:not(textarea.' + uid + ')',
+ 'input:not(input[type])',
+ 'input[type=text]',
+ 'input[type=password]',
+ 'input[type=email]',
+ 'input[type=url]'
+ ].join(',');
+
+ autoResize.AutoResizer = AutoResizer;
+
+ $.fn.autoResize = autoResize;
+
+ function autoResize(config) {
+ this.filter(autoResize.resizableFilterSelector).each(function(){
+ new AutoResizer( $(this), config );
+ });
+ return this;
+ }
+
+ function AutoResizer(el, config) {
+
+ if (el.data('AutoResizer')) {
+ el.data('AutoResizer').destroy();
+ }
+
+ config = this.config = $.extend(true, {}, autoResize.defaults, config);
+ this.el = el;
+
+ this.nodeName = el[0].nodeName.toLowerCase();
+
+ this.originalHeight = el.height();
+ this.previousScrollTop = null;
+
+ this.value = el.val();
+
+ if (config.maxWidth === 'original') config.maxWidth = el.width();
+ if (config.minWidth === 'original') config.minWidth = el.width();
+ if (config.maxHeight === 'original') config.maxHeight = el.height();
+ if (config.minHeight === 'original') config.minHeight = el.height();
+
+ if (this.nodeName === 'textarea') {
+ el.css({
+ resize: 'none',
+ overflowY: 'hidden'
+ });
+ }
+
+ el.data('AutoResizer', this);
+
+ // Make sure onAfterResize is called upon animation completion
+ config.animate.complete = (function(f){
+ return function() {
+ config.onAfterResize.call(el);
+ return f.apply(this, arguments);
+ };
+ }(config.animate.complete));
+
+ this.bind();
+
+ }
+
+ AutoResizer.prototype = {
+
+ bind: function() {
+
+ var check = $.proxy(function(){
+ this.check();
+ return true;
+ }, this);
+
+ this.unbind();
+
+ this.el
+ .bind('keyup.autoResize', check)
+ //.bind('keydown.autoResize', check)
+ .bind('change.autoResize', check)
+ .bind('paste.autoResize', function() {
+ setTimeout(function() { check(); }, 0);
+ });
+
+ if (!this.el.is(':hidden')) {
+ this.check(null, true);
+ }
+
+ },
+
+ unbind: function() {
+ this.el.unbind('.autoResize');
+ },
+
+ createClone: function() {
+
+ var el = this.el,
+ clone = this.nodeName === 'textarea' ? el.clone() : $('Get premium
+
+
+
Enter trial mode
+
Get premium
+
+
';
+
+ return $current;
+ }
+
+ function displayUnderground() {
+ $this->getPremiumUi();
+ $this->redeemPremiumUi();
+ }
+
+ function getPremiumUi() {
+ ?>
+
+
Get Premium
+
Licenses can be transferred between websites but excesively doing this (doing it over 10 times in a week for example) may cause the license to be blacklisted
+
+
The price will be converted into your local currency before the transaction completes
+
+
+
Purchase with PayPal
+
+ licensingFields();
+ }
+
+ function licensingFields() {
+ ?>
+
+
+
+
"/>
+ _settings()->fetchSetting('license_public', 'vendor')->getValue();
+ }
+
+ function privateKey() {
+ return $this->_settings()->fetchSetting('license_private', 'vendor')->getValue();
+ }
+}
+?>
\ No newline at end of file