Merge branch 'release-2.0'

client/config.rb

@@ -0,0 +1,24 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "css"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+output_style = :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

includes/class.admin.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'class.base.php';
-
 /**
  * Admin functionality
  * @package Simple Lightbox

includes/class.base.php

@@ -1,9 +1,5 @@
 <?php
 
-require_once 'class.utilities.php';
-require_once 'class.options.php';
-require_once 'class.admin.php';
-
 /**
  * @package Simple Lightbox
  * @subpackage Base

includes/class.base_collection.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.base.php';
 
 /**
  * Managed collection

includes/class.base_object.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.base.php';
 
 /**
  * Base Object

includes/class.collection_controller.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.base_collection.php';
 
 /**
  * Collection Controller

includes/class.component.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.base_object.php';
 
 /**
  * Component

includes/class.content_handler.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.component.php';
 
 /**
  * Content Handler

includes/class.content_handlers.php

@@ -1,6 +1,4 @@
 <?php
-require_once 'class.collection_controller.php';
-require_once 'class.content_handler.php';
 
 /**
  * Content Handler Collection

includes/class.fields.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'class.base.php';
-
 /**
  * Fields - Base class
  * Core properties/methods for fields

includes/class.options.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.fields.php';
 
 /**
  * Option object

includes/class.template_tag.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.component.php';
 
 /**
  * Template Tag

includes/class.template_tags.php

@@ -1,6 +1,4 @@
 <?php
-require_once 'class.collection_controller.php';
-require_once 'class.template_tag.php';
 
 /**
  * Content Handler Collection

includes/class.theme.php

@@ -1,5 +1,4 @@
 <?php
-require_once 'class.component.php';
 
 /**
  * Theme

includes/class.themes.php

@@ -1,6 +1,4 @@
 <?php
-require_once 'class.collection_controller.php';
-require_once 'class.theme.php';
 
 /**
  * Themes Collection

main.php

@@ -3,7 +3,7 @@
 Plugin Name: Simple Lightbox
 Plugin URI: http://archetyped.com/lab/slb-2-0rc4/
 Description: The highly customizable lightbox for WordPress
-Version: 2.0RC4 (BETA)
+Version: 2.0
 Author: Archetyped
 Author URI: http://archetyped.com
 */
@@ -24,13 +24,34 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+
+/**
+ * Class loading handler
+ * @param string $classname Class to load
+ */
+function slb_autoload($classname) {
+	$prefix = 'SLB_';
+	//Remove prefix
+	if ( 0 !== strpos($classname, $prefix) ) {
+		return false;
+	}
+	//Format class for filename
+	$fn = 'class.' . strtolower( substr($classname, strlen($prefix)) ) . '.php';
+	//Build path
+	$path = dirname(__FILE__) . '/' . "includes/" . $fn;
+	//Load file
+	if ( is_readable($path) ) {
+		require $path;
+	}
+}
+
+spl_autoload_register('slb_autoload');
+
 require_once 'model.php';
 
 $slb = new SLB_Lightbox();
 
 function slb_register_theme($name, $title, $stylesheet_url, $layout) {
 	global $slb;
 	$slb->register_theme($name, $title, $stylesheet_url, $layout);
-}
-
-?>
+}

model.php

@@ -1,10 +1,5 @@
 <?php 
 
-require_once 'includes/class.base.php';
-require_once 'includes/class.themes.php';
-require_once 'includes/class.content_handlers.php';
-require_once 'includes/class.template_tags.php';
-
 /**
  * Model (Core functionality)
  * @package Simple Lightbox

readme.txt

@@ -1,44 +1,33 @@
 === Simple Lightbox ===
 Contributors: Archetyped
-Donate link: http://archetyped.com/tools/simple-lightbox/
+Donate link: http://gum.co/slb-donate
 License: GPLv2
 Tags: lightbox, gallery, photography, images, theme, template, style
 Requires at least: 3.6
-Tested up to: 3.6
+Tested up to: 3.6.1
 Stable tag: trunk
 
 The highly customizable lightbox for WordPress
 
 == Description ==
 Simple Lightbox is a very simple and customizable lightbox that is easy to add to your WordPress website.
 
-### BETA NOTES
-The current release is a **release candidate**.  Please test and [provide feedback on GitHub](https://github.com/archetyped/simple-lightbox/wiki/Reporting-Issues).
-Main changes
-
-#### Release Candidate 4
-* Optimize: Improved support for legacy IE versions (v8 and lower)
-* Optimize: SLB theme's responsive layout now adheres to responsiveness of WP theme
-* Optimize: Improved responsive theme compatibility on mobile devices
-* Optimize: Improved theme validation
-* Optimize: Reorganize theme assets
-
 #### Features
 Options for customizing the lightbox behavior are located in the **Appearance > Lightbox** admin menu (or just click the **Settings** link below the plugin's name when viewing the list of installed plugins)
 
-* **Supports links in Widgets (New!)**
-* **Supports Image Attachment links**
-* **Display image metadata (caption, description, etc.) in lightbox**
 * Automatically activate links (no manual coding required)
+* Automatically resize lightbox to fit in window
+* Customize lightbox with **themes**
+* Mobile-optimized responsive themes included
+* Customizable lightbox animations
+* Infinitely customizable with **add-ons**
+* Supports WordPress **image attachment** links
+* Supports links in **widgets**
 * Keyboard Navigation
-* Link Validation (optional)
-* User-customizable skin (template) support
+* Display media metadata (caption, description, etc.) in lightbox
 * Enable Lightbox depending on Page Type (Home, Pages, Archive, etc.)
 * Group image links (play as a slideshow)
-* Group image links by Post (e.g. separate slideshow for each post on home page)
-* UI/Animation Customization
-* Slideshow Customization
-* Backwards-compatibility with legacy lightbox links
+* Group image links by Post (separate slideshow for each post on page)
 
 #### Usage
 1. Insert links to images/image attachments into your posts/pages
@@ -63,38 +52,21 @@ Get more information on [Simple Lightbox's official page](http://archetyped.com/
 == Screenshots ==
 
 1. Lightbox Customization Options
-2. Customized UI Text
+2. Light Theme
+3. Dark Theme
 
 == Changelog ==
 
-### 2.0 (BETA NOTICE)
-The current release is a **release candidate**.  Please test and [provide feedback on GitHub](https://github.com/archetyped/simple-lightbox/wiki/Reporting-Issues).
-
-= 2.0 Release Candidate 4 =
-* Optimize: Improved support for legacy IE versions (v8 and lower)
-* Optimize: SLB theme's responsive layout now adheres to responsiveness of WP theme
-* Optimize: Improved responsive theme compatibility on mobile devices
-* Optimize: Improved theme validation
-* Optimize: Reorganize theme assets
-
-= 2.0 Release Candidate 3 =
-* Optimize: Refined Lightbox caption precedence
-* Optimize: Increase width of navigation hit targets
-* Optimize: Client-side validation and loading
-* Optimize: Refined Admin JS loading
-* Optimize: Removed custom JS prototype methods
-* Fix: **Kevin's Theory of Relativity** -- Theme HTTPS Compatibility
-* Fix: **Prototype Anilator** -- Prototype library compatibility
-* Fix: **Lucy's in the Sky (without Gravity)** -- Gravity Forms compatibility
-* Fix: **Unseen Zephyr** -- User-defined overlay opacity
-
-= 2.0 Release Candidate 2.1 =
-* Fix: Undefined value when viewport element does not exist
-
-= 2.0 Release Candidate 2 =
-* Optimize: Load client output in footer
-* Optimize: Responsive viewport handling less aggressive
-* Update: New POT file for translations
+= 2.0 =
+* Completely rewritten lightbox code
+* Add: Automatically resize lightbox to fit window
+* Add: APIs for third-party add-ons
+* Add: Flexible theme support
+* Add: Flexible content handler support
+* Add: Mobile-optimized responsive themes (2)
+* Optimize: PHP class autoloading
+* Optimize: Improved performance and compatibility
+* Optimize: Full internationalization support
 
 = 1.6 =
 * Add: Widget support

themes/black/config.rb

@@ -7,7 +7,7 @@
 images_dir = "images"
 
 # You can select your preferred output style here (can be overridden via the command line):
-# output_style = :expanded or :nested or :compact or :compressed
+output_style = :compressed
 
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true

themes/default/config.rb

@@ -7,7 +7,7 @@
 images_dir = "images"
 
 # You can select your preferred output style here (can be overridden via the command line):
-# output_style = :expanded or :nested or :compact or :compressed
+output_style = :compressed
 
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true