Restructure

Signed-off-by: Daniel Chatfield <[email protected]>
volcanicpixels · Apr 15, 2012 · f3f672d · f3f672d
1 parent 0af2ec1
commit f3f672d
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 7 deletions.
diff --git a/README b/README
diff --git a/_classes/lavaPrivateBlogAccessLogsPage.php b/_classes/lavaPrivateBlogAccessLogsPage.php
@@ -1,5 +1,5 @@
 <?php
-class lavaPrivateBlogAccessLogsPage extends lavaTablePage
+class lavaPrivateBlogAccessLogsPage extends lavaAdvancedTablePage
 {
 
 }

diff --git a/lava/_classes/lavaAdvancedTablePage.php b/lava/_classes/lavaAdvancedTablePage.php
@@ -0,0 +1,65 @@
+
+<?php
+class lavaAdvancedTablePage extends lavaPage
+{
+    public $dataSource;
+    public $dataCache;
+    public $displayOrder = array();
+
+
+    function loadPage() {
+        $this->addAction( "toolbarButtons" );
+        $this->_pages()->addScript( $this->_slug( "lavaTableScripts" ), "lava/_static/table_scripts.js", array( "jquery" ) );
+    }
+
+    function setDataSource( $dataSource )
+    {
+        $this->dataSource = $dataSource;
+        return $this->_pages( false );
+    }
+
+    function setDisplayOrder( $displayString )
+    {
+        $this->displayOrder = explode( ";", $displayString );
+        $dataSourceSlug = $this->dataSource;
+        $hookTag = "_dataSourceAjax_row/dataSource:{$dataSourceSlug}";
+        $this->addFilter( $hookTag, "doDisplayOrder" );
+        return $this->_pages( false );
+    }
+
+    function setOrderBy( $order ) {
+        $this->_tables()->fetchTable( $this->dataSource )->setOrderBy( $order );
+        return $this->_pages( false );
+    }
+
+    function displayPage() {
+        if( is_null( $this->dataSource ) ) {
+            $this->dieWith( "No data source specified for this page" );
+        }
+    	$this->doTablePage();
+    }
+
+    function doTablePage() {
+        //$this->setHiddenField( ""  )
+        ?>
+        <div class="lava-layout lava-layout-full-width bleed-left bleed-right">
+            <div class="lava-inset-module lava-filters">
+
+            </div>
+        </div>
+        <?php
+    }
+
+
+    function toolbarButtons()
+    {
+        ?>
+        <div class="toolbar-block toolbar-overground">
+            <button class="lava-btn lava-btn-action lava-btn-inline lava-btn-action-white lava-table-loader-refresh-button" data-clicked-text="<?php _e( "Refreshing", $this->_framework() ) ?>"><?php _e( "Refresh", $this->_framework() ) ?></button>
+            <button class="lava-btn lava-btn-action lava-btn-inline lava-btn-action-white lava-btn-form-submit lava-btn-confirmation not-implemented" data-form="lava-table-reset" data-clicked-text="<?php _e( "Resetting", $this->_framework() ) ?>"><?php _e( "Reset Settings", $this->_framework() ) ?></button>
+        </div>
+        <?php
+    }
+
+}
+?>
diff --git a/lava/_classes/lavaMiscFunctions.php b/lava/_classes/lavaMiscFunctions.php
@@ -64,7 +64,7 @@ function versionMatch( $ver1, $ver2 = null ) {
         if( $ver1 == $ver2 ) {
             return true;
         }
-        return fasle;
+        return false;
     }
 
     function userAgentInfo() {

diff --git a/lava/_classes/lavaPages.php b/lava/_classes/lavaPages.php
@@ -44,6 +44,7 @@ function lavaConstruct()
         //$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( "lavaScriptsNew" ), "lava/_static/scripts_new.js", array( "jquery" ) );
         $this->addScript( $this->_slug( "dropkick" ), "lava/_static/dropkick.js", array( "jquery" ) );
         $this->addScript( $this->_slug( "modernizr" ), "lava/_static/modernizr.js" );
         $this->addScript( $this->_slug( "tiptip" ), "lava/_static/tiptip.js", array( "jquery" ) );

diff --git a/lava/_classes/lavaTable.php b/lava/_classes/lavaTable.php
@@ -115,6 +115,8 @@ function doInstall() {
 
         $sql .= "\n);";
         require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+
+
         dbDelta($sql);
         return true;
     }

diff --git a/lava/_static/scripts.js b/lava/_static/scripts.js
@@ -295,7 +295,7 @@ function bindButtons() {
         hideUnderground();
     });
 	//not implemented buttons
-	jQuery(".lava-btn.not-implemented").addClass("lava-btn-disabled").addClass("tiptip-right").attr("title", "This feature hasn't been imlemented yet :(");
+	jQuery(".lava-btn.not-implemented").addClass("lava-btn-disabled").addClass("tiptip-right").attr("title", "This feature hasn't been implemented yet :(");
 }
 
 function bindSticky()

diff --git a/lava/_static/scripts_new.js b/lava/_static/scripts_new.js
diff --git a/lava/_static/table_scripts.js b/lava/_static/table_scripts.js
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: http://www.spiders-design.co.uk/donate/
 Tags: password,protect,password protect,wordpress,blog, security
 Requires at least: 3.3.1
 Tested up to: 3.3.1
-Stable tag: 3.9
+Stable tag: 3.9.1
 
 This plugin password protects your wordpress blog with a single password.
 

diff --git a/vendor.php b/vendor.php
@@ -8,7 +8,6 @@
 */
 class private_blog_vendor extends lavaExtension {
 
-	public $isLocal = false;
 	public $apiVersion = 1;
 
 	function init() {
@@ -161,7 +160,10 @@ function getInstallId() {
 	}
 
 	function getVendorUrl( $append = "" ) {
-		if( $this->isLocal ) {
+		if( ! defined( 'LAVA_API_IS_LOCAL' ) ) {
+			define( 'LAVA_API_IS_LOCAL', false );
+		}
+		if( LAVA_API_IS_LOCAL ) {
 			return "http://localhost:8082/" . $append;
 		} else {
 			return 'http://www.volcanicpixels.com/' . $append;