Renaming classes, and adding config parsing

thethemefoundry · Oct 20, 2011 · 5d01bc1 · 5d01bc1
1 parent 2d7735e
commit 5d01bc1
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 25 deletions.
diff --git a/classes/settings.php b/classes/settings.php
diff --git a/classes/struts.php b/classes/struts.php
@@ -0,0 +1,23 @@
+<?php
+
+function struts_autoloader( $class ) {
+	$filename = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . strtolower( str_replace( '_', DIRECTORY_SEPARATOR, $class ) . '.php' );
+
+	if ( file_exists( $filename ) ) {
+		require_once $filename;
+	}
+}
+
+spl_autoload_register( 'struts_autoloader' );
+
+class Struts {
+	static protected $_config = NULL;
+
+	static public function load_config( array $config ) {
+		self::$_config = $config;
+	}
+
+	static public function config( $name ) {
+		return self::$_config[$name];
+	}
+}
diff --git a/classes/settings/option.php → classes/struts/option.php b/classes/settings/option.php → classes/struts/option.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class Settings_Option {
+abstract class Struts_Option {
 	protected $_name, $_valid_values, $_value, $_type, $_default_value,
 			  $_tab, $_label, $_description, $_parent_name, $_validation_function;
 

diff --git a/classes/settings/option/checkbox.php → classes/struts/option/checkbox.php b/classes/settings/option/checkbox.php → classes/struts/option/checkbox.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Option_Checkbox extends Settings_Option {
+class Struts_Option_Checkbox extends Struts_Option {
 
 	public function to_html() {
 		$id = $this->html_id();

diff --git a/classes/settings/option/image.php → classes/struts/option/image.php b/classes/settings/option/image.php → classes/struts/option/image.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Option_Image extends Settings_Option {
+class Struts_Option_Image extends Struts_Option {
 
 	public function to_html() {
 		$id = $this->html_id();

diff --git a/classes/settings/option/select.php → classes/struts/option/select.php b/classes/settings/option/select.php → classes/struts/option/select.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Option_Select extends Settings_Option {
+class Struts_Option_Select extends Struts_Option {
 	public function to_html() {
 		$id = $this->html_id();
 		$name = $this->html_name();

diff --git a/classes/settings/option/text.php → classes/struts/option/text.php b/classes/settings/option/text.php → classes/struts/option/text.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Option_Text extends Settings_Option {
+class Struts_Option_Text extends Struts_Option {
 	public function to_html() {
 		$id = $this->html_id();
 		$name = $this->html_name();

diff --git a/classes/settings/collection.php → classes/struts/options.php b/classes/settings/collection.php → classes/struts/options.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Collection {
+class Struts_Options {
 	protected $_sections, $_options, $_name, $_slug;
 
 	public function __construct( $slug, $name ) {
@@ -70,14 +70,14 @@ public function enqueue_scripts() {
 			wp_enqueue_script( 'media-upload' );
 			wp_enqueue_script(
 				'struts-admin',
-				get_template_directory_uri() . '/includes/struts/javascripts/struts.js',
+				Struts::config( 'uri' ) . '/javascripts/struts.js',
 				array( 'jquery', 'media-upload' ),
 				null
 			);
 			add_thickbox();
 			wp_enqueue_style(
 				'struts-admin',
-				get_template_directory_uri() . '/includes/struts/stylesheets/struts.css'
+				Struts::config( 'uri' ) . '/stylesheets/struts.css'
 			);
 		}
 	}
@@ -141,7 +141,7 @@ public function validate( $inputs ) {
 	 *
 	 */
 	public function add_section( $id, $title, $description = NULL ) {
-		$this->_sections[] = new Settings_Section( $id, $title, $description, $this->name() );
+		$this->_sections[] = new Struts_Section( $id, $title, $description, $this->name() );
 	}
 
 	/**
@@ -152,10 +152,10 @@ public function add_section( $id, $title, $description = NULL ) {
 	 * @param $type - type of option (text/select/checkbox/etc)
 	 * @param $section - name of the section this option goes in
 	 *
-	 * @return Settings_Option
+	 * @return Struts_Option
 	 */
 	public function add_option( $name, $type, $section = NULL ) {
-		$option_class = 'Settings_Option_' . ucfirst( $type );
+		$option_class = 'Struts_Option_' . ucfirst( $type );
 
 		$option = new $option_class;
 		$option->name( $name );

diff --git a/classes/settings/section.php → classes/struts/section.php b/classes/settings/section.php → classes/struts/section.php
@@ -1,6 +1,6 @@
 <?php
 
-class Settings_Section {
+class Struts_Section {
 	protected $_id, $_title, $_description, $_parent_name;
 
 	public function __construct( $id, $title, $description, $parent_name ) {

diff --git a/config.example.php b/config.example.php
@@ -0,0 +1,4 @@
+<?php
+return array(
+	'uri' => get_template_directory_uri() . '/includes/struts' // required
+);