From dacd4fd329f5cb01452f258f11a204dd8bc345be Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Fri, 21 Sep 2012 21:47:51 +0930 Subject: [PATCH 001/136] Initial commit of refactored Feather. Signed-off-by: Jason Lewis --- applications/core/routes.php | 6 +++ applications/core/start.php | 1 + config/components.php | 5 +++ config/database.php | 13 ++++++ start.php | 76 ++++++++++++++++++++++++++++++++++++ start/autoloading.php | 5 +++ start/facades.php | 7 ++++ 7 files changed, 113 insertions(+) create mode 100644 applications/core/routes.php create mode 100644 applications/core/start.php create mode 100644 config/components.php create mode 100644 config/database.php create mode 100644 start.php create mode 100644 start/autoloading.php create mode 100644 start/facades.php diff --git a/applications/core/routes.php b/applications/core/routes.php new file mode 100644 index 0000000..e9c1eaf --- /dev/null +++ b/applications/core/routes.php @@ -0,0 +1,6 @@ + 'localhost', + 'database' => 'feather', + 'username' => 'root', + 'password' => '', + 'prefix' => '', + 'charset' => 'utf8', + 'driver' => 'mysql' + +); \ No newline at end of file diff --git a/start.php b/start.php new file mode 100644 index 0000000..02faa4a --- /dev/null +++ b/start.php @@ -0,0 +1,76 @@ +share(function() +{ + return new Components\Config\Repository; +}); + +$feather['config']->set('laravel: database.connections.feather', $feather['config']->get('feather: database')); + +//$feather['config']->db(); + +/* +|-------------------------------------------------------------------------- +| Register Feather Applications +|-------------------------------------------------------------------------- +| +| Feather is split into separate applications for better separation of +| logic. Register each of the applications as defined in the configuration +| with the Laravel bundle manager. +| +*/ + diff --git a/start/autoloading.php b/start/autoloading.php new file mode 100644 index 0000000..6be24be --- /dev/null +++ b/start/autoloading.php @@ -0,0 +1,5 @@ + path('feather') +)); \ No newline at end of file diff --git a/start/facades.php b/start/facades.php new file mode 100644 index 0000000..365f928 --- /dev/null +++ b/start/facades.php @@ -0,0 +1,7 @@ + Date: Fri, 21 Sep 2012 21:48:17 +0930 Subject: [PATCH 002/136] Initial commit of application component. Signed-off-by: Jason Lewis --- components/feather/application.php | 108 +++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 components/feather/application.php diff --git a/components/feather/application.php b/components/feather/application.php new file mode 100644 index 0000000..320e653 --- /dev/null +++ b/components/feather/application.php @@ -0,0 +1,108 @@ +register($this); + } + + /** + * Share a closure such that it is a singleton. + * + * @param Closure $closure + * @return Closure + */ + public function share(Closure $closure) + { + return function($container) use ($closure) + { + // We'll declare a static object here, if the object is not defined + // then we'll get execute the closure and return it. + static $object; + + if(is_null($object)) + { + $object = $closure($container); + } + + return $object; + }; + } + + /** + * Determine if an offset exists. + * + * @param string $key + * @return bool + */ + public function offsetExists($key) + { + return isset($this->container[$key]); + } + + /** + * Get the value at a given offset. + * + * @param string $key + * @return mixed + */ + public function offsetGet($key) + { + if(!$this->offsetExists($key)) + { + throw new InvalidArgumentException("Identifier {$key} is not in the container."); + } + + return $this->container[$key]($this); + } + + /** + * Set the value at a given offset. + * + * @param string $key + * @param mixed $value + * @return void + */ + public function offsetSet($key, $value) + { + if(!$value instanceof Closure) + { + $value = function() use ($value) + { + return $value; + }; + } + + $this->container[$key] = $value; + } + + /** + * Unset a given offset. + * + * @param string $key + * @return void + */ + public function offsetUnset($key) + { + unset($this->container[$key]); + } + +} \ No newline at end of file From 959f7d3c03da81f6067c7accedce41ffd2069a59 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Fri, 21 Sep 2012 21:48:41 +0930 Subject: [PATCH 003/136] Initial commit of config component and config tests. Signed-off-by: Jason Lewis --- components/config/repository.php | 134 +++++++++++++++++++++++++++++++ tests/config.test.php | 59 ++++++++++++++ 2 files changed, 193 insertions(+) create mode 100644 components/config/repository.php create mode 100644 tests/config.test.php diff --git a/components/config/repository.php b/components/config/repository.php new file mode 100644 index 0000000..2626ff7 --- /dev/null +++ b/components/config/repository.php @@ -0,0 +1,134 @@ +key, str_replace('(:feather)', '(:bundle)', $item->value)); + } + + return $config; + }); + } + + /** + * Determine if a key exists. + * + * @param string $key + * @return bool + */ + public function has($key) + { + return !is_null($this->get($key)); + } + + /** + * Set a config key to a given value. + * + * @param string $key + * @param mixed $value + * @return void + */ + public function set($key, $value) + { + return Config::set($this->prefix($key), $value); + } + + /** + * Get a key from the configuration. + * + * @param string $key + * @param mixed $default + * @return mixed + */ + public function get($key, $default = null) + { + return Config::get($this->prefix($key), $default); + } + + /** + * Determine the prefix for a given key. + * + * @param string $key + * @return string + */ + private function prefix($key) + { + if(!str_contains($key, ': ')) + { + return $key; + } + + list($prefix, $key) = explode(': ', $key); + + switch($prefix) + { + // The feather prefix is applied to both database and file-based + // configuration items located within the bundle. + case 'feather': + return "feather::{$key}"; + break; + + // The gear prefix is applied to Feather gears, the gear + // name should appear before the file and key to be used. + case 'gear': + list($gear, $key) = explode(' ', $key); + + return "feather::gear:{$gear} {$key}"; + break; + default: + return $key; + } + } + +} \ No newline at end of file diff --git a/tests/config.test.php b/tests/config.test.php new file mode 100644 index 0000000..85778d2 --- /dev/null +++ b/tests/config.test.php @@ -0,0 +1,59 @@ +getRepository(); + + $config->set('name', 'jason'); + $this->assertEquals('jason', $config->get('name')); + + $config->set('person.name', 'jason'); + $this->assertEquals('jason', $config->get('person.name')); + + $config->set('namespace::person.name', 'jason'); + $this->assertEquals('jason', $config->get('namespace::person.name')); + + $config->set('gear: mock person.name', 'jason'); + $this->assertEquals('jason', $config->get('gear: mock person.name')); + + $config->set('theme: mock person.name', 'jason'); + $this->assertEquals('jason', $config->get('theme: mock person.name')); + } + + public function testGetBasicItems() + { + $config = $this->getRepository(); + + $this->assertEquals('bar', $config->get('test.foo')); + $this->assertEquals('orange', $config->get('test.apple')); + } + + public function testEntireArrayCanBeReturned() + { + $config = $this->getRepository(); + + $this->assertEquals($this->getItems(), $config->get('test')); + } + + private function getRepository() + { + $config = new Feather\Components\Config\Repository; + + $config->set('test', $this->getItems()); + + return $config; + } + + private function getItems() + { + return array('foo' => 'bar', 'apple' => 'orange'); + } + +} \ No newline at end of file From 3e7a16f324d0cd4095cd3e212da39d04cabf349e Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 00:27:47 +0930 Subject: [PATCH 004/136] Allow saving and deleting of database configuration items. Signed-off-by: Jason Lewis --- components/config/repository.php | 153 ++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/components/config/repository.php b/components/config/repository.php index 2626ff7..c24fbab 100644 --- a/components/config/repository.php +++ b/components/config/repository.php @@ -1,5 +1,6 @@ table('config')->get() as $item) { array_set($config, $item->key, str_replace('(:feather)', '(:bundle)', $item->value)); } return $config; }); + + foreach($items as $key => $item) + { + array_set(Config::$items['feather']['db'], $key, $item); + } + } + + /** + * Reload the database configuration items. + * + * @return void + */ + public function reload() + { + Cache::forget('config'); + + unset(Config::$items['feather']['db']); + + $this->db(); } /** @@ -81,6 +108,13 @@ public function has($key) */ public function set($key, $value) { + // If the key does not exist and it belongs to the database configuration the item is + // dirty and needs to be inserted. + if(!$this->has($key) and starts_with($this->idenfitier($key), 'db')) + { + $this->dirty[] = substr($this->idenfitier($key), 3); + } + return Config::set($this->prefix($key), $value); } @@ -96,6 +130,105 @@ public function get($key, $default = null) return Config::get($this->prefix($key), $default); } + /** + * Save a key, group of keys, or all configuration items to the database. + * Only keys that belong to the database configuration can be saved. + * + * @param array $keys + * @return void + */ + public function save($keys = array()) + { + $items = array(); + + if($keys) + { + // Each key must belong to the database set of configuration items to be saved + // back into the database. + foreach((array) $keys as $key) + { + if(starts_with($this->idenfitier($key), 'db')) + { + $items[substr($this->idenfitier($key), 3)] = $this->get($key); + } + } + } + else + { + $items = $this->get('feather: db'); + } + + $update = $insert = array(); + + foreach($items as $key => $value) + { + // Using variable variables we can assign the item to the correct array + // depending on whether or not the item already exists within the + // database. + $variable = in_array($key, $this->dirty) ? 'insert' : 'update'; + + if(is_array($value)) + { + foreach($value as $key => $value) + { + ${$variable}[] = compact('key', 'value'); + } + + continue; + } + + ${$variable}[] = compact('key', 'value'); + } + + // Using PDO transactions we'll spin through our array of keys to update and execute + // the query for each of them. If something goes wrong the transaction will be rolled + // back automatically. + if($update) + { + DB::connection(FEATHER_DATABASE)->transaction(function() use ($update) + { + foreach($update as $item) + { + DB::connection(FEATHER_DATABASE)->table('config')->where_key($item['key'])->update(array('value' => $item['value'])); + } + }); + } + + // Because inserts behave differently to an update we can perform a batch insert with + // Fluent by providing an array of arrays. We'll use this method instead of transactions. + if($insert) + { + DB::connection(FEATHER_DATABASE)->table('config')->insert($insert); + } + } + + /** + * Delete a key or group of keys from the database. + * Only keys that belong to the database configuration can be deleted. + * + * @param array $keys + * @return void + */ + public function delete($keys) + { + $delete = array(); + + // Each key must belong to the database set of configuration items to be deleted + // from the database. + foreach((array) $keys as $key) + { + if(starts_with($this->idenfitier($key), 'db')) + { + $delete[] = substr($this->idenfitier($key), 3); + } + } + + if($delete) + { + DB::connection(FEATHER_DATABASE)->table('config')->where_in('key', $delete)->delete(); + } + } + /** * Determine the prefix for a given key. * @@ -131,4 +264,22 @@ private function prefix($key) } } + /** + * Determine the idenfitier excluding any namespacing. + * + * @param string $key + * @return string + */ + private function idenfitier($key) + { + if(!str_contains($key, '::') and !str_contains($key = $this->prefix($key), '::')) + { + return null; + } + + list($namespace, $idenfitier) = explode('::', $key); + + return $idenfitier; + } + } \ No newline at end of file From d48ea3525486cff6d23200990413a32123928d68 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 00:28:04 +0930 Subject: [PATCH 005/136] Updated config tests to include saving and deleting. Signed-off-by: Jason Lewis --- tests/config.test.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/config.test.php b/tests/config.test.php index 85778d2..9899485 100644 --- a/tests/config.test.php +++ b/tests/config.test.php @@ -42,6 +42,46 @@ public function testEntireArrayCanBeReturned() $this->assertEquals($this->getItems(), $config->get('test')); } + public function testCheckItemExistance() + { + $config = $this->getRepository(); + + $config->set('foo', 'bar'); + $this->assertTrue($config->has('foo')); + + $this->assertTrue(!$config->has('apple')); + } + + public function testItemsCanBeSaved() + { + $config = $this->getRepository(); + + $config->set('feather: db.test', 'foobar'); + $config->save('feather: db.test'); + + $config->reload(); + + $this->assertEquals('foobar', $config->get('feather: db.test')); + + $config->delete('feather: db.test'); + } + + public function testItemsCanBeDeleted() + { + $config = $this->getRepository(); + + $config->set('feather: db.test', 'foobar'); + $config->save('feather: db.test'); + + $config->reload(); + + $config->delete('feather: db.test'); + + $config->reload(); + + $this->assertEquals(null, $config->get('feather: db.test')); + } + private function getRepository() { $config = new Feather\Components\Config\Repository; From e0717f07d9351f8b1e91f066fec7b8624f8278bc Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 00:29:19 +0930 Subject: [PATCH 006/136] No longer break off the start script when in CLI. Signed-off-by: Jason Lewis --- start.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/start.php b/start.php index 02faa4a..92ed333 100644 --- a/start.php +++ b/start.php @@ -1,6 +1,7 @@ set('laravel: database.connections.feather', $feather['config']->get('feather: database')); +define('FEATHER_DATABASE', 'feather'); -//$feather['config']->db(); +$feather['config']->set('laravel: database.connections.' . FEATHER_DATABASE, $feather['config']->get('feather: database')); + +$feather['config']->db(); /* |-------------------------------------------------------------------------- @@ -72,5 +75,4 @@ | logic. Register each of the applications as defined in the configuration | with the Laravel bundle manager. | -*/ - +*/ \ No newline at end of file From 42d2bd849ebdea57e9c73d4f425c6bdd6acf3ae1 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 00:29:34 +0930 Subject: [PATCH 007/136] Initial commit of support component. Signed-off-by: Jason Lewis --- components/support/facade.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 components/support/facade.php diff --git a/components/support/facade.php b/components/support/facade.php new file mode 100644 index 0000000..7d9db6f --- /dev/null +++ b/components/support/facade.php @@ -0,0 +1,7 @@ + Date: Sat, 22 Sep 2012 00:33:25 +0930 Subject: [PATCH 008/136] Namespaced the autoloading start script. Signed-off-by: Jason Lewis --- start/autoloading.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/start/autoloading.php b/start/autoloading.php index 6be24be..6f453f0 100644 --- a/start/autoloading.php +++ b/start/autoloading.php @@ -1,4 +1,15 @@ - path('feather') From 9cac24645a99ff4c8d4810ef517ea6bb03496051 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 00:59:47 +0930 Subject: [PATCH 009/136] Initial commit of facade tests. Signed-off-by: Jason Lewis --- tests/facade.test.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/facade.test.php diff --git a/tests/facade.test.php b/tests/facade.test.php new file mode 100644 index 0000000..150db8f --- /dev/null +++ b/tests/facade.test.php @@ -0,0 +1,29 @@ + new ApplicationStub)); + + $this->assertEquals('apple', FacadeStub::bar()); + } + +} + +class FacadeStub extends Feather\Components\Support\Facade { + + protected static function accessor(){ return 'foo'; } + +} + +class ApplicationStub { + + public function bar() + { + return 'apple'; + } + +} \ No newline at end of file From 62a0fbf36cf3683b3d303f132e6e9b1ca068de54 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:00:11 +0930 Subject: [PATCH 010/136] Polishing off the facades. Signed-off-by: Jason Lewis --- components/support/facade.php | 46 ++++++++++++++++++++++++++++++++++- start.php | 14 +++++++++++ start/facades.php | 9 +++++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/components/support/facade.php b/components/support/facade.php index 7d9db6f..0d800c5 100644 --- a/components/support/facade.php +++ b/components/support/facade.php @@ -1,7 +1,51 @@ db(); +/* +|-------------------------------------------------------------------------- +| Load Feather Facades +|-------------------------------------------------------------------------- +| +| Load in the Feather facades to give components a static interface through +| which methods can be accessed throughout the application. +| +*/ + +Components\Support\Facade::application($feather); + +require path('feather') . 'start' . DS . 'facades' . EXT; + /* |-------------------------------------------------------------------------- | Register Feather Applications diff --git a/start/facades.php b/start/facades.php index 365f928..3054823 100644 --- a/start/facades.php +++ b/start/facades.php @@ -2,6 +2,11 @@ class Config extends Components\Support\Facade { - - + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'config'; } + } \ No newline at end of file From 11825a16f35ae0713989618c4e86bec36f2bc53f Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:05:17 +0930 Subject: [PATCH 011/136] Combined the configuration files into a single file. Signed-off-by: Jason Lewis --- config/components.php | 5 ----- config/database.php | 13 ------------ config/feather.php | 47 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 18 deletions(-) delete mode 100644 config/components.php delete mode 100644 config/database.php create mode 100644 config/feather.php diff --git a/config/components.php b/config/components.php deleted file mode 100644 index 207cc1e..0000000 --- a/config/components.php +++ /dev/null @@ -1,5 +0,0 @@ - 'localhost', - 'database' => 'feather', - 'username' => 'root', - 'password' => '', - 'prefix' => '', - 'charset' => 'utf8', - 'driver' => 'mysql' - -); \ No newline at end of file diff --git a/config/feather.php b/config/feather.php new file mode 100644 index 0000000..759709f --- /dev/null +++ b/config/feather.php @@ -0,0 +1,47 @@ + array( + 'host' => 'localhost', + 'database' => 'feather', + 'username' => 'root', + 'password' => '', + 'prefix' => '', + 'charset' => 'utf8', + 'driver' => 'mysql' + ), + + + /* + |-------------------------------------------------------------------------- + | Feather Components + |-------------------------------------------------------------------------- + | + | Components to be registered at runtime with Feather. It is advised you + | do not edit anything down there. + | + */ + + 'components' => array() + +); \ No newline at end of file From 90c82a3a7981ef0b34663869ac3638f46b9840dc Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:25:00 +0930 Subject: [PATCH 012/136] Added default applications to feather configuration. Signed-off-by: Jason Lewis --- config/feather.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/config/feather.php b/config/feather.php index 759709f..59c7dee 100644 --- a/config/feather.php +++ b/config/feather.php @@ -42,6 +42,21 @@ | */ - 'components' => array() + 'components' => array(), + + /* + |-------------------------------------------------------------------------- + | Feather Applications + |-------------------------------------------------------------------------- + | + | Applications to be registered at runtime with Feather. It is advised you + | do not edit anything down there. + | + */ + + 'applications' => array( + 'admin' => '(:feather)/admin', + 'core' => '(:feather)' + ), ); \ No newline at end of file From beef3130621ef704bfb8cad7ac24f13f25f2c741 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:25:59 +0930 Subject: [PATCH 013/136] Register and start applications. Signed-off-by: Jason Lewis --- start.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/start.php b/start.php index 6265853..e33634f 100644 --- a/start.php +++ b/start.php @@ -62,7 +62,7 @@ define('FEATHER_DATABASE', 'feather'); -$feather['config']->set('laravel: database.connections.' . FEATHER_DATABASE, $feather['config']->get('feather: database')); +$feather['config']->set('laravel: database.connections.' . FEATHER_DATABASE, $feather['config']->get('feather: feather.database')); $feather['config']->db(); @@ -89,4 +89,16 @@ | logic. Register each of the applications as defined in the configuration | with the Laravel bundle manager. | -*/ \ No newline at end of file +*/ + +foreach($feather['config']->get('feather: feather.applications') as $application => $handles) +{ + $handles = str_replace('(:feather)', Bundle::option('feather', 'handles'), $handles); + + Bundle::register("feather/{$application}", array( + 'handles' => $handles, + 'location' => "feather/applications/{$application}" + )); + + starts_with(Request::uri(), $handles) and Bundle::start("feather/{$application}"); +} \ No newline at end of file From 4d0b4fa3ec3e73daff67fd8ee2067f1c27c32456 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:30:04 +0930 Subject: [PATCH 014/136] Initial commit of basic theme. Signed-off-by: Jason Lewis --- themes/basic/public/css/theme.css | 1493 +++++++++++++++++ themes/basic/public/img/background.png | Bin 0 -> 23173 bytes themes/basic/public/img/heading.png | Bin 0 -> 1729 bytes themes/basic/public/img/loading.gif | Bin 0 -> 847 bytes themes/basic/public/img/sprites.png | Bin 0 -> 15604 bytes themes/basic/public/js/jquery-ui.js | 17 + themes/basic/public/js/jquery.js | 2 + themes/basic/public/js/leaner.js | 68 + themes/basic/public/js/theme.js | 170 ++ themes/basic/public/js/tooltip.js | 125 ++ themes/basic/start.php | 27 + .../basic/views/misc/authorization.blade.php | 7 + themes/basic/views/template.blade.php | 90 + 13 files changed, 1999 insertions(+) create mode 100644 themes/basic/public/css/theme.css create mode 100644 themes/basic/public/img/background.png create mode 100644 themes/basic/public/img/heading.png create mode 100644 themes/basic/public/img/loading.gif create mode 100644 themes/basic/public/img/sprites.png create mode 100644 themes/basic/public/js/jquery-ui.js create mode 100644 themes/basic/public/js/jquery.js create mode 100644 themes/basic/public/js/leaner.js create mode 100644 themes/basic/public/js/theme.js create mode 100644 themes/basic/public/js/tooltip.js create mode 100644 themes/basic/start.php create mode 100644 themes/basic/views/misc/authorization.blade.php create mode 100644 themes/basic/views/template.blade.php diff --git a/themes/basic/public/css/theme.css b/themes/basic/public/css/theme.css new file mode 100644 index 0000000..19c0ac2 --- /dev/null +++ b/themes/basic/public/css/theme.css @@ -0,0 +1,1493 @@ +body { + background-image: url('../img/background.png'); + padding: 0; + margin: 0; + font-family: "Helvetica", "Helvetica Neue", Arial, sans-serif; + font-size: 13px; + color: #454545; + line-height: 1.45em; +} + +input, button, textarea { + color: #454545; + font-family: "Helvetica", "Helvetica Neue", Arial, sans-serif; + font-size: 1em; +} + +a { + color: #d7634c; +} + +a:hover { + text-decoration: none; +} + +.group:after, +fieldset dd:after, +.alert-floated:after { + content: ""; + display: table; + clear: both; +} + +/** + * The container element holds all other elements and is centered on our screen. + */ +.container { + position: relative; + width: 1140px; + margin: 0 auto; + padding: 0; +} + +/** + * The header contains the logo and some vital navigation for getting around the forum. + * Our user related data will also appear here when they are signed in. + */ +.header > .logo { + clear: right; + float: left; +} + +/** + * The user section of the header is above everything and is easily to see, it's fixed. + */ +.header > .user { + float: right; + margin: 10px 0 30px; + font-size: 14px; +} + +.header > .user a { + text-decoration: none; +} + +.header > .user > ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +.header > .user > ul > li { + float: left; + padding: 0 18px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background-color: #fff; + margin: 0 0 0 6px; + position: relative; + line-height: 34px; +} + +.header > .user > ul > li.light { background-color: #d1c9c1; } +.header > .user > ul > li.light:hover { background-color: #d9d2cb; } + +.header > .user > ul > li.dark { background: rgba(0, 0, 0, 0.6); } +.header > .user > ul > li.dark:hover { background: rgba(0, 0, 0, 0.7); } + +.header > .user > ul > li.attn { background: rgba(215, 99, 76, 0.8); } +.header > .user > ul > li.attn:hover { background: rgba(215, 99, 76, 0.95); } + +.header > .user > ul > li.link > a { + display: block; + margin: 0 -18px; + padding: 0 18px; +} + +.header > .user > ul > li.dark a, +.header > .user > ul > li.attn a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); +} + +/** + * When a menu with options is hovered we show another dropdown menu. + */ +.header > .user > ul > li.has-options:hover { + -moz-border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} + +.header > .user > ul > li.has-options > ul { + display: none; + list-style-type: none; + margin: 0; + padding: 0; + position: absolute; + top: 40px; + left: 0; + line-height: normal; + width: 350px; + -moz-border-radius: 0 2px 2px 2px; + -webkit-border-radius: 0 2px 2px 2px; + border-radius: 0 2px 2px 2px; + overflow: hidden; +} + +.header > .user > ul > li.dark.has-options > ul { background: rgba(0, 0, 0, 0.7); } +.header > .user > ul > li.attn.has-options > ul { background: rgba(215, 99, 76, 0.95); } + +.header > .user > ul > li.has-options:hover > ul { + display: block; +} + +/** + * Place a smaller bar after the hovered option so we can shift the actual dropdown below + * other menu items. + */ +.header > .user > ul > li.has-options:hover:before { + content: ""; + display: block; + width: 100%; + height: 6px; + position: absolute; + top: 34px; + left: 0; +} + +.header > .user > ul > li.dark.has-options:hover:before { background: rgba(0, 0, 0, 0.7); } +.header > .user > ul > li.attn.has-options:hover:before { background: rgba(215, 99, 76, 0.95); } + +/** + * Items for the dropdown menu. + */ +.header > .user > ul > li.has-options > ul > li { + float: left; + width: 50%; + padding: 4px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +.header > .user > ul > li.has-options > ul > li > a { + display: block; + padding: 6px 14px; + color: #fff; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.header > .user > ul > li.attn.has-options > ul > li > a:hover { + background-color: #d15843; +} + +/** + * The header navigation is floated right and consists of nice squares, love the squares. + */ +.header > .navigation { + float: right; +} + +.header > .navigation > li { + float: left; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + margin: 0 0 0 3px; +} + +.header > .navigation > li > a { + display: block; + color: #999; + text-shadow: 0 1px 0 #fff; + text-decoration: none; + font-weight: bold; + font-size: 14px; + text-transform: lowercase; + padding: 8px 16px; +} + +.header > .navigation > li:hover { + background: rgba(0, 0, 0, 0.1); +} + +.header > .navigation > li.important { + background: rgba(215, 99, 76, 0.6); +} + +.header > .navigation > li.important:hover { + background: rgba(215, 99, 76, 0.8); +} + +.header > .navigation > li.selected { + background: rgba(0, 0, 0, 0.25); +} + +.header > .navigation > li.selected > a, +.header > .navigation > li.important > a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); +} + +/** + * The main body is a large container that stands out from the background. + */ +.body { + margin: 30px 0 0; + background-color: #fff; + box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); + padding: 10px 10px 20px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} + +.body .content { + clear: both; +} + +/** + * The breadcrumbs get nice little arrow separators. + */ +.breadcrumbs { + margin: -10px -10px 10px; + background-color: #f2f2f2; + border-bottom: 1px solid #e6e6e6; + text-shadow: 0 1px 0 #fff; + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; + border-radius: 2px 2px 0 0; + line-height: 40px; +} + +.breadcrumbs > li, +.breadcrumbs > li > a { + color: #666; +} + +.breadcrumbs > li { + display: inline-block; + margin: 0 0 0 -3px; + cursor: default; +} + +.breadcrumbs > li:first-child { margin-left: 0; } + +.breadcrumbs > li, +.breadcrumbs > li > a { + position: relative; + padding: 0 4px 0 26px; + color: #989898; +} + +.breadcrumbs > li > a { + display: block; + text-decoration: none; + margin: 0 -4px 0 -26px; +} + +.breadcrumbs > li:first-child, +.breadcrumbs > li:first-child > a { + position: relative; + padding: 0 4px 0 10px; + color: #989898; +} + +.breadcrumbs > li:first-child > a { + margin: 0 -4px 0 -10px; +} + +.breadcrumbs > li > a:hover, +.breadcrumbs > li > a:focus { + color: #555; +} + +.breadcrumbs > li:hover { + background-color: #f9f9f9; +} + +.breadcrumbs > li:active { + border-color: #f1f1f1; +} + +.breadcrumbs > li:before { + position: absolute; + display: inline-block; + content: ""; + top: -1px; + right: -20px; + border-top: 21px solid rgba(255, 255, 255, 0); + border-bottom: 21px solid rgba(255, 255, 255, 0); + border-left: 19px solid #e2e2e2; + z-index: 1; +} + +.breadcrumbs > li:hover:before, +.breadcrumbs > li:focus:before { + border-left-color: #d7d7d7; +} + +.breadcrumbs > li:after { + position: absolute; + display: inline-block; + content: ""; + top: -1px; + right: -18px; + border-top: 21px solid rgba(255, 255, 255, 0); + border-bottom: 21px solid rgba(255, 255, 255, 0); + border-left: 19px solid #f2f2f2; + z-index: 1; +} + +.breadcrumbs > li:hover:after { + border-left-color: #f9f9f9; +} + +.breadcrumbs > li:hover { text-decoration: none; } + +/** + * Headings appear throughout the body and are a different font and weight + * then other items. + */ +.body h1, +.body h2, +.body h3 { + margin: 0 0 16px; + font-family: "Trebuchet MS", "Ubuntu", serif; + font-size: 24px; + color: #999; + text-transform: uppercase; +} + +.body h2 { font-size: 20px; } +.body h3 { font-size: 18px; } + +.body h1 a, +.body h2 a { + text-decoration: none; +} + +.body p:first-child { margin-top: 0; } +.body p:last-child { margin-bottom: 0; } + +/** + * Body halves allow the page to be split in two equal halves. + */ +.halves > .half-left { + float: left; + width: 49%; +} + +.halves > .half-right { + margin: 0 0 0 51%; +} + +/** + * The footer simply appears under the body and nothing more. + */ +.footer { + font-size: 11px; + padding: 10px 0; + color: #999; +} + +.footer > .powered { + float: left; + margin: 0; +} + +.footer > .stats { + float: right; +} + +.footer > .stats > li { + float: left; + margin: 0 0 0 24px; +} + +.footer > .stats .unit { + display: inline-block; + background-color: #999; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); + padding: 1px 4px; + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2); + font-weight: bold; + margin: 0 4px 0 0; +} + +/** + * A loading div that can be placed just about anywhere. + */ +.loading { + background: url('../img/loading.gif') no-repeat; + width: 16px; + height: 16px; + display: inline-block; +} + +/** + * The place description style. Shown when viewing a single place. + */ +.place-description { + margin: 0 0 16px; + padding: 4px 10px; + background-color: #f1f1f1; + border: 1px solid #eaeaea; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + display: inline-block; + color: #888; +} + +/** + * Styles for showing all discussions within places. This is used on the main page and when viewing + * a single place. + */ +.discussions > li { + display: block; + padding: 16px 0; + border-top: 1px solid #EAEAEA; + letter-spacing: -4px; + word-spacing: -4px; +} + +.discussions > li.place { + border-top: 0; +} + +.discussions > li.place + li { + margin-top: 0; + border-top: 1px solid #f4f4f4; +} + +.discussions > li.discussion > div { + display: inline-block; + line-height: 1.7em; + word-spacing: normal; + vertical-align: middle; + letter-spacing: normal; + *display: inline; + zoom: 1; +} + +.discussions > li.place, +.discussions > li.empty, +.discussions > li.extra { + position: relative; + letter-spacing: normal; + word-spacing: normal; +} + +.discussions > li.place, +.discussions > li.extra, +.discussions > li.empty { + border-top: 0; +} + +.discussions > li.place, +.discussions > li.extra, +.discussions > li.empty { + padding: 0; +} + +.discussions > li.place + li.empty { + border-top: 0; + margin: 0 0 30px; +} + +.discussions > li h1, +.discussions > li h2, +.discussions > li h3 { + margin: 0 0 16px; +} + +.place h1 a { color: #494949; } + +/** + * The see more discussions link for each place. + */ +.discussions > li.more { + text-align: right; + padding: 16px 0 30px; + border: 0; + letter-spacing: normal; + word-spacing: normal; + width: 21%; +} + +.discussions > li.more span { + position: relative; + font-size: 14px; + top: -1px; +} + +/** + * A total discussions nested within place counter is shown next to each place title. + */ +.discussion-counter { + position: relative; + top: -1px; + cursor: default; + font-size: 10px; + display: inline-block; + margin: 0 2px 0 18px; + background-color: #777; + color: #fff; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + border-radius: 12px; + padding: 0 5px; + line-height: 16px; + vertical-align: middle; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); +} + +h1 > .discussion-counter { + top: -2px; + font-family: "Helvetica", "Helvetica Neue", Arial, sans-serif; + margin-left: 9px; +} + +/** + * We show the places children to a specified depth only in a nice dropdown, similar to the user bar. + */ +.children { + margin: 0 0 16px; +} + +.children li { + position: relative; +} + +.children > li { + display: inline-block; + font-size: 13px; + color: #777; + margin: 0 6px 0 0; + padding: 0 8px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background-color: #F1F1F1; + line-height: 25px; +} + +.children > li a { + color: #777; + text-decoration: none; +} + +.children > li a:hover { color: #444; } + +.children > li.parent-child ul li .discussion-counter { + position: absolute; + right: 0; + top: 5px; +} + +.children li:hover .discussion-counter { + background-color: #fff; + color: #d7634c; +} + +.children > li:hover { + background: rgba(215, 99, 76, 0.95); +} + +.children > li.parent-child:hover { + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; + border-radius: 2px 2px 0 0; +} + +/** + * This is a spacer that we put between the place and the dropdown itself. So we + * can space the dropdown a bit. + */ +.children > li.parent-child:hover:before { + content: ""; + display: block; + width: 100%; + height: 4px; + background: rgba(215, 99, 76, 0.95); + position: absolute; + top: 25px; + left: 0; +} + +.children > li:hover > a:hover { text-decoration: none; } + +/** + * Those that have a dropdown arrow show it first as gray then as white. + */ +.children > li > .dropdown-arrow { + display: inline-block; + width: 7px; + height: 4px; + background: url('../img/sprites.png') no-repeat 0 -48px; + vertical-align: middle; + margin: -1px 0 0 1px; +} + +.children > li.parent-child:hover > .dropdown-arrow { background-position: -7px -48px; } + +/** + * When a child place is hovered show the dropdown. + */ +.children > li.parent-child:hover > ul { + display: block; +} + +.children > li:hover li, +.children > li:hover a { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); +} + +.children > li > ul a { + display: inline-block; + padding: 0 8px; + margin: 0 70px 0 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.children > li > ul a:hover { + background-color: #d15843; + text-decoration: none; +} + +.children > li > ul { + display: none; + list-style-type: none; + position: absolute; + z-index: 2; + top: 29px; + left: 0; + margin: 0; + padding: 0; + background: rgba(215, 99, 76, 0.95); + min-width: 200px; + max-width: 500px; + white-space: nowrap; + -moz-border-radius: 0 2px 2px 2px; + -webkit-border-radius: 0 2px 2px 2px; + border-radius: 0 2px 2px 2px; + padding: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} + +.children > li > ul li { + line-height: 24px; +} + +.children > li > ul li ul { + list-style-type: none; + margin: 0; + padding: 0 0 0 20px; +} + +/** + * Showing a discussions information within a place listing. + */ +.discussions > li.discussion > .place { + width: 21%; + text-align: right; +} + +.discussions > li.discussion > .meta { + margin: 0 0 0 2%; + position: relative; + width: 55%; +} + +.discussions > li.discussion > .meta > .title { + font-size: 16px; +} + +.discussions > li.discussion > .meta > .title:after { + content: ""; + display: block; +} + +.discussions > li.discussion > .meta > p { + color: #777; + margin: 0 12px 0 0; +} + +.discussions > li.discussion > .meta > p a { + color: #444; + text-decoration: none; +} + +.discussions > li.discussion > .meta > span + a { margin: 0 0 0 4px; } + +/** + * When a user is signed in the discussions options appear when they hover + * over a discussion. + */ +.discussions > li.discussion > .meta .options { + position: absolute; + top: 50%; + right: 25px; + margin: -8px 0 0 18px; +} + +.discussions > li.discussion > .meta .options a { + display: none; + background: url('../img/sprites.png') no-repeat -16px -48px; + width: 16px; + height: 16px; + margin: 0 8px 0 0; + vertical-align: text-top; +} + +.discussions > li.discussion > .meta .options a.watch:hover { background-position: -16px -64px; } + +.discussions > li.discussion > .meta .options a.watch.watching { + display: inline-block; + background-position: -16px -80px; +} + +.discussions > li.discussion > .meta .options a.tools { background-position: -32px -48px; } +.discussions > li.discussion > .meta .options a.tools:hover { background-position: -32px -64px; } + +.discussions > li.discussion:hover > .meta .options a { display: inline-block; } + +/** + * The statistics consists of 3 boxes of equal width with a light gray coloring. + */ +.discussions > li.discussion > .stats { + text-align: right; + width: 22%; + word-spacing: -4px; + letter-spacing: -4px; +} + +.discussions > li.discussion > .stats > div { + width: 33%; + background-color: #f6f6f6; + display: inline-block; + padding: 2px 0 5px; + word-spacing: normal; + letter-spacing: normal; +} + +.discussions > li.discussion > .stats > div > span { + display: block; + text-align: center; + font-size: 10px; + text-transform: uppercase; + color: #777; +} + +.discussions > li.discussion > .stats > div > span.number { + font-size: 22px; +} + +/** + * When selecting users who can participate in a discussion. + */ +.discussion-participants input { + min-width: 40%; +} + +.participants { + min-height: 35px; + margin: 8px 0 0; +} + +.participants > img { + width: 30px; + height: 30px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + margin: 0 3px 0 0; + cursor: pointer; +} + +.participants > span { + margin: 0 0 14px; +} + +/** + * Start discussion textbox. + */ +.discussion-textarea { + margin: 24px 0 0; +} + +.discussion-textarea textarea { + width: 100%; + height: 400px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +/** + * Forms and form related stylings. + */ +fieldset { + border: 0; + padding: 0; + margin: 30px 0 0; +} + +fieldset:first-child { + margin: 0; +} + +fieldset dl { + margin: 0; + line-height: 1.4em; +} + +fieldset dl dt { + float: left; + width: 30%; + text-align: right; + margin: 5px 0 12px 0; +} + +fieldset dl dt label { + font-weight: bold; + font-size: 14px; +} + +fieldset dl dd { + margin: 0 0 12px 33%; +} + +fieldset dl dd:last-child { + margin-bottom: 0; +} + +fieldset dl dd .description { + display: block; + margin: 6px 0 0; + color: #999; + font-size: 12px; + line-height: 1.5em; +} + +input, +textarea, +select { + background-color: #fff; + border: 1px solid #dcdcdc; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding: 6px 8px; + -webkit-transition: box-shadow 0.1s ease-in-out 0s; + -moz-transition: box-shadow 0.1s ease-in-out 0s; + -o-transition: box-shadow 0.1s ease-in-out 0s; + transition: box-shadow 0.1s ease-in-out 0s; + min-width: 60%; + resize: none; + font-family: "Helvetica", "Helvetica Neue", Arial, sans-serif; + font-size: 100%; +} + +select, +input[type=radio], +input[type=checkbox] { + min-width: 0; +} + +input[type=radio], +input[type=checkbox] { + vertical-align: middle; + margin: -3px 0 0; +} + +input:focus, +textarea:focus, +select:focus { + box-shadow: 0 0 4px #d7d7d7; +} + +input::-webkit-input-placeholder { + color: #bbb !important; +} + +input:-moz-placeholder { + color: #bbb !important; +} + +input[type="submit"] { + min-width: inherit; +} + +button::-moz-focus-inner, +input[type="button"]::-moz-focus-inner, +input[type="submit"]::-moz-focus-inner, +input[type="reset"]::-moz-focus-inner { + padding: 0 !important; + border: 0 none !important; +} + +.error input, +.error textarea { + border-color: #fab1b1; + box-shadow: 0 0 4px #fab1b1; +} + +.label.error-inline { + margin: 6px 0 0; +} + +.error-spacer { + display: block; +} + +select optgroup { + text-align: center; +} + +fieldset .decider { + overflow: hidden; +} + +fieldset .decider span { + float: left; + padding: 5px 12px 4px; + border-width: 1px; + border-style: solid; + text-transform: uppercase; + font-size: 12px; + font-weight: bold; + text-shadow: 0 1px 0 #fff; +} + +fieldset .decider input { + margin-right: 4px; +} + +fieldset .decider .yes { + background-color: #DFF0D8; + border-color: #bed9a8; + color: #468847; + border-right: 0; + -moz-border-radius: 2px 0 0 2px; + -webkit-border-radius: 2px 0 0 2px; + border-radius: 2px 0 0 2px; +} + +fieldset .decider .no { + background-color: #FCE9E9; + border-color: #fab1b1; + color: #B94A48; + border-left: 0; + -moz-border-radius: 0 2px 2px 0; + -webkit-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; +} + +/** + * User Authorization styles, for Twitter, Facebook, Google, and OpenID. + */ +.authorization-links > a { + background: url('../img/sprites.png') no-repeat 0 0; + width: 32px; + height: 32px; + display: inline-block; + margin: 0 6px 0 0; +} + +.authorization-links > a.google { background-position: -32px 0; } +.authorization-links > a.facebook { background-position: -64px 0; } +.authorization-links > a.twitter { background-position: -96px 0; } + +/** + * Buttons are styled by applying the btn and a btn type to an element. + */ +.btn { + display: inline-block; + line-height: normal; + padding: 12px 14px 13px; + background: #fafafa; + background: -moz-linear-gradient(top, #fafafa 0%, #ececec 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fafafa), color-stop(100%,#ececec)); + background: -webkit-linear-gradient(top, #fafafa 0%,#ececec 100%); + background: -o-linear-gradient(top, #fafafa 0%,#ececec 100%); + background: -ms-linear-gradient(top, #fafafa 0%,#ececec 100%); + background: linear-gradient(top, #fafafa 0%,#ececec 100%); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: 1px solid #dadada; + border-bottom-color: #c5c5c5; + box-shadow: inset 0 1px 0 #fff; + text-shadow: 0 1px 0 #fff; + color: #666; + text-decoration: none; + cursor: pointer; +} + +.btn:active { + box-shadow: inset 0 4px 10px rgba(0, 0, 0, 0.1) !important; +} + +.btn:hover { + background: #f1f1f1; +} + +.btn.btn-big { + font-size: 14px; + font-weight: bold; +} + +.btn.btn-small { + font-size: 11px; +} + +.btn.btn-fat { + padding: 12px 18px 13px; +} + +/** + * Primary Button + */ +.btn.btn-primary { + color: #fff !important; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #d8724b; + background: -moz-linear-gradient(top, #d8724b 0%, #d7614d 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8724b), color-stop(100%,#d7614d)); + background: -webkit-linear-gradient(top, #d8724b 0%,#d7614d 100%); + background: -o-linear-gradient(top, #d8724b 0%,#d7614d 100%); + background: -ms-linear-gradient(top, #d8724b 0%,#d7614d 100%); + background: linear-gradient(top, #d8724b 0%,#d7614d 100%); + border-color: #cf5a47; + border-bottom-color: #c3432d; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-primary:hover { + background: #d56e47; +} + +/** + * Info Button + */ +.btn.btn-info { + color: #fff !important; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #65afe3; + background: -moz-linear-gradient(top, #65afe3 0%, #469ad5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#65afe3), color-stop(100%,#469ad5)); + background: -webkit-linear-gradient(top, #65afe3 0%,#469ad5 100%); + background: -o-linear-gradient(top, #65afe3 0%,#469ad5 100%); + background: -ms-linear-gradient(top, #65afe3 0%,#469ad5 100%); + background: linear-gradient(top, #65afe3 0%,#469ad5 100%); + border-color: #3e92cd; + border-bottom-color: #1a72b1; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-info:hover { + background: #56a2d7; +} + +/** + * Success Button + */ +.btn.btn-success { + color: #fff !important; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #80b65d; + background: -moz-linear-gradient(top, #80b65d 0%, #6ca843 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#80b65d), color-stop(100%,#6ca843)); + background: -webkit-linear-gradient(top, #80b65d 0%,#6ca843 100%); + background: -o-linear-gradient(top, #80b65d 0%,#6ca843 100%); + background: -ms-linear-gradient(top, #80b65d 0%,#6ca843 100%); + background: linear-gradient(top, #80b65d 0%,#6ca843 100%); + border-color: #639f3b; + border-bottom-color: #569829; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-success:hover { + background: #7ab254; +} + +/** + * Warning Button + */ +.btn.btn-warning { + color: #fff !important; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #dda24f; + background: -moz-linear-gradient(top, #dda24f 0%, #ce8927 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dda24f), color-stop(100%,#ce8927)); + background: -webkit-linear-gradient(top, #dda24f 0%,#ce8927 100%); + background: -o-linear-gradient(top, #dda24f 0%,#ce8927 100%); + background: -ms-linear-gradient(top, #dda24f 0%,#ce8927 100%); + background: linear-gradient(top, #dda24f 0%,#ce8927 100%); + border-color: #c7811d; + border-bottom-color: #bc730a; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-warning:hover { + background: #d89b44; +} + +/** + * Danger Button + */ +.btn.btn-danger { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #cc493f; + background: -moz-linear-gradient(top, #cc493f 0%, #c43025 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cc493f), color-stop(100%,#c43025)); + background: -webkit-linear-gradient(top, #cc493f 0%,#c43025 100%); + background: -o-linear-gradient(top, #cc493f 0%,#c43025 100%); + background: -ms-linear-gradient(top, #cc493f 0%,#c43025 100%); + background: linear-gradient(top, #cc493f 0%,#c43025 100%); + border-color: #c2291e; + border-bottom-color: #bc1509; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-danger:hover { + background: #c84338; +} + +/** + * Inverse Button + */ +.btn.btn-inverse { + color: #fff; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); + background: #595959; + background: -moz-linear-gradient(top, #595959 0%, #434343 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#595959), color-stop(100%,#434343)); + background: -webkit-linear-gradient(top, #595959 0%,#434343 100%); + background: -o-linear-gradient(top, #595959 0%,#434343 100%); + background: -ms-linear-gradient(top, #595959 0%,#434343 100%); + background: linear-gradient(top, #595959 0%,#434343 100%); + border-color: #3e3e3e; + border-bottom-color: #313131; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); +} + +.btn.btn-inverse:hover { + background: #515151; +} + +/** + * Soft Button + * This button is slightly different, it's smaller and barely got a background gradient. + */ +.btn-soft { + padding: 6px 10px; + color: #999; + text-shadow: none; + background: #fff; + border-color: #ededed; + border-bottom-color: #d9d9d9; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.07); +} + +.btn.btn-soft:hover { + background: #fff; + border-color: #e0e0e0; + border-bottom-color: #cfcfcf; + color: #666; +} + +.btn.btn-soft:active { + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.07) !important; + border-color: #f3f3f3; + border-bottom-color: #e1e1e1; +} + +/** + * Inline labels, different colors for different labels. + */ +.label { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + padding: 2px 8px 3px; + background-color: #bbb; + color: #FFFFFF; + font-size: 11px; + line-height: 14px; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); + vertical-align: text-top; + position: relative; + top: -1px; + white-space: nowrap; + text-transform: uppercase; + display: inline-block; +} + +.label.label-success { + background-color: #1f9a31; +} + +.label.label-important { + background-color: #dd5956; +} + +.label.label-info { + background-color: #2895ca; +} + +.label.label-bright { + background-color: #e58749; +} + +.label.label-private { + background-color: #dd5956; +} + +.label.label-draft { + background-color: #4e4744; +} + +.label.label-inverse { + background-color: #4e4744; +} + +/** + * Alert boxes, different colors for different types of alerts. + */ +.alert { + background-color: #FCF8E3; + border: 1px solid #FBEED5; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + color: #C09853; + margin-bottom: 16px; + padding: 12px 16px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6); +} + +.alert.alert-floated { + float: left; +} + +.alert:last-child { margin: 0; } + +.alert.alert-light { + background-color: #e7e7e7; + border-color: #d8d8d8; + color: #5b5b5b; +} + +.alert.alert-error { + background-color: #FCE9E9; + border-color: #fab1b1; + color: #B94A48; +} + +.alert.alert-success { + background-color: #DFF0D8; + border-color: #D6E9C6; + color: #468847; +} + +.alert.alert-info { + background-color: #D9EDF7; + border-color: #BCE8F1; + color: #3A87AD; +} + +.alert ol { + list-style-type: decimal; + margin: 8px 0 0 0; + padding: 0 0 0 40px; +} + +/** + * By default lists have no style type or margins/paddings. + */ +ul, ol { + list-style-type: none; + margin: 0; + padding: 0; +} + +/** + * Some text alignments. + */ +.text-center { text-align: center; } +.text-left { text-align: left; } +.text-right { text-align: right; } + +/** + * Tooltip Styles + */ +.tooltip-container { + display: none; + position: absolute; + top: 0; + left: 0; + border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + line-height: normal !important; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + background-color: #222; + background: rgba(0, 0, 0, 0.85); + z-index: 99; +} + +.tooltip-container .tooltip-wrapper { + position: relative; +} + +.tooltip-container .tooltip-arrow { + position: absolute; + border-width: 5px; + border-style: solid; +} + +.tooltip-container.arrow-b .tooltip-arrow { + top: -10px; + left: 50%; + margin-left: -5px; + border-color: transparent transparent #222 transparent; + border-color: transparent transparent rgba(0, 0, 0, 0.85) transparent; +} + +.tooltip-container.arrow-t .tooltip-arrow { + bottom: -10px; + left: 50%; + margin-left: -5px; + border-color: #222 transparent transparent transparent; + border-color: rgba(0, 0, 0, 0.85) transparent transparent transparent; +} + +.tooltip-container.arrow-l .tooltip-arrow { + top: 50%; + right: -10px; + margin-top: -5px; + border-color: transparent transparent transparent #222; + border-color: transparent transparent transparent rgba(0, 0, 0, 0.85); +} + +.tooltip-container.arrow-r .tooltip-arrow { + top: 50%; + left: -10px; + margin-top: -5px; + border-color: transparent #222 transparent transparent; + border-color: transparent rgba(0, 0, 0, 0.85) transparent transparent; +} + +.tooltip-container .tooltip-content { + color: #fff; + text-shadow: 0 1px 0 #000; + padding: 8px 16px; + font-size: 12px; +} + +/** + * The box modal is a nice popup box that appears over the page. + */ +#lean-overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; + background: #000; + display: none; +} + +#box-modal { + display: none; + max-width: 700px; + max-height: 500px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + background-color: #fff; + box-shadow: 0 0 6px #222; +} + +#box-modal #box-content { + padding: 25px; +} + +#box-modal #box-content h2 { + margin: -25px -25px 25px; + padding: 25px 25px 28px; + -moz-border-radius: 6px 6px 0 0; + -webkit-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; + background-color: #f9f9f9; + border-bottom: 1px solid #f1f1f1; + color: #666; + font-weight: normal; +} + +/** + * The autocomplete container is positioned after an input box. + */ +.autocomplete { + position: relative; +} + +.autocomplete .ui-autocomplete { + display: none; + position: absolute; + top: 100%; + left: 0; + width: 300px; + list-style-type: none; + border: 1px solid #dcdcdc; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + background-color: #fff; + color: #fff; + text-shadow: 0 1px 0 #fff; + padding: 0; + margin: 14px 0 0; +} + +.autocomplete .ui-autocomplete:after { + display: block; + position: absolute; + content: ""; + top: -8px; + left: 25px; + border-left: 8px solid rgba(255, 255, 255, 0); + border-right: 8px solid rgba(255, 255, 255, 0); + border-bottom: 8px solid #fff; +} + +.autocomplete .ui-autocomplete:before { + display: block; + position: absolute; + content: ""; + top: -11px; + left: 23px; + border-left: 10px solid rgba(255, 255, 255, 0); + border-right: 10px solid rgba(255, 255, 255, 0); + border-bottom: 10px solid #dcdcdc; +} + +.autocomplete .ui-autocomplete > li { margin: 0 0 6px; } + +.autocomplete .ui-autocomplete > li > a { + display: block; + padding: 6px; +} + +.autocomplete .ui-autocomplete > li:last-child { margin-bottom: 0; } + +.autocomplete .ui-autocomplete > li > a:hover, +.autocomplete .ui-autocomplete > li > a.ui-state-hover { background-color: #e3e3e3; } \ No newline at end of file diff --git a/themes/basic/public/img/background.png b/themes/basic/public/img/background.png new file mode 100644 index 0000000000000000000000000000000000000000..3e3aca46b98cba878c55e5c8e451399093d70560 GIT binary patch literal 23173 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

1h2nDLqe>m=rswbkN*Aj# z&B7V|FEenp+4Q}g5l=HoF7nFV(nV-5igK-{ZSu$kHA}l&m8c}1Dbcnf9-qiElth8c zK&&TuBm~D|iN_=KXtnCAN~jU%eLUR1WMym#kHJ2v&kW``FIY6+l{(Rs2U3~)MM?F! z!RYY-#qt~%tmsoy^G##QG*>AMrS0Tr^kjwWN~;HHw#-P zn?65GSBpVZgh9!i6gOD{ey|(F3|`q2R!_65c=OBLC9cEri@M8Mhk1&k;`yySnksb4 zaTbgwc~IQ4gs9g(4ka9HAd~J$V^}sv)c-PHW~-{gfNe37e!cR$HNzTpOT<_@j6{hm z06}^?%QbmfEN+Xx>QGg?z_aDEhkK>EbDB9JlEamDc3zKQErezzGDznWB?)QeR_Ndg zp$Sgx-&w%w+L19reCwEcUW`yK4ZxuqC2K)!1gF9xbry=L#>MyZ)0($Uv&6J0f2Rb6 zlToNj_XU1}%lDO3P1kr)&D`roY+p66itRlTUU=A%W3i~butu+2;lqay9kZ@Q-%*;f zH?qfUie#a>&#jNG(3;T*I$24Y=-Y)7h$T) z98n=<9PU|7apKT#QL=U`h#0Av4pg~e5mW8w@->PpX(R#(Rvul7y=o`n7MHj(-ySDR zrs%d9iOjT}(_{rwDv@}BMt`x!&(3d=&m?Hen3yw|gj7YaBYi$10&QIQMBXJ`L<4hP zdUjP}h1CbAF1N-gE;Ux&YEsx*wHa1SH3I3{uPpPRaSuhS$!pCucL3t1u1!B-Rta8SC+G~$9;}ut9Hg+Qnzh|;!?kEEXfHA zGC8}dK`!lzK6;x7Sgzh!^-6bHW+@>=8un|fN>-1!JrV@u<}Qil)2B}w93(r+dnEGI z!yN#YgBsZYEVXlHqk`0__s1)d{$~%i(i#%jDT1ov3M*qInQ456!2RG`gk;6jd_hTV34&8uck(+Gxf z6|vm1_UKkbpOl=R3S}!@tQHcLYY2-l*x!kSa_*w#s9vH^6K$~nY%j)ERvwEio@+lb zyQ&i`%D!MxR+?iB$tz*XHaF21`;F|)CI4hcS{AybT$py1+9GIZxwjUYj|$!~_1vl5 zKt)P>!Cli#h@k9%bj2zvq@H?_!1_cf^h$al_jEr>`=D6NwrvrqR`4e#Cg+E#5vv8w z949d!pARt>iQUZpSU05Dgt z6%qO(;R)8%g4V=tt>k3qpXZoH>x<)MI=YCdd!bh%)Vy)!L(5-MbYCK#C^Qs);jCJ< z>N8K2I;|Q!dq*T06mW?Y+gSu+>~ESW`lm9C1;VOHiwK)yRmE|vvS~!Nq_CurA&J}7 zQ(WPAeuao{`h598HQHxc&yuBuMvCVRY}3G~z=e&h>eX&=trpf*j8zM0cUZBKJxFR> zy$%i%f-QagD;~zYO@!%wSD4oAA$#2W*;rlr&b+%a58s=ktc->MzI2P}G}$wxa9)F6 zd3?!@mfw_$pIR$dQ(rlkvc-Ht2%my6I~}Qbm6%d$$WiBoFhBKLvRjUXB~6iek1sDJ z0p*V>W3T+scDho=cgNc{6|E-a)7;b&q`KTymOeAPV!(S1hitr!?74KcI9pcfc{;X9GzrFa1afEQC0a2diozvs5bLsXR$pc%khX9A8mnqfsYcLpjMi2g6su}vlJd1)0Bb&3tNc?k$t-58_MmBrYQvY@ z>#_wI2bU4QC5Ih?Dq1WR^E9SVT55zpb_mk-#mSDJcI%sOzNylXraA7Xh{-9k#CsEd zTMtoK!x=sr;miO_rMVbvMslu@sR1r{U{Xd_4?AFW6OZvRy0T}~OseyZ9 zM{o(i$k6x?#zi#hY6Q>TdNt=~nG#p+oNe-S zIoXk(o^>=uxQtcB1XsqZJdsO$jaB7YB(E)bCqj!7%%qHm3d|BsNQjz7MNN`w`L<iI;FLh@PH&F1Z@)~>1duuE$i21E9b_(-t^rAD*-}(3|X#IZz3;_4qNOJ#D RU5o$#002ovPDHLkV1litTz&um literal 0 HcmV?d00001 diff --git a/themes/basic/public/img/heading.png b/themes/basic/public/img/heading.png new file mode 100644 index 0000000000000000000000000000000000000000..256be5a2f0782d2a9007e803957e149e7efe6e57 GIT binary patch literal 1729 zcmeAS@N?(olHy`uVBq!ia0vp^eL$?r!3HF!s9jVAQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?>3@Ln2Bde0{8v^Ko2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ON>h49S0l>G8y zuxejlE6=>*lEl2^R8JRMC7^!2%*+%kb2BqHV{-!+HzxyELqk_XM_=yk=Z7nBfk3xGDeq!wkCrKY$Q<>xAZJ#3YU+bvEw&4cPq z!R;1joO<j&mQA-`Zs}ge{hTB1;<{TikGN+{`>1E-baS?=rIRJo z)R>FAI`>Vua9rWf{hqWO#!Ww}_WVCmzGHXQR<1h}Fx zx7{x8f1-P-$J8ap_qf&(8L|1>r@l%!(RtazPs`>1AnFRJps!?{W*TAImHZ73MCna&OD;O7`k-Nq)!itV{TeXQ9C*$wra( zpsNjClg~6-Ok6sNr$#uf4@0sa81FhOF>=-O2TcRqDp0+kfRBnbgflj-9ni#d1N3>yd+@%WP{Z`gHVj*&*w!bLo16W{zRb~Zg?r!Y_(ywo?EIh4zN@;rP0m%lP)vTlD`8@uQNHE0*_E^>qbnE-;OgOf$lQ|gnw zWt!5vF7LZ*>iEuM&bBhvt81SqM;2mAN$4-E~SHEULX zfB);(uQzYreD&(p%F4>-=4J*`fZ~5{Ki808XU70nBRvCVMxb8Be^Smxsfi`2DGKG8 zB^e5dS&0=n`H3ldnR#jX42nNlIJtnTbU?O%9Lc~MprFu~k~wdwfk=*`R!hRFwKGJH zO_VZi_`r6vqanJN#fB-fHDIDZD`RKtqP{hnIt`vtKNhJZec0tOX@W(|3R5-NicZsP z1sh?JPnEJq-}gIVvm`@7q09YJPllG%(FZG5IH>Uf%AY4_+!FE7;yMx_!l}EY-SE9}BbSx)X+!TV z9xY7|**x@SsNCFG$-p77@8TKO8(G|Xjo~g1claV178!VOinZz(^f_JO>dO}JdiItl z)ZVn5nWaW0n>R+2pQjtEr9qHjZBUrPWGHgfVMVjE9NQZ4W7*wJa~Kt!o+Q{aG;U|w zH$mC8$)d_BFrp!OckZGxZXuXN$NjhA8stpCkV#!C8H>m&MeWS!~VrCworWK*zpwZK-g4NP^sHGl2k8vz> zFkv{f>6oLE=R}STvlb?B*yXjddK##7Nc75in{VRv&|yE=saw*l)zs`NB_goouN2N#u}s9-J_<+U=2#1U;qFUX$cPi literal 0 HcmV?d00001 diff --git a/themes/basic/public/img/sprites.png b/themes/basic/public/img/sprites.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f56d75f3530b5e71ad9597b4b06029ed314b1a GIT binary patch literal 15604 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 Y%)jk5o%|yG_djG=DJ97&ag(6`1&NADj{pDw literal 0 HcmV?d00001 diff --git a/themes/basic/public/js/jquery-ui.js b/themes/basic/public/js/jquery-ui.js new file mode 100644 index 0000000..614e198 --- /dev/null +++ b/themes/basic/public/js/jquery-ui.js @@ -0,0 +1,17 @@ +/*! jQuery UI - v1.8.23 - 2012-08-15 +* https://github.com/jquery/jquery-ui +* Includes: jquery.ui.core.js +* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ +(function(a,b){function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;return!b.href||!g||f.nodeName.toLowerCase()!=="map"?!1:(h=a("img[usemap=#"+g+"]")[0],!!h&&d(h))}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(a.ui.version)return;a.extend(a.ui,{version:"1.8.23",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;return a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0),/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a("").outerWidth(1).jquery||a.each(["Width","Height"],function(c,d){function h(b,c,d,f){return a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)}),c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){return c===b?g["inner"+d].call(this):this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){return typeof b!="number"?g["outer"+d].call(this,b):this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:a.expr.createPseudo?a.expr.createPseudo(function(b){return function(c){return!!a.data(c,b)}}):function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.curCSS||(a.curCSS=a.css),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!d||!a.element[0].parentNode)return;for(var e=0;e0?!0:(b[d]=1,e=b[d]>0,b[d]=0,e)},isOverAxis:function(a,b,c){return a>b&&a0?b.left-e:Math.max(b.left-c.collisionPosition.left,b.left)},top:function(b,c){var d=a(window),e=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=e>0?b.top-e:Math.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c.at[0]===e)return;var d=a(window),f=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft(),g=c.my[0]==="left"?-c.elemWidth:c.my[0]==="right"?c.elemWidth:0,h=c.at[0]==="left"?c.targetWidth:-c.targetWidth,i=-2*c.offset[0];b.left+=c.collisionPosition.left<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]===e)return;var d=a(window),f=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop(),g=c.my[1]==="top"?-c.elemHeight:c.my[1]==="bottom"?c.elemHeight:0,h=c.at[1]==="top"?c.targetHeight:-c.targetHeight,i=-2*c.offset[1];b.top+=c.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.offset.setOffset||(a.offset.setOffset=function(b,c){/static/.test(a.curCSS(b,"position"))&&(b.style.position="relative");var d=a(b),e=d.offset(),f=parseInt(a.curCSS(b,"top",!0),10)||0,g=parseInt(a.curCSS(b,"left",!0),10)||0,h={top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.call(b,h):d.css(h)},a.fn.offset=function(b){var c=this[0];return!c||!c.ownerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(this,b)}):h.call(this)}),a.curCSS||(a.curCSS=a.css),function(){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d,e,g,h,i;d=document.createElement(b?"div":"body"),g={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=g[j];d.appendChild(c),e=b||document.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText="position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;",h=a(c).offset(function(a,b){return b}).offset(),d.innerHTML="",e.removeChild(d),i=h.top+h.left+(b?2e3:0),f.fractions=i>21&&i<22}()})(jQuery);;/*! jQuery UI - v1.8.23 - 2012-08-15 +* https://github.com/jquery/jquery-ui +* Includes: jquery.ui.autocomplete.js +* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ +(function(a,b){var c=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var b=this,c=this.element[0].ownerDocument,d;this.isMultiLine=this.element.is("textarea"),this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(b.options.disabled||b.element.propAttr("readOnly"))return;d=!1;var e=a.ui.keyCode;switch(c.keyCode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._move("nextPage",c);break;case e.UP:b._keyEvent("previous",c);break;case e.DOWN:b._keyEvent("next",c);break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active&&(d=!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.select(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:clearTimeout(b.searching),b.searching=setTimeout(function(){b.term!=b.element.val()&&(b.selectedItem=null,b.search(null,c))},b.options.delay)}}).bind("keypress.autocomplete",function(a){d&&(d=!1,a.preventDefault())}).bind("focus.autocomplete",function(){if(b.options.disabled)return;b.selectedItem=null,b.previous=b.element.val()}).bind("blur.autocomplete",function(a){if(b.options.disabled)return;clearTimeout(b.searching),b.closing=setTimeout(function(){b.close(a),b._change(a)},150)}),this._initSource(),this.menu=a("

    ").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",c)[0]).mousedown(function(c){var d=b.menu.element[0];a(c.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(c){c.target!==b.element[0]&&c.target!==d&&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTimeout(b.closing)},13)}).menu({focus:function(a,c){var d=c.item.data("item.autocomplete");!1!==b._trigger("focus",a,{item:d})&&/^key/.test(a.originalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=d.item.data("item.autocomplete"),f=b.previous;b.element[0]!==c.activeElement&&(b.element.focus(),b.previous=f,setTimeout(function(){b.previous=f,b.selectedItem=e},1)),!1!==b._trigger("select",a,{item:e})&&b.element.val(e.value),b.term=b.element.val(),b.close(a),b.selectedItem=e},blur:function(a,c){b.menu.element.is(":visible")&&b.element.val()!==b.term&&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.beforeunloadHandler=function(){b.element.removeAttr("autocomplete")},a(window).bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.menu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandler),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b==="source"&&this._initSource(),b==="appendTo"&&this.menu.element.appendTo(a(c||"body",this.element[0].ownerDocument)[0]),b==="disabled"&&c&&this.xhr&&this.xhr.abort()},_initSource:function(){var b=this,c,d;a.isArray(this.options.source)?(c=this.options.source,this.source=function(b,d){d(a.ui.autocomplete.filter(c,b.term))}):typeof this.options.source=="string"?(d=this.options.source,this.source=function(c,e){b.xhr&&b.xhr.abort(),b.xhr=a.ajax({url:d,data:c,dataType:"json",success:function(a,b){e(a)},error:function(){e([])}})}):this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val(),this.term=this.element.val();if(a.length").data("item.autocomplete",c).append(a("").text(c.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visible")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.deactivate();return}this.menu[a](b)},widget:function(){return this.menu.element},_keyEvent:function(a,b){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(a,b),b.preventDefault()}}),a.extend(a.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(b,c){var d=new RegExp(a.ui.autocomplete.escapeRegex(c),"i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(jQuery),function(a){a.widget("ui.menu",{_create:function(){var b=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){if(!a(c.target).closest(".ui-menu-item a").length)return;c.preventDefault(),b.select(c)}),this.refresh()},refresh:function(){var b=this,c=this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouseleave(function(){b.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var c=b.offset().top-this.element.offset().top,d=this.element.scrollTop(),e=this.element.height();c<0?this.element.scrollTop(d+c):c>=e&&this.element.scrollTop(d+c-e+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end(),this._trigger("focus",a,{item:b})},deactivate:function(){if(!this.active)return;this.active.children("a").removeClass("ui-state-hover").removeAttr("id"),this._trigger("blur"),this.active=null},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.active){this.activate(c,this.element.children(b));return}var d=this.active[a+"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,this.element.children(b))},nextPage:function(b){if(this.hasScroll()){if(!this.active||this.last()){this.activate(b,this.element.children(".ui-menu-item:first"));return}var c=this.active.offset().top,d=this.element.height(),e=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=this.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!this.active||this.first()){this.activate(b,this.element.children(".ui-menu-item:last"));return}var c=this.active.offset().top,d=this.element.height(),e=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c+d-a(this).height();return b<10&&b>-10});e.length||(e=this.element.children(".ui-menu-item:first")),this.activate(b,e)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
    a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
    t
    ",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
    ",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;jq&&u.push({elem:this,matches:o.slice(q)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;ai){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="
    ",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="

    ",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
    ","
    "]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
    ").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file diff --git a/themes/basic/public/js/leaner.js b/themes/basic/public/js/leaner.js new file mode 100644 index 0000000..76f99cf --- /dev/null +++ b/themes/basic/public/js/leaner.js @@ -0,0 +1,68 @@ +(function($){ + $.fn.extend({ + leaner: function(options) { + + var close = function (id){ + $("#lean-overlay").fadeOut(200); + $('#box-modal').hide(); + }; + + var center = function(width, height) + { + $('#box-modal').css({ + 'display' : 'block', + 'position' : 'fixed', + 'opacity' : 0, + 'z-index': 11000, + 'left' : 50 + '%', + 'margin-left' : -(width / 2) + "px", + 'top' : 50 + '%', + 'margin-top' : -(height / 2) + "px" + }); + } + + var defaults = { + top: 100, + overlay: 0.7 + }; + + $("body").append($("
    ")).append($("
    ")); + + options = $.extend({}, defaults, options); + + return this.each(function() { + + $(this).click(function(e) { + + $('#box-modal').show().find('#box-content').html('
    '); + + center($('#box-modal').outerWidth(), $('#box-modal').outerHeight()); + + $('#box-modal').find('#box-content').load($(this).attr("href") + ' .content', function() + { + $("#lean-overlay, #box-close").click(function() { + close(); + }); + + $(document).one('keydown', function(e) { + if(e.keyCode == 27) { + close(); + } + }); + + var overlay = $('#lean-overlay'); + + overlay.css({ 'display' : 'block', opacity : 0 }); + overlay.fadeTo(200, options.overlay); + + center($('#box-modal').outerWidth(), $('#box-modal').outerHeight()); + + $('#box-modal').fadeTo(200, 1); + }); + + e.preventDefault(); + }); + }); + } + }); +})(jQuery); diff --git a/themes/basic/public/js/theme.js b/themes/basic/public/js/theme.js new file mode 100644 index 0000000..07d1b54 --- /dev/null +++ b/themes/basic/public/js/theme.js @@ -0,0 +1,170 @@ +var FEATHER = {}; + +(function($) +{ + /** + * Register the leaner modal that works for this theme. + */ + $('a.popup-ui').leaner(); + + /** + * Register the tooltips that appear throughout the theme. + */ + $('.tooltip-ui').tooltip({ 'position': 'top', 'offset': 2, 'live': true }); + $('.tooltip-ui-right').tooltip({ 'position': 'right', 'offset': 4, 'live': true }); + $('.tooltip-ui-places').tooltip({ 'position': 'bottomLeft', 'offset': 3, 'width': 350 }); + $('.tooltip-ui-footer').tooltip({ 'position': 'right', 'offset': 5, 'width': 350 }); + + /** + * Assign the auto complete plugin to our discussion participants input box. + */ + (function($) + { + var properties = { + cache: {}, + participants: [], + elements: { + input: $('.discussion-participants').find('input#participants'), + auto: $('.discussion-participants').find('.autocomplete'), + anyone: $('.participants').find('.anyone'), + participants: $('.participants'), + loading: $('
    ').attr('class', 'loading') + } + } + + function add(participant) + { + // Hide the default 'anyone can participate' message. + properties.elements.anyone.hide(); + + // Loop over each participant and if they are the same as the one trying to be + // added then forget it! They can only be added once. + for(var i = 0; i < properties.participants.length; ++i) + { + if(properties.participants[i] == participant.value) + { + return; + } + } + + // Add the participants name to the participants array. + properties.participants.push(participant.value); + + // Add the participants avatar to the participants div. + properties.elements.participants.append($('').attr({ + 'src': participant.avatar + '?d=mm', + 'class': 'tooltip-ui', + 'title': participant.value + }).data('name', participant.value).fadeIn('fast')); + } + + /** + * If there is some comma separated names already in the participants input box we'll poll a request + * to the API to get all of the users details, we need their avatar. + */ + if(properties.elements.input.val().length) + { + var array = $.map(properties.elements.input.val().split(','), $.trim); + + properties.elements.input.val(''); + + properties.elements.anyone.hide().after(properties.elements.loading); + + $.getJSON(app.base + '/api/v1/user/bunch.json', { data: JSON.stringify(array) }, function(data, status, xhr) + { + properties.elements.loading.fadeOut('fast', function() + { + for(var i = 0; i < data.length; ++i) + { + setTimeout(add, (i + 1) * 150, { value: data[i].username, avatar: data[i].avatar }); + } + }); + }); + } + + properties.elements.input.autocomplete({ + source: function(request, response) + { + if(request.term in properties.cache) + { + response(properties.cache[request.term]); + + return; + } + + $.getJSON(app.base + '/api/v1/user/find.json', request, function(data, status, xhr) + { + var store = []; + + for(var i = 0; i < data.length; ++i) + { + store.push({ + 'value': data[i].username, + 'avatar': data[i].avatar + }); + } + + properties.cache[request.term] = store; + + response(store); + }); + }, + appendTo: properties.elements.auto, + position: { my: "left top", at: "left bottom", collision: "none", offset: "0 14px" }, + autoFocus: true, + + // When we show the results highlight the typed text in the matched results. + open: function (e, ui) + { + var data = properties.elements.input.data('autocomplete'); + + data.menu.element.find('a').each(function() + { + $(this).html($(this).text().replace(new RegExp('(' + data.term.split(' ').join('|') + ')', 'gi'), '$1')); + }); + }, + + // When an item is selected we'll add to the array of participants, then we'll add the + // users avatar to the participants div. + select: function(e, ui) + { + e.preventDefault(); + + add(ui.item); + + properties.elements.input.val('').autocomplete('close'); + } + }); + + // Attach an event handler to any clicking events of any images inside the participants div, + // we'll then remove the user from the selected participants. + properties.elements.participants.find('img').live('click', function() + { + var name = $(this).data('name'); + + for(var i = 0; i < properties.participants.length; ++i) + { + if(properties.participants[i] == name) break; + } + + properties.participants.splice(i, 1); + + $(this).fadeOut('fast', function() + { + // If there are no participants, show the default text. + if(properties.participants.length == 0) $('.participants').find('.anyone').show(); + }); + }); + + // Attach an event handler to the submission of the form so we can inject another form field + // with a comma separated list of participants. + $('.manage-discussion').find('form').on('submit', function(e) + { + $(this).find('input[name=participants]').after($('').attr({ + name: 'participants', + type: 'hidden', + value: properties.participants.join(',') + })); + }); + })($); +})(jQuery); \ No newline at end of file diff --git a/themes/basic/public/js/tooltip.js b/themes/basic/public/js/tooltip.js new file mode 100644 index 0000000..54ed2cc --- /dev/null +++ b/themes/basic/public/js/tooltip.js @@ -0,0 +1,125 @@ +/** + * Tooltip for jQuery by Jason Lewis + * ----------------------------------------- + * This is a simple tooltip plugin for jQuery which allows tooltips on elements with an arrow + * at multiple positions of the tooltip. + * + * @author Jason Lewis + * @copyright 2011 - 2012 Jason Lewis + * @version 1.0 + * @license 3-clause BSD + */ +(function($){ + $.fn.tooltip = function(opts){ + + var options = $.extend({}, $.fn.tooltip.defaults, opts), + elements = { + container: $('
    '), + wrapper: $('
    '), + arrow: $('
    '), + content: $('
    ') + }, + binder = options.live ? 'live' : 'bind', + title = ''; + + // Append the tooltip contents to the body + $('body').append(elements.container.html(elements.wrapper.html(elements.arrow).append(elements.content))); + + // Set some options + elements.container.css({ maxWidth: options.width + 'px' }); + + return this[binder]({ + mouseover: function(){ + var elm = $(this); + title = elm.attr(options.attr); + + if(title.length > 0){ + elements.content.text(title); + elm.attr(options.attr, ''); + + var dimensions = { + top: elm.offset().top, + left: elm.offset().left, + width: elm.outerWidth(), + height: elm.outerHeight(), + actualWidth: elm.outerWidth(true), + actualHeight: elm.outerHeight(true), + arrow: { + width: elements.arrow.outerWidth() / 2, + height: elements.arrow.outerHeight() / 2 + } + }, + offsets = {}; + + // Determine the position. + switch(options.position.charAt(0)){ + case 'b': + elements.container.addClass('arrow-b'); + offsets = { + top: (dimensions.top + dimensions.height) + dimensions.arrow.height + options.offset, + left: dimensions.left + (dimensions.width / 2) - (elements.container.outerWidth() / 2) + }; + break; + case 't': + elements.container.addClass('arrow-t'); + offsets = { + top: (dimensions.top - elements.container.outerHeight(true)) - dimensions.arrow.height - options.offset, + left: dimensions.left + (dimensions.width / 2) - (elements.container.outerWidth() / 2) + }; + break; + case 'l': + elements.container.addClass('arrow-l'); + offsets = { + top: dimensions.top + (dimensions.height / 2) - (elements.container.outerHeight() / 2), + left: dimensions.left - elements.container.outerWidth(true) - dimensions.arrow.width - options.offset + }; + break; + case 'r': + elements.container.addClass('arrow-r'); + offsets = { + top: dimensions.top + (dimensions.height / 2) - (elements.container.outerHeight() / 2), + left: dimensions.left + dimensions.width + dimensions.arrow.width + options.offset + }; + break; + } + + if(options.position == 'topLeft' || options.position == 'bottomLeft') + { + offsets.left += (elements.container.outerWidth() / 2) - (dimensions.width / 2); + + elements.arrow.css('left', elements.arrow.outerWidth()); + } + else if(options.position == 'topRight' || options.position == 'bottomRight') + { + offsets.left = (dimensions.left + dimensions.width) - elements.container.outerWidth(); + + elements.arrow.css('left', elements.container.outerWidth() - elements.arrow.outerWidth()); + } + else if(options.position == 'rightTop' || options.position == 'leftTop') + { + offsets.top = dimensions.top; + elements.arrow.css('top', dimensions.height / 2); + } + + elements.container.css(offsets).show(); + } + }, + mouseout: function(){ + elements.container.hide(); + + $(this).attr(options.attr, title); + } + }); + + return this; + }; + + // Default Options + $.fn.tooltip.defaults = { + width: 300, + offset: 0, + live: false, + position: 'top', + attr: 'title' + }; +})(jQuery); \ No newline at end of file diff --git a/themes/basic/start.php b/themes/basic/start.php new file mode 100644 index 0000000..4acb76d --- /dev/null +++ b/themes/basic/start.php @@ -0,0 +1,27 @@ +add('theme', 'css/theme.css'); + +/* +|-------------------------------------------------------------------------- +| Theme Scripts +|-------------------------------------------------------------------------- +| +| Register the themes scripts. +| +*/ + +Asset::container('theme')->add('jquery', 'js/jquery.js') + ->add('jquery-ui', 'js/jquery-ui.js') + ->add('leaner', 'js/leaner.js') + ->add('tooltip', 'js/tooltip.js') + ->add('theme', 'js/theme.js'); \ No newline at end of file diff --git a/themes/basic/views/misc/authorization.blade.php b/themes/basic/views/misc/authorization.blade.php new file mode 100644 index 0000000..7532db1 --- /dev/null +++ b/themes/basic/views/misc/authorization.blade.php @@ -0,0 +1,7 @@ +{{ HTML::link('', '', array('class' => 'openid tooltip-ui', 'title' => 'OpenID')) }} + +{{ HTML::link('', '', array('class' => 'google tooltip-ui', 'title' => 'Google')) }} + +{{ HTML::link('', '', array('class' => 'facebook tooltip-ui', 'title' => 'Facebook')) }} + +{{ HTML::link('', '', array('class' => 'twitter tooltip-ui', 'title' => 'Twitter')) }} \ No newline at end of file diff --git a/themes/basic/views/template.blade.php b/themes/basic/views/template.blade.php new file mode 100644 index 0000000..3b093e2 --- /dev/null +++ b/themes/basic/views/template.blade.php @@ -0,0 +1,90 @@ + + + + + + + @event('view: before template.title') {{ $title }} – {{ $app->title }} + + + {{ Asset::container('theme')->styles() }} + + + + + + +
    + +
    + +
    + @if(Feather\Auth::online()) + @include('feather::menus.user') + @else + @include('feather::menus.guest') + @endif +
    + + + +
      +
    • + {{ HTML::link_to_route('feather', 'Discussions') }} +
      • +
    • + {{ HTML::link('activity', 'Recent Activity') }} +
      • +
    • + {{ HTML::link('members', 'Members') }} +
      • + + @if(Feather\Auth::activated()) +
    • + {{ HTML::link_to_new_discussion('Start A New Discussion') }} +
      • + @endif +
    + +
    + +
    +
      + {{ Feather\Breadcrumbs::trail() }} +
    + + @if($alert) +
    + {{ $alert->message }} +
    + @endif + +
    + {{ $content }} +
    +
    + +
    +

    Powered by {{ HTML::link('feather', 'Feather') }}

    + +
      +
    • + 3,457 + Registered Members +
      • +
    • + 2,702 + Discussions +
      • +
    +
    + +
    + + {{ Asset::container('theme')->scripts() }} + + + + \ No newline at end of file From 60309c69e029c29d17bad4f647278422519fb609 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:54:56 +0930 Subject: [PATCH 015/136] Allow components to be registered with Feather. Signed-off-by: Jason Lewis --- start.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/start.php b/start.php index e33634f..f361715 100644 --- a/start.php +++ b/start.php @@ -66,6 +66,24 @@ $feather['config']->db(); +/* +|-------------------------------------------------------------------------- +| Load Feather Components +|-------------------------------------------------------------------------- +| +| Load in the Feather components. +| +*/ + +foreach($feather['config']->get('feather: feather.components') as $component => $closure) +{ + if(is_callable($closure)) + { + $closure($feather); + } +} + + /* |-------------------------------------------------------------------------- | Load Feather Facades From 24baf468247462ffc9aa7066e3f0c88d3196a965 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:55:28 +0930 Subject: [PATCH 016/136] Removed old register method. Signed-off-by: Jason Lewis --- components/feather/application.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/components/feather/application.php b/components/feather/application.php index 320e653..89b6820 100644 --- a/components/feather/application.php +++ b/components/feather/application.php @@ -13,17 +13,6 @@ class Application implements ArrayAccess { */ private $container = array(); - /** - * Register a provider with the application. - * - * @param object $provider - * @return void - */ - public function register($provider) - { - $provider->register($this); - } - /** * Share a closure such that it is a singleton. * From 4bb59e7a7e5c8e9e228505a4d92376b1fc3be0f7 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 01:57:27 +0930 Subject: [PATCH 017/136] Initial commit of auth component. Signed-off-by: Jason Lewis --- components/auth/driver.php | 5 +++++ components/auth/protector.php | 10 ++++++++++ config/feather.php | 10 +++++++++- start/facades.php | 11 +++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 components/auth/driver.php create mode 100644 components/auth/protector.php diff --git a/components/auth/driver.php b/components/auth/driver.php new file mode 100644 index 0000000..b46831f --- /dev/null +++ b/components/auth/driver.php @@ -0,0 +1,5 @@ + array(), + 'components' => array( + 'auth' => function($feather) + { + $feather['auth'] = $feather->share(function($feather) + { + return new Feather\Components\Auth\Protector; + }); + } + ), /* |-------------------------------------------------------------------------- diff --git a/start/facades.php b/start/facades.php index 3054823..df4521b 100644 --- a/start/facades.php +++ b/start/facades.php @@ -9,4 +9,15 @@ class Config extends Components\Support\Facade { */ protected static function accessor(){ return 'config'; } +} + +class Auth extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'auth'; } + } \ No newline at end of file From 775c4f7e7cdf393257d0337f7cbeaa10eea23317 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 02:16:50 +0930 Subject: [PATCH 018/136] Cleanup of protecter class. Signed-off-by: Jason Lewis --- components/auth/protector.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/components/auth/protector.php b/components/auth/protector.php index e205370..46db9ba 100644 --- a/components/auth/protector.php +++ b/components/auth/protector.php @@ -2,9 +2,6 @@ class Protector { - public function something() - { - return 'rabbits'; - } + } \ No newline at end of file From 2f2bd4fb6caf88b4562055a9411244bff1cb9c63 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 02:17:04 +0930 Subject: [PATCH 019/136] Initial commut of gear component. Signed-off-by: Jason Lewis --- components/gear/manager.php | 7 +++++++ config/feather.php | 7 +++++++ start/facades.php | 11 +++++++++++ 3 files changed, 25 insertions(+) create mode 100644 components/gear/manager.php diff --git a/components/gear/manager.php b/components/gear/manager.php new file mode 100644 index 0000000..d74bf91 --- /dev/null +++ b/components/gear/manager.php @@ -0,0 +1,7 @@ + function($feather) + { + $feather['gear'] = $feather->share(function($feather) + { + return new Feather\Components\Gear\Manager; + }); } ), diff --git a/start/facades.php b/start/facades.php index df4521b..93e8278 100644 --- a/start/facades.php +++ b/start/facades.php @@ -20,4 +20,15 @@ class Auth extends Components\Support\Facade { */ protected static function accessor(){ return 'auth'; } +} + +class Gear extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'gear'; } + } \ No newline at end of file From 3708a17015df0e7b2bcec18bec1f29c257389f98 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 13:47:55 +0930 Subject: [PATCH 020/136] Removed start directory, autoloading is now in start.php Signed-off-by: Jason Lewis --- start/facades.php => facades.php | 0 start.php | 7 +++++-- start/autoloading.php | 16 ---------------- 3 files changed, 5 insertions(+), 18 deletions(-) rename start/facades.php => facades.php (100%) delete mode 100644 start/autoloading.php diff --git a/start/facades.php b/facades.php similarity index 100% rename from start/facades.php rename to facades.php diff --git a/start.php b/start.php index f361715..b07830e 100644 --- a/start.php +++ b/start.php @@ -2,6 +2,7 @@ use Bundle; use Request; +use Autoloader; /* |-------------------------------------------------------------------------- @@ -31,7 +32,9 @@ | */ -require path('feather') . 'start' . DS . 'autoloading' . EXT; +Autoloader::namespaces(array( + 'Feather' => path('feather') +)); /* |-------------------------------------------------------------------------- @@ -96,7 +99,7 @@ Components\Support\Facade::application($feather); -require path('feather') . 'start' . DS . 'facades' . EXT; +require path('feather') . 'facades' . EXT; /* |-------------------------------------------------------------------------- diff --git a/start/autoloading.php b/start/autoloading.php deleted file mode 100644 index 6f453f0..0000000 --- a/start/autoloading.php +++ /dev/null @@ -1,16 +0,0 @@ - path('feather') -)); \ No newline at end of file From 705df1b19ebbb1a27515ab485389f2bc884880c0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 13:49:01 +0930 Subject: [PATCH 021/136] Fixed a comment. Signed-off-by: Jason Lewis --- start.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.php b/start.php index b07830e..3462e43 100644 --- a/start.php +++ b/start.php @@ -28,7 +28,7 @@ | Core Autoloading |-------------------------------------------------------------------------- | -| Register the Feather namespaces and mappings Laravel's autoloader. +| Register the Feather namespaces and mappings with Laravel's autoloader. | */ From ce61b484fb6e94b78a89589e8243f68ee4de36c7 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 13:52:39 +0930 Subject: [PATCH 022/136] Fixed bug with old applications directory naming. Signed-off-by: Jason Lewis --- start.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start.php b/start.php index 3462e43..cd73c43 100644 --- a/start.php +++ b/start.php @@ -15,9 +15,9 @@ set_path('feather', __DIR__ . DS); -set_path('core', path('feather') . 'app' . DS . 'core' . DS); +set_path('core', path('feather') . 'applications' . DS . 'core' . DS); -set_path('admin', path('feather') . 'app' . DS . 'admin' . DS); +set_path('admin', path('feather') . 'applications' . DS . 'admin' . DS); set_path('gears', path('feather') . 'gears' . DS); From d4cfbcd8009bc9d1a0dac5295739378a3cac177c Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 14:36:43 +0930 Subject: [PATCH 023/136] Load Feather instance and register autoloaders in core start. Signed-off-by: Jason Lewis --- applications/core/start.php | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/applications/core/start.php b/applications/core/start.php index a814366..d4e6476 100644 --- a/applications/core/start.php +++ b/applications/core/start.php @@ -1 +1,27 @@ - path('core') . 'models' +)); \ No newline at end of file From ab034c130f7b30169c627de1747cb496da3964bb Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 14:36:57 +0930 Subject: [PATCH 024/136] Initial commit of core models. Signed-off-by: Jason Lewis --- applications/core/models/base.php | 39 +++++++++++++++++++++++++++++++ applications/core/models/gear.php | 19 +++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 applications/core/models/base.php create mode 100644 applications/core/models/gear.php diff --git a/applications/core/models/base.php b/applications/core/models/base.php new file mode 100644 index 0000000..903ac5c --- /dev/null +++ b/applications/core/models/base.php @@ -0,0 +1,39 @@ + Date: Sat, 22 Sep 2012 14:37:29 +0930 Subject: [PATCH 025/136] Allow the facade instance to be returned. Signed-off-by: Jason Lewis --- components/support/facade.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/components/support/facade.php b/components/support/facade.php index 0d800c5..3b982e9 100644 --- a/components/support/facade.php +++ b/components/support/facade.php @@ -12,13 +12,18 @@ abstract class Facade { protected static $feather; /** - * Set the application facade instance. + * Set or get the application facade instance. * * @param Feather\Components\Feather\Application $app - * @return void + * @return Feather\Components\Feather\Application */ - public static function application($app) + public static function application($app = null) { + if(is_null($app)) + { + return static::$feather; + } + static::$feather = $app; } From 70b5f116cccca4ca642b7497a7931b3fdfe04203 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 14:38:11 +0930 Subject: [PATCH 026/136] Gears can be registered and events can be registered. Signed-off-by: Jason Lewis --- components/gear/container.php | 73 +++++++++++++++++++ components/gear/foundation.php | 89 +++++++++++++++++++++++ components/gear/manager.php | 125 ++++++++++++++++++++++++++++++++- 3 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 components/gear/container.php create mode 100644 components/gear/foundation.php diff --git a/components/gear/container.php b/components/gear/container.php new file mode 100644 index 0000000..abb3ce8 --- /dev/null +++ b/components/gear/container.php @@ -0,0 +1,73 @@ +container[$key]); + } + + /** + * Get the value at a given offset. + * + * @param string $key + * @return mixed + */ + public function offsetGet($key) + { + if(!$this->offsetExists($key)) + { + throw new InvalidArgumentException("Identifier {$key} is not in the container."); + } + + return $this->container[$key]($this); + } + + /** + * Set the value at a given offset. + * + * @param string $key + * @param mixed $value + * @return void + */ + public function offsetSet($key, $value) + { + if(!$value instanceof Closure) + { + $value = function() use ($value) + { + return $value; + }; + } + + $this->container[$key] = $value; + } + + /** + * Unset a given offset. + * + * @param string $key + * @return void + */ + public function offsetUnset($key) + { + unset($this->container[$key]); + } + +} \ No newline at end of file diff --git a/components/gear/foundation.php b/components/gear/foundation.php new file mode 100644 index 0000000..2abb1ac --- /dev/null +++ b/components/gear/foundation.php @@ -0,0 +1,89 @@ +event('listen', $event, $handler); + } + + /** + * Overrides existing events listening for an event and fire + * a method or closure handler. + * + * @param string $event + * @param string|Closure $handler + * @return void + */ + public function override($event, $handler) + { + $this->event('override', $event, $handler); + } + + /** + * Binds different types of events. + * + * @param string $type + * @param string $event + * @param string|Closure $handler + * @return void + */ + private function event($type, $event, $handler) + { + $gear = $this; + + Event::$type($event, function($parameters = array()) use ($gear, $handler) + { + // If the handler is a callable closure then we'll execute the closure + // and return its result. + if(is_callable($handler)) + { + return $handler($parameters); + } + + // If the handler is a method that exists on the gear object then execute + // the method and return its result. + elseif(method_exists($gear, $handler)) + { + return call_user_func_array(array($gear, $handler), $parameters); + } + + // By default we'll return null, as the event manager will expect a non + // null result. + return null; + }); + + Event::fire('event'); + } + + /** + * Executed when a gear is enabled. + * + * @return void + */ + public function enabled(){} + + /** + * Executed when a gear is disabled. + * + * @return void + */ + public function disabled(){} + + /** + * Executed when a gear is removed. + * + * @return void + */ + public function remove(){} + +} \ No newline at end of file diff --git a/components/gear/manager.php b/components/gear/manager.php index d74bf91..8ff5994 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -1,7 +1,130 @@ location)) + { + $this->gears[$gear->identifier] = $gear; + + // Start any gears that have been set to automatically start. + if($gear->auto) + { + return $this->start($gear->identifier); + } + } + + return true; + } + + /** + * Determines if a Gear has been registered. + * + * @param string $gear + * @return bool + */ + public function registered($gear) + { + return isset($this->gears[$gear]); + } + + /** + * Start a registered Gear. + * + * @param string $gear + * @return bool + */ + public function start($gear) + { + if($this->started($gear)) + { + return $this->started[$gear]; + } + elseif(!$this->registered($gear)) + { + return false; + } + + $this->started[$gear] = new Container; + + // Spin through all the files within the gears directory and those that have + // the .gear.php suffix we'll require and hopefully be able to instantiate + // a new object. + foreach(new FilesystemIterator(path('gears') . $this->gears[$gear]->location) as $file) + { + if(ends_with($file->getFilename(), '.gear.php')) + { + require $file->getPathname(); + + $name = str_replace('.gear.php', null, $file->getFilename()); + + $class = "\\Feather\\Gear\\{$this->gears[$gear]->identifier}\\{$name}"; + + if(class_exists($class)) + { + $this->started[$gear][$name] = new $class; + } + } + } + + return $this->started[$gear]; + } + + /** + * Determines if a Gear has been started. + * + * @param string $gear + * @return bool + */ + public function started($gear) + { + return isset($this->started[$gear]); + } + + /** + * Gets a Gears container. + * + * @param string $gear + * @return object + */ + public function get($gear) + { + if(!$this->started($gear) or !$this->registered($gear)) + { + return false; + } + + return $this->started[$gear]; + } } \ No newline at end of file From 329016eeae412a7941eeeeefc7233cc2cc950df6 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:43:34 +0930 Subject: [PATCH 027/136] Fixed bug with manager. Signed-off-by: Jason Lewis --- components/gear/manager.php | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/components/gear/manager.php b/components/gear/manager.php index 8ff5994..9a79ba7 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -11,14 +11,14 @@ class Manager { * * @var array */ - protected $gears = array(); + public $gears = array(); /** * Started Gears. * * @var array */ - protected $started = array(); + public $started = array(); /** * Register a Gear with the manager. @@ -31,9 +31,18 @@ public function register(Gear $gear) if(!$gear instanceof Gear) { throw new InvalidArgumentException('Supplied Gear is a not supported type.'); - } + } + + if(starts_with($gear->location, 'path: ')) + { + $path = substr($gear->location, 6); + } + else + { + $path = path('gears') . $gear->location; + } - if(file_exists($path = path('gears') . $gear->location)) + if(file_exists($path)) { $this->gears[$gear->identifier] = $gear; @@ -80,7 +89,16 @@ public function start($gear) // Spin through all the files within the gears directory and those that have // the .gear.php suffix we'll require and hopefully be able to instantiate // a new object. - foreach(new FilesystemIterator(path('gears') . $this->gears[$gear]->location) as $file) + if(starts_with($this->gears[$gear]->location, 'path: ')) + { + $path = substr($this->gears[$gear]->location, 6); + } + else + { + $path = path('gears') . $this->gears[$gear]->location; + } + + foreach(new FilesystemIterator($path) as $file) { if(ends_with($file->getFilename(), '.gear.php')) { From adf3b7a41155daa8a2091493f8acd74fb463655e Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:43:50 +0930 Subject: [PATCH 028/136] Allow mockery to be autoloaded when executed via CLI. Signed-off-by: Jason Lewis --- start.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/start.php b/start.php index cd73c43..9cb3ade 100644 --- a/start.php +++ b/start.php @@ -122,4 +122,24 @@ )); starts_with(Request::uri(), $handles) and Bundle::start("feather/{$application}"); +} + +/* +|-------------------------------------------------------------------------- +| Feather CLI +|-------------------------------------------------------------------------- +| +| When Feather is running via the CLI we'll automatically load in Mockery +| for testing purposes only. +| +*/ + +if(Request::cli()) +{ + require 'Mockery/Loader.php'; + require 'Hamcrest/Hamcrest.php'; + + with(new \Mockery\Loader)->register(); + + var_dump('here'); } \ No newline at end of file From 2d4c6501baeea6e41ab6153585529f31f207c3e8 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:44:08 +0930 Subject: [PATCH 029/136] Refactoring config tests. Signed-off-by: Jason Lewis --- tests/config.test.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/config.test.php b/tests/config.test.php index 9899485..043bbea 100644 --- a/tests/config.test.php +++ b/tests/config.test.php @@ -2,11 +2,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { - public function setUp() - { - Bundle::start('feather'); - } - public function testItemsCanBeSet() { $config = $this->getRepository(); From 2cb9184134c0dda1429d9782d773ec00eadad854 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:44:18 +0930 Subject: [PATCH 030/136] Refactoring facade tests. Signed-off-by: Jason Lewis --- tests/facade.test.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/facade.test.php b/tests/facade.test.php index 150db8f..37f799c 100644 --- a/tests/facade.test.php +++ b/tests/facade.test.php @@ -6,24 +6,29 @@ class FacadeTest extends PHPUnit_Framework_TestCase { public function testFacadeCallsApplication() { - FacadeStub::application(array('foo' => new ApplicationStub)); + FacadeStub::application(array('stub' => new ApplicationStub)); - $this->assertEquals('apple', FacadeStub::bar()); + $this->assertEquals('dog', FacadeStub::cat()); } } class FacadeStub extends Feather\Components\Support\Facade { - protected static function accessor(){ return 'foo'; } + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'stub'; } } class ApplicationStub { - public function bar() + public static function cat() { - return 'apple'; + return 'dog'; } } \ No newline at end of file From 01c340329f3217f65255fa04813f4ad46143c9c0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:44:25 +0930 Subject: [PATCH 031/136] Initial commit of gear tests. Signed-off-by: Jason Lewis --- tests/gear.test.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests/gear.test.php diff --git a/tests/gear.test.php b/tests/gear.test.php new file mode 100644 index 0000000..0013cf2 --- /dev/null +++ b/tests/gear.test.php @@ -0,0 +1,37 @@ + 'stub', + 'location' => 'path: ' . __DIR__ . DS . 'mock', + 'auto' => false + )); + + $manager = new Feather\Components\Gear\Manager; + + $manager->register($gear); + + $this->assertTrue($manager->registered('stub')); + } + + public function testCanStartGear() + { + $gear = new Feather\Models\Gear(array( + 'identifier' => 'stub', + 'location' => 'path: ' . __DIR__ . DS . 'mock', + 'auto' => false + )); + + $manager = new Feather\Components\Gear\Manager; + + $manager->register($gear); + + $this->assertTrue($manager->start('stub') instanceof Feather\Components\Gear\Container); + } + + + +} \ No newline at end of file From 53f563d0d1772861de1b2aa341c058968b8596a1 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:45:04 +0930 Subject: [PATCH 032/136] Removed some debugging things. Signed-off-by: Jason Lewis --- start.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/start.php b/start.php index 9cb3ade..3b5781f 100644 --- a/start.php +++ b/start.php @@ -140,6 +140,4 @@ require 'Hamcrest/Hamcrest.php'; with(new \Mockery\Loader)->register(); - - var_dump('here'); } \ No newline at end of file From 191041c9bad0b51b73868cb253a9e7a03825416c Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 18:53:42 +0930 Subject: [PATCH 033/136] Added mock directory and mock gear. Signed-off-by: Jason Lewis --- tests/mock/mock.gear.php | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/mock/mock.gear.php diff --git a/tests/mock/mock.gear.php b/tests/mock/mock.gear.php new file mode 100644 index 0000000..b6c4ca1 --- /dev/null +++ b/tests/mock/mock.gear.php @@ -0,0 +1,3 @@ + Date: Sat, 22 Sep 2012 18:53:56 +0930 Subject: [PATCH 034/136] More refined testing for gear starting and registering. Signed-off-by: Jason Lewis --- tests/gear.test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/gear.test.php b/tests/gear.test.php index 0013cf2..276a4c2 100644 --- a/tests/gear.test.php +++ b/tests/gear.test.php @@ -29,9 +29,9 @@ public function testCanStartGear() $manager->register($gear); - $this->assertTrue($manager->start('stub') instanceof Feather\Components\Gear\Container); + $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $manager->start('stub')); + $this->assertTrue($manager->started('stub')); + $this->assertInstanceOf('Feather\\Gear\\Stub\\Mock', $gear['mock']); } - - } \ No newline at end of file From 442bb58eaa349df081b548c47b74c8e82a4c4d15 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 19:04:24 +0930 Subject: [PATCH 035/136] Initial commit of skeleton gear, just an example. Signed-off-by: Jason Lewis --- gears/skeleton/bone.gear.php | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 gears/skeleton/bone.gear.php diff --git a/gears/skeleton/bone.gear.php b/gears/skeleton/bone.gear.php new file mode 100644 index 0000000..15b1a9d --- /dev/null +++ b/gears/skeleton/bone.gear.php @@ -0,0 +1,38 @@ +listen('event', function() + { + // Depending on the event you may be required to return a value or null. + }); + + // Listen for an event and execute a method on the class. + $this->listen('event', 'method'); + + // Override existing events that are listening for the same event. + $this->override('event', 'method'); + } + + /** + * This method will be executed when the event is fired by Feather. + * + * @return void + */ + public function method(){} + +} \ No newline at end of file From 01fca694a8c7b17b5d784a054ed01a4faaa19b4b Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 19:42:01 +0930 Subject: [PATCH 036/136] Fixed some issues with gears and allow gears to be disabled. Signed-off-by: Jason Lewis --- components/gear/manager.php | 41 ++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/components/gear/manager.php b/components/gear/manager.php index 9a79ba7..47e666d 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -1,5 +1,6 @@ getFilename(), '.gear.php')) { - require $file->getPathname(); + require_once $file->getPathname(); $name = str_replace('.gear.php', null, $file->getFilename()); @@ -129,6 +130,20 @@ public function started($gear) return isset($this->started[$gear]); } + /** + * Disable a gear for this run only. + * + * @param string $gear + * @return void + */ + public function disable($gear) + { + if($this->registered($gear)) + { + unset($this->gears[$gear]); + } + } + /** * Gets a Gears container. * @@ -145,4 +160,28 @@ public function get($gear) return $this->started[$gear]; } + /** + * Fire an event and implodes the returned results. + * + * @param string $event + * @param array $parameters + * @return string + */ + public function fire($event, $parameters = array()) + { + return implode(PHP_EOL, array_filter(Event::fire($event, array($parameters)))); + } + + /** + * Fire the first event in the queue. + * + * @param string $event + * @param array $parameters + * @return string + */ + public function first($event, $parameters = array()) + { + return Event::first($event, $parameters); + } + } \ No newline at end of file From 3f427698f5b66d29e880545c220270e92a8d5818 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 19:42:14 +0930 Subject: [PATCH 037/136] More work on the gear tests. Signed-off-by: Jason Lewis --- tests/gear.test.php | 44 ++++++++++++++++++++++++++-------------- tests/mock/mock.gear.php | 21 ++++++++++++++++++- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/tests/gear.test.php b/tests/gear.test.php index 276a4c2..7c808d8 100644 --- a/tests/gear.test.php +++ b/tests/gear.test.php @@ -2,36 +2,50 @@ class GearTest extends PHPUnit_Framework_TestCase { - public function testCanRegisterGear() + public $gear; + + public $manager; + + public function setUp() { - $gear = new Feather\Models\Gear(array( + $this->gear = new Feather\Models\Gear(array( 'identifier' => 'stub', 'location' => 'path: ' . __DIR__ . DS . 'mock', 'auto' => false )); - $manager = new Feather\Components\Gear\Manager; + $this->manager = new Feather\Components\Gear\Manager; - $manager->register($gear); + $this->manager->register($this->gear); - $this->assertTrue($manager->registered('stub')); + $this->manager->start('stub'); + } + + public function testCanRegisterGear() + { + $this->assertTrue($this->manager->registered('stub')); } public function testCanStartGear() { - $gear = new Feather\Models\Gear(array( - 'identifier' => 'stub', - 'location' => 'path: ' . __DIR__ . DS . 'mock', - 'auto' => false - )); + $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $this->manager->start('stub')); + $this->assertTrue($this->manager->started('stub')); + $this->assertInstanceOf('Feather\\Gear\\Stub\\Mock', $gear['mock']); + } - $manager = new Feather\Components\Gear\Manager; + public function testCanDisableGear() + { + $this->assertTrue($this->manager->registered('stub')); - $manager->register($gear); + $this->manager->disable('stub'); - $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $manager->start('stub')); - $this->assertTrue($manager->started('stub')); - $this->assertInstanceOf('Feather\\Gear\\Stub\\Mock', $gear['mock']); + $this->assertTrue(!$this->manager->registered('stub')); + } + + public function testGearEventsFire() + { + $this->assertEquals('cat', Feather\Components\Gear\Manager::first('mock.callable')); + $this->assertEquals('dog', Feather\Components\Gear\Manager::first('mock.method')); } } \ No newline at end of file diff --git a/tests/mock/mock.gear.php b/tests/mock/mock.gear.php index b6c4ca1..68b570d 100644 --- a/tests/mock/mock.gear.php +++ b/tests/mock/mock.gear.php @@ -1,3 +1,22 @@ listen('mock.callable', function() + { + return 'cat'; + }); + + $this->listen('mock.method', 'cat'); + } + + public function cat() + { + return 'dog'; + } + +} \ No newline at end of file From fd783d73dffcb35eb896d4d564b9494cb727356e Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 20:06:58 +0930 Subject: [PATCH 038/136] Renamed the feather component to foundation. Signed-off-by: Jason Lewis --- .../{feather => foundation}/application.php | 2 +- components/foundation/component.php | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) rename components/{feather => foundation}/application.php (97%) create mode 100644 components/foundation/component.php diff --git a/components/feather/application.php b/components/foundation/application.php similarity index 97% rename from components/feather/application.php rename to components/foundation/application.php index 89b6820..54e7e8a 100644 --- a/components/feather/application.php +++ b/components/foundation/application.php @@ -1,4 +1,4 @@ -feather = $feather; + } + +} \ No newline at end of file From 50da35d722c4b1bafb59f1c8177d869e87668900 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 20:07:27 +0930 Subject: [PATCH 039/136] Components now extend the base component class. Signed-off-by: Jason Lewis --- components/auth/protector.php | 17 +++++++++++++++-- components/config/repository.php | 8 ++++++-- components/gear/manager.php | 3 ++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/components/auth/protector.php b/components/auth/protector.php index 46db9ba..6b3567c 100644 --- a/components/auth/protector.php +++ b/components/auth/protector.php @@ -1,7 +1,20 @@ feather['config']->get('feather: db.auth.driver'); + + dd($authenticator); + } } \ No newline at end of file diff --git a/components/config/repository.php b/components/config/repository.php index c24fbab..10d88fb 100644 --- a/components/config/repository.php +++ b/components/config/repository.php @@ -5,8 +5,9 @@ use Cache; use Event; use Config; +use Feather\Components\Foundation; -class Repository { +class Repository extends Foundation\Component { /** * Dirty configuration items. @@ -19,10 +20,13 @@ class Repository { * Bootstrap the config repository, override the Laravel event for configuration * file loading so that Gear and Theme items can be picked up. * + * @param Feather\Components\Foundation\Application * @return void */ - public function __construct() + public function __construct(Foundation\Application $feather) { + parent::__construct($feather); + Event::override(Config::loader, function($bundle, $file) { if(str_contains($file, ':')) diff --git a/components/gear/manager.php b/components/gear/manager.php index 47e666d..cee4ee2 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -4,8 +4,9 @@ use FilesystemIterator; use Feather\Models\Gear; use InvalidArgumentException; +use Feather\Components\Foundation\Component; -class Manager { +class Manager extends Component { /** * Registered Gears. From b52bdb630d0243c80d48cae6262de41f230cf06b Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 20:07:52 +0930 Subject: [PATCH 040/136] Pass in the feather instance to each component. Signed-off-by: Jason Lewis --- config/feather.php | 4 ++-- start.php | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/config/feather.php b/config/feather.php index b0814ae..062902d 100644 --- a/config/feather.php +++ b/config/feather.php @@ -47,14 +47,14 @@ { $feather['auth'] = $feather->share(function($feather) { - return new Feather\Components\Auth\Protector; + return new Feather\Components\Auth\Protector($feather); }); }, 'gear' => function($feather) { $feather['gear'] = $feather->share(function($feather) { - return new Feather\Components\Gear\Manager; + return new Feather\Components\Gear\Manager($feather); }); } ), diff --git a/start.php b/start.php index 3b5781f..80eaee4 100644 --- a/start.php +++ b/start.php @@ -45,7 +45,7 @@ | */ -$feather = new Components\Feather\Application; +$feather = new Components\Foundation\Application; /* |-------------------------------------------------------------------------- @@ -58,9 +58,9 @@ | */ -$feather['config'] = $feather->share(function() +$feather['config'] = $feather->share(function($feather) { - return new Components\Config\Repository; + return new Components\Config\Repository($feather); }); define('FEATHER_DATABASE', 'feather'); @@ -124,6 +124,17 @@ starts_with(Request::uri(), $handles) and Bundle::start("feather/{$application}"); } +/* +|-------------------------------------------------------------------------- +| Feather Authentication +|-------------------------------------------------------------------------- +| +| Boostrap the authentication component. +| +*/ + +$feather['auth']->bootstrap(); + /* |-------------------------------------------------------------------------- | Feather CLI From 69d0e757719c62b66baef903412ccd1eec957a19 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 21:49:52 +0930 Subject: [PATCH 041/136] Renamed the protector class to authorizer. Signed-off-by: Jason Lewis --- components/auth/authorizer.php | 208 +++++++++++++++++++++++++++++++++ components/auth/protector.php | 20 ---- 2 files changed, 208 insertions(+), 20 deletions(-) create mode 100644 components/auth/authorizer.php delete mode 100644 components/auth/protector.php diff --git a/components/auth/authorizer.php b/components/auth/authorizer.php new file mode 100644 index 0000000..ac61fbe --- /dev/null +++ b/components/auth/authorizer.php @@ -0,0 +1,208 @@ +feather['config']->set('laravel: auth.driver', 'feather'); + + $authenticator = $this->feather['config']->get('feather: db.auth.driver'); + + if(!$this->online() and ($response = $this->feather['gear']->first("auth: bootstrap {$authenticator}"))) + { + Route::filter('feather::before', function() use ($response) + { + return $response; + }); + } + + $this->feather['gear']->fire('auth: started'); + } + + /** + * Access control prevents users without specific permissions from accessing certain parts + * of Feather. Actions can have rules defined in the configuration file. This method will + * check a user to see if they have the correct permissions to perform the given action. + * + * @param string $action + * @param object $resource + * @return bool + */ + public function can($action, $resource) + { + if(!str_contains($action, ': ')) + { + throw new InvalidArgumentException("Invalid action [{$action}] supplied to ACL."); + } + + list($verb, $action) = explode(': ', $action); + + // To make things look lovely when writing actions we'll replace any spaces with underscores + // as that's how role permissions are stored in the database. + $action = str_replace(' ', '_', $action); + + foreach($this->user()->roles as $role) + { + if($role->{"{$verb}_{$action}"}) + { + // If we have a valid resource then we'll need to see if we have a rule in the configuration + // for this action. If there is no rule then there is further checking that needs to be done + // on the resource. + if(!is_null($resource)) + { + if($this->feather['config']->has("feather: auth.rules.{$verb}.{$action}")) + { + $callback = $this->feather['config']->get("feather: auth.rules.{$verb}.{$action}"); + + return $callback($resource); + } + + continue; + } + + // If there was no valid resource then the action was simply a role based action. We + // can return true here because the user has the correct permissions for this action. + return true; + } + } + + // Sorry chum, but you can't do that! + return false; + } + + /** + * The complete opposite of above, determines if a user is not able to perform an action. + * + * @param string $action + * @param object $resource + * @return bool + */ + public function cannot($action, $resource) + { + return !$this->can($action, $resource); + } + + /** + * Determines if a user is a given role or roles. + * + * @param array $roles + * @return bool + */ + public function is($roles) + { + // If the role has an aliased name then make sure we grab the correct name of + // the role from the aliases array. + $aliases = $this->feather['config']->get('feather: auth.aliases'); + + foreach((array) $roles as $key => $role) + { + if(array_key_exists(strtolower($role), $aliases)) + { + $roles[$key] = $aliases[strtolower($role)]; + } + } + + foreach($this->user()->roles as $role) + { + if(in_array(strtolower($role->name), (array) $roles)) + { + return true; + } + + // Because some roles can be granted a super moderator permission, if we + // are checking that a user is a moderator we'll also check that the role + // is a super moderator. + if(in_array('moderator', $roles) and $role->super_moderator) + { + return true; + } + } + + return false; + } + + /** + * Determines if a user is not a given role or roles. + * + * @param array $roles + * @return bool + */ + public function not($roles) + { + return !$this->is($roles); + } + + /** + * Determines if a user is online. + * + * @return bool + */ + public function online() + { + return !$this->is('guest'); + } + + /** + * Determines if a user is offline. + * + * @return bool + */ + public function offline() + { + return !$this->online(); + } + + /** + * Determines if a user has activated their account. + * + * @return bool + */ + public function activated() + { + return (bool) $this->user()->activated; + } + + /** + * Logs a user out and flushes the session. + * + * @return void + */ + public function logout() + { + Session::flush(); + + Auth::logout(); + } + + /** + * Route methods that are uncallable through to Laravel's Auth class. This provids a clean + * interface for accessing methods on that class. + * + * @param string $method + * @param array $parameters + * @return mixed + */ + public function __call($method, $parameters) + { + return call_user_func_array(array('Auth', $method), $parameters); + } + +} \ No newline at end of file diff --git a/components/auth/protector.php b/components/auth/protector.php deleted file mode 100644 index 6b3567c..0000000 --- a/components/auth/protector.php +++ /dev/null @@ -1,20 +0,0 @@ -feather['config']->get('feather: db.auth.driver'); - - dd($authenticator); - } - -} \ No newline at end of file From 4ad159583369b0b68c7aeafcf11a91437698b216 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 21:50:05 +0930 Subject: [PATCH 042/136] Initial commit of auth config. Signed-off-by: Jason Lewis --- config/auth.php | 174 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 config/auth.php diff --git a/config/auth.php b/config/auth.php new file mode 100644 index 0000000..186a23b --- /dev/null +++ b/config/auth.php @@ -0,0 +1,174 @@ + array( + 'admin' => 'administrator' + ), + + /* + |-------------------------------------------------------------------------- + | Action Rules + |-------------------------------------------------------------------------- + | + | Auth uses action rules when checking a user has permission to perform + | a given action. + | + | For example, a user may delete users but may not delete themselves. To + | do this we create a rule for that verb and action. + | + | Rules a placed within the verb for an action. The verbs are: 'access', + | 'use', 'start', 'edit', 'delete', 'approve', and 'moderate'. + | + */ + + 'rules' => array( + + /* + |-------------------------------------------------------------------------- + | Delete Verb + |-------------------------------------------------------------------------- + */ + + 'delete' => array( + + /* + |-------------------------------------------------------------------------- + | Deleting Users + |-------------------------------------------------------------------------- + | + | Users that can delete other users are not able to delete themselves. + | + */ + + 'users' => function($deleting) + { + return ($deleting->id != Feather\Auth::user()->id); + } + ), + + /* + |-------------------------------------------------------------------------- + | Edit Verb + |-------------------------------------------------------------------------- + */ + + 'edit' => array( + + /* + |-------------------------------------------------------------------------- + | Editing Discussion + |-------------------------------------------------------------------------- + | + | Users can edit their own discussions, unless they are Administrator or + | Moderator, they can edit all. + | + */ + + 'discussion' => function($discussion) + { + $user = Feather\Auth::user(); + + if(Feather\Auth::is('admin')) + { + return true; + } + elseif(Feather\Auth::is('moderator')) + { + return true; + } + + // The easy checks have been done, now to see if the user is a place specific + // moderator on the discussions place. + if($discussion->place->moderators) + { + foreach($discussion->place->moderators as $moderator) + { + if($user->id == $moderator->user_id) + { + return true; + } + } + } + + // Lastly if this discussion belongs to this user and they have permission to + // edit their own discussions we'll allow them to edit this discussion. + if($user->id == $discussion->user_id and Feather\Auth::can('edit: own discussions')) + { + return true; + } + + return false; + } + + ), + + /* + |-------------------------------------------------------------------------- + | View Verb + |-------------------------------------------------------------------------- + */ + + 'view' => array( + + /* + |-------------------------------------------------------------------------- + | Viewing Discussion + |-------------------------------------------------------------------------- + | + | Users can view all discussions unless it is either private or a draft. + | + */ + + 'discussion' => function($discussion) + { + $user = Feather\Auth::user(); + + // Private discussions can only be viewed by participants, the original + // poster, and administrators/moderators. + if($discussion->private) + { + if($discussion->user_id == $user->id or Feather\Auth::is(array('admin', 'moderator'))) + { + return true; + } + + foreach($discussion->participants as $participant) + { + if(Feather\Auth::online() and $participant->user_id == $user->id) + { + return true; + } + } + + return false; + } + + // Draft discussions can only be viewed by the original author and + // administrators/moderators. + elseif($discussion->draft) + { + if($discussion->user_id == $user->id or Feather\Auth::is(array('admin', 'moderator'))) + { + return true; + } + + return false; + } + + return true; + } + + ) + ) + +); \ No newline at end of file From 3bfdce4984bf510942bbcc43d0e86087e55522c0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 21:50:28 +0930 Subject: [PATCH 043/136] Initial commit of the auth dispatcher. Signed-off-by: Jason Lewis --- components/auth/dispatcher.php | 7 +++++++ config/feather.php | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 components/auth/dispatcher.php diff --git a/components/auth/dispatcher.php b/components/auth/dispatcher.php new file mode 100644 index 0000000..485de48 --- /dev/null +++ b/components/auth/dispatcher.php @@ -0,0 +1,7 @@ +share(function($feather) { - return new Feather\Components\Auth\Protector($feather); + return new Feather\Components\Auth\Authorizer($feather); + }); + }, + 'sso' => function($feather) + { + $feather['sso'] = $feather->share(function($feather) + { + return new Feather\Components\Auth\Dispactcher($feather); }); }, 'gear' => function($feather) From c2e10d983a3b56a5d47f2088c6a72eecf7eb97b3 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 21:50:44 +0930 Subject: [PATCH 044/136] Initial commit of role and user models. Signed-off-by: Jason Lewis --- applications/core/models/role.php | 12 ++++++++++++ applications/core/models/user.php | 29 +++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 applications/core/models/role.php create mode 100644 applications/core/models/user.php diff --git a/applications/core/models/role.php b/applications/core/models/role.php new file mode 100644 index 0000000..e369d76 --- /dev/null +++ b/applications/core/models/role.php @@ -0,0 +1,12 @@ +has_many_and_belongs_to('Feather\\Models\\Role', 'user_roles', 'user_id', 'role_id'); + } + +} \ No newline at end of file From 1b0b567c5732651bd33f747b0cf8d131355e02c9 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 22:20:33 +0930 Subject: [PATCH 045/136] Polishing off the auth driver. Signed-off-by: Jason Lewis --- components/auth/driver.php | 116 +++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/components/auth/driver.php b/components/auth/driver.php index b46831f..96f21c9 100644 --- a/components/auth/driver.php +++ b/components/auth/driver.php @@ -1,5 +1,121 @@ find($id); + + // To provide a cleaner syntax when accessing roles, we'll make each of the roles keys + // the same as its ID. + $roles = array(); + + foreach($user->roles as $role) $roles[$role->id] = $role; + + $user->relationships['roles'] = $roles; + + return $user; + }, Models\User::cache_time); + } + else + { + return Cache::remember('guest', function() + { + return new Models\User(array( + 'roles' => array(3 => Models\Role::find(3)) + ), true); + }, Models\User::cache_time); + } + } + + /** + * Attempt to log a user in and if need be migrate them from an older system. + * + * @param array $credentials + * @return bool|object + */ + public function attempt($credentials = array()) + { + // Find the user in the database with the username they have provided in the + // login form. If no user can be found then that's as far as we go. + if(!$user = Models\User::where_username($credentials['username'])->first()) + { + return false; + } + + // If there is an active migration from another forum we'll need to perform + // a couple of extra checks. A migrating user has only a single role, which + // is the migrating roll. If the user has not been migrated then we'll + // attempt to migrate them. + if($migration = Models\Migration::active()) + { + $driver = Migrator\Drivers\Driver::make($migration); + + if($user->roles()->only('roles.id') == 6 and ($old = $driver->login($credentials))) + { + // Because the users password is most likely hashed - it damn + // well better be - we'll replace the password key in the array + // with the password they logged in with. That way Feather can + // re-hash it when storing it. + $old = (object) array_merge((array) $old, array('password' => $credentials['password'])); + + // Finally attempt to migrate the user. If the migration fails it's + // logged so that the administrator can take further action if + // required. + if(!$user = $driver->migrate_user($old, $user)) + { + dd('Failed to migrate user.'); + + return false; + } + } + else + { + return false; + } + } + else + { + // For a user that doesn't need to be migrated a simple hash check is in order. + if(!Hash::check($credentials['password'], $user->password)) + { + return false; + } + } + + return $this->login($user, array_get($credentials, 'remember')); + } + + /** + * Log a user in to Feather. + * + * @param int|Feather\Models\User $user + * @param bool $remember + * @return bool + */ + public function login($user, $remember = false) + { + if($user instanceof Models\User) + { + $user = $user->id; + } + + return parent::login($user, $remember); + } + } \ No newline at end of file From f7200e991efa4602d47774300b5b5c835be0f893 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 22:21:13 +0930 Subject: [PATCH 046/136] Initial commit of the auth dispatcher. Signed-off-by: Jason Lewis --- components/auth/dispatcher.php | 2 +- facades.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/components/auth/dispatcher.php b/components/auth/dispatcher.php index 485de48..695869b 100644 --- a/components/auth/dispatcher.php +++ b/components/auth/dispatcher.php @@ -2,6 +2,6 @@ use Feather\Components\Foundation\Component; -class Authorizer extends Component { +class Dispatcher extends Component { } \ No newline at end of file diff --git a/facades.php b/facades.php index 93e8278..966bc7c 100644 --- a/facades.php +++ b/facades.php @@ -22,6 +22,17 @@ protected static function accessor(){ return 'auth'; } } +class SSO extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'sso'; } + +} + class Gear extends Components\Support\Facade { /** From f44d2f4a9bd96ba05b3b1a9fd89528f83ab94b54 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 22:21:34 +0930 Subject: [PATCH 047/136] Initial commit of the migrations for authentication. Signed-off-by: Jason Lewis --- applications/core/models/migration.php | 22 +++++++ components/auth/migrator/drivers/driver.php | 72 +++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 applications/core/models/migration.php create mode 100644 components/auth/migrator/drivers/driver.php diff --git a/applications/core/models/migration.php b/applications/core/models/migration.php new file mode 100644 index 0000000..0bc0e1b --- /dev/null +++ b/applications/core/models/migration.php @@ -0,0 +1,22 @@ +first(); + } + +} \ No newline at end of file diff --git a/components/auth/migrator/drivers/driver.php b/components/auth/migrator/drivers/driver.php new file mode 100644 index 0000000..c5a970a --- /dev/null +++ b/components/auth/migrator/drivers/driver.php @@ -0,0 +1,72 @@ +database)) + { + $feather['config']->set('laravel: database.connections.feather:migration', array( + 'driver' => 'mysql', + 'host' => $migration->host, + 'database' => $migration->database, + 'username' => $migration->username, + 'password' => $migration->password, + 'charset' => 'utf8', + 'prefix' => '' + )); + + $connection = DB::connection('feather:migration'); + } + + if(isset(static::$extenders[$migration->driver])) + { + $resolver = static::$extenders[$migration->driver]; + + return static::$driver = $resolver($connection, $feather); + } + + switch($migration->driver) + { + case 'flux': + return static::$driver = new Flux($connection, $feather); + break; + } + } + + /** + * Register a custom migration driver. + * + * @param string $driver + * @param Closure $resolver + * @return void + */ + public static function extend($driver, $resolver) + { + static::$extenders[$driver] = $resolver; + } + +} \ No newline at end of file From b2b725f49fce68b3e80d592dc6909b8f8658c8e8 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 22:27:22 +0930 Subject: [PATCH 048/136] Added a FluxBB migration driver. Signed-off-by: Jason Lewis --- components/auth/migrator/drivers/driver.php | 46 +++++++++++++++++++++ components/auth/migrator/drivers/flux.php | 23 +++++++++++ 2 files changed, 69 insertions(+) create mode 100644 components/auth/migrator/drivers/flux.php diff --git a/components/auth/migrator/drivers/driver.php b/components/auth/migrator/drivers/driver.php index c5a970a..a3fea87 100644 --- a/components/auth/migrator/drivers/driver.php +++ b/components/auth/migrator/drivers/driver.php @@ -16,6 +16,34 @@ abstract class Driver { */ public static $extenders = array(); + /** + * The drivers database connection. + * + * @var Laravel\Database\Connection + */ + protected $connection; + + /** + * The feather instance. + * + * @var Feather\Components\Foundation\Application + */ + protected $feather; + + /** + * Creates a new migration driver instance. + * + * @param Laravel\Database\Connection $connection + * @param Feather\Components\Foundation\Application $feather + * @return void + */ + public function __construct(\Laravel\Database\Connection $connection, \Feather\Components\Foundation\Application $feather) + { + $this->connection = $connection; + + $this->feather = $feather; + } + /** * Loads a migration driver. * @@ -69,4 +97,22 @@ public static function extend($driver, $resolver) static::$extenders[$driver] = $resolver; } + /** + * Return the database connection for method chaining. + * + * @return Laravel\Database\Connection + */ + public function db() + { + return $this->connection; + } + + /** + * Attempt to log a user in on the system. + * + * @param array $credentials + * @return bool|object + */ + abstract public function login($credentials); + } \ No newline at end of file diff --git a/components/auth/migrator/drivers/flux.php b/components/auth/migrator/drivers/flux.php new file mode 100644 index 0000000..e54ba27 --- /dev/null +++ b/components/auth/migrator/drivers/flux.php @@ -0,0 +1,23 @@ +db()->where_username($credentials['username'])->first(); + + if(is_null($user) or sha1($credentials['password']) != $user->password) + { + return false; + } + + return $user; + } + +} \ No newline at end of file From 64029dcc9a970658c984ed61e7209e66670ede79 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 23:40:26 +0930 Subject: [PATCH 049/136] Removed the bootstrapping of the authenticator. Signed-off-by: Jason Lewis --- start.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/start.php b/start.php index 80eaee4..5cf8465 100644 --- a/start.php +++ b/start.php @@ -124,17 +124,6 @@ starts_with(Request::uri(), $handles) and Bundle::start("feather/{$application}"); } -/* -|-------------------------------------------------------------------------- -| Feather Authentication -|-------------------------------------------------------------------------- -| -| Boostrap the authentication component. -| -*/ - -$feather['auth']->bootstrap(); - /* |-------------------------------------------------------------------------- | Feather CLI From 302149571f4eacc28df5d05f16b65ab7c4c56e92 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 23:41:19 +0930 Subject: [PATCH 050/136] Fixed a number of bugs with the authorizer. Signed-off-by: Jason Lewis --- components/auth/authorizer.php | 42 ++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/components/auth/authorizer.php b/components/auth/authorizer.php index ac61fbe..16586f0 100644 --- a/components/auth/authorizer.php +++ b/components/auth/authorizer.php @@ -4,18 +4,27 @@ use Route; use Session; use InvalidArgumentException; -use Feather\Components\Foundation\Component; +use Feather\Components\Foundation; -class Authorizer extends Component { +class Authorizer extends Foundation\Component { /** - * Bootstrap the authentication by extending with a custom driver and firing - * any registerd authenticator events. + * The current logged in user. * + * @var mixed + */ + public $user; + + /** + * Overload the constructor, bootstrap the authenticator. + * + * @param Feather\Components\Foundation\Application $feather * @return void */ - public function bootstrap() + public function __construct(Foundation\Application $feather) { + parent::__construct($feather); + Auth::extend('feather', function() { return new Driver; @@ -24,6 +33,10 @@ public function bootstrap() // Override the Laravel authentication driver for this run only. $this->feather['config']->set('laravel: auth.driver', 'feather'); + $this->user = $this->user(); + + // Depending on the authenticator being used their may be a response thrown back that + // interupts the normal response of Feather. $authenticator = $this->feather['config']->get('feather: db.auth.driver'); if(!$this->online() and ($response = $this->feather['gear']->first("auth: bootstrap {$authenticator}"))) @@ -46,7 +59,7 @@ public function bootstrap() * @param object $resource * @return bool */ - public function can($action, $resource) + public function can($action, $resource = null) { if(!str_contains($action, ': ')) { @@ -59,7 +72,7 @@ public function can($action, $resource) // as that's how role permissions are stored in the database. $action = str_replace(' ', '_', $action); - foreach($this->user()->roles as $role) + foreach($this->user->roles as $role) { if($role->{"{$verb}_{$action}"}) { @@ -95,7 +108,7 @@ public function can($action, $resource) * @param object $resource * @return bool */ - public function cannot($action, $resource) + public function cannot($action, $resource = null) { return !$this->can($action, $resource); } @@ -108,11 +121,16 @@ public function cannot($action, $resource) */ public function is($roles) { + if(!is_array($roles)) + { + $roles = array($roles); + } + // If the role has an aliased name then make sure we grab the correct name of // the role from the aliases array. $aliases = $this->feather['config']->get('feather: auth.aliases'); - foreach((array) $roles as $key => $role) + foreach($roles as $key => $role) { if(array_key_exists(strtolower($role), $aliases)) { @@ -120,9 +138,9 @@ public function is($roles) } } - foreach($this->user()->roles as $role) + foreach($this->user->roles as $role) { - if(in_array(strtolower($role->name), (array) $roles)) + if(in_array(strtolower($role->name), $roles)) { return true; } @@ -177,7 +195,7 @@ public function offline() */ public function activated() { - return (bool) $this->user()->activated; + return (bool) $this->user->activated; } /** From 212ef3161e0d4df8eafa2d28b1d7ff4dd6521a48 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 23:41:29 +0930 Subject: [PATCH 051/136] Initial commit of auth tests. Signed-off-by: Jason Lewis --- tests/auth.test.php | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/auth.test.php diff --git a/tests/auth.test.php b/tests/auth.test.php new file mode 100644 index 0000000..3e2f6a6 --- /dev/null +++ b/tests/auth.test.php @@ -0,0 +1,60 @@ +feather = Feather\Components\Support\Facade::application(); + + $this->feather['auth']->user = $this->user(); + } + + public function tearDown() + { + M::close(); + } + + public function testCanDoAction() + { + $this->assertTrue($this->feather['auth']->can('do: something')); + } + + public function testCannotDoAction() + { + $this->assertTrue($this->feather['auth']->cannot('view: something')); + } + + public function testCanCheckRole() + { + $this->assertTrue($this->feather['auth']->is('administrator')); + $this->assertTrue($this->feather['auth']->is('admin')); + $this->assertTrue($this->feather['auth']->not('boggyman')); + } + + public function testCanCheckOnline() + { + $this->assertTrue($this->feather['auth']->online()); + } + + public function testCanCheckActivation() + { + $this->assertTrue($this->feather['auth']->activated()); + } + + public function user() + { + return new Feather\Models\User(array( + 'roles' => array( + new Feather\Models\Role(array('do_something' => 1)), + new Feather\Models\Role(array('name' => 'Administrator')), + new Feather\Models\Role(array('view_something' => 0)) + ), + 'activated' => 1 + )); + } + +} \ No newline at end of file From 973b6bc286075f03dba618203182773414b92595 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sat, 22 Sep 2012 23:41:51 +0930 Subject: [PATCH 052/136] Refactoring of tests. Signed-off-by: Jason Lewis --- tests/config.test.php | 4 +++- tests/facade.test.php | 5 +++- tests/gear.test.php | 56 ++++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/tests/config.test.php b/tests/config.test.php index 043bbea..2c487e9 100644 --- a/tests/config.test.php +++ b/tests/config.test.php @@ -79,7 +79,9 @@ public function testItemsCanBeDeleted() private function getRepository() { - $config = new Feather\Components\Config\Repository; + $feather = Feather\Components\Support\Facade::application(); + + $config = $feather['config']; $config->set('test', $this->getItems()); diff --git a/tests/facade.test.php b/tests/facade.test.php index 37f799c..f426a89 100644 --- a/tests/facade.test.php +++ b/tests/facade.test.php @@ -6,9 +6,12 @@ class FacadeTest extends PHPUnit_Framework_TestCase { public function testFacadeCallsApplication() { - FacadeStub::application(array('stub' => new ApplicationStub)); + $feather = Feather\Components\Support\Facade::application(); + FacadeStub::application(array('stub' => new ApplicationStub)); $this->assertEquals('dog', FacadeStub::cat()); + + Feather\Components\Support\Facade::application($feather); } } diff --git a/tests/gear.test.php b/tests/gear.test.php index 7c808d8..15ac5e4 100644 --- a/tests/gear.test.php +++ b/tests/gear.test.php @@ -2,50 +2,52 @@ class GearTest extends PHPUnit_Framework_TestCase { - public $gear; - - public $manager; - - public function setUp() - { - $this->gear = new Feather\Models\Gear(array( - 'identifier' => 'stub', - 'location' => 'path: ' . __DIR__ . DS . 'mock', - 'auto' => false - )); - - $this->manager = new Feather\Components\Gear\Manager; - - $this->manager->register($this->gear); - - $this->manager->start('stub'); - } - public function testCanRegisterGear() { - $this->assertTrue($this->manager->registered('stub')); + $feather = $this->stub(); + + $this->assertTrue($feather['gear']->registered('stub')); } public function testCanStartGear() { - $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $this->manager->start('stub')); - $this->assertTrue($this->manager->started('stub')); + $feather = $this->stub(); + + $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $feather['gear']->start('stub')); + $this->assertTrue($feather['gear']->started('stub')); $this->assertInstanceOf('Feather\\Gear\\Stub\\Mock', $gear['mock']); } public function testCanDisableGear() { - $this->assertTrue($this->manager->registered('stub')); + $feather = $this->stub(); + + $this->assertTrue($feather['gear']->registered('stub')); - $this->manager->disable('stub'); + $feather['gear']->disable('stub'); - $this->assertTrue(!$this->manager->registered('stub')); + $this->assertTrue(!$feather['gear']->registered('stub')); } public function testGearEventsFire() { - $this->assertEquals('cat', Feather\Components\Gear\Manager::first('mock.callable')); - $this->assertEquals('dog', Feather\Components\Gear\Manager::first('mock.method')); + $feather = $this->stub(); + + $this->assertEquals('cat', $feather['gear']->first('mock.callable')); + $this->assertEquals('dog', $feather['gear']->first('mock.method')); + } + + public function stub() + { + $feather = Feather\Components\Support\Facade::application(); + + $feather['gear']->register(new Feather\Models\Gear(array( + 'identifier' => 'stub', + 'location' => 'path: ' . __DIR__ . DS . 'mock', + 'auto' => false + ))); + + return $feather; } } \ No newline at end of file From b09413df332a35d739fc091ac1938f0264ad4565 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 00:13:15 +0930 Subject: [PATCH 053/136] Refactoring config tests. Signed-off-by: Jason Lewis --- tests/config.test.php | 88 ++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 51 deletions(-) diff --git a/tests/config.test.php b/tests/config.test.php index 2c487e9..708a96c 100644 --- a/tests/config.test.php +++ b/tests/config.test.php @@ -2,93 +2,79 @@ class ConfigTest extends PHPUnit_Framework_TestCase { - public function testItemsCanBeSet() + public $feather; + + public function setUp() { - $config = $this->getRepository(); + $this->feather = Feather\Components\Support\Facade::application(); - $config->set('name', 'jason'); - $this->assertEquals('jason', $config->get('name')); + $this->feather['config']->set('test', $this->items()); + } - $config->set('person.name', 'jason'); - $this->assertEquals('jason', $config->get('person.name')); + public function testItemsCanBeSet() + { + $this->feather['config']->set('name', 'jason'); + $this->assertEquals('jason', $this->feather['config']->get('name')); - $config->set('namespace::person.name', 'jason'); - $this->assertEquals('jason', $config->get('namespace::person.name')); + $this->feather['config']->set('person.name', 'jason'); + $this->assertEquals('jason', $this->feather['config']->get('person.name')); - $config->set('gear: mock person.name', 'jason'); - $this->assertEquals('jason', $config->get('gear: mock person.name')); + $this->feather['config']->set('namespace::person.name', 'jason'); + $this->assertEquals('jason', $this->feather['config']->get('namespace::person.name')); - $config->set('theme: mock person.name', 'jason'); - $this->assertEquals('jason', $config->get('theme: mock person.name')); + $this->feather['config']->set('gear: mock person.name', 'jason'); + $this->assertEquals('jason', $this->feather['config']->get('gear: mock person.name')); + + $this->feather['config']->set('theme: mock person.name', 'jason'); + $this->assertEquals('jason', $this->feather['config']->get('theme: mock person.name')); } public function testGetBasicItems() { - $config = $this->getRepository(); - - $this->assertEquals('bar', $config->get('test.foo')); - $this->assertEquals('orange', $config->get('test.apple')); + $this->assertEquals('bar', $this->feather['config']->get('test.foo')); + $this->assertEquals('orange', $this->feather['config']->get('test.apple')); } public function testEntireArrayCanBeReturned() { - $config = $this->getRepository(); - - $this->assertEquals($this->getItems(), $config->get('test')); + $this->assertEquals($this->items(), $this->feather['config']->get('test')); } public function testCheckItemExistance() { - $config = $this->getRepository(); - - $config->set('foo', 'bar'); - $this->assertTrue($config->has('foo')); + $this->feather['config']->set('foo', 'bar'); - $this->assertTrue(!$config->has('apple')); + $this->assertTrue($this->feather['config']->has('foo')); + $this->assertTrue(!$this->feather['config']->has('apple')); } public function testItemsCanBeSaved() { - $config = $this->getRepository(); + $this->feather['config']->set('feather: db.test', 'foobar'); + $this->feather['config']->save('feather: db.test'); - $config->set('feather: db.test', 'foobar'); - $config->save('feather: db.test'); + $this->feather['config']->reload(); - $config->reload(); + $this->assertEquals('foobar', $this->feather['config']->get('feather: db.test')); - $this->assertEquals('foobar', $config->get('feather: db.test')); - - $config->delete('feather: db.test'); + $this->feather['config']->delete('feather: db.test'); } public function testItemsCanBeDeleted() { - $config = $this->getRepository(); - - $config->set('feather: db.test', 'foobar'); - $config->save('feather: db.test'); - - $config->reload(); - - $config->delete('feather: db.test'); + $this->feather['config']->set('feather: db.test', 'foobar'); + $this->feather['config']->save('feather: db.test'); - $config->reload(); - - $this->assertEquals(null, $config->get('feather: db.test')); - } - - private function getRepository() - { - $feather = Feather\Components\Support\Facade::application(); + $this->feather['config']->reload(); - $config = $feather['config']; + $this->feather['config']->delete('feather: db.test'); - $config->set('test', $this->getItems()); + $this->feather['config']->reload(); - return $config; + $this->assertEquals(null, $this->feather['config']->get('feather: db.test')); } - private function getItems() + public function items() { return array('foo' => 'bar', 'apple' => 'orange'); } From 19aaa2a4952e6d5febef4d0053011c2bd60f89a0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 00:14:44 +0930 Subject: [PATCH 054/136] Refactoring gears tests. Signed-off-by: Jason Lewis --- tests/gear.test.php | 51 +++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/tests/gear.test.php b/tests/gear.test.php index 15ac5e4..ec2d2ca 100644 --- a/tests/gear.test.php +++ b/tests/gear.test.php @@ -2,52 +2,43 @@ class GearTest extends PHPUnit_Framework_TestCase { - public function testCanRegisterGear() + public $feather; + + public function setUp() { - $feather = $this->stub(); + $this->feather = Feather\Components\Support\Facade::application(); - $this->assertTrue($feather['gear']->registered('stub')); + $this->feather['gear']->register(new Feather\Models\Gear(array( + 'identifier' => 'stub', + 'location' => 'path: ' . __DIR__ . DS . 'mock', + 'auto' => false + ))); } - public function testCanStartGear() + public function testCanRegisterGear() { - $feather = $this->stub(); + $this->assertTrue($this->feather['gear']->registered('stub')); + } - $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $feather['gear']->start('stub')); - $this->assertTrue($feather['gear']->started('stub')); + public function testCanStartGear() + { + $this->assertInstanceOf('Feather\\Components\\Gear\\Container', $gear = $this->feather['gear']->start('stub')); + $this->assertTrue($this->feather['gear']->started('stub')); $this->assertInstanceOf('Feather\\Gear\\Stub\\Mock', $gear['mock']); } public function testCanDisableGear() { - $feather = $this->stub(); - - $this->assertTrue($feather['gear']->registered('stub')); + $this->assertTrue($this->feather['gear']->registered('stub')); - $feather['gear']->disable('stub'); + $this->feather['gear']->disable('stub'); - $this->assertTrue(!$feather['gear']->registered('stub')); + $this->assertTrue(!$this->feather['gear']->registered('stub')); } public function testGearEventsFire() { - $feather = $this->stub(); - - $this->assertEquals('cat', $feather['gear']->first('mock.callable')); - $this->assertEquals('dog', $feather['gear']->first('mock.method')); + $this->assertEquals('cat', $this->feather['gear']->first('mock.callable')); + $this->assertEquals('dog', $this->feather['gear']->first('mock.method')); } - - public function stub() - { - $feather = Feather\Components\Support\Facade::application(); - - $feather['gear']->register(new Feather\Models\Gear(array( - 'identifier' => 'stub', - 'location' => 'path: ' . __DIR__ . DS . 'mock', - 'auto' => false - ))); - - return $feather; - } - } \ No newline at end of file From 40c68f645a71d06b7149c65bab991b8d03853e2a Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 00:54:37 +0930 Subject: [PATCH 055/136] Initial commit of redirector component. Signed-off-by: Jason Lewis --- components/foundation/redirector.php | 155 +++++++++++++++++++++++++++ config/feather.php | 11 +- 2 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 components/foundation/redirector.php diff --git a/components/foundation/redirector.php b/components/foundation/redirector.php new file mode 100644 index 0000000..2d0d89a --- /dev/null +++ b/components/foundation/redirector.php @@ -0,0 +1,155 @@ +with('alert', array('type' => $type, 'message' => __($key, $replacements))); + } + + /** + * Create a redirect response with the query string appended. + * + * @param string $url + * @return object + */ + public function with_query($url) + { + $url = URL::to($this->pattern($url)); + + if($query = urldecode(Request::getQueryString())) + { + $url = "{$url}?{$query}"; + } + + return $this->to($url); + } + + /** + * Create a redirect response to the current page. + * + * @return object + */ + public function to_self() + { + return $this->with_query(URI::current()); + } + + /** + * Create a redirect response to the previous page. + * + * @param string $default + * @return object + */ + public function to_previous($default = null) + { + return $this->to(Input::has('return') ? Input::get('return') : $this->pattern($default)); + } + + /** + * Create a redirect response after a logout. + * + * @return object + */ + public static function after_logout() + { + return $this->for_auth(Config::get('feather: auth.logout_url')); + } + + /** + * Create a redirect response before a registration. + * + * @return object + */ + public static function before_register() + { + return $this->for_auth(Config::get('feather: auth.register_url')); + } + + /** + * Create a redirect response before a login. + * + * @return object + */ + public static function before_login() + { + return $this->for_auth(Config::get('feather: auth.login_url')); + } + + /** + * Create a redirect response to an authentication page. + * + * @param string $url + * @return object + */ + protected function for_auth($url) + { + $replace = array( + '{feather}' => Bundle::option('feather', 'handles'), + '{current}' => URL::to(Input::has('return') ? Input::get('return') : URI::current()), + '{token}' => Auth::online() ? Auth::user()->authenticator_token : null + ); + + if(Config::get('feather: auth.driver') == 'internal') + { + $url = URL::to_route('feather'); + } + else + { + $url = str_replace(array_keys($replace), array_values($replace), $url); + } + + return $this->to($url); + } + + /** + * Builds a URL based on defined patterns. + * + * @param string $url + * @return string + */ + protected function pattern($url) + { + if(starts_with($url, 'route: ')) + { + return URL::to_route(substr($url, 7)); + } + elseif(starts_with($url, 'action: ')) + { + return URL::to_action(substr($url, 8)); + } + + return $url; + } + + /** + * Flash a Validator's errors to the session data. + * + * @param object|string $container + * @return object + */ + public function with_errors($container) + { + $errors = !($container instanceof Messages) ? new Messages(array($container)) : $container; + + return $this->with('errors', $errors); + } + +} \ No newline at end of file diff --git a/config/feather.php b/config/feather.php index 665e690..333d314 100644 --- a/config/feather.php +++ b/config/feather.php @@ -54,7 +54,7 @@ { $feather['sso'] = $feather->share(function($feather) { - return new Feather\Components\Auth\Dispactcher($feather); + return new Feather\Components\Auth\SSO($feather); }); }, 'gear' => function($feather) @@ -63,7 +63,14 @@ { return new Feather\Components\Gear\Manager($feather); }); - } + }, + 'redirect' => function($feather) + { + $feather['redirect'] = $feather->share(function($feather) + { + return new Feather\Components\Foundation\Redirector(null); + }); + }, ), /* From fe011750368c22bff07b5b7e07c29e20dc996633 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 00:55:17 +0930 Subject: [PATCH 056/136] Renamed dispatcher to SSO. Signed-off-by: Jason Lewis --- components/auth/dispatcher.php | 7 ---- components/auth/sso.php | 75 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 7 deletions(-) delete mode 100644 components/auth/dispatcher.php create mode 100644 components/auth/sso.php diff --git a/components/auth/dispatcher.php b/components/auth/dispatcher.php deleted file mode 100644 index 695869b..0000000 --- a/components/auth/dispatcher.php +++ /dev/null @@ -1,7 +0,0 @@ - null, + 'username' => null, + 'email' => null, + 'token' => null + ); + + /** + * Authorizes a user from an external application. + * + * @param array $credentials + * @return mixed + */ + public function authorize(array $credentials) + { + $credentials = array_merge($this->defaults, $credentials); + + // If the current request is POST then the user is either registering or + // connecting an account. + if(Request::method() == 'POST') + { + $method = Input::has('create') ? 'register' : 'connect'; + + return $this->{$method}($credentials); + } + + extract($credentials); + + // If a user exists with an associated e-mail address that matches then this user has already + // been authenticated with a SSO service. + if($user = User::where_authenticator_associated_email($email)->first()) + { + // An authenticators token may change from time to time. If the tokens are no longer + // the same then the token must be updated. + if($user->authenticator_token != $token) + { + $user->authenticator_token = $token; + + $user->save(); + } + + $this->feather['auth']->login($user); + + return $this->feather['redirect']->to_self(); + } + + // If there is a user in the database who has the same e-mail or username as our + // user then they need to either link their account or create a new one. + elseif($user = User::where('username', '=', $username)->or_where('email', '=', $email)->first()) + { + Breadcrumbs::drop(__('feather::titles.connect_to_community')); + + return View::of('layout')->with('title', __('feather::titles.connect_to_community')) + ->nest('content', 'feather::user.associate', compact('user')); + } + + // If there is no user in the database then the associated user is our actual user. Does + // that make sense? Well... we basically just create them a new account. + return static::create($credentials, $credentials); + } + +} \ No newline at end of file From 93a8720913a0e0474542aa83e27a6c684fc259cf Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:00:44 +0930 Subject: [PATCH 057/136] Initial commit of exceptions. Signed-off-by: Jason Lewis --- exceptions.php | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ start.php | 11 ++++++++ 2 files changed, 80 insertions(+) create mode 100644 exceptions.php diff --git a/exceptions.php b/exceptions.php new file mode 100644 index 0000000..c45d00d --- /dev/null +++ b/exceptions.php @@ -0,0 +1,69 @@ +errors = $errors; + } + + /** + * Get the errors. + * + * @return array + */ + public function get() + { + return $this->errors; + } + +} + +/* +|-------------------------------------------------------------------------- +| Feather Model Exception +|-------------------------------------------------------------------------- +| +| The exception class for Feather models. +| +*/ + +class FeatherModelException extends Exception {} + +/* +|-------------------------------------------------------------------------- +| Auth Exception +|-------------------------------------------------------------------------- +| +| The exception class for Feather's Authentication. +| +*/ + +class AuthException extends Exception {} \ No newline at end of file diff --git a/start.php b/start.php index 5cf8465..742a349 100644 --- a/start.php +++ b/start.php @@ -23,6 +23,17 @@ set_path('themes', path('feather') . 'themes' . DS); +/* +|-------------------------------------------------------------------------- +| Feather Exceptions +|-------------------------------------------------------------------------- +| +| Load in Feather's Exception Classes +| +*/ + +require path('feather') . 'exceptions' . EXT; + /* |-------------------------------------------------------------------------- | Core Autoloading From d98b45989ef92597897475e1d73d5a3830ebb316 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:01:00 +0930 Subject: [PATCH 058/136] Added some more facades. Signed-off-by: Jason Lewis --- facades.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/facades.php b/facades.php index 966bc7c..011ee46 100644 --- a/facades.php +++ b/facades.php @@ -42,4 +42,37 @@ class Gear extends Components\Support\Facade { */ protected static function accessor(){ return 'gear'; } +} + +class Crumbs extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'crumbs'; } + +} + +class Redirect extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'redirect'; } + +} + +class Validator extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'validator'; } + } \ No newline at end of file From af3284e6e98dc12a86606555168058969e75587d Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:01:24 +0930 Subject: [PATCH 059/136] Initial commit of crumbs component. Signed-off-by: Jason Lewis --- components/support/crumbs.php | 103 ++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 components/support/crumbs.php diff --git a/components/support/crumbs.php b/components/support/crumbs.php new file mode 100644 index 0000000..58766af --- /dev/null +++ b/components/support/crumbs.php @@ -0,0 +1,103 @@ +place($crumb); + } + else + { + // If the crumb is an object, such as a Laravel Messages object, then convert it + // to a string as any objects being passed to this method will have a __toString() + if(is_object($crumb)) + { + $crumb = array((string) $crumb); + } + + // Fetch the title of the crumb and the crumbs link. If the crumb does not have + // a supplied link then use the current page. + $title = isset($crumb['title']) ? $crumb['title'] : array_shift($crumb); + + $link = isset($crumb['link']) ? $crumb['link'] : URL::current(); + + $this->crumbs[] = (object) compact('link', 'title'); + } + } + + /** + * Leaves a trail of crumbs. + * + * @return string + */ + public function trail($element = 'li') + { + $response = array( + $this->item(URL::to_route('feather'), $this->feather['config']->get('feather: db.forum.title'), $element) + ); + + foreach($this->crumbs as $crumb) + { + $response[] = $this->item($crumb->link, $crumb->title, $element); + } + + return implode(PHP_EOL, $response); + } + + /** + * Adds a place to the trail. + * + * @param Feather\Models\Place $place + * @return array + */ + protected function place($place) + { + // Add each of the ancestors of this place to the crumbs. + foreach($place->crumbs() as $crumb) + { + $this->crumbs[] = array( + 'link' => URL::to_route('place', array($crumb->id, $crumb->slug)), + 'title' => $crumb->name + ); + } + + return $this->crumbs[] = array( + 'link' => URL::to_route('place', array($place->id, $place->slug)), + 'title' => $place->name + ); + } + + /** + * Return a list item with the link. + * + * @param string $link + * @param string $text + * @param string $element + * @return string + */ + public function item($link, $text, $element = 'li') + { + return "<{$element}>" . HTML::link($link, $text) . ""; + } + +} \ No newline at end of file From 48bf9ce3446e86e96b4e9740f4a1af1d8f5dfed0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:01:59 +0930 Subject: [PATCH 060/136] Initial commit of validation component. Signed-off-by: Jason Lewis --- components/support/validation.php | 185 ++++++++++++++++++++++++++++++ config/validation.php | 5 + 2 files changed, 190 insertions(+) create mode 100644 components/support/validation.php create mode 100644 config/validation.php diff --git a/components/support/validation.php b/components/support/validation.php new file mode 100644 index 0000000..a414fbb --- /dev/null +++ b/components/support/validation.php @@ -0,0 +1,185 @@ +application = $application; + + return $this; + } + + /** + * Get a validator. + * + * @param string $validator + * @return Feather\Components\Support\Validation + */ + public function get($validator) + { + if(!$this->validating[$validator] = $this->feather['config']->get("feather: validation.{$validator}")) + { + throw new InvalidArgumentException("Invalid validator [{$validator}] supplied."); + } + + return $this; + } + + /** + * Sets input to validate against. + * + * @param array $input + * @return Feather\Components\Support\Validation + */ + public function against($input) + { + $this->input = $input; + + return $this; + } + + /** + * Executes validation and returns true on success. + * + * @return bool + */ + public function passes() + { + // If a response is returned from the closure then we have a custom error messages + // to throw with the exception. + if($responses = call_user_func(reset($this->validating), $this)) + { + if(!is_array(reset($responses))) $responses = array(array_shift($responses) => array()); + + foreach($responses as $response => $replacements) + { + $responses[$response] = __("{$this->application}::{$response}", $replacements)->get(); + } + + throw new FeatherValidationException(new Messages($responses)); + } + + $event = key($this->validating); + + $this->feather['gear']->fire("validation: before {$event}", array($this)); + + $validator = new Validator($this->input, $this->rules, $this->messages); + + if($validator->connection(DB::connection(FEATHER_DATABASE))->fails()) + { + throw new FeatherValidationException($validator->errors); + } + + return true; + } + + /** + * Adds a rule or array of rules to the rules array. + * + * @param string $name + * @param array|string $rule + * @return Feather\Components\Support\Validation + */ + public function rule($name, $rule) + { + if(!isset($this->rules[$name])) + { + $this->rules[$name] = array(); + } + + $this->rules[$name] = array_merge($this->rules[$name], (array) $rule); + + return $this; + } + + /** + * Adds a message to the messages array. + * + * @param string $rule + * @param array|string $message + * @return Feather\Components\Support\Validation + */ + public function message($rule, $message) + { + $replacements = array(); + + if(is_array($message)) + { + list($message, $replacements) = $message; + } + + $this->messages[str_replace('.', '_', $rule)] = __("{$this->application}::{$message}", $replacements)->get(); + + return $this; + } + + /** + * Adds a data key/value pair to the data array. + * + * @param string $key + * @param mixed $value + * @return Feather\Components\Support\Validation + */ + public function with($key, $value) + { + $this->data[$key] = $value; + + return $this; + } + +} \ No newline at end of file diff --git a/config/validation.php b/config/validation.php new file mode 100644 index 0000000..207cc1e --- /dev/null +++ b/config/validation.php @@ -0,0 +1,5 @@ + Date: Sun, 23 Sep 2012 02:02:24 +0930 Subject: [PATCH 061/136] Added the new components to be loaded at runtime. Signed-off-by: Jason Lewis --- config/feather.php | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/config/feather.php b/config/feather.php index 333d314..f923e5b 100644 --- a/config/feather.php +++ b/config/feather.php @@ -31,6 +31,20 @@ 'driver' => 'mysql' ), + /* + |-------------------------------------------------------------------------- + | Feather Applications + |-------------------------------------------------------------------------- + | + | Applications to be registered at runtime with Feather. It is advised you + | do not edit anything down there. + | + */ + + 'applications' => array( + 'admin' => '(:feather)/admin', + 'core' => '(:feather)' + ), /* |-------------------------------------------------------------------------- @@ -71,21 +85,19 @@ return new Feather\Components\Foundation\Redirector(null); }); }, + 'crumbs' => function($feather) + { + $feather['crumbs'] = $feather->share(function($feather) + { + return new Feather\Components\Support\Crumbs($feather); + }); + }, + 'validator' => function($feather) + { + $feather['validator'] = $feather->share(function($feather) + { + return new Feather\Components\Support\Validation($feather); + }); + } ), - - /* - |-------------------------------------------------------------------------- - | Feather Applications - |-------------------------------------------------------------------------- - | - | Applications to be registered at runtime with Feather. It is advised you - | do not edit anything down there. - | - */ - - 'applications' => array( - 'admin' => '(:feather)/admin', - 'core' => '(:feather)' - ), - ); \ No newline at end of file From de4bcd64a82acc39a16a04e22d106132c73dce73 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:03:51 +0930 Subject: [PATCH 062/136] Refactoring auth tests. Signed-off-by: Jason Lewis --- tests/auth.test.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/auth.test.php b/tests/auth.test.php index 3e2f6a6..6b39da9 100644 --- a/tests/auth.test.php +++ b/tests/auth.test.php @@ -1,7 +1,5 @@ feather['auth']->user = $this->user(); } - public function tearDown() - { - M::close(); - } - public function testCanDoAction() { $this->assertTrue($this->feather['auth']->can('do: something')); From 314ee2a8ec50b603175b9981bb68ee589bbb11b0 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:04:49 +0930 Subject: [PATCH 063/136] Fixed bug with crumbs, method was not meant to be static. Signed-off-by: Jason Lewis --- components/support/crumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/support/crumbs.php b/components/support/crumbs.php index 58766af..5b6e3f1 100644 --- a/components/support/crumbs.php +++ b/components/support/crumbs.php @@ -20,7 +20,7 @@ class Crumbs extends Component { * @param array|object $crumb * @return void */ - public static function drop($crumb) + public function drop($crumb) { if($crumb instanceof Models\Place) { From 66a8a16a3a1ba9023576f04bed90c0777d435b41 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:11:47 +0930 Subject: [PATCH 064/136] Initial commit of crumbs tests. Signed-off-by: Jason Lewis --- tests/crumbs.test.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 tests/crumbs.test.php diff --git a/tests/crumbs.test.php b/tests/crumbs.test.php new file mode 100644 index 0000000..478aa9e --- /dev/null +++ b/tests/crumbs.test.php @@ -0,0 +1,24 @@ +feather = Feather\Components\Support\Facade::application(); + } + + public function testCanDropCrumb() + { + $this->feather['crumbs']->drop('stub'); + + $this->assertNotEmpty($this->feather['crumbs']->crumbs); + } + + public function testCanGetHTML() + { + $this->assertEquals('
  • stub
    • ', $this->feather['crumbs']->item('/', 'stub')); + } + +} From 49a3f634ad15f96af77d8c243f905c39202ed04c Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:41:02 +0930 Subject: [PATCH 065/136] Initial commit of validation tests. Signed-off-by: Jason Lewis --- tests/validation.test.php | 88 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 tests/validation.test.php diff --git a/tests/validation.test.php b/tests/validation.test.php new file mode 100644 index 0000000..ba077fc --- /dev/null +++ b/tests/validation.test.php @@ -0,0 +1,88 @@ +feather = Feather\Components\Support\Facade::application(); + } + + public function tearDown() + { + $this->feather['validator']->app('core'); + + $this->feather['validator']->rules = array(); + + $this->feather['validator']->messages = array(); + } + + public function testCanChangeApplication() + { + $this->feather['validator']->app('cat'); + + $this->assertEquals('cat', $this->feather['validator']->application); + } + + public function testCanValidateAgainstInput() + { + $this->feather['validator']->against(array('foo' => 'bar')); + + $this->assertEquals(array('foo' => 'bar'), $this->feather['validator']->input); + } + + public function testCanSetCustomData() + { + $this->feather['validator']->with('foo', 'bar'); + + $this->assertEquals(array('foo' => 'bar'), $this->feather['validator']->data); + } + + public function testCanLoadValidatorClosure() + { + $this->feather['config']->set('feather: validation.test', function($validator){}); + + $this->feather['validator']->get('test'); + + $this->assertArrayHasKey('test', $this->feather['validator']->validating); + } + + public function testCanAddRule() + { + $this->feather['validator']->rule('cat', 'dog'); + + $this->assertEquals(array('cat' => array('dog')), $this->feather['validator']->rules); + } + + public function testCanAddMessage() + { + $this->feather['validator']->message('cat', 'dog'); + + $this->assertEquals(array('cat' => 'core::dog'), $this->feather['validator']->messages); + } + + public function testValidationDoesPass() + { + $this->feather['config']->set('feather: validation.test', function($validator){ + $validator->rule('cat', 'required'); + }); + + $this->assertTrue($this->feather['validator']->get('test')->against(array('cat' => 'dog'))->passes()); + } + + public function testValidationExceptionIsThrown() + { + $this->feather['config']->set('feather: validation.test', function($validator){ + $validator->rule('cat', 'required'); + }); + + try { + $this->feather['validator']->get('test')->against(array())->passes(); + } + catch (FeatherValidationException $exception) {} + + $this->assertInstanceOf('FeatherValidationException', $exception); + } + +} From d110df92fdcba3d3c9d4f2cfccf10e931ef505bf Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:57:50 +0930 Subject: [PATCH 066/136] Initial commit of date component. Signed-off-by: Jason Lewis --- components/support/date.php | 203 ++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 components/support/date.php diff --git a/components/support/date.php b/components/support/date.php new file mode 100644 index 0000000..ca6cb19 --- /dev/null +++ b/components/support/date.php @@ -0,0 +1,203 @@ + array('second', 'minute', 'hour', 'day', 'week', 'month', 'year'), + 'lengths' => array(60, 60, 24, 7, 4.35, 12) + ); + + /** + * Alternate text to show if date is invalid. + * + * @var string + */ + public $alternate; + + /** + * Text to show before the returned formatted string. + * + * @var string + */ + public $prefix; + + /** + * Text to show after the returned formatted string. + * + * @var string + */ + public $suffix; + + /** + * The DateTime being used for the current instance. + * + * @var object + */ + public $date; + + /** + * Set the date to use. + * + * @param int|string $date + * @return Feather\Components\Support\Date + */ + public function set($date) + { + $this->date = new DateTime; + + if(is_numeric($date)) + { + $this->date->setTimestamp($date); + } + else + { + $this->date->setTimestamp(strtotime($date)); + } + + return $this; + } + + /** + * Format a date and return it for the discussion meta data. + * + * @param string|int $date + * @return string + */ + public function meta($date) + { + return '' . $date->relative('short') . ''; + } + + /** + * Sets the alternate text to display if the date is of an invalid format. + * + * @param string $text + * @return Feather\Components\Support\Date + */ + public function alternate($text) + { + $this->alternate = $text; + + return $this; + } + + /** + * Sets the prefix text. + * + * @param string $text + * @return Feather\Components\Support\Date + */ + public function prefix($text) + { + $this->prefix = $text; + + return $this; + } + + /** + * Sets the suffix text. + * + * @param string $text + * @return Feather\Components\Support\Date + */ + public function suffix($text) + { + $this->suffix = $text; + + return $this; + } + + /** + * Returns the formatted date. + * + * @param string $format + * @return string + */ + public function show($format) + { + $formats = array( + 'long' => $this->feather['config']->get('feather: db.datetime.long_date'), + 'short' => $this->feather['config']->get('feather: db.datetime.short_date'), + 'time' => $this->feather['config']->get('feather: db.datetime.time_only') + ); + + if(isset($formats[$format])) + { + $format = $formats[$format]; + } + + $errors = $this->date->getLastErrors(); + + if($this->date->getTimestamp() == 0 or $errors['warning_count'] > 0 or $errors['error_count'] > 0) + { + return $this->alternate ?: 'Invalid date supplied.'; + } + + return $this->prefix . $this->date->format($format) . $this->suffix; + } + + /** + * Returns a fuzzy formated date. + * + * @return string + */ + public function fuzzy($stop = 'week', $format = 'long') + { + $difference = time() - $this->date->getTimestamp(); + + $offset = array_search($stop, static::$fuzzy['periods']) + 1; + + $periods = array_slice(static::$fuzzy['periods'], 0, $offset); + + $lengths = array_slice(static::$fuzzy['lengths'], 0, $offset); + + for($i = 0; $difference >= $lengths[$i] and $i < count($lengths) - 1; $i++) + { + $difference = $difference / $lengths[$i]; + } + + $difference = round($difference); + + if($difference != 1) + { + $periods[$i] .= 's'; + } + + if($difference > $lengths[$i]) + { + return $this->show($format); + } + + return $this->prefix . number_format($difference) . ' ' . $periods[$i] . ' ago' . $this->suffix; + } + + /** + * Returns a relative formated date. + * + * @return string + */ + public function relative($format = 'long') + { + $days = intval((time() - $this->date->getTimestamp()) / 86400); + + if($days == 0) + { + return __('feather::common.today')->get() . ', ' . $this->show('time'); + } + elseif($days == 1) + { + return __('feather::common.yesterday')->get() . ', ' . $this->show('time'); + } + + return $this->show($format); + } + +} \ No newline at end of file From 8df0ab0945c140bbb4518bf0de4aca4020b6db78 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 02:58:03 +0930 Subject: [PATCH 067/136] Initial commit of date component. Signed-off-by: Jason Lewis --- config/feather.php | 7 +++++++ facades.php | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/config/feather.php b/config/feather.php index f923e5b..7f4aeaf 100644 --- a/config/feather.php +++ b/config/feather.php @@ -98,6 +98,13 @@ { return new Feather\Components\Support\Validation($feather); }); + }, + 'date' => function($feather) + { + $feather['date'] = $feather->share(function($feather) + { + return new Feather\Components\Support\Date($feather); + }); } ), ); \ No newline at end of file diff --git a/facades.php b/facades.php index 011ee46..450b92e 100644 --- a/facades.php +++ b/facades.php @@ -75,4 +75,15 @@ class Validator extends Components\Support\Facade { */ protected static function accessor(){ return 'validator'; } +} + +class Date extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'date'; } + } \ No newline at end of file From eb37098518dc5c5d5be5c7920c36b64125891f37 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 03:16:41 +0930 Subject: [PATCH 068/136] Date component is no longer shared. Signed-off-by: Jason Lewis --- config/feather.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/feather.php b/config/feather.php index 7f4aeaf..b569203 100644 --- a/config/feather.php +++ b/config/feather.php @@ -101,10 +101,10 @@ }, 'date' => function($feather) { - $feather['date'] = $feather->share(function($feather) + $feather['date'] = function($feather) { return new Feather\Components\Support\Date($feather); - }); + }; } ), ); \ No newline at end of file From ee66c8aed55286ffa823bd687ee6a7a3c2f7fd00 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 03:17:03 +0930 Subject: [PATCH 069/136] Refining the date tests. Signed-off-by: Jason Lewis --- tests/date.test.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/date.test.php diff --git a/tests/date.test.php b/tests/date.test.php new file mode 100644 index 0000000..1944d19 --- /dev/null +++ b/tests/date.test.php @@ -0,0 +1,42 @@ +feather = Feather\Components\Support\Facade::application(); + } + + public function testSetDateAsTimestamp() + { + $this->assertEquals('31/01/1991', $this->feather['date']->set(strtotime('31 January 1991'))->show('d/m/Y')); + } + + public function testSetDateAsString() + { + $this->assertEquals('31/01/1991', $this->feather['date']->set('31 January 1991')->show('d/m/Y')); + } + + public function testCanSetAlternateString() + { + $this->assertEquals('cat', $this->feather['date']->set('dog')->alternate('cat')->show('d/m/Y')); + } + + public function testCanSetPrefixString() + { + $this->assertEquals('cat31/01/1991', $this->feather['date']->set('31 January 1991')->prefix('cat')->show('d/m/Y')); + } + + public function testCanSetSuffixString() + { + $this->assertEquals('31/01/1991cat', $this->feather['date']->set('31 January 1991')->suffix('cat')->show('d/m/Y')); + } + + public function testCanGetFuzzyDate() + { + $this->assertEquals('1 day ago', $this->feather['date']->set('Yesterday')->fuzzy()); + } + +} From 3b59e49c7ee2373b8f8580a94a429f8336c5ce3a Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 03:17:25 +0930 Subject: [PATCH 070/136] Fixed a couple bugs with the date component. Signed-off-by: Jason Lewis --- components/support/date.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/support/date.php b/components/support/date.php index ca6cb19..113bc9a 100644 --- a/components/support/date.php +++ b/components/support/date.php @@ -153,11 +153,11 @@ public function fuzzy($stop = 'week', $format = 'long') { $difference = time() - $this->date->getTimestamp(); - $offset = array_search($stop, static::$fuzzy['periods']) + 1; + $offset = array_search($stop, $this->fuzzy['periods']) + 1; - $periods = array_slice(static::$fuzzy['periods'], 0, $offset); + $periods = array_slice($this->fuzzy['periods'], 0, $offset); - $lengths = array_slice(static::$fuzzy['lengths'], 0, $offset); + $lengths = array_slice($this->fuzzy['lengths'], 0, $offset); for($i = 0; $difference >= $lengths[$i] and $i < count($lengths) - 1; $i++) { From acf397fac0314aef1bcedd2c0047c050dacf793c Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 12:48:34 +0930 Subject: [PATCH 071/136] Refactoring the date tests. Signed-off-by: Jason Lewis --- tests/date.test.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/date.test.php b/tests/date.test.php index 1944d19..2925336 100644 --- a/tests/date.test.php +++ b/tests/date.test.php @@ -9,27 +9,27 @@ public function setUp() $this->feather = Feather\Components\Support\Facade::application(); } - public function testSetDateAsTimestamp() + public function testDateSetAsTimestamp() { $this->assertEquals('31/01/1991', $this->feather['date']->set(strtotime('31 January 1991'))->show('d/m/Y')); } - public function testSetDateAsString() + public function testDateSetAsString() { $this->assertEquals('31/01/1991', $this->feather['date']->set('31 January 1991')->show('d/m/Y')); } - public function testCanSetAlternateString() + public function testAlternateTextOnError() { $this->assertEquals('cat', $this->feather['date']->set('dog')->alternate('cat')->show('d/m/Y')); } - public function testCanSetPrefixString() + public function testCanPrefixDate() { $this->assertEquals('cat31/01/1991', $this->feather['date']->set('31 January 1991')->prefix('cat')->show('d/m/Y')); } - public function testCanSetSuffixString() + public function testCanSuffixDate() { $this->assertEquals('31/01/1991cat', $this->feather['date']->set('31 January 1991')->suffix('cat')->show('d/m/Y')); } From 5be3203da757743188134484eda5a0b7043d6bfc Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 12:51:03 +0930 Subject: [PATCH 072/136] Moved the redirector into the support components. Signed-off-by: Jason Lewis --- components/{foundation => support}/redirector.php | 2 +- config/feather.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename components/{foundation => support}/redirector.php (98%) diff --git a/components/foundation/redirector.php b/components/support/redirector.php similarity index 98% rename from components/foundation/redirector.php rename to components/support/redirector.php index 2d0d89a..a05fd67 100644 --- a/components/foundation/redirector.php +++ b/components/support/redirector.php @@ -1,4 +1,4 @@ - function($feather) { - $feather['redirect'] = $feather->share(function($feather) + $feather['redirect'] = function($feather) { - return new Feather\Components\Foundation\Redirector(null); - }); + return new Feather\Components\Support\Redirector(null); + }; }, 'crumbs' => function($feather) { From 2a0784c39d9e1debe6c20b6eb2eb2c3bbe0718f8 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 12:53:15 +0930 Subject: [PATCH 073/136] Refactoring facade tests. Signed-off-by: Jason Lewis --- tests/facade.test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/facade.test.php b/tests/facade.test.php index f426a89..e40bfe9 100644 --- a/tests/facade.test.php +++ b/tests/facade.test.php @@ -1,7 +1,5 @@ Date: Sun, 23 Sep 2012 13:13:49 +0930 Subject: [PATCH 074/136] Renamed crumbs to breadcrumbs. Signed-off-by: Jason Lewis --- components/support/{crumbs.php => breadcrumbs.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename components/support/{crumbs.php => breadcrumbs.php} (98%) diff --git a/components/support/crumbs.php b/components/support/breadcrumbs.php similarity index 98% rename from components/support/crumbs.php rename to components/support/breadcrumbs.php index 5b6e3f1..1ee2f93 100644 --- a/components/support/crumbs.php +++ b/components/support/breadcrumbs.php @@ -5,7 +5,7 @@ use Feather\Models; use Feather\Components\Foundation\Component; -class Crumbs extends Component { +class Breadcrumbs extends Component { /** * Crumbs to be dropped on the trail. From ee9e734b31c2fe86ec7ec3cb448427a49cdb9b66 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 13:14:22 +0930 Subject: [PATCH 075/136] Moved the validation component. Signed-off-by: Jason Lewis --- .../{support/validation.php => validation/validator.php} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename components/{support/validation.php => validation/validator.php} (95%) diff --git a/components/support/validation.php b/components/validation/validator.php similarity index 95% rename from components/support/validation.php rename to components/validation/validator.php index a414fbb..d93e6a8 100644 --- a/components/support/validation.php +++ b/components/validation/validator.php @@ -1,13 +1,12 @@ -feather['gear']->fire("validation: before {$event}", array($this)); - $validator = new Validator($this->input, $this->rules, $this->messages); + $validator = new \Validator($this->input, $this->rules, $this->messages); if($validator->connection(DB::connection(FEATHER_DATABASE))->fails()) { From 3923182075c40a4d75f72d53d77506f30538b9fc Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 13:15:11 +0930 Subject: [PATCH 076/136] Initial commit of pagination component. Signed-off-by: Jason Lewis --- components/pagination/paginator.php | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 components/pagination/paginator.php diff --git a/components/pagination/paginator.php b/components/pagination/paginator.php new file mode 100644 index 0000000..4b961cd --- /dev/null +++ b/components/pagination/paginator.php @@ -0,0 +1,55 @@ + $last = ceil($total / $per_page)) + { + return ($last > 0) ? $last : 1; + } + + return (static::valid($page)) ? $page : 1; + } + + /** + * Create a HTML page link. + * + * @param int $page + * @param string $text + * @param string $class + * @return string + */ + protected function link($page, $text, $class) + { + $page = "p{$page}"; + + if(preg_match('/p([0-9]+)/', $page)) + { + $uri = preg_replace('/\/p([0-9]+)/', '', URI::current(), 1); + } + + return HTML::link($uri . '/' . $page, $text, compact('class'), Request::secure()); + } + +} \ No newline at end of file From 4fa2f53a1bd32f92c16169acc89e6d3952f68f2e Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 13:15:24 +0930 Subject: [PATCH 077/136] Refactoring of facades and components. Signed-off-by: Jason Lewis --- config/feather.php | 15 +++++++++++---- facades.php | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/config/feather.php b/config/feather.php index 471b987..6f2ff22 100644 --- a/config/feather.php +++ b/config/feather.php @@ -89,15 +89,15 @@ { $feather['crumbs'] = $feather->share(function($feather) { - return new Feather\Components\Support\Crumbs($feather); + return new Feather\Components\Support\Breadcrumbs($feather); }); }, 'validator' => function($feather) { - $feather['validator'] = $feather->share(function($feather) + $feather['validator'] = function($feather) { - return new Feather\Components\Support\Validation($feather); - }); + return new Feather\Components\Validation\Validator($feather); + }; }, 'date' => function($feather) { @@ -105,6 +105,13 @@ { return new Feather\Components\Support\Date($feather); }; + }, + 'paginator' => function($feather) + { + $feather['paginator'] = function($feather) + { + return new Feather\Components\Pagination\Paginator($feather); + }; } ), ); \ No newline at end of file diff --git a/facades.php b/facades.php index 450b92e..afb6606 100644 --- a/facades.php +++ b/facades.php @@ -86,4 +86,15 @@ class Date extends Components\Support\Facade { */ protected static function accessor(){ return 'date'; } +} + +class Paginator extends Components\Support\Facade { + + /** + * Gets the name of the facade component. + * + * @return string + */ + protected static function accessor(){ return 'paginator'; } + } \ No newline at end of file From 58f8ab7d89401c725b6c800109292bf0d9c8b02f Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 13:29:48 +0930 Subject: [PATCH 078/136] Missed the controller method when porting. Signed-off-by: Jason Lewis --- components/gear/manager.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/components/gear/manager.php b/components/gear/manager.php index cee4ee2..5317c6b 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -1,6 +1,8 @@ method); + + return Event::first("controller: {$event} {$route->controller}@{$method}.{$route->controller_action}", array(array($controller))); + } + } \ No newline at end of file From 173fee196293fc2fe2cf325c98830498d1d120ff Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 14:58:43 +0930 Subject: [PATCH 079/136] Fixed problem with fuzzy date test. Signed-off-by: Jason Lewis --- tests/date.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/date.test.php b/tests/date.test.php index 2925336..c6a43d7 100644 --- a/tests/date.test.php +++ b/tests/date.test.php @@ -36,7 +36,7 @@ public function testCanSuffixDate() public function testCanGetFuzzyDate() { - $this->assertEquals('1 day ago', $this->feather['date']->set('Yesterday')->fuzzy()); + $this->assertEquals('0 seconds ago', $this->feather['date']->set('Now')->fuzzy()); } } From 7a812aacbc720adb12b7059b854efaa60e2dfd40 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 14:58:59 +0930 Subject: [PATCH 080/136] Fixed issues with the validation tests. Signed-off-by: Jason Lewis --- tests/validation.test.php | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/tests/validation.test.php b/tests/validation.test.php index ba077fc..d7ed7b1 100644 --- a/tests/validation.test.php +++ b/tests/validation.test.php @@ -9,57 +9,48 @@ public function setUp() $this->feather = Feather\Components\Support\Facade::application(); } - public function tearDown() - { - $this->feather['validator']->app('core'); - - $this->feather['validator']->rules = array(); - - $this->feather['validator']->messages = array(); - } - public function testCanChangeApplication() { - $this->feather['validator']->app('cat'); + $validator = $this->feather['validator']->app('cat'); - $this->assertEquals('cat', $this->feather['validator']->application); + $this->assertEquals('cat', $validator->application); } public function testCanValidateAgainstInput() { - $this->feather['validator']->against(array('foo' => 'bar')); + $validator = $this->feather['validator']->against(array('foo' => 'bar')); - $this->assertEquals(array('foo' => 'bar'), $this->feather['validator']->input); + $this->assertEquals(array('foo' => 'bar'), $validator->input); } public function testCanSetCustomData() { - $this->feather['validator']->with('foo', 'bar'); + $validator = $this->feather['validator']->with('foo', 'bar'); - $this->assertEquals(array('foo' => 'bar'), $this->feather['validator']->data); + $this->assertEquals(array('foo' => 'bar'), $validator->data); } public function testCanLoadValidatorClosure() { $this->feather['config']->set('feather: validation.test', function($validator){}); - $this->feather['validator']->get('test'); + $validator = $this->feather['validator']->get('test'); - $this->assertArrayHasKey('test', $this->feather['validator']->validating); + $this->assertArrayHasKey('test', $validator->validating); } public function testCanAddRule() { - $this->feather['validator']->rule('cat', 'dog'); + $validator = $this->feather['validator']->rule('cat', 'dog'); - $this->assertEquals(array('cat' => array('dog')), $this->feather['validator']->rules); + $this->assertEquals(array('cat' => array('dog')), $validator->rules); } public function testCanAddMessage() { - $this->feather['validator']->message('cat', 'dog'); + $validator = $this->feather['validator']->message('cat', 'dog'); - $this->assertEquals(array('cat' => 'core::dog'), $this->feather['validator']->messages); + $this->assertEquals(array('cat' => 'core::dog'), $validator->messages); } public function testValidationDoesPass() From 5c8143f39407b006fb088fd83892ae823d61127f Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 15:13:49 +0930 Subject: [PATCH 081/136] Initial commit of views bootstrapping. Signed-off-by: Jason Lewis --- bootstrap/views.php | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 bootstrap/views.php diff --git a/bootstrap/views.php b/bootstrap/views.php new file mode 100644 index 0000000..a9598f6 --- /dev/null +++ b/bootstrap/views.php @@ -0,0 +1,108 @@ +bundle('feather/themes/' . $feather['config']->get('feather: db.forum.theme', 'default')); + +set_path('theme', path('themes') . $feather['config']->get('feather: db.forum.theme', 'default') . DS); + +Bundle::register('feather theme', array( + 'location' => 'path: ' . path('theme') +)); + +/* +|-------------------------------------------------------------------------- +| View Event Override +|-------------------------------------------------------------------------- +| +| Feather views behave differently to standard Laravel views. Templates +| have the ability to override views found in applications. This allows +| templates to provide custom structuring depending on the features the +| template offers. +| +| To enable this functionality Feather must override the event loader of +| view files. +| +*/ + +Event::override(View::loader, function($bundle, $view) +{ + if(!str_contains($bundle, ' ')) + { + $bundle = "feather {$bundle}"; + } + + $path = Bundle::path($bundle) . 'views'; + + if(!is_null(View::file($bundle, $view, path('theme') . 'views'))) + { + $path = path('theme') . 'views'; + } + + if(str_contains($view, ': ')) + { + list($directory, $view) = explode(': ', $view); + + list($name, $view) = explode(' ', $view); + + if(!is_null(View::file($bundle, $view, path('feather') . Str::plural($directory) . DS . $name . DS . 'views'))) + { + $path = path('feather') . Str::plural($directory) . DS . $name . DS . 'views'; + } + } + + return View::file($bundle, $view, $path); +}); + +/* +|-------------------------------------------------------------------------- +| Global Feather Variable +|-------------------------------------------------------------------------- +| +| The feather global view variable is shared across all views. It contains +| some basic information about the forum as well as the currently logged in +| user. +| +*/ + +Event::listen('auth: started', function() use ($feather) +{ + $user = array(); + + if($feather['auth']->online()) + { + $user = $feather['auth']->user(); + } + + View::share('feather', (object) array_merge($feather['config']->get('feather: db.forum'), array('user' => (object) $user))); +}); + +/* +|-------------------------------------------------------------------------- +| Default Variable Assignment +|-------------------------------------------------------------------------- +| +| Some variables are used almost always inside a template. To ensure these +| varaiables are always set we'll set them if they are not currently set. +| +*/ + +$defaults = function($view) +{ + if(!isset($view->title)) $view->title = 'Index'; + + if(!isset($view->alert)) $view->alert = null; +}; + +View::composer('feather core::template', $defaults); +View::composer('feather admin::template', $defaults); \ No newline at end of file From e3df7121ba930d1845e500c4a149692ea213f35b Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 15:14:15 +0930 Subject: [PATCH 082/136] Moved the exceptions file into the bootstrap directory. Signed-off-by: Jason Lewis --- exceptions.php => bootstrap/exceptions.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename exceptions.php => bootstrap/exceptions.php (100%) diff --git a/exceptions.php b/bootstrap/exceptions.php similarity index 100% rename from exceptions.php rename to bootstrap/exceptions.php From 0eeacabdb460a27bdcf374728683868e208da00d Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 15:14:33 +0930 Subject: [PATCH 083/136] Fixed a couple issues with the facades and incorrect naming. Signed-off-by: Jason Lewis --- config/feather.php | 4 ++-- facades.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/feather.php b/config/feather.php index 6f2ff22..ff02cbf 100644 --- a/config/feather.php +++ b/config/feather.php @@ -85,9 +85,9 @@ return new Feather\Components\Support\Redirector(null); }; }, - 'crumbs' => function($feather) + 'breadcrumbs' => function($feather) { - $feather['crumbs'] = $feather->share(function($feather) + $feather['breadcrumbs'] = $feather->share(function($feather) { return new Feather\Components\Support\Breadcrumbs($feather); }); diff --git a/facades.php b/facades.php index afb6606..16e4b1f 100644 --- a/facades.php +++ b/facades.php @@ -44,14 +44,14 @@ protected static function accessor(){ return 'gear'; } } -class Crumbs extends Components\Support\Facade { +class Breadcrumbs extends Components\Support\Facade { /** * Gets the name of the facade component. * * @return string */ - protected static function accessor(){ return 'crumbs'; } + protected static function accessor(){ return 'breadcrumbs'; } } From faba56380deb5038a6e401197e39939e30912c6e Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 15:15:05 +0930 Subject: [PATCH 084/136] A bit of shuffling of code execution to ensure everything is loaded prior to it being needed. Signed-off-by: Jason Lewis --- start.php | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/start.php b/start.php index 742a349..13b6273 100644 --- a/start.php +++ b/start.php @@ -23,17 +23,6 @@ set_path('themes', path('feather') . 'themes' . DS); -/* -|-------------------------------------------------------------------------- -| Feather Exceptions -|-------------------------------------------------------------------------- -| -| Load in Feather's Exception Classes -| -*/ - -require path('feather') . 'exceptions' . EXT; - /* |-------------------------------------------------------------------------- | Core Autoloading @@ -80,6 +69,19 @@ $feather['config']->db(); +/* +|-------------------------------------------------------------------------- +| Load Feather Bootstrapping +|-------------------------------------------------------------------------- +| +| We can now bootstrap the remaining items. +| +*/ + +require path('feather') . 'bootstrap' . DS . 'views' . EXT; + +require path('feather') . 'bootstrap' . DS . 'exceptions' . EXT; + /* |-------------------------------------------------------------------------- | Load Feather Components @@ -89,15 +91,14 @@ | */ -foreach($feather['config']->get('feather: feather.components') as $component => $closure) +foreach($feather['config']->get('feather: feather.components') as $component => $resolver) { - if(is_callable($closure)) + if(is_callable($resolver)) { - $closure($feather); + $resolver($feather); } } - /* |-------------------------------------------------------------------------- | Load Feather Facades @@ -127,14 +128,26 @@ { $handles = str_replace('(:feather)', Bundle::option('feather', 'handles'), $handles); - Bundle::register("feather/{$application}", array( + Bundle::register("feather {$application}", array( 'handles' => $handles, 'location' => "feather/applications/{$application}" )); - starts_with(Request::uri(), $handles) and Bundle::start("feather/{$application}"); + starts_with(Request::uri(), $handles) and Bundle::start("feather {$application}"); } +/* +|-------------------------------------------------------------------------- +| Bootstrap Authentication +|-------------------------------------------------------------------------- +| +| Authentication needs to be bootstrapped so that we have the correct +| auth driver set, any authenticators are registered, and the user is set. +| +*/ + +$feather['auth']->bootstrap(); + /* |-------------------------------------------------------------------------- | Feather CLI From 035a1d6a6f02e653d2a32f2c27ab93f28fe254ca Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 15:15:35 +0930 Subject: [PATCH 085/136] Authorizer is now bootstrapped from the start.php file. Signed-off-by: Jason Lewis --- components/auth/authorizer.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/components/auth/authorizer.php b/components/auth/authorizer.php index 16586f0..dfd575f 100644 --- a/components/auth/authorizer.php +++ b/components/auth/authorizer.php @@ -4,9 +4,9 @@ use Route; use Session; use InvalidArgumentException; -use Feather\Components\Foundation; +use Feather\Components\Foundation\Component; -class Authorizer extends Foundation\Component { +class Authorizer extends Component { /** * The current logged in user. @@ -16,15 +16,12 @@ class Authorizer extends Foundation\Component { public $user; /** - * Overload the constructor, bootstrap the authenticator. + * Bootstrap the authenticator. * - * @param Feather\Components\Foundation\Application $feather * @return void */ - public function __construct(Foundation\Application $feather) + public function bootstrap() { - parent::__construct($feather); - Auth::extend('feather', function() { return new Driver; From c38a971f21e7e2eadcddd1224aed5536a3c55e9d Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:51:04 +0930 Subject: [PATCH 086/136] Autoload core and admin models, shifting of logic, and theme development mode. Signed-off-by: Jason Lewis --- start.php | 65 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/start.php b/start.php index 13b6273..eaee54e 100644 --- a/start.php +++ b/start.php @@ -1,5 +1,6 @@ path('feather') + 'Feather\\Core' => path('core') . 'models', + 'Feather\\Admin' => path('admin') . 'models', + 'Feather' => path('feather') )); /* @@ -82,6 +85,8 @@ require path('feather') . 'bootstrap' . DS . 'exceptions' . EXT; +require path('feather') . 'bootstrap' . DS . 'ioc' . EXT; + /* |-------------------------------------------------------------------------- | Load Feather Components @@ -113,6 +118,18 @@ require path('feather') . 'facades' . EXT; +/* +|-------------------------------------------------------------------------- +| Bootstrap Authentication +|-------------------------------------------------------------------------- +| +| Authentication needs to be bootstrapped so that we have the correct +| auth driver set, any authenticators are registered, and the user is set. +| +*/ + +$feather['auth']->bootstrap(); + /* |-------------------------------------------------------------------------- | Register Feather Applications @@ -126,28 +143,16 @@ foreach($feather['config']->get('feather: feather.applications') as $application => $handles) { - $handles = str_replace('(:feather)', Bundle::option('feather', 'handles'), $handles); + $handles = trim(str_replace('(:feather)', Bundle::option('feather', 'handles'), $handles), '/'); Bundle::register("feather {$application}", array( 'handles' => $handles, 'location' => "feather/applications/{$application}" )); - starts_with(Request::uri(), $handles) and Bundle::start("feather {$application}"); + starts_with(Request::uri(), $handles ?: Request::uri()) and Bundle::start("feather {$application}"); } -/* -|-------------------------------------------------------------------------- -| Bootstrap Authentication -|-------------------------------------------------------------------------- -| -| Authentication needs to be bootstrapped so that we have the correct -| auth driver set, any authenticators are registered, and the user is set. -| -*/ - -$feather['auth']->bootstrap(); - /* |-------------------------------------------------------------------------- | Feather CLI @@ -164,4 +169,32 @@ require 'Hamcrest/Hamcrest.php'; with(new \Mockery\Loader)->register(); -} \ No newline at end of file +} + +/* +|-------------------------------------------------------------------------- +| Theme Development Mode +|-------------------------------------------------------------------------- +| +| When not running via the CLI and theme development mode is on we'll +| publish all the themes related assets. +| +*/ +if($feather['config']->get('feather: db.forum.theme_development_mode') and !Request::cli()) +{ + $publisher = IoC::resolve('feather: publisher'); + + ob_start() and $publisher->theme((array) $feather['config']->get('feather: db.forum.theme')) and ob_clean(); +} + +/* +|-------------------------------------------------------------------------- +| Theme Bootstrap +|-------------------------------------------------------------------------- +| +| Because themes are registered as a Laravel bundle they can contain a +| start script to register any theme related assets with the container. +| +*/ + +Bundle::start('feather theme'); \ No newline at end of file From a9e5d2a6df77390808201bf79420be43b8aa6c1a Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:51:29 +0930 Subject: [PATCH 087/136] Initial commit of base controller. Signed-off-by: Jason Lewis --- applications/core/controllers/base.php | 153 +++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 applications/core/controllers/base.php diff --git a/applications/core/controllers/base.php b/applications/core/controllers/base.php new file mode 100644 index 0000000..ecb5b2f --- /dev/null +++ b/applications/core/controllers/base.php @@ -0,0 +1,153 @@ +feather = Feather\Components\Support\Facade::application(); + } + + /** + * Determines if a place is valid, if it is return the place. + * + * @param int $id + * @return Feather\Models\Place + */ + protected function place($id) + { + return is_numeric($id) ? Feather\Models\Place::with('permissions')->find($id) : null; + } + + /** + * Determines if a discussion is valid, if it is return the discussion. + * + * @param int $id + * @return Feather\Models\Discussion + */ + protected function discussion($id) + { + return is_numeric($id) ? Feather\Models\Discussion::with('participants')->find($id) : null; + } + + /** + * Method to be run before each request. + * + * @return void + */ + public function before() + { + if($this->geared) + { + $this->feather['gear']->controller('before', $this); + } + } + + /** + * Method to be run after each request. + * + * @return void + */ + public function after($response) + { + if($this->geared) + { + $this->feather['gear']->controller('after', $this); + } + + $this->feather['gear']->fire('assets: change styles', array(Asset::container('theme'))); + + $this->feather['gear']->fire('assets: change scripts', array(Asset::container('theme'))); + } + + /** + * Overload the execute method on the controller. If the controller is geared we'll + * run the first override gear and return the result accordingly. + * + * @param string $method + * @param array $parameters + * @return string|object + */ + public function execute($method, $parameters = array()) + { + $response = $this->geared ? $this->feather['gear']->controller('override', $this) : null; + + // Only if the response is not null and we actually fired a gear event successfully. + if(!is_null($response) and $response) + { + $response = is_string($response) ? $response : $this->layout; + + return $response; + } + + return parent::execute($method, $parameters); + } + + /** + * Magic method for calling Feather components. + * + * @param string $component + * @return object + */ + public function __get($component) + { + if(isset($this->feather[$component])) + { + return $tihs->feather[$component]; + } + + throw new BadMethodCallException('Invalid component [{$component}] called on controller.'); + } + + /** + * Catch-all method for requests that can't be matched. + * + * @param string $method + * @param array $parameters + * @return Response + */ + public function __call($method, $parameters) + { + $response = $this->geared ? $this->feather['gear']->controller('create', $this) : null; + + if(is_null($response) or !$response) + { + return Response::error('404'); + } + } + +} \ No newline at end of file From 7b2f4ffa932a7fea6e0b78665ff17fbc6610e6b9 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:52:35 +0930 Subject: [PATCH 088/136] Renaming of core model namespace. Signed-off-by: Jason Lewis --- applications/core/models/base.php | 2 +- applications/core/models/gear.php | 2 +- applications/core/models/migration.php | 2 +- applications/core/models/role.php | 2 +- applications/core/models/user.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/core/models/base.php b/applications/core/models/base.php index 903ac5c..833f0be 100644 --- a/applications/core/models/base.php +++ b/applications/core/models/base.php @@ -1,4 +1,4 @@ -has_many_and_belongs_to('Feather\\Models\\Role', 'user_roles', 'user_id', 'role_id'); + return $this->has_many_and_belongs_to('Feather\\Core\\Role', 'user_roles', 'user_id', 'role_id'); } } \ No newline at end of file From 033160a882a8e6fbdb86c136255533f6ec656863 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:53:31 +0930 Subject: [PATCH 089/136] Moved model autoloading out of the core start script. Signed-off-by: Jason Lewis --- applications/core/start.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/core/start.php b/applications/core/start.php index d4e6476..034aa7b 100644 --- a/applications/core/start.php +++ b/applications/core/start.php @@ -22,6 +22,6 @@ | */ -Autoloader::namespaces(array( - 'Feather\\Models' => path('core') . 'models' +Autoloader::map(array( + 'Feather_Base_Controller' => path('core') . 'controllers' . DS . 'base' . EXT )); \ No newline at end of file From a4203215ef6ac8da39d1e317d498860e98be5517 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:57:00 +0930 Subject: [PATCH 090/136] Blade extenders and HTML macros added. Signed-off-by: Jason Lewis --- bootstrap/views.php | 99 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/bootstrap/views.php b/bootstrap/views.php index a9598f6..0302e41 100644 --- a/bootstrap/views.php +++ b/bootstrap/views.php @@ -1,9 +1,11 @@ $4', $value); +}); + +/* +|-------------------------------------------------------------------------- +| Blade Events +|-------------------------------------------------------------------------- +| +| Fire custom Gear events. +| +*/ + +Blade::extend(function($value) +{ + $matcher = Blade::matcher('event'); + + return preg_replace($matcher, '$1', $value); +}); + +/* +|-------------------------------------------------------------------------- +| Blade Inline Errors +|-------------------------------------------------------------------------- +| +| Display inline errors for a specific form element. +| +*/ + +Blade::extend(function($value) +{ + $matcher = Blade::matcher('error'); + + return preg_replace($matcher, '$1has$2 ? view("feather core::error.inline", array("error" => $errors->first$1)) : null; ?>', $value); +}); + +/* +|-------------------------------------------------------------------------- +| Blade Errors +|-------------------------------------------------------------------------- +| +| Display all errors for a form. +| +*/ + +Blade::extend(function($value) +{ + $matcher = Blade::matcher('errors'); + + return preg_replace($matcher, '$1all() ? view("feather core::error.page", array("errors" => $errors->all())) : null; ?>', $value); +}); + +/* +|-------------------------------------------------------------------------- +| HTML::link_to_new_discussion() Macro +|-------------------------------------------------------------------------- +| +| Custom HTML macro to link to the new discussion page. +| +*/ + +HTML::macro('link_to_new_discussion', function($title, $attributes = array()) use ($feather) +{ + $uri = URI::current(); + + if(str_contains($uri, 'place')) + { + $url = preg_replace('/\/p([0-9]+)/', '', $uri) . (ends_with($uri, 'start') ? null : '/start'); + + preg_match('/(\d+)-.*?/', $uri, $matches); + + // If the user cannot start discussions on the selected place, don't show the button. + if($feather['auth']->cannot('start: discussions', Feather\Models\Place::find(array_pop($matches)))) + { + return null; + } + } + else + { + $url = URL::to_route('start.discussion'); + } + + return HTML::link($url, $title, $attributes); +}); \ No newline at end of file From d940befc4a78ee8224a705104bf501457b0bc6ed Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:58:07 +0930 Subject: [PATCH 091/136] Renamed the breadcrumbs test. Signed-off-by: Jason Lewis --- tests/{crumbs.test.php => breadcrumbs.test.php} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename tests/{crumbs.test.php => breadcrumbs.test.php} (54%) diff --git a/tests/crumbs.test.php b/tests/breadcrumbs.test.php similarity index 54% rename from tests/crumbs.test.php rename to tests/breadcrumbs.test.php index 478aa9e..6e6756b 100644 --- a/tests/crumbs.test.php +++ b/tests/breadcrumbs.test.php @@ -1,6 +1,6 @@ feather['crumbs']->drop('stub'); + $this->feather['breadcrumbs']->drop('stub'); - $this->assertNotEmpty($this->feather['crumbs']->crumbs); + $this->assertNotEmpty($this->feather['breadcrumbs']->crumbs); } public function testCanGetHTML() { - $this->assertEquals('
  • stub
    • ', $this->feather['crumbs']->item('/', 'stub')); + $this->assertEquals('
  • stub
    • ', $this->feather['breadcrumbs']->item('/', 'stub')); } } From a156a2a5b8cc2910f2ebb4d803d3f0bfc7089171 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 18:58:27 +0930 Subject: [PATCH 092/136] Initial commit of IoC bootstrap. Signed-off-by: Jason Lewis --- bootstrap/ioc.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 bootstrap/ioc.php diff --git a/bootstrap/ioc.php b/bootstrap/ioc.php new file mode 100644 index 0000000..339940b --- /dev/null +++ b/bootstrap/ioc.php @@ -0,0 +1,31 @@ + Date: Sun, 23 Sep 2012 19:14:44 +0930 Subject: [PATCH 093/136] Fixed really bad spelling of 'this'. Signed-off-by: Jason Lewis --- applications/core/controllers/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/core/controllers/base.php b/applications/core/controllers/base.php index ecb5b2f..c97b380 100644 --- a/applications/core/controllers/base.php +++ b/applications/core/controllers/base.php @@ -127,7 +127,7 @@ public function __get($component) { if(isset($this->feather[$component])) { - return $tihs->feather[$component]; + return $this->feather[$component]; } throw new BadMethodCallException('Invalid component [{$component}] called on controller.'); From 10dae1d2315c455832c3a08a731aae1469272774 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 19:15:04 +0930 Subject: [PATCH 094/136] Initial commit of publish task. Signed-off-by: Jason Lewis --- tasks/publish.php | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 tasks/publish.php diff --git a/tasks/publish.php b/tasks/publish.php new file mode 100644 index 0000000..087a80f --- /dev/null +++ b/tasks/publish.php @@ -0,0 +1,128 @@ +theme() and $this->gear(); + + echo PHP_EOL . PHP_EOL . "All theme and plugin assets have been published..."; + + return true; + } + + /** + * Register all the gears and publish all their assets. + * + * @param array $parameters + * @return void + */ + public function gear($parameters = array()) + { + $publish = empty($parameters) ? null : array_shift($parameters); + + $this->publish($publish, path('gears') . DS, 'plugins'); + + return true; + } + + /** + * Register all the themes and publish all their assets. + * + * @param array $parameters + * @return void + */ + public function theme($parameters = array()) + { + $publish = empty($parameters) ? null : array_shift($parameters); + + $this->publish($publish, path('themes') . DS, 'themes'); + + return true; + } + + /** + * Publish a theme or plugins assets. + * + * @param string $publish + * @param string $path + * @param string $type + * @return void + */ + private function publish($publish, $path, $type) + { + if(file_exists($path)) + { + ob_start(); + + $publisher = new Laravel\CLI\Tasks\Bundle\Publisher; + + $published = 0; + + foreach(new FilesystemIterator($path) as $item) + { + if($item->isDir() and ($publish == $item->getFilename() or is_null($publish))) + { + $name = $item->getFilename(); + + if(file_exists($item->getPathname() . DS . 'public')) + { + // To publish the assets we must first register the bundle. Afterwards + // we can run the publish task. + Bundle::register($this->name($name, $type), array( + 'location' => 'path: ' . $item->getPathname(), + 'handles' => null, + 'auto' => false + )); + + ob_start(); + + $publisher->publish($this->name($name, $type)); + + if(str_contains(ob_get_clean(), 'published')) + { + echo "[{$type}] Assets for '{$name}' have been published." . PHP_EOL; + + $published++; + } + else + { + echo "[{$type}] Could not publish assets for '{$name}'." . PHP_EOL; + } + } + } + } + + if(($string = ob_get_clean()) == '') + { + echo "[{$type}] There were no assets to publish."; + } + else + { + echo $string . "[{$type}] Total published: {$published}" . PHP_EOL . PHP_EOL; + } + } + else + { + echo "Could not locate the Feather {$type} directory. Please check your installation."; + } + } + + /** + * Name given to theme or gear. + * + * @param string $name + * @param string $type + * @return string + */ + private function name($name, $type) + { + return "feather/{$type}/{$name}"; + } + +} \ No newline at end of file From 2e48dd52b8fef530b4a011e2f33d860c1c911b28 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 19:17:12 +0930 Subject: [PATCH 095/136] Bit of model refactoring. Signed-off-by: Jason Lewis --- components/auth/driver.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components/auth/driver.php b/components/auth/driver.php index 96f21c9..a63b064 100644 --- a/components/auth/driver.php +++ b/components/auth/driver.php @@ -2,7 +2,7 @@ use Hash; use Cache; -use Feather\Models; +use Feather\Core; class Driver extends \Laravel\Auth\Drivers\Driver { @@ -19,7 +19,7 @@ public function retrieve($id) { return Cache::remember("user_{$id}", function() use ($id) { - $user = Models\User::with(array('roles'))->find($id); + $user = Core\User::with(array('roles'))->find($id); // To provide a cleaner syntax when accessing roles, we'll make each of the roles keys // the same as its ID. @@ -30,16 +30,16 @@ public function retrieve($id) $user->relationships['roles'] = $roles; return $user; - }, Models\User::cache_time); + }, Core\User::cache_time); } else { return Cache::remember('guest', function() { - return new Models\User(array( - 'roles' => array(3 => Models\Role::find(3)) + return new Core\User(array( + 'roles' => array(3 => Core\Role::find(3)) ), true); - }, Models\User::cache_time); + }, Core\User::cache_time); } } @@ -53,7 +53,7 @@ public function attempt($credentials = array()) { // Find the user in the database with the username they have provided in the // login form. If no user can be found then that's as far as we go. - if(!$user = Models\User::where_username($credentials['username'])->first()) + if(!$user = Core\User::where_username($credentials['username'])->first()) { return false; } @@ -62,7 +62,7 @@ public function attempt($credentials = array()) // a couple of extra checks. A migrating user has only a single role, which // is the migrating roll. If the user has not been migrated then we'll // attempt to migrate them. - if($migration = Models\Migration::active()) + if($migration = Core\Migration::active()) { $driver = Migrator\Drivers\Driver::make($migration); @@ -104,13 +104,13 @@ public function attempt($credentials = array()) /** * Log a user in to Feather. * - * @param int|Feather\Models\User $user + * @param int|Feather\Core\User $user * @param bool $remember * @return bool */ public function login($user, $remember = false) { - if($user instanceof Models\User) + if($user instanceof Core\User) { $user = $user->id; } From 9b7bc8da1e6825498f1b4347a100e6aa232aee6f Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 19:52:08 +0930 Subject: [PATCH 096/136] Initial commit of langauge files. Signed-off-by: Jason Lewis --- applications/core/language/en/common.php | 23 ++++++++++ applications/core/language/en/login.php | 58 ++++++++++++++++++++++++ applications/core/language/en/titles.php | 20 ++++++++ 3 files changed, 101 insertions(+) create mode 100644 applications/core/language/en/common.php create mode 100644 applications/core/language/en/login.php create mode 100644 applications/core/language/en/titles.php diff --git a/applications/core/language/en/common.php b/applications/core/language/en/common.php new file mode 100644 index 0000000..bb62e2c --- /dev/null +++ b/applications/core/language/en/common.php @@ -0,0 +1,23 @@ + 'Username', + 'password' => 'Password', + 'email' => 'E-mail', + 'login' => 'Sign In', + 'register' => 'Create Account', + 'connect_with_existing_service' => 'Connect with an existing service', + 'today' => 'Today', + 'yesterday' => 'Yesterday', + 'rules' => 'Rules' +); \ No newline at end of file diff --git a/applications/core/language/en/login.php b/applications/core/language/en/login.php new file mode 100644 index 0000000..360aa4b --- /dev/null +++ b/applications/core/language/en/login.php @@ -0,0 +1,58 @@ + 'Your username and/or password is incorrect.', + + /* + |-------------------------------------------------------------------------- + | Login Validation Messages + |-------------------------------------------------------------------------- + | + | English language messages for individual field errors. + | + */ + + 'messages' => array( + 'username' => array('is_required' => 'You did not enter a username.'), + 'password' => array('is_required' => 'You did not enter a password.') + ), + + /* + |-------------------------------------------------------------------------- + | Login Form Labels + |-------------------------------------------------------------------------- + | + | English language messages for login page form labels. + | + */ + + 'labels' => array( + 'remember' => array( + 'title' => 'Remember me', + 'helper' => 'If yes, when you next return you\'ll be automatically signed in.' + ), + 'register' => array( + 'title' => 'No account? Create a new account today!' + ) + ) + +); \ No newline at end of file diff --git a/applications/core/language/en/titles.php b/applications/core/language/en/titles.php new file mode 100644 index 0000000..d8488ef --- /dev/null +++ b/applications/core/language/en/titles.php @@ -0,0 +1,20 @@ + 'Home', + 'login' => 'Sign In', + 'register' => 'Create Account', + 'rules' => 'Rules', + 'connect_to_community' => 'Connect to Community', + 'start_discussion' => 'Start Discussion', + 'edit_discussion' => 'Edit Discussion' +); \ No newline at end of file From 2cb09d7701a281bdfbfb8b14b1ed3d43b2bd4d92 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 19:52:26 +0930 Subject: [PATCH 097/136] Validator loads validation configuration from specific application. Signed-off-by: Jason Lewis --- components/validation/validator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/validation/validator.php b/components/validation/validator.php index d93e6a8..ee1738a 100644 --- a/components/validation/validator.php +++ b/components/validation/validator.php @@ -9,7 +9,7 @@ class Validator extends Component { /** - * Application to load messages from. + * Application to load from. * * @var string */ @@ -71,7 +71,7 @@ public function app($application) */ public function get($validator) { - if(!$this->validating[$validator] = $this->feather['config']->get("feather: validation.{$validator}")) + if(!$this->validating[$validator] = $this->feather['config']->get("feather {$this->application}: validation.{$validator}")) { throw new InvalidArgumentException("Invalid validator [{$validator}] supplied."); } From f223af0886c30979984a4f31754ca76041fd9ab1 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:26:24 +0930 Subject: [PATCH 098/136] Config items can be loaded on a per application basis. Signed-off-by: Jason Lewis --- components/config/repository.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/components/config/repository.php b/components/config/repository.php index 10d88fb..263f01e 100644 --- a/components/config/repository.php +++ b/components/config/repository.php @@ -248,6 +248,15 @@ private function prefix($key) list($prefix, $key) = explode(': ', $key); + // Applications can refer to their own configuration files the same way that + // they are registered with Feather. + if(str_contains($prefix, ' ')) + { + list(, $app) = explode(' ', $prefix); + + $prefix = 'app'; + } + switch($prefix) { // The feather prefix is applied to both database and file-based @@ -263,6 +272,19 @@ private function prefix($key) return "feather::gear:{$gear} {$key}"; break; + + // The theme prefix is applied to Feather themes, the theme + // name should appear before the file and key to be used. + case 'theme': + list($theme, $key) = explode(' ', $key); + + return "feather::theme:{$theme} {$key}"; + break; + + case 'app': + return "feather {$app}::{$key}"; + break; + default: return $key; } From f30e80eb94dd296f023d6e56e942a022c064a9d4 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:26:37 +0930 Subject: [PATCH 099/136] Fixed a couple bugs in the gear manager. Signed-off-by: Jason Lewis --- components/gear/manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/gear/manager.php b/components/gear/manager.php index 5317c6b..0593b51 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -4,7 +4,7 @@ use Event; use Request; use FilesystemIterator; -use Feather\Models\Gear; +use Feather\Core\Gear; use InvalidArgumentException; use Feather\Components\Foundation\Component; From 19673a8e6dcb4cac798d26e0fbc6766b21d998a6 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:27:33 +0930 Subject: [PATCH 100/136] Validation files can be stored in custom validation directory. Signed-off-by: Jason Lewis --- components/validation/validator.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/components/validation/validator.php b/components/validation/validator.php index ee1738a..af3d869 100644 --- a/components/validation/validator.php +++ b/components/validation/validator.php @@ -71,12 +71,22 @@ public function app($application) */ public function get($validator) { - if(!$this->validating[$validator] = $this->feather['config']->get("feather {$this->application}: validation.{$validator}")) + $segments = explode('.', $validator); + + if(file_exists($path = path('applications') . $this->application . DS . 'validation' . DS . $segments[0] . EXT)) { - throw new InvalidArgumentException("Invalid validator [{$validator}] supplied."); + if($this->validating[$validator] = array_get(require $path, implode('.', array_slice($segments, 1)))) + { + return $this; + } } - return $this; + if($this->validating[$validator] = $this->feather['config']->get("feather {$this->application}: validation.{$validator}")) + { + return $this; + } + + throw new InvalidArgumentException("Invalid validator [{$validator}] supplied."); } /** @@ -101,7 +111,7 @@ public function passes() { // If a response is returned from the closure then we have a custom error messages // to throw with the exception. - if($responses = call_user_func(reset($this->validating), $this)) + if($responses = call_user_func_array(reset($this->validating), array($this))) { if(!is_array(reset($responses))) $responses = array(array_shift($responses) => array()); From 07a13d7920e2aec2b1552844d8fbf5ac25718b24 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:27:51 +0930 Subject: [PATCH 101/136] Fixed some issues with tests. Signed-off-by: Jason Lewis --- tests/auth.test.php | 8 ++++---- tests/breadcrumbs.test.php | 2 +- tests/gear.test.php | 2 +- tests/validation.test.php | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/auth.test.php b/tests/auth.test.php index 6b39da9..b650b9b 100644 --- a/tests/auth.test.php +++ b/tests/auth.test.php @@ -40,11 +40,11 @@ public function testCanCheckActivation() public function user() { - return new Feather\Models\User(array( + return new Feather\Core\User(array( 'roles' => array( - new Feather\Models\Role(array('do_something' => 1)), - new Feather\Models\Role(array('name' => 'Administrator')), - new Feather\Models\Role(array('view_something' => 0)) + new Feather\Core\Role(array('do_something' => 1)), + new Feather\Core\Role(array('name' => 'Administrator')), + new Feather\Core\Role(array('view_something' => 0)) ), 'activated' => 1 )); diff --git a/tests/breadcrumbs.test.php b/tests/breadcrumbs.test.php index 6e6756b..3e23f48 100644 --- a/tests/breadcrumbs.test.php +++ b/tests/breadcrumbs.test.php @@ -18,7 +18,7 @@ public function testCanDropCrumb() public function testCanGetHTML() { - $this->assertEquals('
  • stub
    • ', $this->feather['breadcrumbs']->item('/', 'stub')); + $this->assertEquals('
  • stub
    • ', $this->feather['breadcrumbs']->item('/', 'stub')); } } diff --git a/tests/gear.test.php b/tests/gear.test.php index ec2d2ca..7622dba 100644 --- a/tests/gear.test.php +++ b/tests/gear.test.php @@ -8,7 +8,7 @@ public function setUp() { $this->feather = Feather\Components\Support\Facade::application(); - $this->feather['gear']->register(new Feather\Models\Gear(array( + $this->feather['gear']->register(new Feather\Core\Gear(array( 'identifier' => 'stub', 'location' => 'path: ' . __DIR__ . DS . 'mock', 'auto' => false diff --git a/tests/validation.test.php b/tests/validation.test.php index d7ed7b1..2bfb020 100644 --- a/tests/validation.test.php +++ b/tests/validation.test.php @@ -32,7 +32,7 @@ public function testCanSetCustomData() public function testCanLoadValidatorClosure() { - $this->feather['config']->set('feather: validation.test', function($validator){}); + $this->feather['config']->set('feather core: validation.test', function($validator){}); $validator = $this->feather['validator']->get('test'); @@ -55,7 +55,7 @@ public function testCanAddMessage() public function testValidationDoesPass() { - $this->feather['config']->set('feather: validation.test', function($validator){ + $this->feather['config']->set('feather core: validation.test', function($validator){ $validator->rule('cat', 'required'); }); @@ -64,7 +64,7 @@ public function testValidationDoesPass() public function testValidationExceptionIsThrown() { - $this->feather['config']->set('feather: validation.test', function($validator){ + $this->feather['config']->set('feather core: validation.test', function($validator){ $validator->rule('cat', 'required'); }); From 74dbba8cfbd39dfe888f1493755494ae1c0114a7 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:29:32 +0930 Subject: [PATCH 102/136] Don't need this anymore. Signed-off-by: Jason Lewis --- config/validation.php | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 config/validation.php diff --git a/config/validation.php b/config/validation.php deleted file mode 100644 index 207cc1e..0000000 --- a/config/validation.php +++ /dev/null @@ -1,5 +0,0 @@ - Date: Sun, 23 Sep 2012 20:29:50 +0930 Subject: [PATCH 103/136] Added path to applications directory. Signed-off-by: Jason Lewis --- start.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/start.php b/start.php index eaee54e..4b114c3 100644 --- a/start.php +++ b/start.php @@ -16,9 +16,11 @@ set_path('feather', __DIR__ . DS); -set_path('core', path('feather') . 'applications' . DS . 'core' . DS); +set_path('applications', path('feather') . 'applications' . DS); -set_path('admin', path('feather') . 'applications' . DS . 'admin' . DS); +set_path('core', path('applications') . 'core' . DS); + +set_path('admin', path('applications') . 'admin' . DS); set_path('gears', path('feather') . 'gears' . DS); From d2c6e18994e16dbb4c8a4925588eb1dec56e5182 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:38:27 +0930 Subject: [PATCH 104/136] Fixed bug with validator. Signed-off-by: Jason Lewis --- components/validation/validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/validation/validator.php b/components/validation/validator.php index af3d869..0a4c117 100644 --- a/components/validation/validator.php +++ b/components/validation/validator.php @@ -75,7 +75,7 @@ public function get($validator) if(file_exists($path = path('applications') . $this->application . DS . 'validation' . DS . $segments[0] . EXT)) { - if($this->validating[$validator] = array_get(require $path, implode('.', array_slice($segments, 1)))) + if($this->validating[$validator] = array_get(require $path, implode('.', array_slice($segments, 1)) ?: null)) { return $this; } From 2e1b9c1a1a1f3698e205c5293d83d7220d00a321 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:39:20 +0930 Subject: [PATCH 105/136] Refining the template. Signed-off-by: Jason Lewis --- themes/basic/views/template.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/basic/views/template.blade.php b/themes/basic/views/template.blade.php index 3b093e2..46e9c4f 100644 --- a/themes/basic/views/template.blade.php +++ b/themes/basic/views/template.blade.php @@ -4,7 +4,7 @@ - @event('view: before template.title') {{ $title }} – {{ $app->title }} + @event('view: before template.title') {{ $title }} – {{ $feather->title }} {{ Asset::container('theme')->styles() }} @@ -22,9 +22,9 @@
    @if(Feather\Auth::online()) - @include('feather::menus.user') + @include('core::menu.user') @else - @include('feather::menus.guest') + @include('core::menu.guest') @endif
    From 01e6b8c326810b964d775a926517469873822e9f Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:39:53 +0930 Subject: [PATCH 106/136] Initial commit of index controller. Signed-off-by: Jason Lewis --- applications/core/controllers/index.php | 151 ++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 applications/core/controllers/index.php diff --git a/applications/core/controllers/index.php b/applications/core/controllers/index.php new file mode 100644 index 0000000..cfa4d6d --- /dev/null +++ b/applications/core/controllers/index.php @@ -0,0 +1,151 @@ +feather['config']->get('feather: db.overview.discussions_per_place')); + + $this->layout->nest('content', 'core::index.overview'); + } + + /** + * Allows a user to enter their login details into a form and then become + * authenticated on the forums. + * + * @return void + */ + public function get_login() + { + if($this->feather['auth']->online()) + { + return $this->redirect->to_route('feather'); + } + elseif($this->config->get('feather: db.auth.driver', 'internal') != 'internal') + { + return $this->redirect->before_login(); + } + + $this->breadcrumbs->drop(__('feather core::titles.login')); + + $this->layout->with('title', __('feather core::titles.login')) + ->nest('content', 'feather core::user.login'); + } + + /** + * Handles the posting of the login form and after validation, attempts to + * authenticate the user. + * + * @return void + */ + public function post_login() + { + try + { + $this->validator->get('auth.login')->against(Input::get())->passes(); + } + catch (FeatherValidationException $errors) + { + return $this->redirect->with_query('route: login')->with_input()->with_errors($errors->get()); + } + + if($this->auth->attempt(Input::get())) + { + return $this->redirect->to_previous('route: feather'); + } + + return $this->redirect->to_self()->with_input()->alert('error', 'feather core::login.failure'); + } + + /** + * Logs a user out of the forums and redirects them back to where they were, or depending + * on the authentication driver, a logout landing page. + * + * @return void + */ + public function get_logout() + { + Feather\Auth::logout(); + + // Return to the generated logout URL, this can change depending on the authentication + // driver that is being used. + return Feather\Redirect::after_logout(); + } + + /** + * If registrations are enabled a user can enter the required details into the registration + * form and register an account on the forums. + * + * @return void + */ + public function get_register() + { + if(Feather\Config::get('feather: auth.driver', 'internal') != 'internal') + { + return Feather\Redirect::before_register(); + } + + Feather\Breadcrumbs::drop(__('feather::titles.register')); + + $this->layout->with('title', __('feather::titles.register')) + ->nest('content', 'feather::user.register'); + } + + /** + * Handles the posting of the registration form. Validates and then attempts to + * register a user with the details they supplied. If e-mail activation is enabled + * a user will also be sent an e-mail so they can activate their account. + * + * @return void + */ + public function post_register() + { + try + { + Feather\Validation\Auth\Register::passes(Input::all()); + } + catch (FeatherValidationException $errors) + { + return Feather\Redirect::to_self()->with_input()->with_errors($errors->get()); + } + + try + { + $user = Feather\Models\User::register(Input::all()); + } + catch (FeatherRegistrationException $errors) + { + return Feather\Redirect::to_self()->with_input()->alert('error', 'feather::register.failure'); + } + + // Users must confirm their e-mail address once they have registered. We + // will now send them an e-mail with their activation code. + if(Feather\Config::get('feather: registration.confirm_email')) + { + + } + + // Log the user in and redirect back to the home page. + Feather\Auth::login($user->id); + + return Feather\Redirect::to_previous('route: feather'); + } + + /** + * Simply shows the forums rules. + * + * @return void + */ + public function get_rules() + { + $this->layout->with('title', __('feather::titles.rules')) + ->nest('content', 'feather::misc.rules'); + } + +} \ No newline at end of file From 1dff1532b7b50751f56a645c58bec033553abfb7 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:40:22 +0930 Subject: [PATCH 107/136] Refactoring the base controller. Signed-off-by: Jason Lewis --- applications/core/controllers/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/core/controllers/base.php b/applications/core/controllers/base.php index c97b380..10141a4 100644 --- a/applications/core/controllers/base.php +++ b/applications/core/controllers/base.php @@ -130,7 +130,7 @@ public function __get($component) return $this->feather[$component]; } - throw new BadMethodCallException('Invalid component [{$component}] called on controller.'); + throw new BadMethodCallException("Invalid component [{$component}] called on controller."); } /** From 7c5200cbb15b6c423ad581faa724a02182b80ad3 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:40:45 +0930 Subject: [PATCH 108/136] Initial commit of auth validation. Signed-off-by: Jason Lewis --- applications/core/validation/auth.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 applications/core/validation/auth.php diff --git a/applications/core/validation/auth.php b/applications/core/validation/auth.php new file mode 100644 index 0000000..2e57bdf --- /dev/null +++ b/applications/core/validation/auth.php @@ -0,0 +1,13 @@ + function($validator) + { + $validator->rule('username', 'required') + ->rule('password', 'required') + ->message('username.required', 'login.messages.username.is_required') + ->message('password.required', 'login.messages.password.is_required'); + } + +); \ No newline at end of file From 22e139070ccf06014e02f7f3fac36aca24025c94 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:41:01 +0930 Subject: [PATCH 109/136] Initial commit of some views. Signed-off-by: Jason Lewis --- .../core/views/index/overview.blade.php | 1 + applications/core/views/menu/guest.blade.php | 4 ++ applications/core/views/user/login.blade.php | 52 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 applications/core/views/index/overview.blade.php create mode 100644 applications/core/views/menu/guest.blade.php create mode 100644 applications/core/views/user/login.blade.php diff --git a/applications/core/views/index/overview.blade.php b/applications/core/views/index/overview.blade.php new file mode 100644 index 0000000..3c002eb --- /dev/null +++ b/applications/core/views/index/overview.blade.php @@ -0,0 +1 @@ +Oh la la \ No newline at end of file diff --git a/applications/core/views/menu/guest.blade.php b/applications/core/views/menu/guest.blade.php new file mode 100644 index 0000000..a61f73a --- /dev/null +++ b/applications/core/views/menu/guest.blade.php @@ -0,0 +1,4 @@ +
      +
    • {{ HTML::link(URL::to_route('login') . '?return=' . URI::current(), 'Sign In') }}
      • +
    • {{ HTML::link(URL::to_route('register') . '?return=' . URI::current(), 'Create Account') }}
      • +
    \ No newline at end of file diff --git a/applications/core/views/user/login.blade.php b/applications/core/views/user/login.blade.php new file mode 100644 index 0000000..102b2d6 --- /dev/null +++ b/applications/core/views/user/login.blade.php @@ -0,0 +1,52 @@ +

    {{ __('feather core::titles.login') }}

    + +{{ Form::open(urldecode(URI::full()), 'post') }} + +
    + +
    + +
    {{ Form::label('username', __('feather core::common.username')) }}
    +
    + {{ Form::text('username', Input::old('username')) }} + + @error('username') +
    + +
    {{ Form::label('password', __('feather core::common.password')) }}
    +
    + {{ Form::password('password') }} + + @error('password') +
    + +
    {{ Form::label('remember', __('feather core::login.labels.remember.title')) }}
    +
    +
    + + +
    + +
    + {{ __('feather core::login.labels.remember.helper') }} +
    +
    + +
    + +
    + +
    + {{ Form::submit(__('feather core::common.login'), array('class' => 'btn btn-primary btn-big')) }}   + {{ HTML::link_to_route('register', __('feather core::login.labels.register.title'), null, array('class' => 'btn large')) }} +
    + +{{ Form::token() . Form::close() }} \ No newline at end of file From 619f27285bebd90826c77facb4158062274a59ab Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:41:14 +0930 Subject: [PATCH 110/136] Added the main auth routes. Signed-off-by: Jason Lewis --- applications/core/routes.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/applications/core/routes.php b/applications/core/routes.php index e9c1eaf..0aa3276 100644 --- a/applications/core/routes.php +++ b/applications/core/routes.php @@ -1,6 +1,13 @@ 'feather', 'uses' => 'feather core::index@index')); + +/* +|-------------------------------------------------------------------------- +| User Authentication +|-------------------------------------------------------------------------- +*/ + +Route::any('(:bundle)/login', array('as' => 'login', 'uses' => 'feather core::index@login')); +Route::any('(:bundle)/register', array('as' => 'register', 'uses' => 'feather core::login@register')); +Route::get('(:bundle)/logout', array('as' => 'logout', 'uses' => 'feather core::login@logout')); \ No newline at end of file From f6f275d7c5be8c2a8e8cc944c52e98cdedd653c6 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:54:52 +0930 Subject: [PATCH 111/136] Fixed some nasty bugs in the redirector. Signed-off-by: Jason Lewis --- components/support/redirector.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/support/redirector.php b/components/support/redirector.php index a05fd67..23843f1 100644 --- a/components/support/redirector.php +++ b/components/support/redirector.php @@ -3,6 +3,7 @@ use URL; use URI; use Input; +use Bundle; use Request; use Redirect; use Feather\Auth; @@ -68,9 +69,9 @@ public function to_previous($default = null) * * @return object */ - public static function after_logout() + public function after_logout() { - return $this->for_auth(Config::get('feather: auth.logout_url')); + return $this->for_auth(Config::get('feather: db.auth.logout_url')); } /** @@ -78,9 +79,9 @@ public static function after_logout() * * @return object */ - public static function before_register() + public function before_register() { - return $this->for_auth(Config::get('feather: auth.register_url')); + return $this->for_auth(Config::get('feather: db.auth.register_url')); } /** @@ -88,9 +89,9 @@ public static function before_register() * * @return object */ - public static function before_login() + public function before_login() { - return $this->for_auth(Config::get('feather: auth.login_url')); + return $this->for_auth(Config::get('feather: db.auth.login_url')); } /** @@ -107,7 +108,7 @@ protected function for_auth($url) '{token}' => Auth::online() ? Auth::user()->authenticator_token : null ); - if(Config::get('feather: auth.driver') == 'internal') + if(Config::get('feather: db.auth.driver') == 'internal') { $url = URL::to_route('feather'); } From 7328b1132dd379d379cf5cbfed4c3ce106d41908 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:55:11 +0930 Subject: [PATCH 112/136] Fixed a couple issues with the view bootstrapping. Signed-off-by: Jason Lewis --- bootstrap/views.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap/views.php b/bootstrap/views.php index 0302e41..ba1357e 100644 --- a/bootstrap/views.php +++ b/bootstrap/views.php @@ -1,5 +1,7 @@ cannot('start: discussions', Feather\Models\Place::find(array_pop($matches)))) + if($feather['auth']->cannot('start: discussions', Core\Place::find(array_pop($matches)))) { return null; } From d73be40d09939e751d5c72e5bbb789ab11b4f615 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 20:55:34 +0930 Subject: [PATCH 113/136] Added some getters and setters to the user model. Signed-off-by: Jason Lewis --- applications/core/models/user.php | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/applications/core/models/user.php b/applications/core/models/user.php index 2ed878d..3345e9e 100644 --- a/applications/core/models/user.php +++ b/applications/core/models/user.php @@ -1,5 +1,8 @@ has_many_and_belongs_to('Feather\\Core\\Role', 'user_roles', 'user_id', 'role_id'); } + /** + * When setting a password it must be hashed before stored in the database. + * + * @param string $password + * @return void + */ + public function set_password($password) + { + $this->set_attribute('password', Hash::make($password)); + } + + /** + * Getter for a users slug. + * + * @return string + */ + public function get_slug() + { + return Str::slug($this->get_attribute('username')); + } + + /** + * Getter for a users name. + * + * @return string + */ + public function get_name() + { + return $this->get_attribute('username'); + } + + /** + * Getter for a users avatar URL, provided by Gravatar. + * + * @return string + */ + public function get_avatar() + { + return 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($this->get_attribute('email')))); + } + } \ No newline at end of file From 253048a7b6866ba45c60a145961f760808f83b27 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 21:07:33 +0930 Subject: [PATCH 114/136] More refactoring of the core application. Signed-off-by: Jason Lewis --- applications/core/controllers/index.php | 14 +- applications/core/language/en/register.php | 81 +++ applications/core/models/ness.php | 477 ++++++++++++++++++ applications/core/models/place.php | 49 ++ applications/core/routes.php | 40 +- applications/core/views/menu/user.blade.php | 33 ++ .../core/views/user/register.blade.php | 82 +++ 7 files changed, 767 insertions(+), 9 deletions(-) create mode 100644 applications/core/language/en/register.php create mode 100644 applications/core/models/ness.php create mode 100644 applications/core/models/place.php create mode 100644 applications/core/views/menu/user.blade.php create mode 100644 applications/core/views/user/register.blade.php diff --git a/applications/core/controllers/index.php b/applications/core/controllers/index.php index cfa4d6d..3c5a602 100644 --- a/applications/core/controllers/index.php +++ b/applications/core/controllers/index.php @@ -71,11 +71,11 @@ public function post_login() */ public function get_logout() { - Feather\Auth::logout(); + $this->auth->logout(); // Return to the generated logout URL, this can change depending on the authentication // driver that is being used. - return Feather\Redirect::after_logout(); + return $this->redirect->after_logout(); } /** @@ -86,15 +86,15 @@ public function get_logout() */ public function get_register() { - if(Feather\Config::get('feather: auth.driver', 'internal') != 'internal') + if($this->config->get('feather: db.auth.driver', 'internal') != 'internal') { - return Feather\Redirect::before_register(); + return $this->redirect->before_register(); } - Feather\Breadcrumbs::drop(__('feather::titles.register')); + $this->breadcrumbs->drop(__('feather core::titles.register')); - $this->layout->with('title', __('feather::titles.register')) - ->nest('content', 'feather::user.register'); + $this->layout->with('title', __('feather core::titles.register')) + ->nest('content', 'feather core::user.register'); } /** diff --git a/applications/core/language/en/register.php b/applications/core/language/en/register.php new file mode 100644 index 0000000..5f53147 --- /dev/null +++ b/applications/core/language/en/register.php @@ -0,0 +1,81 @@ + 'Your registration was unsuccessful. Please try again later or get in touch with an admin.', + + /* + |-------------------------------------------------------------------------- + | Register Validation Messages + |-------------------------------------------------------------------------- + | + | English language messages for individual field errors. + | + */ + + 'messages' => array( + 'username' => array( + 'is_required' => 'You did not enter a username.', + 'too_short' => 'Your username must be at least :length characters.', + 'too_long' => 'Your username must be less than :length characters.', + 'is_invalid' => 'Your username contained invalid characters.', + 'already_exists' => 'An account already exists with that username.' + ), + 'password' => array( + 'is_required' => 'You did not enter a password.', + 'too_short' => 'Your password must be at least :length characters.', + 'too_long' => 'Your password must be less than :length characters.', + 'did_not_match' => 'The passwords you entered did not match.', + ), + 'password_confirmation' => array( + 'is_required' => 'You did not confirm your password.', + ), + 'email' => array( + 'is_required' => 'You did not enter an e-mail address.', + 'invalid' => 'The e-mail you entered is invalid.', + 'already_exists' => 'An account already exists with that e-mail.', + 'does_not_exist' => 'The e-mail you entered does not exist.' + ), + 'rules' => array( + 'not_accepted' => 'You must read and accept the community rules.' + ) + ), + + /* + |-------------------------------------------------------------------------- + | Register Form Labels + |-------------------------------------------------------------------------- + | + | English language messages for register page form labels. + | + */ + + 'labels' => array( + 'password_confirmation' => array( + 'title' => 'Confirm Password' + ), + 'rules' => array( + 'helper' => 'I have read and agree to the :link.' + ) + ) + + +); \ No newline at end of file diff --git a/applications/core/models/ness.php b/applications/core/models/ness.php new file mode 100644 index 0000000..10b92ee --- /dev/null +++ b/applications/core/models/ness.php @@ -0,0 +1,477 @@ + + * + * @author Jason Lewis + * @version 1.0.2 + */ +class Ness extends Base { + + /** + * Stores the Ness related data to avoid cluttering the Eloquent-space. + * + * @var bool + */ + protected $ness = array( + 'deleting' => false, + 'crumbs' => null + ); + + /** + * Place a node after another node in the tree. + * + * + * $node = Ness::find(4); + * + * // Place the node after the node with an ID of 2. + * $node->after(2); + * + * // Place the node after another Ness object. + * $node->after(Ness::find(2)); + * + * + * @param object|int $node + * @return object + */ + public function after($node) + { + return $this->sibling($node, 'after'); + } + + /** + * Place a node before another node in the tree. + * + * + * $node = Ness::find(4); + * + * // Place the node before the node with an ID of 2. + * $node->before(2); + * + * // Place the node before another Ness object. + * $node->before(Ness::find(2)); + * + * + * @param object|int $node + * @return object + */ + public function before($node) + { + return $this->sibling($node, 'before'); + } + + /** + * Makes a node a sibling of another node, the position can either be before or after. + * + * @param object|int $node + * @param string $position + * @return object + */ + protected function sibling($node, $position) + { + $node = $this->check($node); + + // If our node currently exists we need to fake its death, shifting it outside of the + // tree momenterily. + if($this->exists) + { + $this->fake(); + + // Refresh the node we are placing it after so we can get the latest right value. + $node->refresh(); + + // And now revive the bastard to the new left position. + $this->revive(($position == 'after') ? $node->rgt : $node->lft - 1); + } + + // If the node doesn't exist yet in the tree we need to set the left and right values. + // If our position is BEFORE our left value will be the siblings current left value, if + // it is AFTER then it will be the right value plus 1. The right value will always be + // the left value plus 1. + else + { + $this->lft = ($position == 'after') ? $node->rgt + 1 : $node->lft; + + $this->rgt = $this->lft + 1; + + // We need to make an adjustment to the tree so we can fit out brand new node in. + // Once done we'll save our new node. + $this->adjustment($this->lft) + ->save(); + } + + return $this; + } + + /** + * Nest the current node on the supplied node. + * + * + * $node = Ness::find(3); + * + * // Nest the node on node with an ID of 5. + * $node->nest(5); + * + * // Nest the node on another Ness object. + * $node->nest(Ness::find(5)); + * + * + * @param object|int $node + * @return object + */ + public function nest($node) + { + $node = $this->check($node); + + if(!$node->exists) + { + throw new Exception('The node you are nesting on has not been saved yet.'); + } + + // If our node currently exists we need to fake its death, shifting it outside of the + // tree momenterily. + if($this->exists) + { + $this->fake(); + + // Refresh the node we are placing it after so we can get the latest right value. + $node->refresh(); + + // And now revive the bastard to the parent nodes right value. + $this->revive($node->rgt - 1); + + // Refresh our node. + $this->refresh(); + } + + // If the node doesn't exist yet we need set the left and right values. The new node will + // always be placed at the end of any other children. + else + { + $this->lft = $node->rgt; + + $this->rgt = $this->lft + 1; + + // We need to make an adjustment to the tree so we can fit out brand new node in. + // Once done we'll save our new node. + $this->adjustment($this->lft - 1) + ->save(); + } + } + + /** + * Parent node abandons children nodes, they become orphans of the next parent. + * + * + * $parent = Ness::find(4); + * + * // Abandon the children making them orphans to the parents parent. + * $parent->abandon(); + * + * // Abandon the children then move the node to another position. + * $parent->abandon()->before(2); + * + * + * @return object + */ + public function abandon() + { + if(!$this->parent()) + { + throw new Exception('Could not abandon children because the node is not a parent.'); + } + + // Shift all the children of the node forward one position. + static::where('lft', 'BETWEEN', DB::raw(($this->lft + 1) . ' AND ' . ($this->rgt - 1)))->update(array( + 'lft' => DB::raw('lft + 1'), + 'rgt' => DB::raw('rgt + 1') + )); + + $this->rgt = $this->lft + 1; + + $this->save(); + + return $this; + } + + /** + * Deletes a node and any children of that node unless the node has abandoned its children. + * + * + * $node = Ness::find(3); + * + * // Delete the node including it's children if it has any. + * $node->delete(); + * + * // To save the children abandon them before deleting. + * $node->abandon()->delete(); + * + * + * @return object + */ + public function delete() + { + if($this->exists) + { + // If we are deleting then we'll allow Eloquent to take care of the rest. + if($this->ness['deleting']) + { + parent::delete(); + + $this->ness['deleting'] = false; + } + + // If not deleting yet we'll need to check what it is we are actually deleting. + else + { + $this->ness['deleting'] = true; + + // If the node is a parent then we are going to delete all the children along with it. + // To delete a node without its children be sure to abandon the children before deleting. + if($this->parent()) + { + static::where('lft', 'BETWEEN', DB::raw($this->lft . ' AND ' . $this->rgt))->delete(); + } + + // If it's not a parent node then just delete the node, simple really! + else + { + $this->ness['deleting'] = false; + + // Allow Eloquent to delete the actual node. + parent::delete(); + } + + // Now to re-adjust the tree removing the gap we have left. + $this->adjustment($this->lft, ($this->width() + 1) * -1); + } + } + + return $this; + } + + /** + * Return an array of crumbs that led to the current node. + * + * + * $node = Ness::find(3); + * + * $crumbs = $node->crumbs(); + * + * + * @return array + */ + public function crumbs() + { + if(is_null($this->ness['crumbs'])) + { + $this->ness['crumbs'] = static::where('lft', '<', $this->lft)->where('rgt', '>', $this->rgt)->order_by('lft', 'asc')->get(); + } + + return $this->ness['crumbs']; + } + + /** + * Return an array of children for a node. + * + * + * $node = Ness::find(3); + * + * $children = $node->children(); + * + * + * @return array + */ + public function children() + { + if(!$this->parent()) + { + return $children = array(); + } + else + { + $sql = "SELECT node.*, (COUNT( parent.name ) -1) AS depth + FROM places AS node + CROSS JOIN places AS parent + WHERE node.lft > {$this->lft} + AND node.rgt < {$this->rgt} + AND node.lft BETWEEN parent.lft AND parent.rgt + GROUP BY node.id + ORDER BY node.lft"; + + $children = array(); + + foreach(DB::connection(static::$connection)->query($sql) as $object) + { + $children[] = new static((array) $object, true); + } + } + + return $children; + } + + /** + * Refreshes the node by getting the latest left and right values from the database. + * + * @return object + */ + public function refresh() + { + $updated = static::find($this->id); + + $this->fill(array( + 'lft' => $updated->lft, + 'rgt' => $updated->rgt + )); + + return $this; + } + + /** + * Fakes the removal of the node and its children from the database so that a node + * can be shifted around. + * + * @return object + */ + protected function fake() + { + // To fake the removal we'll shift the node outside of the tree by subtracting the + // right value from the node and its children. + static::where('lft', 'BETWEEN', DB::raw("{$this->lft} AND {$this->rgt}"))->update(array( + 'lft' => DB::raw("lft - {$this->rgt}"), + 'rgt' => DB::raw("rgt - {$this->rgt}") + )); + + // Adjust all those from our current left value by reducing a gap. Any nodes that have + // left and right values greater than or equal to this node will have 2 values taken + // from both their left and right values, thus 'removing' this node from the tree. + return $this->adjustment($this->lft, ($this->width() + 1) * -1); + } + + /** + * Revives a fake death (weird) node and all its children. Hallelujah! + * + * @param int $on + * @return object + */ + protected function revive($on) + { + // Make the adjustment to fit the node back into the tree. + $this->adjustment($on); + + // To revive the faked death we need to shift the node back into the tree by adding the + // left value and width of the node to those nodes between the negative width and zero. + $left = $this->width() * -1; + + $adjustment = $on + $this->width() + 1; + + static::where('lft', 'BETWEEN', DB::raw("{$left} AND 0"))->update(array( + 'lft' => DB::raw("lft + {$adjustment}"), + 'rgt' => DB::raw("rgt + {$adjustment}") + )); + + return $this; + } + + /** + * Perform an adjustment of all nodes from a given amount and of a given width. + * + * @param int $from + * @param int $width + * @return object + */ + protected function adjustment($from, $width = null) + { + if(is_null($width)) + { + $width = $this->width() + 1; + } + + static::where('lft', '>', $from)->update(array('lft' => DB::raw("lft + {$width}"))); + + static::where('rgt', '>', $from)->update(array('rgt' => DB::raw("rgt + {$width}"))); + + return $this; + } + + /** + * A node is a parent when its width is greater than one. + * + * + * if($node->parent()) + * { + * // The node is a parent. + * } + * + * + * @return bool + */ + public function parent() + { + return $this->width() > 1; + } + + /** + * Returns the width of the node in the tree. + * + * @return int + */ + public function width() + { + return $this->rgt - $this->lft; + } + + /** + * Checks a node to make sure it's valid, if not attempts to make it valid. + * + * @param object|int $node + * @return object + */ + protected function check($node) + { + if(is_numeric($node)) + { + $node = static::find($node); + } + + return $node; + } + + /** + * Overload the Eloquent save method so we can set the left and right values of a node if they aren't + * set by one of the other methods. + * + * @return bool + */ + public function save() + { + if(!$this->exists and is_null($this->lft)) + { + // If this is the first node in the tree then it gets the left and right values of 1 and 2. + if(!$after = static::select(array('lft', 'rgt'))->order_by('rgt', 'desc')->take(1)->first()) + { + $this->fill(array( + 'lft' => 1, + 'rgt' => 2 + )); + } + else + { + $this->fill(array( + 'lft' => $after->rgt + 1, + 'rgt' => $after->rgt + 2 + )); + } + + } + + return parent::save(); + } + +} \ No newline at end of file diff --git a/applications/core/models/place.php b/applications/core/models/place.php new file mode 100644 index 0000000..850f5e1 --- /dev/null +++ b/applications/core/models/place.php @@ -0,0 +1,49 @@ +has_many('Feather\\Models\\Permission', 'place_id'); + } + + /** + * A place has many moderators. + * + * @return object + */ + public function moderators() + { + return $this->has_many('Feather\\Models\\Place\\Moderator', 'place_id'); + } + + /** + * A place has many discussions. + * + * @return object + */ + public function discussions() + { + return $this->has_many('Feather\\Models\\Discussion', 'place_id'); + } + +} \ No newline at end of file diff --git a/applications/core/routes.php b/applications/core/routes.php index 0aa3276..7acd1d0 100644 --- a/applications/core/routes.php +++ b/applications/core/routes.php @@ -9,5 +9,41 @@ */ Route::any('(:bundle)/login', array('as' => 'login', 'uses' => 'feather core::index@login')); -Route::any('(:bundle)/register', array('as' => 'register', 'uses' => 'feather core::login@register')); -Route::get('(:bundle)/logout', array('as' => 'logout', 'uses' => 'feather core::login@logout')); \ No newline at end of file +Route::any('(:bundle)/register', array('as' => 'register', 'uses' => 'feather core::index@register')); +Route::get('(:bundle)/logout', array('as' => 'logout', 'uses' => 'feather core::index@logout')); + +/* +|-------------------------------------------------------------------------- +| Members and Profiles +|-------------------------------------------------------------------------- +*/ + +Route::get('(:bundle)/members', array('as' => 'members', 'uses' => 'feather::members@index')); +Route::get('(:bundle)/profile/(:any)', array('as' => 'profile', 'uses' => 'feather::profile@index')); + +/* +|-------------------------------------------------------------------------- +| Places +|-------------------------------------------------------------------------- +*/ + +Route::get('(:bundle)/place/(:num)-(:any)/(:page?)', array('as' => 'place', 'uses' => 'feather::place@place')); + +/* +|-------------------------------------------------------------------------- +| Discussions and Starting Discussions +|-------------------------------------------------------------------------- +*/ + +Route::any('(:bundle)/discussion/start', array('as' => 'start.discussion', 'uses' => 'feather::discussion@start')); +Route::any('(:bundle)/place/(:num)-(:any)/start', 'feather::discussion@start'); +Route::any('(:bundle)/discussion/(:num)-(:any)/(:page?)', array('as' => 'discussion', 'uses' => 'feather::discussion@index')); +Route::any('(:bundle)/discussion/(:num)-(:any)/edit', array('as' => 'discussion.edit', 'uses' => 'feather::discussion@edit')); + +/* +|-------------------------------------------------------------------------- +| Rules +|-------------------------------------------------------------------------- +*/ + +Route::get('(:bundle)/rules', array('as' => 'rules', 'uses' => 'feather::home@rules')); \ No newline at end of file diff --git a/applications/core/views/menu/user.blade.php b/applications/core/views/menu/user.blade.php new file mode 100644 index 0000000..39c771c --- /dev/null +++ b/applications/core/views/menu/user.blade.php @@ -0,0 +1,33 @@ +
      +
    • + {{ HTML::link_to_route('profile', $feather->user->username, array($feather->user->slug)) }} + +
        +
      • + {{ HTML::link('something', 'Profile') }} +
        • +
      • + {{ HTML::link('something', 'Settings') }} +
        • +
      • + {{ HTML::link('something', 'My Discussions') }} +
        • +
      • + {{ HTML::link('something', 'Watched Discussions') }} +
        • +
      +
      • + + @if(Feather\Auth::is('admin')) +
    • + Admin Dashboard +
      • + @endif + +
    • + You have 0 private conversations +
      • + +
    • {{ HTML::link(URL::to_route('logout') . '?return=' . URI::current(), 'Sign Out') }}
      • + +
    \ No newline at end of file diff --git a/applications/core/views/user/register.blade.php b/applications/core/views/user/register.blade.php new file mode 100644 index 0000000..df0bde6 --- /dev/null +++ b/applications/core/views/user/register.blade.php @@ -0,0 +1,82 @@ +

    {{ __('feather core::titles.register') }}

    + +{{ Form::open(URI::full(), 'post') }} + +
    + +
    + +
    + +
    + +
    {{ Form::label('username', __('feather core::common.username')) }}
    +
    + {{ Form::text('username', Input::old('username'), array('autocomplete' => 'off', 'tabindex' => 1)) }} + + @error('username') +
    + +
    {{ Form::label('email', __('feather core::common.email')) }}
    +
    + {{ Form::text('email', Input::old('email'), array('autocomplete' => 'off', 'tabindex' => 1)) }} + + @error('email') +
    + + @event('view: before register.rules') + + @if(Feather\Config::get('feather: db.registration.rules', 0)) + +
    +
    + + + @error('rules') +
    + + @endif + + @event('view: after register.rules') + +
    + +
    + +
    + +
    + +
    + +
    +
    {{ Form::label('password', __('feather core::common.password')) }}
    +
    + {{ Form::password('password', array('autocomplete' => 'off', 'tabindex' => 1)) }} + + @error('password') +
    + +
    {{ Form::label('password_confirmation', __('feather core::register.labels.password_confirmation.title')) }}
    +
    + {{ Form::password('password_confirmation', array('autocomplete' => 'off', 'tabindex' => 1)) }} + + @error('password_confirmation') +
    +
    + +
    + +
    + +
    + +
    + {{ Form::submit(__('feather core::common.register'), array('class' => 'btn btn-primary btn-big', 'tabindex' => 2)) }} +
    + +{{ Form::token() . Form::close() }} \ No newline at end of file From 7194878b01b9fd458f34d9ab959e43c5ab735db5 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 21:41:43 +0930 Subject: [PATCH 115/136] Fixed bug with the publisher, still using plugins. Signed-off-by: Jason Lewis --- tasks/publish.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/publish.php b/tasks/publish.php index 087a80f..99d59ba 100644 --- a/tasks/publish.php +++ b/tasks/publish.php @@ -26,7 +26,7 @@ public function gear($parameters = array()) { $publish = empty($parameters) ? null : array_shift($parameters); - $this->publish($publish, path('gears') . DS, 'plugins'); + $this->publish($publish, path('gears') . DS, 'gears'); return true; } From 97d1320d5fe28b07d4e6f816fe7d6c552c0ae290 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 21:42:16 +0930 Subject: [PATCH 116/136] Bootstrap the gears when constructed. Signed-off-by: Jason Lewis --- components/gear/manager.php | 43 +++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/components/gear/manager.php b/components/gear/manager.php index 0593b51..d3703f0 100644 --- a/components/gear/manager.php +++ b/components/gear/manager.php @@ -2,13 +2,15 @@ use Str; use Event; +use Cache; +use Bundle; use Request; use FilesystemIterator; use Feather\Core\Gear; use InvalidArgumentException; -use Feather\Components\Foundation\Component; +use Feather\Components\Foundation; -class Manager extends Component { +class Manager extends Foundation\Component { /** * Registered Gears. @@ -24,6 +26,41 @@ class Manager extends Component { */ public $started = array(); + /** + * Bootstraps the Gears, loads from database and registers with the manager. + * + * @param Feather\Components\Foundation\Application $feather + * @return void + */ + public function __construct(Foundation\Application $feather) + { + parent::__construct($feather); + + Cache::forget('gears'); + + $manager = $this; + + return Cache::sear('gears', function() use ($manager) + { + foreach(Gear::enabled() as $gear) + { + Bundle::register($gear->identifier, array( + 'location' => 'path: ' . path('gears') . $gear->identifier, + 'handles' => trim(str_replace('(:feather)', Bundle::option('feather', 'handles'), $gear->handles), '/'), + 'auto' => (bool) $gear->auto, + 'autoloads' => (array) json_decode($gear->loads) + )); + + if($gear->auto) + { + Bundle::start($gear->identifier); + } + + $manager->register($gear); + } + }); + } + /** * Register a Gear with the manager. * @@ -115,6 +152,8 @@ public function start($gear) if(class_exists($class)) { $this->started[$gear][$name] = new $class; + + $this->started[$gear][$name]->application($this->feather); } } } From e6a6492df0e7f197d10286e6c6dbb6e31a9d8f0a Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 21:42:42 +0930 Subject: [PATCH 117/136] Register the Feather application with Gears. Signed-off-by: Jason Lewis --- components/gear/foundation.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/components/gear/foundation.php b/components/gear/foundation.php index 2abb1ac..5ce2ea2 100644 --- a/components/gear/foundation.php +++ b/components/gear/foundation.php @@ -4,6 +4,13 @@ abstract class Foundation { + /** + * The feather instance. + * + * @var Feather\Components\Foundation\Application + */ + protected $feather; + /** * Listen for an event and fire a method or closure handler. * @@ -86,4 +93,15 @@ public function disabled(){} */ public function remove(){} + /** + * Set the Feather application instance. + * + * @param Feather\Components\Foundation\Application $feather + * @return void + */ + public function application(\Feather\Components\Foundation\Application $feather) + { + $this->feather = $feather; + } + } \ No newline at end of file From 9f3e744f59a45a02305efd7e8b2cfbd9dd692619 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 21:45:12 +0930 Subject: [PATCH 118/136] Initial commit of reCAPTCHA gear. Signed-off-by: Jason Lewis --- gears/recaptcha/classes/recaptcha.php | 276 ++++++++++++++++++++++ gears/recaptcha/config/keys.php | 25 ++ gears/recaptcha/gear.json | 12 + gears/recaptcha/language/en/messages.php | 15 ++ gears/recaptcha/public/css/recaptcha.css | 36 +++ gears/recaptcha/public/img/sprite.png | Bin 0 -> 2842 bytes gears/recaptcha/recaptcha.gear.php | 79 +++++++ gears/recaptcha/views/recaptcha.blade.php | 41 ++++ 8 files changed, 484 insertions(+) create mode 100644 gears/recaptcha/classes/recaptcha.php create mode 100644 gears/recaptcha/config/keys.php create mode 100644 gears/recaptcha/gear.json create mode 100644 gears/recaptcha/language/en/messages.php create mode 100644 gears/recaptcha/public/css/recaptcha.css create mode 100644 gears/recaptcha/public/img/sprite.png create mode 100644 gears/recaptcha/recaptcha.gear.php create mode 100644 gears/recaptcha/views/recaptcha.blade.php diff --git a/gears/recaptcha/classes/recaptcha.php b/gears/recaptcha/classes/recaptcha.php new file mode 100644 index 0000000..b588839 --- /dev/null +++ b/gears/recaptcha/classes/recaptcha.php @@ -0,0 +1,276 @@ + $value ) + $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + + // Cut the last '&' + $req=substr($req,0,strlen($req)-1); + return $req; + } + + + + /** + * Submits an HTTP POST to a reCAPTCHA server + * @param string $host + * @param string $path + * @param array $data + * @param int port + * @return array response + */ + protected static function _recaptcha_http_post($host, $path, $data, $port = 80) { + + $req = static::_recaptcha_qsencode ($data); + + $http_request = "POST $path HTTP/1.0\r\n"; + $http_request .= "Host: $host\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; + $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; + $http_request .= "\r\n"; + $http_request .= $req; + + $response = ''; + if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { + die ('Could not open socket'); + } + + fwrite($fs, $http_request); + + while ( !feof($fs) ) + $response .= fgets($fs, 1160); // One TCP-IP packet + fclose($fs); + $response = explode("\r\n\r\n", $response, 2); + + return $response; + } + + + + /** + * Gets the challenge HTML (javascript and non-javascript version). + * This is called from the browser, and the resulting reCAPTCHA HTML widget + * is embedded within the HTML form it was called from. + * @param string $pubkey A public key for reCAPTCHA + * @param string $error The error given by reCAPTCHA (optional, default is null) + * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) + * @return string - The HTML to be embedded in the user's form. + */ + public static function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) + { + if ($pubkey == null || $pubkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($use_ssl) { + $server = RECAPTCHA_API_SECURE_SERVER; + } else { + $server = RECAPTCHA_API_SERVER; + } + + $errorpart = ""; + if ($error) { + $errorpart = "&error=" . $error; + } + return ' + + '; + } + + /** + * Calls an HTTP POST function to verify if the user's guess was correct + * @param string $privkey + * @param string $remoteip + * @param string $challenge + * @param string $response + * @param array $extra_params an array of extra variables to post to the server + * @return ReCaptchaResponse + */ + public static function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) + { + if ($privkey == null || $privkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($remoteip == null || $remoteip == '') { + die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + } + + + + //discard spam submissions + if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + $recaptcha_response = new ReCaptchaResponse(); + $recaptcha_response->is_valid = false; + $recaptcha_response->error = 'incorrect-captcha-sol'; + return $recaptcha_response; + } + + $response = static::_recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", + array ( + 'privatekey' => $privkey, + 'remoteip' => $remoteip, + 'challenge' => $challenge, + 'response' => $response + ) + $extra_params + ); + + $answers = explode ("\n", $response [1]); + $recaptcha_response = new ReCaptchaResponse(); + + if (trim ($answers [0]) == 'true') { + $recaptcha_response->is_valid = true; + } + else { + $recaptcha_response->is_valid = false; + $recaptcha_response->error = $answers [1]; + } + return $recaptcha_response; + + } + + /** + * gets a URL where the user can sign up for reCAPTCHA. If your application + * has a configuration page where you enter a key, you should provide a link + * using this function. + * @param string $domain The domain where the page is hosted + * @param string $appname The name of your application + */ + public static function recaptcha_get_signup_url ($domain = null, $appname = null) { + return "https://www.google.com/recaptcha/admin/create?" . static::_recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname)); + } + + protected static function _recaptcha_aes_pad($val) { + $block_size = 16; + $numpad = $block_size - (strlen ($val) % $block_size); + return str_pad($val, strlen ($val) + $numpad, chr($numpad)); + } + + /* Mailhide related code */ + + protected static function _recaptcha_aes_encrypt($val,$ky) { + if (! function_exists ("mcrypt_encrypt")) { + die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); + } + $mode=MCRYPT_MODE_CBC; + $enc=MCRYPT_RIJNDAEL_128; + $val=static::_recaptcha_aes_pad($val); + return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); + } + + + protected static function _recaptcha_mailhide_urlbase64 ($x) { + return strtr(base64_encode ($x), '+/', '-_'); + } + + /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ + protected static function recaptcha_mailhide_url($pubkey, $privkey, $email) { + if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { + die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://www.google.com/recaptcha/mailhide/apikey"); + } + + + $ky = pack('H*', $privkey); + $cryptmail =static::_recaptcha_aes_encrypt ($email, $ky); + + return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . static::_recaptcha_mailhide_urlbase64 ($cryptmail); + } + + /** + * gets the parts of the email to expose to the user. + * eg, given johndoe@example,com return ["john", "example.com"]. + * the email is then displayed as john...@example.com + */ + protected static function _recaptcha_mailhide_email_parts ($email) { + $arr = preg_split("/@/", $email ); + + if (strlen ($arr[0]) <= 4) { + $arr[0] = substr ($arr[0], 0, 1); + } else if (strlen ($arr[0]) <= 6) { + $arr[0] = substr ($arr[0], 0, 3); + } else { + $arr[0] = substr ($arr[0], 0, 4); + } + return $arr; + } + + /** + * Gets html to display an email address given a public an private key. + * to get a key, go to: + * + * http://www.google.com/recaptcha/mailhide/apikey + */ + protected static function recaptcha_mailhide_html($pubkey, $privkey, $email) { + $emailparts = static::_recaptcha_mailhide_email_parts ($email); + $url = static::recaptcha_mailhide_url ($pubkey, $privkey, $email); + + return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); + + } + +} + + +/** + * A ReCaptchaResponse is returned from recaptcha_check_answer() + */ +class ReCaptchaResponse { + var $is_valid; + var $error; +} + +?> diff --git a/gears/recaptcha/config/keys.php b/gears/recaptcha/config/keys.php new file mode 100644 index 0000000..cdcd573 --- /dev/null +++ b/gears/recaptcha/config/keys.php @@ -0,0 +1,25 @@ + '6Lc_aM8SAAAAAKTZc0HhemSXaccrURGDSGazUS2t', + + /* + |-------------------------------------------------------------------------- + | reCAPTCHA Private Key + |-------------------------------------------------------------------------- + | + | The private key given to you by the reCAPTCHA API. + | + */ + 'private' => '6Lc_aM8SAAAAAGWaYHsV0een1bcuLKGEx7xD9rcr' + +); \ No newline at end of file diff --git a/gears/recaptcha/gear.json b/gears/recaptcha/gear.json new file mode 100644 index 0000000..1a0c0ac --- /dev/null +++ b/gears/recaptcha/gear.json @@ -0,0 +1,12 @@ +{ + "name":"reCAPTCHA", + "description":"reCAPTCHA is a bot-prevention tool provided by Google.", + "version":"1.0", + "author": + { + "name":"Jason Lewis", + "email":"jason.lewis1991@gmail.com", + "website":"http://jasonlewis.me" + }, + "dependencies":{} +} \ No newline at end of file diff --git a/gears/recaptcha/language/en/messages.php b/gears/recaptcha/language/en/messages.php new file mode 100644 index 0000000..d703abd --- /dev/null +++ b/gears/recaptcha/language/en/messages.php @@ -0,0 +1,15 @@ + 'You did not enter the security confirmation.', + 'is_incorrect' => 'The security confirmation could not be matched.' +); \ No newline at end of file diff --git a/gears/recaptcha/public/css/recaptcha.css b/gears/recaptcha/public/css/recaptcha.css new file mode 100644 index 0000000..426fcb1 --- /dev/null +++ b/gears/recaptcha/public/css/recaptcha.css @@ -0,0 +1,36 @@ +#recaptcha_image { + margin: 4px 0 10px; +} + +#recaptcha_info { + margin: 10px 0; + font-weight: bold; + font-size: 11px; +} + +.join-recaptcha { + clear: left; + list-style-type: none; + padding: 0; + margin: 10px 0 15px; +} + +.join-recaptcha > li { + padding: 0; + margin: 0 8px 0 0; + width: 16px; + height: 16px; + display: inline-block; + background: url('../img/sprite.png') no-repeat 0 0px; +} + +.join-recaptcha > li.refresh { background-position: -32px 0; } +.join-recaptcha > li.audio { background-position: 0 0; } +.join-recaptcha > li.image { background-position: -48px 0; } +.join-recaptcha > li.help { background-position: -16px 0; } + +.join-recaptcha > li > a { + display: block; + width: 16px; + height: 16px; +} \ No newline at end of file diff --git a/gears/recaptcha/public/img/sprite.png b/gears/recaptcha/public/img/sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..485031b0b0d539eefb34ed4efaf722a03dcaa79a GIT binary patch literal 2842 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 literal 0 HcmV?d00001 diff --git a/gears/recaptcha/recaptcha.gear.php b/gears/recaptcha/recaptcha.gear.php new file mode 100644 index 0000000..195063f --- /dev/null +++ b/gears/recaptcha/recaptcha.gear.php @@ -0,0 +1,79 @@ +listen('view: before register.rules', 'display'); + + $this->listen('assets: change styles', 'styling'); + + $this->listen('validation: before register', 'validation'); + } + + /** + * Display the reCAPTCHA view within the registration page. + * + * @return string + */ + public function display() + { + return View::make('gear: recaptcha recaptcha'); + } + + /** + * Inject the reCAPTCHA styles into the themes asset container. + * + * @param object $container + * @return void + */ + public function styling($container) + { + if(URI::is('register')) + { + $container->add('gear: recaptcha', '../../gears/recaptcha/css/recaptcha.css'); + } + } + + /** + * Add the reCAPTCHA validation rules and messages to the registration validation. + * + * @param object $validator + * @return void + */ + public function validation($validator) + { + $validator->rule('recaptcha_response_field', array('required', 'recaptcha')) + ->message('recaptcha_response_field.required', 'plugin: recaptcha messages.is_required') + ->message('recaptcha_response_field.recaptcha', 'plugin: recaptcha messages.is_incorrect'); + + // Map to the Recaptcha library so we can register our validation rule with the + // validation. + Autoloader::map(array( + 'Recaptcha\\Recaptcha' => __DIR__ . DS . 'classes' . DS . 'recaptcha.php' + )); + + Validator::register('recaptcha', function($attribute, $value, $parameters) + { + $private = $this->feather['config']->get('plugin: recaptcha keys.private'); + + $recaptcha = Recaptcha\Recaptcha::recaptcha_check_answer($private, Request::ip(), Input::get('recaptcha_challenge_field'), $value); + + return $recaptcha->is_valid; + }); + } + +} \ No newline at end of file diff --git a/gears/recaptcha/views/recaptcha.blade.php b/gears/recaptcha/views/recaptcha.blade.php new file mode 100644 index 0000000..3bee47c --- /dev/null +++ b/gears/recaptcha/views/recaptcha.blade.php @@ -0,0 +1,41 @@ + + +
    {{ Form::label('recaptcha_response_field', 'Security Confirmation') }}
    +
    + + + {{ HTML::script('http://www.google.com/recaptcha/api/challenge?k=' . Feather\Config::get('gear: recaptcha keys.public')) }} +
    \ No newline at end of file From 568446f1c6454fdd2020ee7a33732294ec9129ca Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:08:14 +0930 Subject: [PATCH 119/136] Fixed small bug with validator and custom error messages. Signed-off-by: Jason Lewis --- components/validation/validator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/validation/validator.php b/components/validation/validator.php index 0a4c117..5c170dd 100644 --- a/components/validation/validator.php +++ b/components/validation/validator.php @@ -117,7 +117,7 @@ public function passes() foreach($responses as $response => $replacements) { - $responses[$response] = __("{$this->application}::{$response}", $replacements)->get(); + $responses[$response] = __("feather {$this->application}::{$response}", $replacements)->get(); } throw new FeatherValidationException(new Messages($responses)); @@ -172,7 +172,7 @@ public function message($rule, $message) list($message, $replacements) = $message; } - $this->messages[str_replace('.', '_', $rule)] = __("{$this->application}::{$message}", $replacements)->get(); + $this->messages[str_replace('.', '_', $rule)] = __("feather {$this->application}::{$message}", $replacements)->get(); return $this; } From 53a04c72cd2d177c0fe66f79035433fb7f68a79d Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:29:07 +0930 Subject: [PATCH 120/136] Pass the feather instance to validation closures. Signed-off-by: Jason Lewis --- components/validation/validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/validation/validator.php b/components/validation/validator.php index 5c170dd..b7fe394 100644 --- a/components/validation/validator.php +++ b/components/validation/validator.php @@ -111,7 +111,7 @@ public function passes() { // If a response is returned from the closure then we have a custom error messages // to throw with the exception. - if($responses = call_user_func_array(reset($this->validating), array($this))) + if($responses = call_user_func_array(reset($this->validating), array($this, $this->feather))) { if(!is_array(reset($responses))) $responses = array(array_shift($responses) => array()); From f937ff7376436fc14163212fba057a5a2d8e65ec Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:44:10 +0930 Subject: [PATCH 121/136] Bootstrap things such as language event override and fixed some issues. Signed-off-by: Jason Lewis --- bootstrap/languages.php | 42 ++++++++++++++++++++++++++++++++++++++++ bootstrap/validators.php | 16 +++++++++++++++ bootstrap/views.php | 2 +- start.php | 4 ++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 bootstrap/languages.php create mode 100644 bootstrap/validators.php diff --git a/bootstrap/languages.php b/bootstrap/languages.php new file mode 100644 index 0000000..5f2cf62 --- /dev/null +++ b/bootstrap/languages.php @@ -0,0 +1,42 @@ +has$2 ? view("feather core::error.inline", array("error" => $errors->first$1)) : null; ?>', $value); + return preg_replace($matcher, '$1has$2 ? view("feather core::error.inline", array("error" => $errors->first$2)) : null; ?>', $value); }); /* diff --git a/start.php b/start.php index 4b114c3..62931c4 100644 --- a/start.php +++ b/start.php @@ -89,6 +89,10 @@ require path('feather') . 'bootstrap' . DS . 'ioc' . EXT; +require path('feather') . 'bootstrap' . DS . 'validators' . EXT; + +require path('feather') . 'bootstrap' . DS . 'languages' . EXT; + /* |-------------------------------------------------------------------------- | Load Feather Components From ad52bef2189295f8de758bd6738188bfe8e38315 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:44:26 +0930 Subject: [PATCH 122/136] Fixed a couple plugin references. Signed-off-by: Jason Lewis --- gears/recaptcha/recaptcha.gear.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gears/recaptcha/recaptcha.gear.php b/gears/recaptcha/recaptcha.gear.php index 195063f..8c0ae2c 100644 --- a/gears/recaptcha/recaptcha.gear.php +++ b/gears/recaptcha/recaptcha.gear.php @@ -21,7 +21,7 @@ public function __construct() $this->listen('assets: change styles', 'styling'); - $this->listen('validation: before register', 'validation'); + $this->listen('validation: before auth.register', 'validation'); } /** @@ -57,20 +57,21 @@ public function styling($container) public function validation($validator) { $validator->rule('recaptcha_response_field', array('required', 'recaptcha')) - ->message('recaptcha_response_field.required', 'plugin: recaptcha messages.is_required') - ->message('recaptcha_response_field.recaptcha', 'plugin: recaptcha messages.is_incorrect'); + ->message('recaptcha_response_field.required', 'gear: recaptcha messages.is_required') + ->message('recaptcha_response_field.recaptcha', 'gear: recaptcha messages.is_incorrect'); - // Map to the Recaptcha library so we can register our validation rule with the - // validation. + // Map to the Recaptcha library so we can register our validation rule with the validation. Autoloader::map(array( 'Recaptcha\\Recaptcha' => __DIR__ . DS . 'classes' . DS . 'recaptcha.php' )); - Validator::register('recaptcha', function($attribute, $value, $parameters) + $feather = $this->feather; + + Validator::register('recaptcha', function($attribute, $value, $parameters) use ($feather) { - $private = $this->feather['config']->get('plugin: recaptcha keys.private'); + $private = $feather['config']->get('gear: recaptcha keys.private'); - $recaptcha = Recaptcha\Recaptcha::recaptcha_check_answer($private, Request::ip(), Input::get('recaptcha_challenge_field'), $value); + $recaptcha = \Recaptcha\Recaptcha::recaptcha_check_answer($private, Request::ip(), Input::get('recaptcha_challenge_field'), $value); return $recaptcha->is_valid; }); From 592b8e5f5013ed29fb36e9b2ab524c0ca3c1b919 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:44:44 +0930 Subject: [PATCH 123/136] Polishing off the authentication side of things. Signed-off-by: Jason Lewis --- applications/core/controllers/index.php | 21 +++++----- applications/core/language/en/register.php | 2 +- applications/core/models/gear.php | 10 +++++ applications/core/models/user.php | 42 +++++++++++++++++++ applications/core/routes.php | 2 +- applications/core/validation/auth.php | 28 ++++++++++++- .../core/views/error/inline.blade.php | 2 + applications/core/views/misc/rules.blade.php | 3 ++ .../core/views/user/register.blade.php | 4 +- 9 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 applications/core/views/error/inline.blade.php create mode 100644 applications/core/views/misc/rules.blade.php diff --git a/applications/core/controllers/index.php b/applications/core/controllers/index.php index 3c5a602..99f8794 100644 --- a/applications/core/controllers/index.php +++ b/applications/core/controllers/index.php @@ -108,33 +108,32 @@ public function post_register() { try { - Feather\Validation\Auth\Register::passes(Input::all()); + $this->validator->get('auth.register')->against(Input::get())->passes(); } catch (FeatherValidationException $errors) { - return Feather\Redirect::to_self()->with_input()->with_errors($errors->get()); + return $this->redirect->to_self()->with_input()->with_errors($errors->get()); } try { - $user = Feather\Models\User::register(Input::all()); + $user = Feather\Core\User::register(Input::get()); } - catch (FeatherRegistrationException $errors) + catch (FeatherModelException $errors) { - return Feather\Redirect::to_self()->with_input()->alert('error', 'feather::register.failure'); + return $this->redirect->to_self()->with_input()->alert('error', 'feather core::register.failure'); } // Users must confirm their e-mail address once they have registered. We // will now send them an e-mail with their activation code. - if(Feather\Config::get('feather: registration.confirm_email')) + if($this->config->get('feather: db.registration.confirm_email')) { } - // Log the user in and redirect back to the home page. - Feather\Auth::login($user->id); + $this->auth->login($user); - return Feather\Redirect::to_previous('route: feather'); + return $this->redirect->to_previous('route: feather'); } /** @@ -144,8 +143,8 @@ public function post_register() */ public function get_rules() { - $this->layout->with('title', __('feather::titles.rules')) - ->nest('content', 'feather::misc.rules'); + $this->layout->with('title', __('feather core::titles.rules')) + ->nest('content', 'feather core::misc.rules'); } } \ No newline at end of file diff --git a/applications/core/language/en/register.php b/applications/core/language/en/register.php index 5f53147..d36e3cc 100644 --- a/applications/core/language/en/register.php +++ b/applications/core/language/en/register.php @@ -73,7 +73,7 @@ 'title' => 'Confirm Password' ), 'rules' => array( - 'helper' => 'I have read and agree to the :link.' + 'helper' => 'I\'ve read and agree to the :link.' ) ) diff --git a/applications/core/models/gear.php b/applications/core/models/gear.php index 0c702f0..2be0a72 100644 --- a/applications/core/models/gear.php +++ b/applications/core/models/gear.php @@ -16,4 +16,14 @@ class Gear extends Base { */ public static $timestamps = false; + /** + * Return all gears that have been enabled. + * + * @return array + */ + public static function enabled() + { + return static::where_enabled(1)->get(); + } + } \ No newline at end of file diff --git a/applications/core/models/user.php b/applications/core/models/user.php index 3345e9e..c7333e0 100644 --- a/applications/core/models/user.php +++ b/applications/core/models/user.php @@ -2,6 +2,7 @@ use Str; use Hash; +use Feather\Config; class User extends Base { @@ -70,4 +71,45 @@ public function get_avatar() return 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($this->get_attribute('email')))); } + /** + * Register a new user and return the new user object. + * + * @param array $input + * @param bool $activated + * @return object + */ + public static function register($input) + { + $user = new static(array( + 'username' => $input['username'], + 'password' => $input['password'], + 'email' => $input['email'] + )); + + if(Config::get('feather: db.registration.confirm_email')) + { + $user->fill(array( + 'activation_key' => Str::random(30), + 'activated' => 0 + )); + } + + if(!$user->save()) + { + throw new FeatherModelException; + } + + // Attach the users role. If the user needs to confirm their e-mail address they are given + // the confirming role status which has an ID of 4. If not then they receive the standard + // member role which has an ID of 2. + $user->roles()->attach(Config::get('feather: db.registration.confirm_email') ? 4 : 2); + + return $user; + } + + public static function edit($user, $input) + { + + } + } \ No newline at end of file diff --git a/applications/core/routes.php b/applications/core/routes.php index 7acd1d0..dceb16b 100644 --- a/applications/core/routes.php +++ b/applications/core/routes.php @@ -46,4 +46,4 @@ |-------------------------------------------------------------------------- */ -Route::get('(:bundle)/rules', array('as' => 'rules', 'uses' => 'feather::home@rules')); \ No newline at end of file +Route::get('(:bundle)/rules', array('as' => 'rules', 'uses' => 'feather core::index@rules')); \ No newline at end of file diff --git a/applications/core/validation/auth.php b/applications/core/validation/auth.php index 2e57bdf..2ac8b84 100644 --- a/applications/core/validation/auth.php +++ b/applications/core/validation/auth.php @@ -8,6 +8,32 @@ ->rule('password', 'required') ->message('username.required', 'login.messages.username.is_required') ->message('password.required', 'login.messages.password.is_required'); - } + }, + + 'register' => function($validator, $feather) + { + $validator->rule('username', array('required', 'min:3', 'max:20', 'alpha_dot', 'unique:users,username')) + ->rule('password', array('required', 'min:7', 'max:15', 'confirmed')) + ->rule('password_confirmation', array('required')) + ->rule('email', array('required', 'email', 'unique:users,email')) + ->message('username.required', 'register.messages.username.is_required') + ->message('username.min', array('register.messages.username.too_short', array('length' => 3))) + ->message('username.max', array('register.messages.username.too_long', array('length' => 20))) + ->message('username.alpha_dot', 'register.messages.username.is_invalid') + ->message('username.unique', 'register.messages.username.already_exists') + ->message('password.required', 'register.messages.password.is_required') + ->message('password.min', array('register.messages.password.too_short', array('length' => 7))) + ->message('password.max', array('register.messages.password.too_long', array('length' => 15))) + ->message('password.confirmed', 'register.messages.password.did_not_match') + ->message('password_confirmation.required', 'register.messages.password_confirmation.is_required') + ->message('email.required', 'register.messages.email.is_required') + ->message('email.email', 'register.messages.email.invalid') + ->message('email.unique', 'register.messages.email.already_exists'); + if($feather['config']->get('feather: db.registration.rules')) + { + $validator->rule('rules', 'accepted') + ->message('rules.accepted', 'register.messages.rules.not_accepted'); + } + } ); \ No newline at end of file diff --git a/applications/core/views/error/inline.blade.php b/applications/core/views/error/inline.blade.php new file mode 100644 index 0000000..e7e6422 --- /dev/null +++ b/applications/core/views/error/inline.blade.php @@ -0,0 +1,2 @@ + +{{ $error }} \ No newline at end of file diff --git a/applications/core/views/misc/rules.blade.php b/applications/core/views/misc/rules.blade.php new file mode 100644 index 0000000..877c2ff --- /dev/null +++ b/applications/core/views/misc/rules.blade.php @@ -0,0 +1,3 @@ +

    Community Rules

    + +{{ Feather\Gear\Markdown\Parse(Feather\Config::get('feather: db.registration.rules_message')) }} \ No newline at end of file diff --git a/applications/core/views/user/register.blade.php b/applications/core/views/user/register.blade.php index df0bde6..c049922 100644 --- a/applications/core/views/user/register.blade.php +++ b/applications/core/views/user/register.blade.php @@ -31,9 +31,9 @@
    @error('rules') From fcda61999078532696936e2281ff8ae61f3c0c4c Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:44:59 +0930 Subject: [PATCH 124/136] Couple style tweaks. Signed-off-by: Jason Lewis --- themes/basic/public/css/theme.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/themes/basic/public/css/theme.css b/themes/basic/public/css/theme.css index 19c0ac2..52ccd81 100644 --- a/themes/basic/public/css/theme.css +++ b/themes/basic/public/css/theme.css @@ -345,7 +345,8 @@ fieldset dd:after, */ .body h1, .body h2, -.body h3 { +.body h3, +.body h4 { margin: 0 0 16px; font-family: "Trebuchet MS", "Ubuntu", serif; font-size: 24px; @@ -355,6 +356,10 @@ fieldset dd:after, .body h2 { font-size: 20px; } .body h3 { font-size: 18px; } +.body h4 { + font-size: 14px; + display: inline; +} .body h1 a, .body h2 a { From e829f0a5ef4b041e5a8910c9cdfed9dc1f008039 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 22:46:31 +0930 Subject: [PATCH 125/136] Fixed an issue with the validation test. Signed-off-by: Jason Lewis --- tests/validation.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/validation.test.php b/tests/validation.test.php index 2bfb020..7b9e46c 100644 --- a/tests/validation.test.php +++ b/tests/validation.test.php @@ -50,7 +50,7 @@ public function testCanAddMessage() { $validator = $this->feather['validator']->message('cat', 'dog'); - $this->assertEquals(array('cat' => 'core::dog'), $validator->messages); + $this->assertEquals(array('cat' => 'feather core::dog'), $validator->messages); } public function testValidationDoesPass() From 24388adc069ec90bbaa0887157611f0cf6cd24d1 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 23:25:10 +0930 Subject: [PATCH 126/136] Initial commit of OneConnect gear. Signed-off-by: Jason Lewis --- gears/oneconnect/gear.json | 12 + gears/oneconnect/oneconnect.gear.php | 147 ++++++++++++ gears/oneconnect/wordpress/README.md | 32 +++ .../wordpress/feather-oneconnect.php | 213 ++++++++++++++++++ 4 files changed, 404 insertions(+) create mode 100644 gears/oneconnect/gear.json create mode 100644 gears/oneconnect/oneconnect.gear.php create mode 100644 gears/oneconnect/wordpress/README.md create mode 100644 gears/oneconnect/wordpress/feather-oneconnect.php diff --git a/gears/oneconnect/gear.json b/gears/oneconnect/gear.json new file mode 100644 index 0000000..c61efe5 --- /dev/null +++ b/gears/oneconnect/gear.json @@ -0,0 +1,12 @@ +{ + "name":"OneConnect", + "description":"A Single Sign On gear to connect your application to your Feather installation.", + "version":"1.0.0", + "author": + { + "name":"Jason Lewis", + "email":"jason.lewis1991@gmail.com", + "website":"http://jasonlewis.me" + }, + "dependencies":{} +} \ No newline at end of file diff --git a/gears/oneconnect/oneconnect.gear.php b/gears/oneconnect/oneconnect.gear.php new file mode 100644 index 0000000..e2214f5 --- /dev/null +++ b/gears/oneconnect/oneconnect.gear.php @@ -0,0 +1,147 @@ +listen('auth: bootstrap oneconnect', 'bootstrap'); + } + + /** + * Bootstrap the OneConnect plugin. + * + * @return mixed + */ + public function bootstrap() + { + try + { + $this->compatible(); + } + catch (Exception $error) + { + return; + } + + if($credentials = $this->{$this->handler}()) + { + return $this->feather['sso']->authorize((array) $credentials); + } + } + + /** + * Fetch the authentication data using cURL. + * + * @return mixed + */ + protected function curl() + { + $ch = curl_init($this->feather['config']->get('feather: db.auth.authenticate_url')); + + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_COOKIE, $this->cookies()); + + $credentials = json_decode(curl_exec($ch)); + + curl_close($ch); + + return $credentials; + } + + /** + * Fetch the authentication data using file_get_contents(). + * + * @return mixed + */ + protected function file() + { + $opts = array( + 'http' => array( + 'method' => 'GET', + 'header' => 'Cookie: ' . $this->cookies() + ) + ); + + $context = stream_context_create($opts); + + $credentials = json_decode(file_get_contents($this->feather['config']->get('feather: db.auth.authenticate_url'), false, $context)); + + return $credentials; + } + + /** + * Returns a cookie string to be sent along with headers. + * + * @return string + */ + protected function cookies() + { + $cookies = array(); + + foreach(Request::foundation()->cookies->all() as $key => $value) + { + $cookies[] = "{$key}={$value}"; + } + + return implode('; ', $cookies); + } + + /** + * OneConnect needs either cURL or file_get_contents to fetch the authentication data. + * When activating we make sure the plugin is compatible with the environment. + * + * @return void + */ + protected function compatible() + { + if(!function_exists('curl_init')) + { + if(!function_exists('file_get_contents') or !ini_get('allow_url_fopen')) + { + throw new Exception('OneConnect is not compatible with your environment, cURL or allow_url_fopen is required.'); + } + else + { + $this->handler = 'file'; + } + } + else + { + $this->handler = 'curl'; + } + } + + /** + * Runs when the OneConnect plugin is activated. + * + * @return bool + */ + public function activate() + { + try + { + $this->compatible(); + } + catch (Exception $error) + { + throw $error; + } + } + +} \ No newline at end of file diff --git a/gears/oneconnect/wordpress/README.md b/gears/oneconnect/wordpress/README.md new file mode 100644 index 0000000..41f3f9d --- /dev/null +++ b/gears/oneconnect/wordpress/README.md @@ -0,0 +1,32 @@ +# Feather OneConnect for WordPress + +Feather OneConnect for WordPress enables Single Sign On between your Feather installation and WordPress. Your WordPress user base can sign in and be automatically authenticated when they visit your Feather installation. + +### Installation + +Installing Feather OneConnect for WordPress is dead easy. + +1. Copy and paste the `feather-oneconnect.php` file to your WordPress plugin directory. +2. Enable the plugin in your WordPress administration panel. +3. Define your cookie path and domain in your `wp-config.php` file. Here's an example. + + // The cookie path should be just a slash. + define('COOKIEPATH', '/'); + + // The cookie domain should be the same as the one in your Feather installation. + define('COOKIE_DOMAIN', '.mydomain.com'); + +4. Enable OneConnect on your Feather installation. +5. Copy the Authenticate, Registration, Login, and Logout URLs from the Feather OneConnect for WordPress configuration screen and paste them into the corresponding boxes on the OneConnect configuration. + +When you next login to WordPress you'll become authenticated on your Feather installation. If something isn't working properly try deleting your cookies and starting fresh! + +### How It Works + +Feather OneConnect for WordPress only works when both WordPress and your Feather installation are on the same domain. This is because cookies are not available across domains. + +When a user logs in to WordPress they are given a cookie which is stored on their local machine. When the user visits Feather, OneConnect is able to access all the cookies for the current domain, so this includes the WordPress cookies. OneConnect then makes a request to your WordPress installation, it passes along the cookie information so that WordPress can authenticate the current user. WordPress then returns a couple bits of information about the user to OneConnect. + +Once OneConnect has this information it attempts to authorize the user on Feather. If the user has never visited the forum before, OneConnect will attempt to create a new account for the user with the same username and e-mail they have on WordPress. If, for some crazy reason, either of those is taken then OneConnect will show the user a form. The user then has the chance to create a new account, or link themselves to an existing account. Once done the user will be authenticated and can now access the forums. If the e-mail and username are available then the user will be immediately authenticated. + +This all happens very quickly and unless the user is prompted to create or link an account they won't even realise it's happening. \ No newline at end of file diff --git a/gears/oneconnect/wordpress/feather-oneconnect.php b/gears/oneconnect/wordpress/feather-oneconnect.php new file mode 100644 index 0000000..557e407 --- /dev/null +++ b/gears/oneconnect/wordpress/feather-oneconnect.php @@ -0,0 +1,213 @@ +authenticated(); + } + + // Create the admin menu interface for our plugin. + if(is_admin()) + { + add_action('admin_menu', array($this, 'menu')); + } + + add_action('clear_auth_cookie', array($this, 'logout')); + + register_activation_hook(__FILE__, array($this, 'activate')); + register_deactivation_hook(__FILE__, array($this, 'deactivate')); + } + + /** + * Logs the user out of Feather as well. + * + * @return void + */ + public function logout() + { + setcookie($this->cookie, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); + } + + /** + * Adds the plugin to the plugins menu. + * + * @return void + */ + public function menu() + { + add_plugins_page( + 'Feather OneConnect', + 'Feather OneConnect', + 'administrator', + 'oneconnect', + array($this, 'options') + ); + } + + /** + * The options page for the OneConnect plugin. + * + * @return string + */ + public function options() + { + if(isset($_POST['save'])) { + if(function_exists('current_user_can') && !current_user_can('manage_options')) + { + die(__('Permission Denied')); + } + + $authenticate_url = str_replace('{token}', $this->token(), $_POST['feather_oneconnect_authenticate']); + + update_option('feather_oneconnect_authenticate', $authenticate_url); + } + else + { + $authenticate_url = get_option('feather_oneconnect_authenticate'); + } + + echo '
    '; + echo '

    '; + echo '

    '; + echo _e('Feather OneConnect for Wordpress Configuration'); + echo '

    '; + echo '

    The authenticate URL is set by default, however you can change this URL if the default is already in use. Use the {token} placeholder to generate a random token string.

    '; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
    Authenticate URL
    '; + echo '

    '; + echo ''; + + echo '

    '; + echo _e('Feather OneConnect for Wordpress Information'); + echo '

    '; + echo '

    The following information needs to be copied and pasted over to the OneConnect options on your Feather installation.'; + echo '
    Remember that if you changed the Authenticate URL above you need to save it first to get the updated URL.

    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
    Authenticate URL' . site_url(get_option('feather_oneconnect_authenticate'), 'oneconnect-feather-authenticate') . '
    Registration URL' . site_url('wp-login.php?action=register', 'login') . '
    Login URL' . wp_login_url() . '?redirect_to={current}
    Logout URL' . add_query_arg(array('action' => 'logout', '_wpnonce' => '{token}', 'redirect_to' => '{current}'), site_url('wp-login.php', 'login')) . '
    '; + echo ''; + } + + /** + * Shows the authenticated user details in a JSON encoded array. + * + * @return string + */ + protected function authenticated() + { + global $current_user; + + if(!function_exists('get_currentuserinfo')) + { + require (ABSPATH . WPINC . '/pluggable.php'); + } + + get_currentuserinfo(); + + $credentials = array( + 'id' => null, + 'username' => null, + 'email' => null, + 'token' => null + ); + + if($current_user->ID) + { + $credentials = array( + 'id' => $current_user->ID, + 'username' => $current_user->user_login, + 'email' => $current_user->user_email, + 'token' => wp_create_nonce('log-out') + ); + } + + die(json_encode($credentials)); + } + + /** + * Runs when the plugin is activated, adds options. + * + * @return void + */ + public function activate() + { + add_option('feather_oneconnect_authenticate', '?oneconnect=' . $this->token()); + } + + /** + * Runs when the plugin is deactivated, deletes options. + * + * @return void + */ + public function deactivate() + { + delete_option('feather_oneconnect_authenticate'); + } + + /** + * Generates a random token. + * + * @return string + */ + protected function token() + { + return md5(uniqid()); + } + + } + + // Instantiate the plugin! This is way nicer then a bunch of crummy functions in the global space! + // Code pretty! Code with Laravel! :) + $oneconnect = new Feather_OneConnect_Plugin; +} \ No newline at end of file From 45844f5b4203c7ff626590eb8ab668d211c4e840 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 23:25:44 +0930 Subject: [PATCH 127/136] Initial commit of the authentication components single sign on layer. Signed-off-by: Jason Lewis --- components/auth/sso.php | 105 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 8 deletions(-) diff --git a/components/auth/sso.php b/components/auth/sso.php index 9243fae..e3b81cf 100644 --- a/components/auth/sso.php +++ b/components/auth/sso.php @@ -1,7 +1,10 @@ {$method}($credentials); } - extract($credentials); + $required = array('id', 'email', 'username'); + + foreach($required as $credential) + { + if(!array_key_exists($credential, $credentials) or is_null($credentials[$credential])) + { + return; + } + } + + extract($credentials); // If a user exists with an associated e-mail address that matches then this user has already // been authenticated with a SSO service. @@ -59,17 +72,93 @@ public function authorize(array $credentials) // If there is a user in the database who has the same e-mail or username as our // user then they need to either link their account or create a new one. - elseif($user = User::where('username', '=', $username)->or_where('email', '=', $email)->first()) + elseif($user = User::where_username($username)->or_where('email', '=', $email)->first()) { - Breadcrumbs::drop(__('feather::titles.connect_to_community')); + $this->feather['crumbs']->drop(__('feather core::titles.connect_to_community')); + + return View::of('template')->with('title', __('feather core::titles.connect_to_community')) + ->nest('content', 'feather core::user.associate', compact('user')); + } + + // If there is no user in the database then the user does not need to perform any action to + // connect or create their account. We can simply authorize them to continue using Feather. + // ALl of this is behind the scenes and very quick, the user sees nothing. + $user = User::associate($credentials, $credentials); + + $this->feather['auth']->login($user); + + return $this->feather['redirect']->to_self(); + } - return View::of('layout')->with('title', __('feather::titles.connect_to_community')) - ->nest('content', 'feather::user.associate', compact('user')); + /** + * Attempt to create a user to be associated with the foreign application. + * + * @param array $associate + * @return object + */ + protected function create($associate) + { + try + { + $this->feather['validator']->get('auth.sso.create')->against(Input::get())->passes(); + } + catch (FeatherValidationException $errors) + { + return $this->feather['redirect']->to_self()->with_input()->with_errors($errors->get()); + } + + Input::replace(array( + 'username' => Input::get('create_username'), + 'email' => Input::get('create_email') + )); + + if($user = User::associate($associate, $input)) + { + $this->feather['auth']->login($user); + + return $this->feather['redirect']->to_self(); + } + else + { + return $this->feather['redirect']->to_self()->with_input()->alert('failed', 'feather core::register.failure'); + } + } + + /** + * Attempts to connect a user to an existing Feather account. + * + * @param array $associate + * @return object + */ + protected function connect($associate) + { + try + { + $this->feather['validator']->get('auth.connect')->against(Input::get())->passes(); + } + catch (FeatherValidationException $errors) + { + return $this->feather['redirect']->to_self()->with_input()->with_errors($errors->get()); + } + + $user = User::where_email(Input::get('connect_email'))->first(); + + // If we are able to login with the username retrieved from the database and the password + // provided by the user then we can update the assoicated e-mail and redirect the user. + if($this->attempt(array('username' => $user->username, 'password' => Input::get('connect_password')))) + { + $user->fill(array( + 'authenticator' => $this->feather['config']->get('feather: db.auth.driver'), + 'authenticator_associated_email' => $associate['email'], + 'authenticator_token' => $associate['token'] + )); + + $user->save(); + + return $this->feather['redirect']->to_self(); } - // If there is no user in the database then the associated user is our actual user. Does - // that make sense? Well... we basically just create them a new account. - return static::create($credentials, $credentials); + return $this->feather['redirect']->to_self()->with_input()->alert('error', 'feather core::connect.failure'); } } \ No newline at end of file From 0f8997745db1cc6651c4947f69a93bef0318c765 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Sun, 23 Sep 2012 23:26:03 +0930 Subject: [PATCH 128/136] Refining some things for SSO. Signed-off-by: Jason Lewis --- applications/core/models/user.php | 29 ++++++++++++++++++++++++- applications/core/start.php | 14 +++++++++++- applications/core/validation/auth.php | 31 ++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/applications/core/models/user.php b/applications/core/models/user.php index c7333e0..94ae553 100644 --- a/applications/core/models/user.php +++ b/applications/core/models/user.php @@ -76,7 +76,7 @@ public function get_avatar() * * @param array $input * @param bool $activated - * @return object + * @return Feather\Core\User */ public static function register($input) { @@ -112,4 +112,31 @@ public static function edit($user, $input) } + /** + * Register a new user and associate it with an e-mail from an authenticator. + * + * @param array $associate + * @param array $input + * @return Feather\Core\User + */ + public static function associate($associate, $input) + { + $user = new static(array( + 'username' => $input['username'], + 'authenticator' => Config::get('feather: db.auth.driver'), + 'authenticator_token' => $associate['token'], + 'authenticator_associated_email' => $associate['email'], + 'email' => $input['email'] + )); + + if(!$user->save()) + { + throw new FeatherModelException; + } + + $user->roles()->attach(2); + + return $user; + } + } \ No newline at end of file diff --git a/applications/core/start.php b/applications/core/start.php index 034aa7b..4a1fbea 100644 --- a/applications/core/start.php +++ b/applications/core/start.php @@ -1,5 +1,6 @@ path('core') . 'controllers' . DS . 'base' . EXT -)); \ No newline at end of file +)); + +/* +|-------------------------------------------------------------------------- +| Core Template +|-------------------------------------------------------------------------- +| +| Name the core template. +| +*/ + +View::name('feather core::template', 'template'); \ No newline at end of file diff --git a/applications/core/validation/auth.php b/applications/core/validation/auth.php index 2ac8b84..6adbc70 100644 --- a/applications/core/validation/auth.php +++ b/applications/core/validation/auth.php @@ -35,5 +35,34 @@ $validator->rule('rules', 'accepted') ->message('rules.accepted', 'register.messages.rules.not_accepted'); } - } + }, + + 'sso' => array( + + 'create' => function($validator) + { + $validator->rule('create_username', array('required', 'min:3', 'max:20', 'alpha_dot', 'unique:users,username')) + ->rule('create_email', array('required', 'email', 'unique:users,email')) + ->message('create_username.required', 'authenticate.errors.register.username.is_required') + ->message('create_username.min', array('authenticate.errors.register.username.too_short', array('length' => 3))) + ->message('create_username.max', array('authenticate.errors.register.username.too_long', array('length' => 20))) + ->message('create_username.alpha_dot', 'authenticate.errors.register.username.is_invalid') + ->message('create_username.unique', 'authenticate.errors.register.username.already_exists') + ->message('create_email.required', 'authenticate.errors.register.email.is_required') + ->message('create_email.email', 'authenticate.errors.register.email.invalid') + ->message('create_email.unique', 'authenticate.errors.register.email.already_exists'); + }, + + 'connect' => function($validator) + { + $validator->rule('connect_email', array('required', 'email')) + ->rule('connect_password', array('required', 'min:7', 'max:15')) + ->message('connect_email.required', 'authenticate.errors.register.email.is_required') + ->message('connect_email.unique', 'authenticate.errors.register.email.already_exists') + ->message('connect_password.required', 'authenticate.errors.register.password.is_required') + ->message('connect_password.min', array('authenticate.errors.register.password.too_short', array('length' => 7))) + ->message('connect_password.max', array('authenticate.errors.register.password.too_long', array('length' => 15))); + } + + ) ); \ No newline at end of file From 060ea24eabf8cf88d1ac5e7760f6b57142df05e9 Mon Sep 17 00:00:00 2001 From: Jason Lewis Date: Mon, 24 Sep 2012 01:12:15 +0930 Subject: [PATCH 129/136] Initial commit of Feather documentation gear. Signed-off-by: Jason Lewis --- .../auth/singlesignon/introduction.md | 8 + .../auth/singlesignon/oneconnect.md | 80 + gears/docs/documentation/gears/events.md | 513 ++++++ gears/docs/documentation/home.md | 3 + gears/docs/public/css/bootstrap.css | 722 ++++++++ gears/docs/public/css/docs.css | 155 ++ .../public/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../docs/public/img/glyphicons-halflings.png | Bin 0 -> 13826 bytes gears/docs/public/js/bootstrap.js | 7 + gears/docs/public/js/jquery.js | 2 + gears/docs/public/js/prettify.js | 1477 +++++++++++++++++ gears/docs/routes.php | 40 + gears/docs/start.php | 34 + gears/docs/views/contents.blade.php | 45 + gears/docs/views/page.blade.php | 60 + 15 files changed, 3146 insertions(+) create mode 100644 gears/docs/documentation/auth/singlesignon/introduction.md create mode 100644 gears/docs/documentation/auth/singlesignon/oneconnect.md create mode 100644 gears/docs/documentation/gears/events.md create mode 100644 gears/docs/documentation/home.md create mode 100644 gears/docs/public/css/bootstrap.css create mode 100644 gears/docs/public/css/docs.css create mode 100644 gears/docs/public/img/glyphicons-halflings-white.png create mode 100644 gears/docs/public/img/glyphicons-halflings.png create mode 100644 gears/docs/public/js/bootstrap.js create mode 100644 gears/docs/public/js/jquery.js create mode 100644 gears/docs/public/js/prettify.js create mode 100644 gears/docs/routes.php create mode 100644 gears/docs/start.php create mode 100644 gears/docs/views/contents.blade.php create mode 100644 gears/docs/views/page.blade.php diff --git a/gears/docs/documentation/auth/singlesignon/introduction.md b/gears/docs/documentation/auth/singlesignon/introduction.md new file mode 100644 index 0000000..567dd0b --- /dev/null +++ b/gears/docs/documentation/auth/singlesignon/introduction.md @@ -0,0 +1,8 @@ +## Single Sign On + +One of Feather's design goals is to easily and effortlessly allow existing applications with an existing user base to integrate and interact with Feather. What this boils down to is a seemless transition from your application to the forums. No longer will your users have to remember two or more passwords for your application. + +Before using a single sign on provider there are a few things you must consider. + +1. If you've been maintaining a separate user base for your forum and your application for any period and have numerous users in both some users may be required to link there accounts on there initial visit to the forum. +2. A [forum migration](/migrations) and a single sign on provider can not be used in conjunction with each other. If you're migrating from an existing forum then it's recommended that you migrate users for a period of time before enabling single sign on. \ No newline at end of file diff --git a/gears/docs/documentation/auth/singlesignon/oneconnect.md b/gears/docs/documentation/auth/singlesignon/oneconnect.md new file mode 100644 index 0000000..d61532b --- /dev/null +++ b/gears/docs/documentation/auth/singlesignon/oneconnect.md @@ -0,0 +1,80 @@ +## OneConnect + +OneConnect is a gear developed for Feather which allows an application on the same domain as Feather to connect and share user information. OneConnect is very easy to get going, with only a few steps required on the developers end. + +To use OneConnect you need to have knowledge of how to fetch the logged in users information for your application and creating a page that can display this information. + +
    +**Hold up, are you using Laravel?** + +If you're developing an application with [Laravel](http://laravel.com) then we suggest you use the **[Harmonize](/auth/single-sign-on/harmonize)** gear instead. +
    + +### WordPress Plugin + +A WordPress plugin is provided with OneConnect. + +1. Copy the `feather-oneconnect.php` file from `gears/oneconnct/wordpress` into your WordPress plugin directory. +2. From your WordPress dashboard enable the plugin from the Installed Plugins screen. +3. Select the Feather OneConnect settings in the navigation and take note of the configuration details. +4. Enable OneConnect in your Feather dashboard, and during configuration paste the details that were listed by the WordPress plugin. + +Your WordPress users should now be able to login to your WordPress website and be automatically authorized on Feather. + +
    +Just a sec! Be sure to read the README.md file on setting the cookie domain and path for your WordPress installation. +
    + +### How OneConnect Works + +When a user logs in to your application a cookie is set for that user. Your application has access to this cookie, so on subsequent page visits the cookie is picked up and your application will know to keep that user logged in. Let's assume that **Jack** has just logged in to your application. When Jack visits the forum Feather will make a request to a page on your application (yes, the page you need to create). Because Jack is logged in this page shows some information about Jack that Feather grabs. Here's an example. + +~~~~ +{ + "id":874, + "username":"Jack", + "email":"jack@beanstalk.com" +} +~~~~ + +The response is JSON, this allows Feather to easily parse the users information. Now that Feather has the Jack's information it can attempt to authorize him on the forums. Feather will see that Jack is yet to visit the forums, so an account is created for Jack and it's linked to his account on your application. His experience is seemless and he knows nothing of what's going on in the background. + +If Jack has already visited the forums before then he'll be authorized for the forums. Again, Jack's experience is seemless. + +The only time Jack will have an interupted experience is when an account already exists with his username or e-mail address. The only time this may occur is if you're forum has been running longer then your application. If Feather is unable to authorize Jack he'll be presented with a screen asking him to create a new account or link to an existing account. If Jack was already signed up on your forums beforehand then he's able to provide his e-mail address on the forum and the corrosponding password and link his account. If Jack does not have an account then he's able to create a new account. + +OneConnect is actually quite a simple process, however for it to work there are a few things that you, as the developer, need to address on your application. + +### Application Cookies + +OneConnect requires that your applications cookies be set on the same domain as Feather. + +~~~~ +setcookie("TestCookie", $value, time() + 3600, "/", ".yourapp.com"); +~~~~ + +You can see that the cookie path and domain have been set to the entire domain, this means that OneConnect has access to your applications cookies. + +
    +Note that the leading **.** is required for older browsers still implementing the deprecated [RFC 2109](http://www.faqs.org/rfcs/rfc2109). +
    + +### User Information + +When setting up OneConnect you'll be required to enter an **Authentication URL**. This URL is where the JSON encoded logged in users information is displayed. The following fields are required for authorizing the user. + +~~~~ +{ + "id":1, + "username":"Username", + "email":"E-mail Address" +} +~~~~ + +
    +When a user is not logged in an empty JSON encoded array or blank page should be returned. +
    + +### Conclusion + +You should now have OneConnect configured and working correctly. When users from your application login they'll be automatically authoried on Feather. If you have any troubles try clearing your cookies first and then trying again. \ No newline at end of file diff --git a/gears/docs/documentation/gears/events.md b/gears/docs/documentation/gears/events.md new file mode 100644 index 0000000..4205870 --- /dev/null +++ b/gears/docs/documentation/gears/events.md @@ -0,0 +1,513 @@ +## Gear Events + +For those of you that use Laravel, Feather makes use of the Events system to power Gear events. Events are fired at points throughout the execution of Feather and your own custom events can be fired. + +### Event Naming Convention + +Feather uses a very simple naming convention for all events that are fired. This is an event in its most basic form. + + {category}: {timing} {event} + +An example of this convention is as follows. + + validation: before auth.register + +The above event is fired before the registrations validation as assessed. The above event is useful when you want your Gear to add custom inputs to the registration form. + +### Asset Events + + + + + + + + + + + + + + + + + +

    assets: change styles

    Receives + + + + + + + + + +
    ParameterDescription
    `object $container`Asset container being used by current theme.
    +
    Expects + `void` +
    + Fired after the controllers method has been run. An asset container for the theme is passed to the event allowing styles within the container to be modified. +
    + + + + + + + + + + + + + + + + + +

    assets: change scripts

    Receives + + + + + + + + + +
    ParameterDescription
    `object $container`Asset container being used by current theme.
    +
    Expects + `void` +
    + Fired after the controllers method has been run. An asset container for the theme is passed to the event allowing scripts within the container to be modified. +
    + +### Controller Events + + + + + + + + + + + + + + + + + +

    controller: before {controller.name}@{verb}.{method.name}

    Receives + + + + + + + + + +
    ParameterDescription
    `object $controller`Instance of the controller object being resolved.
    +
    Expects + `void` +
    + Fired before a given method on a given controller is executed. Listeners receive an instance of the controller object. +
    + + + + + + + + + + + + + + + + + +

    controller: after {controller.name}@{verb}.{method.name}

    Receives + + + + + + + + + +
    ParameterDescription
    `object $controller`Instance of the controller object being resolved.
    +
    Expects + `void` +
    + Fired after a given method on a given controller is executed. Listeners receive an instance of the controller object. +
    + + + + + + + + + + + + + + + + + +

    controller: override {controller.name}@{verb}.{method.name}

    Receives + + + + + + + + + +
    ParameterDescription
    `object $controller`Instance of the controller object being resolved.
    +
    Expects + `mixed` +
    + Overrides a given method on a given controller. No response needs to be returned meaning the event can interact with the `layout` property on the controller instance. +
    + + + + + + + + + + + + + + + + + +

    controller: create {controller.name}@{verb}.{method.name}

    Receives + + + + + + + + + +
    ParameterDescription
    `object $controller`Instance of the controller object being resolved.
    +
    Expects + `mixed` +
    + Create a method for the given HTTP verb on a given controller. As with overriding a method you can interact with the `layout` property on the controller instance. +
    + +
    +**Don't forget!** + +All controller events receive the controller instance meaning you can interact with the all methods and properties on that controller. +
    + +### View Events + + + + + + + + + + + + + +

    view: before category.title

    Expects + `mixed` +
    + Fired before the category title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after category.title

    Expects + `mixed` +
    + Fired after the category title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before category.discussion.counter

    Expects + `mixed` +
    + Fired before the category discussion counter. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after category.discussion.counter

    Expects + `mixed` +
    + Fired after the category discussion counter. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before category.discussion.title

    Expects + `mixed` +
    + Fired before the category discussion title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after category.discussion.title

    Expects + `mixed` +
    + Fired after the category discussion title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before category.discussion.meta

    Expects + `mixed` +
    + Fired before the category discussion meta information. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after category.discussion.meta

    Expects + `mixed` +
    + Fired after the category discussion meta information. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before category.discussion.stats

    Expects + `mixed` +
    + Fired before the category discussion statistics. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after category.discussion.stats

    Expects + `mixed` +
    + Fired after the category discussion statistics. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before template.title

    Expects + `mixed` +
    + Fired before the template title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after template.title

    Expects + `mixed` +
    + Fired after the template title. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before template.meta

    Expects + `mixed` +
    + Fired before the template meta. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after template.meta

    Expects + `mixed` +
    + Fired after the template meta. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: before register.rules

    Expects + `mixed` +
    + Fired before the registration rules. Expects a value to be returned. +
    + + + + + + + + + + + + + +

    view: after register.rules

    Expects + `mixed` +
    + Fired after the registration rules. Expects a value to be returned. +
    \ No newline at end of file diff --git a/gears/docs/documentation/home.md b/gears/docs/documentation/home.md new file mode 100644 index 0000000..a77c732 --- /dev/null +++ b/gears/docs/documentation/home.md @@ -0,0 +1,3 @@ +# Feather Forums + +Feather is a community forum system. \ No newline at end of file diff --git a/gears/docs/public/css/bootstrap.css b/gears/docs/public/css/bootstrap.css new file mode 100644 index 0000000..c1cc864 --- /dev/null +++ b/gears/docs/public/css/bootstrap.css @@ -0,0 +1,722 @@ +/*! + * Bootstrap v2.0.4 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ +.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} +.clearfix:after{clear:both;} +.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;} +.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:hover,a:active{outline:0;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;} +#map_canvas img{max-width:none;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;} +input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;} +a{color:#0088cc;text-decoration:none;} +a:hover{color:#005580;text-decoration:underline;} +.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} +.row:after{clear:both;} +[class*="span"]{float:left;margin-left:20px;} +.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.span12{width:940px;} +.span11{width:860px;} +.span10{width:780px;} +.span9{width:700px;} +.span8{width:620px;} +.span7{width:540px;} +.span6{width:460px;} +.span5{width:380px;} +.span4{width:300px;} +.span3{width:220px;} +.span2{width:140px;} +.span1{width:60px;} +.offset12{margin-left:980px;} +.offset11{margin-left:900px;} +.offset10{margin-left:820px;} +.offset9{margin-left:740px;} +.offset8{margin-left:660px;} +.offset7{margin-left:580px;} +.offset6{margin-left:500px;} +.offset5{margin-left:420px;} +.offset4{margin-left:340px;} +.offset3{margin-left:260px;} +.offset2{margin-left:180px;} +.offset1{margin-left:100px;} +.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} +.row-fluid:after{clear:both;} +.row-fluid [class*="span"]{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574%;*margin-left:2.0744680846382977%;} +.row-fluid [class*="span"]:first-child{margin-left:0;} +.row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%;} +.row-fluid .span11{width:91.489361693%;*width:91.4361702036383%;} +.row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%;} +.row-fluid .span9{width:74.468085099%;*width:74.4148936096383%;} +.row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%;} +.row-fluid .span7{width:57.446808505%;*width:57.3936170156383%;} +.row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%;} +.row-fluid .span5{width:40.425531911%;*width:40.3723404216383%;} +.row-fluid .span4{width:31.914893614%;*width:31.8617021246383%;} +.row-fluid .span3{width:23.404255317%;*width:23.3510638276383%;} +.row-fluid .span2{width:14.89361702%;*width:14.8404255306383%;} +.row-fluid .span1{width:6.382978723%;*width:6.329787233638298%;} +.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} +.container:after{clear:both;} +.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} +.container-fluid:after{clear:both;} +p{margin:0 0 9px;}p small{font-size:11px;color:#999999;} +.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} +h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} +h3{font-size:18px;line-height:27px;}h3 small{font-size:14px;} +h4,h5,h6{line-height:18px;} +h4{font-size:14px;}h4 small{font-size:12px;} +h5{font-size:12px;} +h6{font-size:11px;color:#999999;text-transform:uppercase;} +.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header h1{line-height:1;} +ul,ol{padding:0;margin:0 0 9px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +ul{list-style:disc;} +ol{list-style:decimal;} +li{line-height:18px;} +ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} +dl{margin-bottom:18px;} +dt,dd{line-height:18px;} +dt{font-weight:bold;line-height:17px;} +dd{margin-left:9px;} +.dl-horizontal dt{float:left;width:120px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +.dl-horizontal dd{margin-left:130px;} +hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +strong{font-weight:bold;} +em{font-style:italic;} +.muted{color:#999999;} +abbr[title]{cursor:help;border-bottom:1px dotted #999999;} +abbr.initialism{font-size:90%;text-transform:uppercase;} +blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} +blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +address{display:block;margin-bottom:18px;font-style:normal;line-height:18px;} +small{font-size:100%;} +cite{font-style:normal;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:18px;} +pre code{padding:0;color:inherit;background-color:transparent;border:0;} +.pre-scrollable{max-height:340px;overflow-y:scroll;} +.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} +.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} +a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} +.label-important,.badge-important{background-color:#b94a48;} +.label-important[href],.badge-important[href]{background-color:#953b39;} +.label-warning,.badge-warning{background-color:#f89406;} +.label-warning[href],.badge-warning[href]{background-color:#c67605;} +.label-success,.badge-success{background-color:#468847;} +.label-success[href],.badge-success[href]{background-color:#356635;} +.label-info,.badge-info{background-color:#3a87ad;} +.label-info[href],.badge-info[href]{background-color:#2d6987;} +.label-inverse,.badge-inverse{background-color:#333333;} +.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} +table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.table th{font-weight:bold;} +.table thead th{vertical-align:bottom;} +.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} +.table tbody+tbody{border-top:2px solid #dddddd;} +.table-condensed th,.table-condensed td{padding:4px 5px;} +.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} +.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} +.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} +.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;} +.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;} +.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;} +.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;} +table .span1{float:none;width:44px;margin-left:0;} +table .span2{float:none;width:124px;margin-left:0;} +table .span3{float:none;width:204px;margin-left:0;} +table .span4{float:none;width:284px;margin-left:0;} +table .span5{float:none;width:364px;margin-left:0;} +table .span6{float:none;width:444px;margin-left:0;} +table .span7{float:none;width:524px;margin-left:0;} +table .span8{float:none;width:604px;margin-left:0;} +table .span9{float:none;width:684px;margin-left:0;} +table .span10{float:none;width:764px;margin-left:0;} +table .span11{float:none;width:844px;margin-left:0;} +table .span12{float:none;width:924px;margin-left:0;} +table .span13{float:none;width:1004px;margin-left:0;} +table .span14{float:none;width:1084px;margin-left:0;} +table .span15{float:none;width:1164px;margin-left:0;} +table .span16{float:none;width:1244px;margin-left:0;} +table .span17{float:none;width:1324px;margin-left:0;} +table .span18{float:none;width:1404px;margin-left:0;} +table .span19{float:none;width:1484px;margin-left:0;} +table .span20{float:none;width:1564px;margin-left:0;} +table .span21{float:none;width:1644px;margin-left:0;} +table .span22{float:none;width:1724px;margin-left:0;} +table .span23{float:none;width:1804px;margin-left:0;} +table .span24{float:none;width:1884px;margin-left:0;} +form{margin:0 0 18px;} +fieldset{padding:0;margin:0;border:0;} +legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#999999;} +label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} +input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} +label{display:block;margin-bottom:5px;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;} +input,textarea{width:210px;} +textarea{height:auto;} +textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} +input[type="radio"],input[type="checkbox"]{margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;} +input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} +.uneditable-textarea{width:auto;height:auto;} +select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} +select{width:220px;border:1px solid #bbb;} +select[multiple],select[size]{height:auto;} +select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.radio,.checkbox{min-height:18px;padding-left:18px;} +.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} +.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} +.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} +.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} +.input-mini{width:60px;} +.input-small{width:90px;} +.input-medium{width:150px;} +.input-large{width:210px;} +.input-xlarge{width:270px;} +.input-xxlarge{width:530px;} +input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;} +.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;} +input,textarea,.uneditable-input{margin-left:0;} +input.span12, textarea.span12, .uneditable-input.span12{width:930px;} +input.span11, textarea.span11, .uneditable-input.span11{width:850px;} +input.span10, textarea.span10, .uneditable-input.span10{width:770px;} +input.span9, textarea.span9, .uneditable-input.span9{width:690px;} +input.span8, textarea.span8, .uneditable-input.span8{width:610px;} +input.span7, textarea.span7, .uneditable-input.span7{width:530px;} +input.span6, textarea.span6, .uneditable-input.span6{width:450px;} +input.span5, textarea.span5, .uneditable-input.span5{width:370px;} +input.span4, textarea.span4, .uneditable-input.span4{width:290px;} +input.span3, textarea.span3, .uneditable-input.span3{width:210px;} +input.span2, textarea.span2, .uneditable-input.span2{width:130px;} +input.span1, textarea.span1, .uneditable-input.span1{width:50px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;border-color:#ddd;} +input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning .checkbox:focus,.control-group.warning .radio:focus,.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} +.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} +.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} +.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success .checkbox:focus,.control-group.success .radio:focus,.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} +input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions:after{clear:both;} +.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);} +:-moz-placeholder{color:#999999;} +:-ms-input-placeholder{color:#999999;} +::-webkit-input-placeholder{color:#999999;} +.help-block,.help-inline{color:#555555;} +.help-block{display:block;margin-bottom:9px;} +.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} +.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2;} +.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} +.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} +.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .uneditable-input{border-right-color:#ccc;border-left-color:#eee;} +.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;} +.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} +.form-search label,.form-inline label{display:inline-block;} +.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} +.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} +.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} +.control-group{margin-bottom:9px;} +legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} +.form-horizontal .control-group:after{clear:both;} +.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;} +.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:160px;} +.form-horizontal .help-block{margin-top:9px;margin-bottom:0;} +.form-horizontal .form-actions{padding-left:160px;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;*line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;*background-color:#d9d9d9;} +.btn:active,.btn.active{background-color:#cccccc \9;} +.btn:first-child{*margin-left:0;} +.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} +.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-large [class^="icon-"]{margin-top:1px;} +.btn-small{padding:5px 9px;font-size:11px;line-height:16px;} +.btn-small [class^="icon-"]{margin-top:-1px;} +.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;} +.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} +.btn{border-color:#ccc;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0055cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;*background-color:#004ab3;} +.btn-primary:active,.btn-primary.active{background-color:#004099 \9;} +.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505;} +.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} +.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a;} +.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} +.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;*background-color:#499249;} +.btn-success:active,.btn-success.active{background-color:#408140 \9;} +.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0;} +.btn-info:active,.btn-info.active{background-color:#24748c \9;} +.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;*background-color:#151515;} +.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} +button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} +button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} +button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} +button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} +[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} +.icon-white{background-image:url("../img/glyphicons-halflings-white.png");} +.icon-glass{background-position:0 0;} +.icon-music{background-position:-24px 0;} +.icon-search{background-position:-48px 0;} +.icon-envelope{background-position:-72px 0;} +.icon-heart{background-position:-96px 0;} +.icon-star{background-position:-120px 0;} +.icon-star-empty{background-position:-144px 0;} +.icon-user{background-position:-168px 0;} +.icon-film{background-position:-192px 0;} +.icon-th-large{background-position:-216px 0;} +.icon-th{background-position:-240px 0;} +.icon-th-list{background-position:-264px 0;} +.icon-ok{background-position:-288px 0;} +.icon-remove{background-position:-312px 0;} +.icon-zoom-in{background-position:-336px 0;} +.icon-zoom-out{background-position:-360px 0;} +.icon-off{background-position:-384px 0;} +.icon-signal{background-position:-408px 0;} +.icon-cog{background-position:-432px 0;} +.icon-trash{background-position:-456px 0;} +.icon-home{background-position:0 -24px;} +.icon-file{background-position:-24px -24px;} +.icon-time{background-position:-48px -24px;} +.icon-road{background-position:-72px -24px;} +.icon-download-alt{background-position:-96px -24px;} +.icon-download{background-position:-120px -24px;} +.icon-upload{background-position:-144px -24px;} +.icon-inbox{background-position:-168px -24px;} +.icon-play-circle{background-position:-192px -24px;} +.icon-repeat{background-position:-216px -24px;} +.icon-refresh{background-position:-240px -24px;} +.icon-list-alt{background-position:-264px -24px;} +.icon-lock{background-position:-287px -24px;} +.icon-flag{background-position:-312px -24px;} +.icon-headphones{background-position:-336px -24px;} +.icon-volume-off{background-position:-360px -24px;} +.icon-volume-down{background-position:-384px -24px;} +.icon-volume-up{background-position:-408px -24px;} +.icon-qrcode{background-position:-432px -24px;} +.icon-barcode{background-position:-456px -24px;} +.icon-tag{background-position:0 -48px;} +.icon-tags{background-position:-25px -48px;} +.icon-book{background-position:-48px -48px;} +.icon-bookmark{background-position:-72px -48px;} +.icon-print{background-position:-96px -48px;} +.icon-camera{background-position:-120px -48px;} +.icon-font{background-position:-144px -48px;} +.icon-bold{background-position:-167px -48px;} +.icon-italic{background-position:-192px -48px;} +.icon-text-height{background-position:-216px -48px;} +.icon-text-width{background-position:-240px -48px;} +.icon-align-left{background-position:-264px -48px;} +.icon-align-center{background-position:-288px -48px;} +.icon-align-right{background-position:-312px -48px;} +.icon-align-justify{background-position:-336px -48px;} +.icon-list{background-position:-360px -48px;} +.icon-indent-left{background-position:-384px -48px;} +.icon-indent-right{background-position:-408px -48px;} +.icon-facetime-video{background-position:-432px -48px;} +.icon-picture{background-position:-456px -48px;} +.icon-pencil{background-position:0 -72px;} +.icon-map-marker{background-position:-24px -72px;} +.icon-adjust{background-position:-48px -72px;} +.icon-tint{background-position:-72px -72px;} +.icon-edit{background-position:-96px -72px;} +.icon-share{background-position:-120px -72px;} +.icon-check{background-position:-144px -72px;} +.icon-move{background-position:-168px -72px;} +.icon-step-backward{background-position:-192px -72px;} +.icon-fast-backward{background-position:-216px -72px;} +.icon-backward{background-position:-240px -72px;} +.icon-play{background-position:-264px -72px;} +.icon-pause{background-position:-288px -72px;} +.icon-stop{background-position:-312px -72px;} +.icon-forward{background-position:-336px -72px;} +.icon-fast-forward{background-position:-360px -72px;} +.icon-step-forward{background-position:-384px -72px;} +.icon-eject{background-position:-408px -72px;} +.icon-chevron-left{background-position:-432px -72px;} +.icon-chevron-right{background-position:-456px -72px;} +.icon-plus-sign{background-position:0 -96px;} +.icon-minus-sign{background-position:-24px -96px;} +.icon-remove-sign{background-position:-48px -96px;} +.icon-ok-sign{background-position:-72px -96px;} +.icon-question-sign{background-position:-96px -96px;} +.icon-info-sign{background-position:-120px -96px;} +.icon-screenshot{background-position:-144px -96px;} +.icon-remove-circle{background-position:-168px -96px;} +.icon-ok-circle{background-position:-192px -96px;} +.icon-ban-circle{background-position:-216px -96px;} +.icon-arrow-left{background-position:-240px -96px;} +.icon-arrow-right{background-position:-264px -96px;} +.icon-arrow-up{background-position:-289px -96px;} +.icon-arrow-down{background-position:-312px -96px;} +.icon-share-alt{background-position:-336px -96px;} +.icon-resize-full{background-position:-360px -96px;} +.icon-resize-small{background-position:-384px -96px;} +.icon-plus{background-position:-408px -96px;} +.icon-minus{background-position:-433px -96px;} +.icon-asterisk{background-position:-456px -96px;} +.icon-exclamation-sign{background-position:0 -120px;} +.icon-gift{background-position:-24px -120px;} +.icon-leaf{background-position:-48px -120px;} +.icon-fire{background-position:-72px -120px;} +.icon-eye-open{background-position:-96px -120px;} +.icon-eye-close{background-position:-120px -120px;} +.icon-warning-sign{background-position:-144px -120px;} +.icon-plane{background-position:-168px -120px;} +.icon-calendar{background-position:-192px -120px;} +.icon-random{background-position:-216px -120px;} +.icon-comment{background-position:-240px -120px;} +.icon-magnet{background-position:-264px -120px;} +.icon-chevron-up{background-position:-288px -120px;} +.icon-chevron-down{background-position:-313px -119px;} +.icon-retweet{background-position:-336px -120px;} +.icon-shopping-cart{background-position:-360px -120px;} +.icon-folder-close{background-position:-384px -120px;} +.icon-folder-open{background-position:-408px -120px;} +.icon-resize-vertical{background-position:-432px -119px;} +.icon-resize-horizontal{background-position:-456px -118px;} +.icon-hdd{background-position:0 -144px;} +.icon-bullhorn{background-position:-24px -144px;} +.icon-bell{background-position:-48px -144px;} +.icon-certificate{background-position:-72px -144px;} +.icon-thumbs-up{background-position:-96px -144px;} +.icon-thumbs-down{background-position:-120px -144px;} +.icon-hand-right{background-position:-144px -144px;} +.icon-hand-left{background-position:-168px -144px;} +.icon-hand-up{background-position:-192px -144px;} +.icon-hand-down{background-position:-216px -144px;} +.icon-circle-arrow-right{background-position:-240px -144px;} +.icon-circle-arrow-left{background-position:-264px -144px;} +.icon-circle-arrow-up{background-position:-288px -144px;} +.icon-circle-arrow-down{background-position:-312px -144px;} +.icon-globe{background-position:-336px -144px;} +.icon-wrench{background-position:-360px -144px;} +.icon-tasks{background-position:-384px -144px;} +.icon-filter{background-position:-408px -144px;} +.icon-briefcase{background-position:-432px -144px;} +.icon-fullscreen{background-position:-456px -144px;} +.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} +.btn-group:after{clear:both;} +.btn-group:first-child{*margin-left:0;} +.btn-group+.btn-group{margin-left:5px;} +.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} +.btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} +.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} +.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;} +.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} +.btn-group>.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);*padding-top:4px;*padding-bottom:4px;} +.btn-group>.btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;} +.btn-group>.btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;} +.btn-group>.btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;} +.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} +.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#0055cc;} +.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;} +.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;} +.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} +.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;} +.btn .caret{margin-top:7px;margin-left:0;} +.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} +.btn-mini .caret{margin-top:5px;} +.btn-small .caret{margin-top:6px;} +.btn-large .caret{margin-top:6px;border-left-width:5px;border-right-width:5px;border-top-width:5px;} +.dropup .btn-large .caret{border-bottom:5px solid #000000;border-top:0;} +.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} +.nav{margin-left:0;margin-bottom:18px;list-style:none;} +.nav>li>a{display:block;} +.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav>.pull-right{float:right;} +.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav li+.nav-header{margin-top:9px;} +.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} +.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.nav-list>li>a{padding:3px 15px;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} +.nav-list [class^="icon-"]{margin-right:2px;} +.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} +.nav-tabs:after,.nav-pills:after{clear:both;} +.nav-tabs>li,.nav-pills>li{float:left;} +.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} +.nav-tabs{border-bottom:1px solid #ddd;} +.nav-tabs>li{margin-bottom:-1px;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} +.nav-stacked>li{float:none;} +.nav-stacked>li>a{margin-right:0;} +.nav-tabs.nav-stacked{border-bottom:0;} +.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} +.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} +.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} +.nav-pills.nav-stacked>li>a{margin-bottom:3px;} +.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} +.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} +.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} +.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} +.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} +.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} +.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} +.tabs-stacked .open>a:hover{border-color:#999999;} +.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} +.tabbable:after{clear:both;} +.tab-content{overflow:auto;} +.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;} +.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.tabs-below>.nav-tabs{border-top:1px solid #ddd;} +.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;} +.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} +.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} +.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;} +.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} +.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} +.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} +.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} +.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} +.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} +.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} +.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} +.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);} +.navbar .container{width:auto;} +.nav-collapse.collapse{height:auto;} +.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#999999;} +.navbar .navbar-text{margin-bottom:0;line-height:40px;} +.navbar .navbar-link{color:#999999;}.navbar .navbar-link:hover{color:#ffffff;} +.navbar .btn,.navbar .btn-group{margin-top:5px;} +.navbar .btn-group .btn{margin:0;} +.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} +.navbar-form:after{clear:both;} +.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} +.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} +.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} +.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} +.navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} +.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} +.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} +.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} +.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.navbar-fixed-top{top:0;} +.navbar-fixed-bottom{bottom:0;} +.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} +.navbar .nav.pull-right{float:right;} +.navbar .nav>li{display:block;float:left;} +.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px;} +.navbar .btn-group{margin:0;padding:5px 5px 6px;} +.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;} +.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;} +.navbar .nav.pull-right{margin-left:10px;margin-right:0;} +.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#222222;*background-color:#151515;} +.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#080808 \9;} +.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} +.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} +.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} +.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} +.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} +.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} +.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar .nav li.dropdown.active .caret{opacity:1;filter:alpha(opacity=100);} +.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent;} +.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#ffffff;} +.navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{left:auto;right:12px;} +.navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{left:auto;right:13px;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} +.breadcrumb .divider{padding:0 5px;color:#999999;} +.breadcrumb .active a{color:#333333;} +.pagination{height:36px;margin:18px 0;} +.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination li{display:inline;} +.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} +.pagination a:hover,.pagination .active a{background-color:#f5f5f5;} +.pagination .active a{color:#999999;cursor:default;} +.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} +.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.pagination-centered{text-align:center;} +.pagination-right{text-align:right;} +.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} +.pager:after{clear:both;} +.pager li{display:inline;} +.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.pager a:hover{text-decoration:none;background-color:#f5f5f5;} +.pager .next a{float:right;} +.pager .previous a{float:left;} +.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;} +.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} +.thumbnails:after{clear:both;} +.row-fluid .thumbnails{margin-left:0;} +.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px;} +.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} +a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} +.thumbnail .caption{padding:9px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} +.alert-heading{color:inherit;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} +.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} +.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} +.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} +.alert-block{padding-top:14px;padding-bottom:14px;} +.alert-block>p,.alert-block>ul{margin-bottom:0;} +.alert-block p+p{margin-top:5px;} +@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} +.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} +.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} +.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} +.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);} +.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} +.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);} +.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} +.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} +.tooltip.top{margin-top:-2px;} +.tooltip.right{margin-left:2px;} +.tooltip.bottom{margin-top:2px;} +.tooltip.left{margin-left:-2px;} +.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.tooltip-arrow{position:absolute;width:0;height:0;} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} +.popover.right{margin-left:5px;} +.popover.bottom{margin-top:5px;} +.popover.left{margin-left:-5px;} +.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.popover .arrow{position:absolute;width:0;height:0;} +.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} +.modal-open .dropdown-menu{z-index:2050;} +.modal-open .dropdown.open{*z-index:2050;} +.modal-open .popover{z-index:2060;} +.modal-open .tooltip{z-index:2070;} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} +.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal.fade.in{top:50%;} +.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} +.modal-body{overflow-y:auto;max-height:400px;padding:15px;} +.modal-form{margin-bottom:0;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-footer:after{clear:both;} +.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} +.modal-footer .btn-group .btn+.btn{margin-left:-1px;} +.dropup,.dropdown{position:relative;} +.dropdown-toggle{*margin-bottom:-3px;} +.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} +.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity:0.3;filter:alpha(opacity=30);} +.dropdown .caret{margin-top:8px;margin-left:2px;} +.dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100);} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} +.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} +.open{*z-index:1000;}.open >.dropdown-menu{display:block;} +.pull-right>.dropdown-menu{right:0;left:auto;} +.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} +.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} +.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.accordion{margin-bottom:18px;} +.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.accordion-heading{border-bottom:0;} +.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} +.accordion-toggle{cursor:pointer;} +.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} +.carousel{position:relative;margin-bottom:18px;line-height:1;} +.carousel-inner{overflow:hidden;width:100%;position:relative;} +.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel .item>img{display:block;line-height:1;} +.carousel .active,.carousel .next,.carousel .prev{display:block;} +.carousel .active{left:0;} +.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} +.carousel .next{left:100%;} +.carousel .prev{left:-100%;} +.carousel .next.left,.carousel .prev.right{left:0;} +.carousel .active.left{left:-100%;} +.carousel .active.right{left:100%;} +.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} +.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} +.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} +.carousel-caption h4,.carousel-caption p{color:#ffffff;} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} +button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} +.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} +.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} diff --git a/gears/docs/public/css/docs.css b/gears/docs/public/css/docs.css new file mode 100644 index 0000000..c066126 --- /dev/null +++ b/gears/docs/public/css/docs.css @@ -0,0 +1,155 @@ +body { + padding-top: 60px; + line-height: 1.6em; + padding-bottom: 20px; +} + +li { + line-height: 1.6em; +} + +p:last-child { + margin-bottom: 0; +} + +.sidebar-nav { + padding: 8px; +} + +pre { + color: #333333; + display: block; + font-family: Menlo,Monaco,"Courier New",monospace; + font-size: 12px; + line-height: 18px; +} + +.prettyprint { + margin-bottom: 24px; +} + +.com { + color: #5A525F; +} + +.lit { + color: #195F91; +} + +.pun, .opn, .clo { + color: #93A1A1; +} + +.fun { + color: #DC322F; +} + +.str, .atv { + color: #D01D33; +} + +.kwd, .linenums .tag { + color: #142459; +} + +.typ, .atn, .dec, .var { + color: #947897; +} + +.pln { + color: #666666; +} + +.prettyprint { + background-color: #F9F9F9; + border: 1px solid #F2F2F2; + border-radius: 2px 2px 2px 2px; + max-height: 300px; + overflow: auto; + padding: 20px; +} + +.prettyprint.linenums { + box-shadow: 70px 0 0 #FFFFFF inset, 71px 0 0 #F1F1F1 inset; +} + +ol.linenums { + margin: 0 0 0 50px; +} + +ol.linenums li { + color: #BEBEC5; + line-height: 21px; + margin: 0; + padding-left: 30px; + text-shadow: 0 1px 0 #FFFFFF; +} + +ol.linenums li:hover { + background-color: #F3F3F3; +} + +.prettyprint.linenums { + box-shadow: none !important; + -moz-box-shadow: none !important; + -webkit-box-shadow: none !important; +} + +.prettyprint.linenums li { + color: #F9F9F9 !important; + padding-left: 0 !important; + font-size: 12px !important; +} + +ol.linenums { + margin: 0 !important; +} + +.api { + width: 100%; + background-color: #F9F9F9; + border: 1px solid #e8e8e8; + margin: 18px 0 18px; +} + +.api:last-child { + margin: 0; +} + +.api th { + padding: 10px; + border-bottom: 1px solid #e8e8e8; + text-align: left; +} + +.api .api-label { + background-color: #f5f5f5; + vertical-align: top; + font-weight: bold; + border-right: 1px solid #e8e8e8; +} + +.api td { + padding: 10px; +} + +.api .parameters th { + text-transform: uppercase; + color: #777; + border-bottom: 0; + padding: 0; +} + +.api .parameters td { + padding: 0 48px 0 0; +} + +.api .parameter { + display: pre; + color: #333; + font-family: Menlo,Monaco,Consolas,"Courier New",monospace; +} + +.api .description { + border-top: 1px solid #e8e8e8; +} \ No newline at end of file diff --git a/gears/docs/public/img/glyphicons-halflings-white.png b/gears/docs/public/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae GIT binary patch literal 8777 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 B7G?kd literal 0 HcmV?d00001 diff --git a/gears/docs/public/img/glyphicons-halflings.png b/gears/docs/public/img/glyphicons-halflings.png new file mode 100644 index 0000000000000000000000000000000000000000..79bc568c21395d5a5ceab62fadb04457094b2ac7 GIT binary patch literal 13826 zcma)jby!@B+o%-915yyF0YFyB4?Ne(CRg z-#O<#&wb84`D17H-t*49Gi$BAvS#fBDJx22pcA4aAt7PN%1EdpAw8RXk~3bSJRMO{ zLOPzl2q2PL5H+wV#M#IJgd}PLHU^Q&+8CLER6#~2F82K(0VJg7mlo<;5G{o-d_b@b zi_u>l7MP9Q6B-FgKp19c1hfJ{$c#Z|7Pf*EM~$r%WELiZ6q=k0YzlVbAae^DR|k-q ztD-v4)e6XKLLn?fCII7mGGGIO7?HtjtZg0nV1g9?*yVeY|6XRLAp1uJVkJoNAEdMt zl*z=w4j?j47B*%e8y7nn*Jl>?&uqM(d6~#Qv9YtUvVUS_<7Q@Os%DRy=VF;OnbPZB&l+~Sg=;$olKxc@r)Yv8{FpRTZ&JYl7zK5_7had2=;im|h^ zOS1E@^NNabNpOiuiHY)jW|#UmR@T-LVq^;h{dM{mYw=&$PyZv9Puu}y1OYp!gTdDS z?kdXWUuEt5GU<9?B8*-aqzJHUs!SW&!V4sCD=ZRit}=F za#FB9kud@CK`bEFpnvsHQESM*Bx{Smy@b!&$kyyB9n2;mQzNJ~ghI&7+QrV?0tmKs zG<38vvbHufF>%IThd>Rse#s3_OPbdF5nnAWt zL)hVIta5&^8bd;2&ytl8Rfo+Tcz~_-Bx?#ZE2<3oUBe})+zpAGX&=O$_aCJBN!CBt zv~LUxtg{dH^uI`jCU#YZa*6x&AyIg@k@bxImc$%rVne48BslqY$+TLFj(v37h7yfx z$^jmG#g_Rs?ETA?`?LMJ^OpUDIY(RQdGlgR?XG$OKf8PyqRZyid2g!3%@a^C1igpD z2NKzV@|1wiF}EtKQRH|$CJJ9)q3e}#g7m#Zl(d`W;iCBregW~kz}j^J z#1PLChA^$dal^V@@cK(w}dv%n2!w4^wV*y35J)-xE{$fXwc@pa}RzJm5M)#tr)iJZA7 zBA<^jjwJWvLx1>RPDIS^k*z$pgpiQZ-O2S}m#&N|A4@|nID3F1~ z+{<)-J1C8b8ezW2FI#gotv2}C#wQERQ(Bd4_} zR$QREVi8_9nE3}6@Vks1@*cVLJrSLt#`lb0$M?!xg%%C;C!jFg2$sX)U0bprNA043 zt1cd;7oNIanP3?<(O0mgAc`)87;35OB;`nL3-yw7Fq`<#Hqz;v+Mj? z%y|w07f93V#m`17f@xa3g&Kss@<20hE22A#Ba2fDjWQe?u<#pkgd4DKg$db>BIa`q zqEeb}1&O#H`nWg^GT=P^c&c$+@UcRMn~k-y&+aN^ic}0j)s9vGd$m}}SL4iw!tr4e z74SRhmFujYvTL$e!;=bil=GRdGp3UA1~R?@@XL?>oK21E-g3xj0Gu;SC|l|8wmd~d zG@8i53Tu3s9ldBp@%(!A6E=rZOl&LAvv1Nkj=ysQ(9(~g-8X6}A>#Y#1a(KQ1TAh( z`*b|k%zN|vOG$C7_4PTiy8Lhr&rZ~I!*iV zG+W%bI&HR#n{T~n|CLrV#?k5#Et)n4f;XdM7~@Er-K9uS8vPNM>uZUibWxth=wqXp zt{0wO*|bZs%9J3Y;Tj4)?d>OBZ>YUb@tFh)1KiKdOeB10_CBOTMml4P#hsP|NnH`$ zn8C$aG#8|gqT#i}vYTeH^aF(r1JFKcz$K3~!6}2FX0@^RHCL+33v-FhYXz#e!VN4~ z3pAY$kL`HvPAaz%ZKvX4N680T6G=`cF|!UT=iU?gUR}#z>rLnIjH4UiW&X!Z2Ih$B z#MDHe_%!Yd4!bTFMGeNcO(+vEfWe=Y&#$#Dh_vk`s>hf<^Bj2jofdTiH?Cvh55o&b zE2N(49<70oDa2DrZnfjbhn{Jl;CT6QCOL517jsNXxh ztk>S%Nl!1kKE!_Y1E%82zuk(#fmi4VMZZ|C9XG#t=_a%pE(?AS@K%j{n=lj?kEKY< zW|3b0>CWE2bkN^RapDK@3*dIhwI~%Mb87ZxnF|-bX;tNwFf}3s_Ti{S8}(TUA=c4( zY2Z!UZS&H=Pk;r%irg?jcz?{s!|V*#QA4{2Fzp37$r+}Z-K{*#DE7B^Inz!%Q9nU} zU%!E(b~61SJ_R5KSY88G!*+2Crm?Vp1DUFviD)lB1c&Atk+dP7K7{oK1?N#HTx(Jx zis^|e#sUW_TPZE3IGu1R+xV`&BV&1NNkrD4j;(NEKdkpSdz8YLZ}ya474taW7yY@8 zsA-+N{3&saE60RSnI802s?NYn0KiULv+`y9hNB!6%B_qCFHMhVOa;O!ge!LzPKbk( zbOnDN{s12ui~i)C55qt9+S4F%_rqna@M}~Kvh3z-^-K67%2T=8H8g<_=LYj#`6IF< z&#}t=5w#4@^{y}B4J8rm?|c7nu!l2bJZ`U-W4@aT)V{Bm!c%#8HewtNPwZ4>dYBdQ z$`?MJMLJt7`j`p7Y7C@WWmQu(B(vQ&FMa>ZZpX>;(|`+m?2Yl|fhX43DejM5BMl`? zr(v=9l4R8Y3}+Abj6x1X^T?$#`1;s>I24lFFFn~&HRgQK%%Ey(mn=20z;U>um1z~Q zJG*-wAw;tG!?{U#JnA5M5rX*u%NF+}y;0xPbTQppWv;^8{aGUxG$gD!0YAlLo;KuE zkFzemm@vHoQYYv<_b|t(esPHC%z-nLF5Q9^?&hl?0?g0d9hVSdDc=X~B?dQzaRfp; z+2*{_ss{}_cv+!%k7WX20;r5{GER*rd{={D1l}-^Se~*W+_M}?z+w9HX;SR@AB6by zI0}UM&nJY!1O!_&a8xRuf`=Drhp4bwFD4GN;7|wXEpdq}@{E+u#{VT}-UEwtWPkxKl^Wa8Qi?#AQLxY4w+?_Y4 zd1glMwHFc0bglfOS-7V_h zjsOP>)fG0TPo!`fIkeDn-b_WlxJH)NqQqX{Cjt1+PPI$%JFTSWT#$Mj_6O?PY#fK3 zMy2&j?Y~|hc!Xla$G$#xZ0%AyTx!yYt=5!)nk&0@J-$=t?&(X;8%~rQYD<{9lr1z zs@8X~WZq3R1+cmT>`KWeE&^_UF>|q&Ay^}*sN63yo7B9nz}D!eQt$6m26sKn>O$P zmvsnQ7b9nJQ46`zs$s*Wtto!ux2}?)U%;Z5%hb7!$w!&8C`>TRG+*DdD0JLss5Xff zBThm&kGp*Qxmrsc3GjV@6TVB6)l|r!wyRJP)U%eM@Of-k4FDYmUY)1+7EUyRGbs_` zleaIf78kfz<{vx`Ls^b4Ogd8_rSR#I2AH%NK)|Vfh#}z~2k0bJcEvc$3He?p;bGVK zyam;#Nl5X&J8j^k<~QS18sq4NPR$kE>m%=`^Ki#+ieKpZYF?TTM#Jv80{<7eYn$&q2aN=p)lq6fG9}Dv2}g_RSVx*Iv-0C}kEWsUw>e$24l?hUH3zqG z2Sa%=_ql^t*`t3yW7`PZ(-yol6mNfiUV1c7e)%BgzOh%HQQd^uq9gC3O*vPSi&V!$ zuJ-gy-6_@)r?@+~#wK_V|QHgllM9B^dZanlnPLZqhL-@Wql1PDLO_j>7Nz?o z+_&sbFV42Gr7019rPl3IUH2}h2Wl+=p46k?>x70Pnt9Gn_CduyDht`=S4b}9&F^387k|mAZg2^t9(aD+I+W{ z#iMaSJ%Slg$*$}d;|(Q|7`BKm3z9) zh-*c!-WX<4{kD>(FE8TvP+#HUL}QrAKt*0vVL7!~ovM)?Ur`?N{))Ew;yk>PkfjG- z*)^I$qo~mV?U!~Gwi(1*M)0+vT9Jy~`kGC^1<}kh2R4PgR^?53j%>|Ns{2kn=ewGn zvPvguwaHo(xrDKI-r{x~q$onf~4u$MK|{q*`g)sDyNO(})q!R?7xZH;c=m6iWiHEU8Q0KT-e zKaAgECVApd!3(FjK2!e|a^g^-5f7L7jB^GFCrwQ_*B`o?=jeoDN_*x+cXrv8gf$36NQ*!QC!Kwg5~wLak^RyUvu(CifB7CA>(1lu6}+@1^DvB!>VYXX?9Ys*9wd&0abG}7TGJ`WsH;FX_s&}n4v(1m|Q)++R8J>#?XO`$8g+3q` zwN~X&6{@){!8Q1(2!in4P8(_gYuOhhFGZ;=C-6kTb%~vBQQ*b-=z*J+>E;6ujm;wX zvb?kY(oC=+ca4)i4a#h@{dTzWSLS3ag^66Gpkn{ke!AC9A{1jMRP%OcQ)<<@nxJH} zZIr?|jBinPoiR)snBOcecjcb@Wuh3my1iVRzl-u;gB}~Rjhub`?Cfu)nPL3L+b$kL zO32z2XK-0_shy`%ZT9<2V<1qI5Rel|E7W{`Hg#M|m&O0`Ua-&p;v}tapS>wTE*On` z756q!EO*AN?oxlV&@ybUeVWd1q~Tg`kpqG}F@V;VsN#&)R^`V00X5}(4*PmNqShEg zQih?Ga1nmgvx@-!Wngeg;A+L{F-(i zf_X7=?WU?j|23>ePpP8OODXHU69Lw_MmSudzHtic8)MWn1BPdI_Ae4ykPB0u9il*G zJ?$Q@);~I`)dd=AQuaxcTe2HSse|E|ii5U_*5>3~bz~#PL%91W(Nyd|=|ZA6*w`c7 z$R1sRD@XhF^&4gJ#exDQRqq3%$Y|oPc!wXV-=n37^UJ=Olj%RP#gEAol|$!AAbjxW zXq&hxEZQyPL4JOa6I*343W#)9&u%!GDhw_3B>yJ7)O`Ae76GRZenb(|eWOMZU_spF zuD{--T)B0<*4E?|ri0F<=p!twyj!hH;HlUN0Htt?hj8zO#!~F83W|K9Lvq z3{RaoPbjaDFu@z{^qW3cjj7kS$GR|;9I%R~LZ@6(ENvrteZFbkkow-9p%qZBx>J+M zq8}TEyApxpU@n((iw0bRrJvc6Cd$y8wbf4?-w4%S5$Slysc^DTKW~+Y`!?zI;_DZL zV9KO0`~P=A@%O2`KlPzF{xwsO>z5=mqo0Z23o-D!NekrdbEa^%TfV56v|FDM?4cKX z@rrk@JJ?1_5irzO66hc^C*{*Ke&o=Ijw!R*ZAgtQC0ezeL17SocQu_m!6VUsNTcVG zpwRaCZCIJ=OR~@li`X(c8LO9k&wjr&0Gd_GRou<{3Hu`Css}PU72iy4PZtFd(l9VK zR)fk*&dPTy&yMX{o8@~bPnX0_Q@UX-RN+o|sC$;fpA|xTEugMj7@)yJ{4@bO3x^+O zH0OTqp82(iEah+>0QWS z$@9x&MNFG_ayE3OJxi@l$%9i2{OAD1go7t5}Sv8p*L*?_XV-Inr zpe~mOfBekpsM*iZA4B0U-_aDDuQGQ>$du+c-pHfXyBaLv@T`?*-je(+>E!q1bXa1q z14-*PWvM+oFg(z{YlRS2em5Pw1U1&De`{t$Pg={frAk6|^cDRB$0e*ut zvJ=N0<2rG{&|2ECVoU=~V0R9rfUWk0Z${R3(A&#kkMCPoz`s?k7N+_8!1v32J*zyO zR9Lv8#NK_E; zsf^8eBN5l`rT5}^m`=Z(Oaw_(G`KLa6xX%V@W0keWi;An4+N4QThS_k{n&Vyk{0!?N_d)(8r)?>J|F`-ZusfRTzNO)+h%L=-)$92e&Ck?1oAE(~~ z$-n~o0g*n;RB*mqiaAn=Wlm0w2D6Yu&4fY#;MU1bvU(~NK6m1FUoPk+w;|b?nzGkO z_PUIl=pfDRhrLvm<;sb9>BFB~Sc4oJ;hS&xb#O~;Q7(2b8< zQ9Hg8isf_ddK#6OY$>r#Kxz@D+gtkY>hy|#o8Z-=^bH`o)WbuhhdK98@PHbw2Zt=7 zV$-oYeC$U<;|pnaU4187;%~hxdnq*JOnEGam?8hex6Iy=ZlWGzZv-4 zoJ{KX4x(J5=P>qor+5;Qvhp3GFBpXJ9fO3crB!vqua&Y$iFJdsGsQL15;##Wtx)a! zYY)JHGBW`d%x6ZI`{f6_r^+OdBbZk{<-B0y4iS|--^SLDWVMu&VT?M2Z|8*E=pfeq z);Kt;$?dDKuIJvdZG|d_=QWvbk?X!+UMjWng_S4uk_M}7f`V03>h!f-=Qxpm9ReU7 za!V9@Dytw&Y;Dn_tG@+O7`;DiSse1^ilx|o^~@+CRqBxKgXtuFTdkV9s}V3?Sy6{S z*XctI(Eyb3h^4g}R#0C=Al$1x3GX$~3fA}}eX>>DF+LFj4zJ()a-xd1d6P?W{`m*D z*x%43iLpP6D8xOj1Z<^h)%1C*{`|uBM zAKe~zJa>JT4Tqn|wxn>-+P9_i;yHBP@*ap6jMJgu7>d2GIq{>J`g;o%tKlmpM-RrSw{_pAKK; zSq)!`7M=VE#*z4?xSugikUTPD}y7GXhB{U`6@}s8z0d@C`F9EQ3#s|A3?{zk{KOin$?&5UgsTdnL zO1i!hQhbL?LiIIX*RA*iV$~) zB>zWXKyBeJC4}W_3SGU)PQseJzO;g~99>U&xx8@V2Qp$StzgO_?GxT!9UmQV2vt-^ zkab;==s?$tI#Akh4J+G|pAPYZQ5vA(8|@a9T2-p=)uPN{@6f@tmW11S)1s z!h%|zyG6Dc);F%IdWaK*t#r*khD51^8Ay)ixzUtt=#AX2VmjE zOFg-|2AdD>SmMSf?bo9uRB)zYaT{m9I%7Vs)$dLGX>bj<#I2?S8OUQRh(mJrJhADZ zT_^gL-3m0*JIokIbOUyiA83%98nW2{Wp2BW5akVi?klylc_3UwSpIlPTwb zEIG-t+EJ;a3(OZ-sGt+R_j^Z;x|qvjBr|7-{wn4kOG&^GRt$u`kMx zzV;Zy-UA7<xMJg(rd2`sKuS9&FoYuUoug>t*^~eJTjg>pWcBUABu-7%@{xM zICt)A_$aq9KQ1!{${`~7GXd+8ZDmu`rjx$oiC@GP<}zwn_dR8&M)WQdC&iw3E)YGG z>3e7ZNZUGzmYhW2?kKOPphuHB2q3zn7e!n3V8t*?@hpE5fc7snCI0l&iE)SiOs(W%=b1^y8b;aHjB&KaO|McF*t%v`zlW*&h5@1@_C^ zu@=`+#rV2TS56EeCh=>uP<-lPc^}fc208qOOb9~TKo;7L zA~1!rYZOt)&{UFvJI5a$VIW+Rn=eIQsZ^sU)8hNGK};PpknpE84hIhht07)(ER+4_ zxLhMx$;116i@tQodN*XTcFS{`!fPjk0n} z1udu3=k`@uaQK?j)YF!Z2n=fc zY`~>$*#BZX+mGk=DFM0Z|L3%DK(H(w+__!4UF`kf9Jf(YzE zR+p>6%a^g;g${|zdmK6-Gj(({7pl{TV*3&Z!Tg4cKvV0j;*Hb(Z#qmw#wdm`wZ8ts zjIUMJ`h#Vh4=S1zDw~a^H)q+6{ z#Hz!oYPE7ZFi~~AG7n#q$;s}pANs@VyV5vhU2&d`=@Es*pQh}pgHHCW`KB+GEa9ck zW`9DlW`Wvi6+8Jp#bM-ebD50CjykM&Y5Nb{=n_#L!>gatGhc`j`D$a>B*m5@1=_tY z1!7V55YfU?hSlU@@flw?^BFXCnLzGQ5nOAvVvjQP>otW|mQj7Pc1evAEdaVt_O7si zLf)Opv3>@Ky-^Y?)9yR;H}8pcbX&{bu?-8JE^rhUOvU2ko_d9PU&9pXO^>cRZ#zZo zCkq39jb4}nCKp>1oQXcr)#BC}eH;uS!al|lo`b0S;{)B1C!B9NGJ7sRRf8u~;@IH-gDB{~GwmgyVn+go-vI%&pi z&YpjGP!eesJV1P}>w0bDVqj#o(Td$rcY=Dy(vmsW4Lu7vblFZ1AkwFt&8yEeH+$MF z-`f?Kpo$}2=fdkh7scLN3X|LFczR*OC>3vQN$>T`HJ{7Et7(nPTo6piDNA7Mqp=3RT0d>DNW?+-b;wgbWc@xKrOgn@*hcG0Bl300~zM z1cqJaF;{x*c%r%A4-dBquj5*G&bu!gKwoO_nS;LQT^1W`?RvhSP_8$3==>+aY-PTt z>bq-vSj!54>+X4cy9uFc7n4e89$B@NcVD5A-ZJOxHgc`}0Xekmrnv zFXt>J(de%xG=HqM%#sdc`1MGQF^WDoQiWxMaI(4dHmX&4!LlBo`(Of>F#wiHG2!fZ zvB{2Q#2#f}GF24rrVMQV1q+OtDek8cd8z74b#rGk91~90FBtkjwVnDn53id&|26Z`rO1<>1bMNki zIionO>*HS1J4(aUYgwsF#kSB3LoKM6=_L4awnOEIti-PdFWHKvSHkYopzzkmO{#f! zBCp*D{8xF0vlect8R3v&sfl^TuDXSf&P%wC74{#9?N5X!pC24A7h4?)2V-9N|c{C;w5wl|z8<2X0es$`*M5j(oF{0r&32 z`U~-Q8qfbA;nM54%Pd-|nK@0LdSA=5KyqV*g)A>?W!gQiNj|kKfej`z+TWeH!`Hpg z4x)z(>^8nLqTC<9RW5iJvCjWHv7}1afGXDDjvlcDu^s2txL;E`C?VN3k?3wy4?Rg4 znmrvze0;v4z1-miFC~klv>fjZbDDi1Sb3^nk~4(v>AQ0kEgcS!BT@@JFn156+M2%+9d~_aj?sf*d7G$H=KZ+;~_5OXv~HkLZB`D1C0=ySHh6%$1n_d9W{Z z&m>oGu#UW7!b=#@N;S*cUt1_&zh6G6Pp&1MS&qW^nP8>f9Vydi7A|Q=nJs1UqHe~% zo8!0@d07eTQ)zRgq2lRbPX=U9X)}<}K~;F^6$@(xJg{M=ogF(BJK$Va())Mp;3$9P zb1zLrct_$*_$9%}3(n0%gfU}7>#&k71PXy}!LO#cR3p!xc`NR8zFQw{A$DKq6Oeuw z;ZC#iv;VMss-vmXR&ElJ5dxInx1l|}uEaG5i80LcV~4TkD%!RUD@5+~l+kiSOpS0( zJ-iwpm}JCR@Sy?BW$_tvO%K-fQUFm-UCi;NK$-MsQoWnQXO+(qUd!{zFS!JepUfxD zmmoFLB>{OkHam{gP2#GXZaq&=xio1Kop4j#`v}Qz6U1D0dc!ks4ikn{Y6ti#ZeqYgF+ z0jQIIQUvnReW)_53Z+>u>)Lw((~vxa6AFrr%d}nI!o7{spwl@ir`qH9j7o=6JXYD| zsp>X-yI}#VHc1S{c}{E|acAh>zF%*}R`4 zM+xtI9F&>Xs(IJooneFYo;l{cU*-2DT~2TUm;QwTC9RXwFSwqHS82mcZmDj8xVn(+ zhjg5e>~E9?3K-*RvJ)uCq0UIdRl~D85$B^#Nph2%)6FN1>6!u6+%oE;F=J5B=`W{` zL<6;Qu8Pq|0+tS%yP10nmIgUV^r%Hyjyo|#W0hIVR`qiw@r)O7`K*l4Ma$$u=XQc$ z^#q3KLI6#VtuIxX4b;#_lx#bieZGmNS8?8jxHeTsE52O+t4ih5iw}=p7@DZs*!jev z{i#&SO#GsN^zjC{G<~Nu|2>~?q2Z@)UnNDB&2?wHQCn?p9v7YpNRPW1 zWM9#550th&<~(gv_Sok5g3e8tnTzkV2|gxe#kE{nUT{aP8n5=}qg4mCp!JuEcz=Ht z&y3I7&uxdKU%P7D+5NV%Ok}hj@mimhKlv+R1bd8?zb|20JJD?Q?=vElsc#c2!VJmq z&W&vW+CaWx`FG1VfMsEf)`p}0TTes}|I{%_X{vj;}wDxh!zb$|D=4e756H z7dp8?Ul~60@eSwbY!+Crzr*mLMSqj6ofW&@mJB8fIGm%=B28`wnbx8F8YnigN|~sB z)ie@y57LaLin3|;u`JzFDsS0JCrG!Z4g+Nd*=-JadG7AesG5y*rMun?dHJhkCMW_% zCal ztKYWr0+ECjETkqk!9jw#hv?D8BB>sVztP<9s&fY3kg7O(65kdl!pnzWhNl>mkKBOP z9wGNuspXb&`T7gZLu#Y670KyIg|D$foZ^6CxK^NurqGjTAORgOb-D`MnNNRW8Xw=g z8)`pHz^^@&DlTfcLBTlT7>c#c{d1Rs^_EM?6rpWz{8ZrZ3&E3&F=tOC;zGnc>6#NjY1JQMZ!+8#j*!95<*U{5CE&b@6WIV= z`L8w`z0>!&Y?@c9IUIXc)WVTOpF}^_=xxWoJZGv|AT41`N;g@MZhWeGa@pxlgGji8 zR3?G5Rb3_fNj8zy!w)Nl>leQXO0(UI&kdY+N-i0G7Z%q|`!Oo^N%yZLWCBLMop?7) z`#d}b79JtI-AG(Fx@TIi!6u-D3-^!Dlae;43Yp1%MZ9XATQ^#ln*F21RntEEXZFkB z`SV+qf>QWy^~x~X!#q&<(a*gW8Npq#5?J;o^D1<$rOl;PQ2b4cBvE-R>e$@3lbK}qIv=--S zEeI|aC9>S#V3jN>JO#=lUV`ja4_n@N34a(b9DsX~5L~fhJpe=AgZbr~VX+0ZQY{x^ z(k)K(A0~mNkFt zA8e)|)*K0!nFmOg^$p@)RlWA0%f_jul)Ga}wOT-A_SHF)3v!5Ywj5XdkuSTR2s1b> z60lzNZMkjx`b~_wapzIo-Eku>H`NV#XFRgb*F@gDM&yDMiwX=D%B zmzw)_!+aX+zV8mY9at~%ev^rb^(0rwKSp(3};ZpMvxEwD2OjDaVA6Ry$0&8rtZV3pHxzf$? zzAjYXA~;b|XCc95MUR%dTT@Z>0}uY+8y=;wW1vky{pKP;cOV}6&6tV$I;>`FK z906wPfPrz9t=;&M?(Wwdm z0?&;KzLQk84srC-9#ap*I_9GregSZjm<$6oiZ>h3ACEnS7A^faq{fPmD!rT69qQG% zRVF#+RDZ(-Ue?g!$?;NT#p=8F8SV%EZ5ry{-5J)UN6Jj~-klPlw7o4w&aUp0pn@@) zM(jp3}a6rP@=sC1ZvM zV)jL-HO|elZ@x|hHXkrmGu9uS2%=Jqa zgIqpCmA+s{=XewW1!LqE)3%%mIO z(8jQbk;xApH`iS0;h7M96j^_3N=#|-xP-=*>3=obmL(W)Au>jdy3E<UjD;R zOI^Va(lW(qH`MjF&}RqCOifgKKA39SANA9=Qv4z+3Qey|4BJBzex_v%9=l5D-xJaG`?IF#?EKul!io4R+`>v>t_65&VXqROwiMr@*>SD)gNHL4^Ml5(vgCqodJjd$~XNSPzt@GziL=mgy;Y+qBZh&1qKxwm{>$kMCyH2rN?F2%^-bX#z9QBC| zNx?aIaFXEMqAKsMWDfWB@Pt3@$5LZ%DVDT70icB1BXM`F_#4rYqTkpk%wf tVgFekgZM{XhA!KlmFcR^%iaf4$rSfz)nO-hfB%&wE2$_^D)!aq{{YOB6}SKZ literal 0 HcmV?d00001 diff --git a/gears/docs/public/js/bootstrap.js b/gears/docs/public/js/bootstrap.js new file mode 100644 index 0000000..2c00b6f --- /dev/null +++ b/gears/docs/public/js/bootstrap.js @@ -0,0 +1,7 @@ +/** +* Bootstrap.js by @fat & @mdo +* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ +!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
    ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

    '})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery) \ No newline at end of file diff --git a/gears/docs/public/js/jquery.js b/gears/docs/public/js/jquery.js new file mode 100644 index 0000000..7d31db9 --- /dev/null +++ b/gears/docs/public/js/jquery.js @@ -0,0 +1,2 @@ +/*! jQuery v@1.8.0 jquery.com | jquery.org/license */ +(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
      a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
      t
      ",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="
      ",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;jq&&u.push({elem:this,matches:o.slice(q)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;ai){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="
      ",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="

      ",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X
      ","
      "]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("
      ").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window); \ No newline at end of file diff --git a/gears/docs/public/js/prettify.js b/gears/docs/public/js/prettify.js new file mode 100644 index 0000000..037c26d --- /dev/null +++ b/gears/docs/public/js/prettify.js @@ -0,0 +1,1477 @@ +// Copyright (C) 2006 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +/** + * @fileoverview + * some functions for browser-side pretty printing of code contained in html. + * + *

      + * For a fairly comprehensive set of languages see the + * README + * file that came with this source. At a minimum, the lexer should work on a + * number of languages including C and friends, Java, Python, Bash, SQL, HTML, + * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk + * and a subset of Perl, but, because of commenting conventions, doesn't work on + * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. + *

      + * Usage:

        + *
      1. include this source file in an html page via + * {@code } + *
      2. define style rules. See the example page for examples. + *
      3. mark the {@code 
        } and {@code } tags in your source with
+ *    {@code class=prettyprint.}
+ *    You can also use the (html deprecated) {@code } tag, but the pretty
+ *    printer needs to do more substantial DOM manipulations to support that, so
+ *    some css styles may not be preserved.
+ * </ol>
+ * That's it.  I wanted to keep the API as simple as possible, so there's no
+ * need to specify which language the code is in, but if you wish, you can add
+ * another class to the {@code <pre>} or {@code <code>} element to specify the
+ * language, as in {@code <pre class="prettyprint lang-java">}.  Any class that
+ * starts with "lang-" followed by a file extension, specifies the file type.
+ * See the "lang-*.js" files in this directory for code that implements
+ * per-language file handlers.
+ * <p>
+ * Change log:<br>
+ * cbeust, 2006/08/22
+ * <blockquote>
+ *   Java annotations (start with "@") are now captured as literals ("lit")
+ * </blockquote>
+ * @requires console
+ */
+
+// JSLint declarations
+/*global console, document, navigator, setTimeout, window */
+
+/**
+ * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
+ * UI events.
+ * If set to {@code false}, {@code prettyPrint()} is synchronous.
+ */
+window['PR_SHOULD_USE_CONTINUATION'] = true;
+
+(function () {
+  // Keyword lists for various languages.
+  // We use things that coerce to strings to make them compact when minified
+  // and to defeat aggressive optimizers that fold large string constants.
+  var FLOW_CONTROL_KEYWORDS = ["break,continue,do,else,for,if,return,while"];
+  var C_KEYWORDS = [FLOW_CONTROL_KEYWORDS,"auto,case,char,const,default," + 
+      "double,enum,extern,float,goto,int,long,register,short,signed,sizeof," +
+      "static,struct,switch,typedef,union,unsigned,void,volatile"];
+  var COMMON_KEYWORDS = [C_KEYWORDS,"catch,class,delete,false,import," +
+      "new,operator,private,protected,public,this,throw,true,try,typeof"];
+  var CPP_KEYWORDS = [COMMON_KEYWORDS,"alignof,align_union,asm,axiom,bool," +
+      "concept,concept_map,const_cast,constexpr,decltype," +
+      "dynamic_cast,explicit,export,friend,inline,late_check," +
+      "mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast," +
+      "template,typeid,typename,using,virtual,where"];
+  var JAVA_KEYWORDS = [COMMON_KEYWORDS,
+      "abstract,boolean,byte,extends,final,finally,implements,import," +
+      "instanceof,null,native,package,strictfp,super,synchronized,throws," +
+      "transient"];
+  var CSHARP_KEYWORDS = [JAVA_KEYWORDS,
+      "as,base,by,checked,decimal,delegate,descending,dynamic,event," +
+      "fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock," +
+      "object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed," +
+      "stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];
+  var COFFEE_KEYWORDS = "all,and,by,catch,class,else,extends,false,finally," +
+      "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," +
+      "true,try,unless,until,when,while,yes";
+  var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS,
+      "debugger,eval,export,function,get,null,set,undefined,var,with," +
+      "Infinity,NaN"];
+  var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," +
+      "goto,if,import,last,local,my,next,no,our,print,package,redo,require," +
+      "sub,undef,unless,until,use,wantarray,while,BEGIN,END";
+  var PYTHON_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "and,as,assert,class,def,del," +
+      "elif,except,exec,finally,from,global,import,in,is,lambda," +
+      "nonlocal,not,or,pass,print,raise,try,with,yield," +
+      "False,True,None"];
+  var RUBY_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "alias,and,begin,case,class," +
+      "def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo," +
+      "rescue,retry,self,super,then,true,undef,unless,until,when,yield," +
+      "BEGIN,END"];
+  var SH_KEYWORDS = [FLOW_CONTROL_KEYWORDS, "case,done,elif,esac,eval,fi," +
+      "function,in,local,set,then,until"];
+  var ALL_KEYWORDS = [
+      CPP_KEYWORDS, CSHARP_KEYWORDS, JSCRIPT_KEYWORDS, PERL_KEYWORDS +
+      PYTHON_KEYWORDS, RUBY_KEYWORDS, SH_KEYWORDS];
+  var C_TYPES = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;
+
+  // token style names.  correspond to css classes
+  /**
+   * token style for a string literal
+   * @const
+   */
+  var PR_STRING = 'str';
+  /**
+   * token style for a keyword
+   * @const
+   */
+  var PR_KEYWORD = 'kwd';
+  /**
+   * token style for a comment
+   * @const
+   */
+  var PR_COMMENT = 'com';
+  /**
+   * token style for a type
+   * @const
+   */
+  var PR_TYPE = 'typ';
+  /**
+   * token style for a literal value.  e.g. 1, null, true.
+   * @const
+   */
+  var PR_LITERAL = 'lit';
+  /**
+   * token style for a punctuation string.
+   * @const
+   */
+  var PR_PUNCTUATION = 'pun';
+  /**
+   * token style for a punctuation string.
+   * @const
+   */
+  var PR_PLAIN = 'pln';
+
+  /**
+   * token style for an sgml tag.
+   * @const
+   */
+  var PR_TAG = 'tag';
+  /**
+   * token style for a markup declaration such as a DOCTYPE.
+   * @const
+   */
+  var PR_DECLARATION = 'dec';
+  /**
+   * token style for embedded source.
+   * @const
+   */
+  var PR_SOURCE = 'src';
+  /**
+   * token style for an sgml attribute name.
+   * @const
+   */
+  var PR_ATTRIB_NAME = 'atn';
+  /**
+   * token style for an sgml attribute value.
+   * @const
+   */
+  var PR_ATTRIB_VALUE = 'atv';
+
+  /**
+   * A class that indicates a section of markup that is not code, e.g. to allow
+   * embedding of line numbers within code listings.
+   * @const
+   */
+  var PR_NOCODE = 'nocode';
+
+
+
+/**
+ * A set of tokens that can precede a regular expression literal in
+ * javascript
+ * http://web.archive.org/web/20070717142515/http://www.mozilla.org/js/language/js20/rationale/syntax.html
+ * has the full list, but I've removed ones that might be problematic when
+ * seen in languages that don't support regular expression literals.
+ *
+ * <p>Specifically, I've removed any keywords that can't precede a regexp
+ * literal in a syntactically legal javascript program, and I've removed the
+ * "in" keyword since it's not a keyword in many languages, and might be used
+ * as a count of inches.
+ *
+ * <p>The link a above does not accurately describe EcmaScript rules since
+ * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works
+ * very well in practice.
+ *
+ * @private
+ * @const
+ */
+var REGEXP_PRECEDER_PATTERN = '(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*';
+
+// CAVEAT: this does not properly handle the case where a regular
+// expression immediately follows another since a regular expression may
+// have flags for case-sensitivity and the like.  Having regexp tokens
+// adjacent is not valid in any language I'm aware of, so I'm punting.
+// TODO: maybe style special characters inside a regexp as punctuation.
+
+
+  /**
+   * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally
+   * matches the union of the sets of strings matched by the input RegExp.
+   * Since it matches globally, if the input strings have a start-of-input
+   * anchor (/^.../), it is ignored for the purposes of unioning.
+   * @param {Array.<RegExp>} regexs non multiline, non-global regexs.
+   * @return {RegExp} a global regex.
+   */
+  function combinePrefixPatterns(regexs) {
+    var capturedGroupIndex = 0;
+  
+    var needToFoldCase = false;
+    var ignoreCase = false;
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.ignoreCase) {
+        ignoreCase = true;
+      } else if (/[a-z]/i.test(regex.source.replace(
+                     /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) {
+        needToFoldCase = true;
+        ignoreCase = false;
+        break;
+      }
+    }
+  
+    var escapeCharToCodeUnit = {
+      'b': 8,
+      't': 9,
+      'n': 0xa,
+      'v': 0xb,
+      'f': 0xc,
+      'r': 0xd
+    };
+  
+    function decodeEscape(charsetPart) {
+      var cc0 = charsetPart.charCodeAt(0);
+      if (cc0 !== 92 /* \\ */) {
+        return cc0;
+      }
+      var c1 = charsetPart.charAt(1);
+      cc0 = escapeCharToCodeUnit[c1];
+      if (cc0) {
+        return cc0;
+      } else if ('0' <= c1 && c1 <= '7') {
+        return parseInt(charsetPart.substring(1), 8);
+      } else if (c1 === 'u' || c1 === 'x') {
+        return parseInt(charsetPart.substring(2), 16);
+      } else {
+        return charsetPart.charCodeAt(1);
+      }
+    }
+  
+    function encodeEscape(charCode) {
+      if (charCode < 0x20) {
+        return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16);
+      }
+      var ch = String.fromCharCode(charCode);
+      if (ch === '\\' || ch === '-' || ch === '[' || ch === ']') {
+        ch = '\\' + ch;
+      }
+      return ch;
+    }
+  
+    function caseFoldCharset(charSet) {
+      var charsetParts = charSet.substring(1, charSet.length - 1).match(
+          new RegExp(
+              '\\\\u[0-9A-Fa-f]{4}'
+              + '|\\\\x[0-9A-Fa-f]{2}'
+              + '|\\\\[0-3][0-7]{0,2}'
+              + '|\\\\[0-7]{1,2}'
+              + '|\\\\[\\s\\S]'
+              + '|-'
+              + '|[^-\\\\]',
+              'g'));
+      var groups = [];
+      var ranges = [];
+      var inverse = charsetParts[0] === '^';
+      for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) {
+        var p = charsetParts[i];
+        if (/\\[bdsw]/i.test(p)) {  // Don't muck with named groups.
+          groups.push(p);
+        } else {
+          var start = decodeEscape(p);
+          var end;
+          if (i + 2 < n && '-' === charsetParts[i + 1]) {
+            end = decodeEscape(charsetParts[i + 2]);
+            i += 2;
+          } else {
+            end = start;
+          }
+          ranges.push([start, end]);
+          // If the range might intersect letters, then expand it.
+          // This case handling is too simplistic.
+          // It does not deal with non-latin case folding.
+          // It works for latin source code identifiers though.
+          if (!(end < 65 || start > 122)) {
+            if (!(end < 65 || start > 90)) {
+              ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]);
+            }
+            if (!(end < 97 || start > 122)) {
+              ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]);
+            }
+          }
+        }
+      }
+  
+      // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
+      // -> [[1, 12], [14, 14], [16, 17]]
+      ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1]  - a[1]); });
+      var consolidatedRanges = [];
+      var lastRange = [NaN, NaN];
+      for (var i = 0; i < ranges.length; ++i) {
+        var range = ranges[i];
+        if (range[0] <= lastRange[1] + 1) {
+          lastRange[1] = Math.max(lastRange[1], range[1]);
+        } else {
+          consolidatedRanges.push(lastRange = range);
+        }
+      }
+  
+      var out = ['['];
+      if (inverse) { out.push('^'); }
+      out.push.apply(out, groups);
+      for (var i = 0; i < consolidatedRanges.length; ++i) {
+        var range = consolidatedRanges[i];
+        out.push(encodeEscape(range[0]));
+        if (range[1] > range[0]) {
+          if (range[1] + 1 > range[0]) { out.push('-'); }
+          out.push(encodeEscape(range[1]));
+        }
+      }
+      out.push(']');
+      return out.join('');
+    }
+  
+    function allowAnywhereFoldCaseAndRenumberGroups(regex) {
+      // Split into character sets, escape sequences, punctuation strings
+      // like ('(', '(?:', ')', '^'), and runs of characters that do not
+      // include any of the above.
+      var parts = regex.source.match(
+          new RegExp(
+              '(?:'
+              + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]'  // a character set
+              + '|\\\\u[A-Fa-f0-9]{4}'  // a unicode escape
+              + '|\\\\x[A-Fa-f0-9]{2}'  // a hex escape
+              + '|\\\\[0-9]+'  // a back-reference or octal escape
+              + '|\\\\[^ux0-9]'  // other escape sequence
+              + '|\\(\\?[:!=]'  // start of a non-capturing group
+              + '|[\\(\\)\\^]'  // start/emd of a group, or line start
+              + '|[^\\x5B\\x5C\\(\\)\\^]+'  // run of other characters
+              + ')',
+              'g'));
+      var n = parts.length;
+  
+      // Maps captured group numbers to the number they will occupy in
+      // the output or to -1 if that has not been determined, or to
+      // undefined if they need not be capturing in the output.
+      var capturedGroups = [];
+  
+      // Walk over and identify back references to build the capturedGroups
+      // mapping.
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          // groups are 1-indexed, so max group index is count of '('
+          ++groupIndex;
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue && decimalValue <= groupIndex) {
+            capturedGroups[decimalValue] = -1;
+          }
+        }
+      }
+  
+      // Renumber groups and reduce capturing groups to non-capturing groups
+      // where possible.
+      for (var i = 1; i < capturedGroups.length; ++i) {
+        if (-1 === capturedGroups[i]) {
+          capturedGroups[i] = ++capturedGroupIndex;
+        }
+      }
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        var p = parts[i];
+        if (p === '(') {
+          ++groupIndex;
+          if (capturedGroups[groupIndex] === undefined) {
+            parts[i] = '(?:';
+          }
+        } else if ('\\' === p.charAt(0)) {
+          var decimalValue = +p.substring(1);
+          if (decimalValue && decimalValue <= groupIndex) {
+            parts[i] = '\\' + capturedGroups[groupIndex];
+          }
+        }
+      }
+  
+      // Remove any prefix anchors so that the output will match anywhere.
+      // ^^ really does mean an anchored match though.
+      for (var i = 0, groupIndex = 0; i < n; ++i) {
+        if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; }
+      }
+  
+      // Expand letters to groups to handle mixing of case-sensitive and
+      // case-insensitive patterns if necessary.
+      if (regex.ignoreCase && needToFoldCase) {
+        for (var i = 0; i < n; ++i) {
+          var p = parts[i];
+          var ch0 = p.charAt(0);
+          if (p.length >= 2 && ch0 === '[') {
+            parts[i] = caseFoldCharset(p);
+          } else if (ch0 !== '\\') {
+            // TODO: handle letters in numeric escapes.
+            parts[i] = p.replace(
+                /[a-zA-Z]/g,
+                function (ch) {
+                  var cc = ch.charCodeAt(0);
+                  return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']';
+                });
+          }
+        }
+      }
+  
+      return parts.join('');
+    }
+  
+    var rewritten = [];
+    for (var i = 0, n = regexs.length; i < n; ++i) {
+      var regex = regexs[i];
+      if (regex.global || regex.multiline) { throw new Error('' + regex); }
+      rewritten.push(
+          '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')');
+    }
+  
+    return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g');
+  }
+
+
+  /**
+   * Split markup into a string of source code and an array mapping ranges in
+   * that string to the text nodes in which they appear.
+   *
+   * <p>
+   * The HTML DOM structure:</p>
+   * <pre>
+   * (Element   "p"
+   *   (Element "b"
+   *     (Text  "print "))       ; #1
+   *   (Text    "'Hello '")      ; #2
+   *   (Element "br")            ; #3
+   *   (Text    "  + 'World';")) ; #4
+   * </pre>
+   * <p>
+   * corresponds to the HTML
+   * {@code <p><b>print </b>'Hello '<br>  + 'World';</p>}.</p>
+   *
+   * <p>
+   * It will produce the output:</p>
+   * <pre>
+   * {
+   *   sourceCode: "print 'Hello '\n  + 'World';",
+   *   //                 1         2
+   *   //       012345678901234 5678901234567
+   *   spans: [0, #1, 6, #2, 14, #3, 15, #4]
+   * }
+   * </pre>
+   * <p>
+   * where #1 is a reference to the {@code "print "} text node above, and so
+   * on for the other text nodes.
+   * </p>
+   *
+   * <p>
+   * The {@code} spans array is an array of pairs.  Even elements are the start
+   * indices of substrings, and odd elements are the text nodes (or BR elements)
+   * that contain the text for those substrings.
+   * Substrings continue until the next index or the end of the source.
+   * </p>
+   *
+   * @param {Node} node an HTML DOM subtree containing source-code.
+   * @return {Object} source code and the text nodes in which they occur.
+   */
+  function extractSourceSpans(node) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+  
+    var chunks = [];
+    var length = 0;
+    var spans = [];
+    var k = 0;
+  
+    var whitespace;
+    if (node.currentStyle) {
+      whitespace = node.currentStyle.whiteSpace;
+    } else if (window.getComputedStyle) {
+      whitespace = document.defaultView.getComputedStyle(node, null)
+          .getPropertyValue('white-space');
+    }
+    var isPreformatted = whitespace && 'pre' === whitespace.substring(0, 3);
+  
+    function walk(node) {
+      switch (node.nodeType) {
+        case 1:  // Element
+          if (nocode.test(node.className)) { return; }
+          for (var child = node.firstChild; child; child = child.nextSibling) {
+            walk(child);
+          }
+          var nodeName = node.nodeName;
+          if ('BR' === nodeName || 'LI' === nodeName) {
+            chunks[k] = '\n';
+            spans[k << 1] = length++;
+            spans[(k++ << 1) | 1] = node;
+          }
+          break;
+        case 3: case 4:  // Text
+          var text = node.nodeValue;
+          if (text.length) {
+            if (!isPreformatted) {
+              text = text.replace(/[ \t\r\n]+/g, ' ');
+            } else {
+              text = text.replace(/\r\n?/g, '\n');  // Normalize newlines.
+            }
+            // TODO: handle tabs here?
+            chunks[k] = text;
+            spans[k << 1] = length;
+            length += text.length;
+            spans[(k++ << 1) | 1] = node;
+          }
+          break;
+      }
+    }
+  
+    walk(node);
+  
+    return {
+      sourceCode: chunks.join('').replace(/\n$/, ''),
+      spans: spans
+    };
+  }
+
+
+  /**
+   * Apply the given language handler to sourceCode and add the resulting
+   * decorations to out.
+   * @param {number} basePos the index of sourceCode within the chunk of source
+   *    whose decorations are already present on out.
+   */
+  function appendDecorations(basePos, sourceCode, langHandler, out) {
+    if (!sourceCode) { return; }
+    var job = {
+      sourceCode: sourceCode,
+      basePos: basePos
+    };
+    langHandler(job);
+    out.push.apply(out, job.decorations);
+  }
+
+  var notWs = /\S/;
+
+  /**
+   * Given an element, if it contains only one child element and any text nodes
+   * it contains contain only space characters, return the sole child element.
+   * Otherwise returns undefined.
+   * <p>
+   * This is meant to return the CODE element in {@code <pre><code ...>} when
+   * there is a single child element that contains all the non-space textual
+   * content, but not to return anything where there are multiple child elements
+   * as in {@code <pre><code>...</code><code>...</code></pre>} or when there
+   * is textual content.
+   */
+  function childContentWrapper(element) {
+    var wrapper = undefined;
+    for (var c = element.firstChild; c; c = c.nextSibling) {
+      var type = c.nodeType;
+      wrapper = (type === 1)  // Element Node
+          ? (wrapper ? element : c)
+          : (type === 3)  // Text Node
+          ? (notWs.test(c.nodeValue) ? element : wrapper)
+          : wrapper;
+    }
+    return wrapper === element ? undefined : wrapper;
+  }
+
+  /** Given triples of [style, pattern, context] returns a lexing function,
+    * The lexing function interprets the patterns to find token boundaries and
+    * returns a decoration list of the form
+    * [index_0, style_0, index_1, style_1, ..., index_n, style_n]
+    * where index_n is an index into the sourceCode, and style_n is a style
+    * constant like PR_PLAIN.  index_n-1 <= index_n, and style_n-1 applies to
+    * all characters in sourceCode[index_n-1:index_n].
+    *
+    * The stylePatterns is a list whose elements have the form
+    * [style : string, pattern : RegExp, DEPRECATED, shortcut : string].
+    *
+    * Style is a style constant like PR_PLAIN, or can be a string of the
+    * form 'lang-FOO', where FOO is a language extension describing the
+    * language of the portion of the token in $1 after pattern executes.
+    * E.g., if style is 'lang-lisp', and group 1 contains the text
+    * '(hello (world))', then that portion of the token will be passed to the
+    * registered lisp handler for formatting.
+    * The text before and after group 1 will be restyled using this decorator
+    * so decorators should take care that this doesn't result in infinite
+    * recursion.  For example, the HTML lexer rule for SCRIPT elements looks
+    * something like ['lang-js', /<[s]cript>(.+?)<\/script>/].  This may match
+    * '<script>foo()<\/script>', which would cause the current decorator to
+    * be called with '<script>' which would not match the same rule since
+    * group 1 must not be empty, so it would be instead styled as PR_TAG by
+    * the generic tag rule.  The handler registered for the 'js' extension would
+    * then be called with 'foo()', and finally, the current decorator would
+    * be called with '<\/script>' which would not match the original rule and
+    * so the generic tag rule would identify it as a tag.
+    *
+    * Pattern must only match prefixes, and if it matches a prefix, then that
+    * match is considered a token with the same style.
+    *
+    * Context is applied to the last non-whitespace, non-comment token
+    * recognized.
+    *
+    * Shortcut is an optional string of characters, any of which, if the first
+    * character, gurantee that this pattern and only this pattern matches.
+    *
+    * @param {Array} shortcutStylePatterns patterns that always start with
+    *   a known character.  Must have a shortcut string.
+    * @param {Array} fallthroughStylePatterns patterns that will be tried in
+    *   order if the shortcut ones fail.  May have shortcuts.
+    *
+    * @return {function (Object)} a
+    *   function that takes source code and returns a list of decorations.
+    */
+  function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) {
+    var shortcuts = {};
+    var tokenizer;
+    (function () {
+      var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns);
+      var allRegexs = [];
+      var regexKeys = {};
+      for (var i = 0, n = allPatterns.length; i < n; ++i) {
+        var patternParts = allPatterns[i];
+        var shortcutChars = patternParts[3];
+        if (shortcutChars) {
+          for (var c = shortcutChars.length; --c >= 0;) {
+            shortcuts[shortcutChars.charAt(c)] = patternParts;
+          }
+        }
+        var regex = patternParts[1];
+        var k = '' + regex;
+        if (!regexKeys.hasOwnProperty(k)) {
+          allRegexs.push(regex);
+          regexKeys[k] = null;
+        }
+      }
+      allRegexs.push(/[\0-\uffff]/);
+      tokenizer = combinePrefixPatterns(allRegexs);
+    })();
+
+    var nPatterns = fallthroughStylePatterns.length;
+
+    /**
+     * Lexes job.sourceCode and produces an output array job.decorations of
+     * style classes preceded by the position at which they start in
+     * job.sourceCode in order.
+     *
+     * @param {Object} job an object like <pre>{
+     *    sourceCode: {string} sourceText plain text,
+     *    basePos: {int} position of job.sourceCode in the larger chunk of
+     *        sourceCode.
+     * }</pre>
+     */
+    var decorate = function (job) {
+      var sourceCode = job.sourceCode, basePos = job.basePos;
+      /** Even entries are positions in source in ascending order.  Odd enties
+        * are style markers (e.g., PR_COMMENT) that run from that position until
+        * the end.
+        * @type {Array.<number|string>}
+        */
+      var decorations = [basePos, PR_PLAIN];
+      var pos = 0;  // index into sourceCode
+      var tokens = sourceCode.match(tokenizer) || [];
+      var styleCache = {};
+
+      for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) {
+        var token = tokens[ti];
+        var style = styleCache[token];
+        var match = void 0;
+
+        var isEmbedded;
+        if (typeof style === 'string') {
+          isEmbedded = false;
+        } else {
+          var patternParts = shortcuts[token.charAt(0)];
+          if (patternParts) {
+            match = token.match(patternParts[1]);
+            style = patternParts[0];
+          } else {
+            for (var i = 0; i < nPatterns; ++i) {
+              patternParts = fallthroughStylePatterns[i];
+              match = token.match(patternParts[1]);
+              if (match) {
+                style = patternParts[0];
+                break;
+              }
+            }
+
+            if (!match) {  // make sure that we make progress
+              style = PR_PLAIN;
+            }
+          }
+
+          isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5);
+          if (isEmbedded && !(match && typeof match[1] === 'string')) {
+            isEmbedded = false;
+            style = PR_SOURCE;
+          }
+
+          if (!isEmbedded) { styleCache[token] = style; }
+        }
+
+        var tokenStart = pos;
+        pos += token.length;
+
+        if (!isEmbedded) {
+          decorations.push(basePos + tokenStart, style);
+        } else {  // Treat group 1 as an embedded block of source code.
+          var embeddedSource = match[1];
+          var embeddedSourceStart = token.indexOf(embeddedSource);
+          var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length;
+          if (match[2]) {
+            // If embeddedSource can be blank, then it would match at the
+            // beginning which would cause us to infinitely recurse on the
+            // entire token, so we catch the right context in match[2].
+            embeddedSourceEnd = token.length - match[2].length;
+            embeddedSourceStart = embeddedSourceEnd - embeddedSource.length;
+          }
+          var lang = style.substring(5);
+          // Decorate the left of the embedded source
+          appendDecorations(
+              basePos + tokenStart,
+              token.substring(0, embeddedSourceStart),
+              decorate, decorations);
+          // Decorate the embedded source
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceStart,
+              embeddedSource,
+              langHandlerForExtension(lang, embeddedSource),
+              decorations);
+          // Decorate the right of the embedded section
+          appendDecorations(
+              basePos + tokenStart + embeddedSourceEnd,
+              token.substring(embeddedSourceEnd),
+              decorate, decorations);
+        }
+      }
+      job.decorations = decorations;
+    };
+    return decorate;
+  }
+
+  /** returns a function that produces a list of decorations from source text.
+    *
+    * This code treats ", ', and ` as string delimiters, and \ as a string
+    * escape.  It does not recognize perl's qq() style strings.
+    * It has no special handling for double delimiter escapes as in basic, or
+    * the tripled delimiters used in python, but should work on those regardless
+    * although in those cases a single string literal may be broken up into
+    * multiple adjacent string literals.
+    *
+    * It recognizes C, C++, and shell style comments.
+    *
+    * @param {Object} options a set of optional parameters.
+    * @return {function (Object)} a function that examines the source code
+    *     in the input job and builds the decoration list.
+    */
+  function sourceDecorator(options) {
+    var shortcutStylePatterns = [], fallthroughStylePatterns = [];
+    if (options['tripleQuotedStrings']) {
+      // '''multi-line-string''', 'single-line-string', and double-quoted
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
+           null, '\'"']);
+    } else if (options['multiLineStrings']) {
+      // 'multi-line-string', "multi-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,  /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,
+           null, '\'"`']);
+    } else {
+      // 'single-line-string', "single-line-string"
+      shortcutStylePatterns.push(
+          [PR_STRING,
+           /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,
+           null, '"\'']);
+    }
+    if (options['verbatimStrings']) {
+      // verbatim-string-literal production from the C# grammar.  See issue 93.
+      fallthroughStylePatterns.push(
+          [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]);
+    }
+    var hc = options['hashComments'];
+    if (hc) {
+      if (options['cStyleComments']) {
+        if (hc > 1) {  // multiline hash comments
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, '#']);
+        } else {
+          // Stop C preprocessor declarations at an unclosed open comment
+          shortcutStylePatterns.push(
+              [PR_COMMENT, /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,
+               null, '#']);
+        }
+        fallthroughStylePatterns.push(
+            [PR_STRING,
+             /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,
+             null]);
+      } else {
+        shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
+      }
+    }
+    if (options['cStyleComments']) {
+      fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
+      fallthroughStylePatterns.push(
+          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
+    }
+    if (options['regexLiterals']) {
+      /**
+       * @const
+       */
+      var REGEX_LITERAL = (
+          // A regular expression literal starts with a slash that is
+          // not followed by * or / so that it is not confused with
+          // comments.
+          '/(?=[^/*])'
+          // and then contains any number of raw characters,
+          + '(?:[^/\\x5B\\x5C]'
+          // escape sequences (\x5C),
+          +    '|\\x5C[\\s\\S]'
+          // or non-nesting character sets (\x5B\x5D);
+          +    '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+'
+          // finally closed by a /.
+          + '/');
+      fallthroughStylePatterns.push(
+          ['lang-regex',
+           new RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')')
+           ]);
+    }
+
+    var types = options['types'];
+    if (types) {
+      fallthroughStylePatterns.push([PR_TYPE, types]);
+    }
+
+    var keywords = ("" + options['keywords']).replace(/^ | $/g, '');
+    if (keywords.length) {
+      fallthroughStylePatterns.push(
+          [PR_KEYWORD,
+           new RegExp('^(?:' + keywords.replace(/[\s,]+/g, '|') + ')\\b'),
+           null]);
+    }
+
+    shortcutStylePatterns.push([PR_PLAIN,       /^\s+/, null, ' \r\n\t\xA0']);
+    fallthroughStylePatterns.push(
+        // TODO(mikesamuel): recognize non-latin letters and numerals in idents
+        [PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_TYPE,        /^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/, null],
+        [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
+        [PR_LITERAL,
+         new RegExp(
+             '^(?:'
+             // A hex number
+             + '0x[a-f0-9]+'
+             // or an octal or decimal number,
+             + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)'
+             // possibly in scientific notation
+             + '(?:e[+\\-]?\\d+)?'
+             + ')'
+             // with an optional modifier like UL for unsigned long
+             + '[a-z]*', 'i'),
+         null, '0123456789'],
+        // Don't treat escaped quotes in bash as starting strings.  See issue 144.
+        [PR_PLAIN,       /^\\[\s\S]?/, null],
+        [PR_PUNCTUATION, /^.[^\s\w\.$@\'\"\`\/\#\\]*/, null]);
+
+    return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
+  }
+
+  var decorateSource = sourceDecorator({
+        'keywords': ALL_KEYWORDS,
+        'hashComments': true,
+        'cStyleComments': true,
+        'multiLineStrings': true,
+        'regexLiterals': true
+      });
+
+  /**
+   * Given a DOM subtree, wraps it in a list, and puts each line into its own
+   * list item.
+   *
+   * @param {Node} node modified in place.  Its content is pulled into an
+   *     HTMLOListElement, and each line is moved into a separate list item.
+   *     This requires cloning elements, so the input might not have unique
+   *     IDs after numbering.
+   */
+  function numberLines(node, opt_startLineNum) {
+    var nocode = /(?:^|\s)nocode(?:\s|$)/;
+    var lineBreak = /\r\n?|\n/;
+  
+    var document = node.ownerDocument;
+  
+    var whitespace;
+    if (node.currentStyle) {
+      whitespace = node.currentStyle.whiteSpace;
+    } else if (window.getComputedStyle) {
+      whitespace = document.defaultView.getComputedStyle(node, null)
+          .getPropertyValue('white-space');
+    }
+    // If it's preformatted, then we need to split lines on line breaks
+    // in addition to <BR>s.
+    var isPreformatted = whitespace && 'pre' === whitespace.substring(0, 3);
+  
+    var li = document.createElement('LI');
+    while (node.firstChild) {
+      li.appendChild(node.firstChild);
+    }
+    // An array of lines.  We split below, so this is initialized to one
+    // un-split line.
+    var listItems = [li];
+  
+    function walk(node) {
+      switch (node.nodeType) {
+        case 1:  // Element
+          if (nocode.test(node.className)) { break; }
+          if ('BR' === node.nodeName) {
+            breakAfter(node);
+            // Discard the <BR> since it is now flush against a </LI>.
+            if (node.parentNode) {
+              node.parentNode.removeChild(node);
+            }
+          } else {
+            for (var child = node.firstChild; child; child = child.nextSibling) {
+              walk(child);
+            }
+          }
+          break;
+        case 3: case 4:  // Text
+          if (isPreformatted) {
+            var text = node.nodeValue;
+            var match = text.match(lineBreak);
+            if (match) {
+              var firstLine = text.substring(0, match.index);
+              node.nodeValue = firstLine;
+              var tail = text.substring(match.index + match[0].length);
+              if (tail) {
+                var parent = node.parentNode;
+                parent.insertBefore(
+                    document.createTextNode(tail), node.nextSibling);
+              }
+              breakAfter(node);
+              if (!firstLine) {
+                // Don't leave blank text nodes in the DOM.
+                node.parentNode.removeChild(node);
+              }
+            }
+          }
+          break;
+      }
+    }
+  
+    // Split a line after the given node.
+    function breakAfter(lineEndNode) {
+      // If there's nothing to the right, then we can skip ending the line
+      // here, and move root-wards since splitting just before an end-tag
+      // would require us to create a bunch of empty copies.
+      while (!lineEndNode.nextSibling) {
+        lineEndNode = lineEndNode.parentNode;
+        if (!lineEndNode) { return; }
+      }
+  
+      function breakLeftOf(limit, copy) {
+        // Clone shallowly if this node needs to be on both sides of the break.
+        var rightSide = copy ? limit.cloneNode(false) : limit;
+        var parent = limit.parentNode;
+        if (parent) {
+          // We clone the parent chain.
+          // This helps us resurrect important styling elements that cross lines.
+          // E.g. in <i>Foo<br>Bar</i>
+          // should be rewritten to <li><i>Foo</i></li><li><i>Bar</i></li>.
+          var parentClone = breakLeftOf(parent, 1);
+          // Move the clone and everything to the right of the original
+          // onto the cloned parent.
+          var next = limit.nextSibling;
+          parentClone.appendChild(rightSide);
+          for (var sibling = next; sibling; sibling = next) {
+            next = sibling.nextSibling;
+            parentClone.appendChild(sibling);
+          }
+        }
+        return rightSide;
+      }
+  
+      var copiedListItem = breakLeftOf(lineEndNode.nextSibling, 0);
+  
+      // Walk the parent chain until we reach an unattached LI.
+      for (var parent;
+           // Check nodeType since IE invents document fragments.
+           (parent = copiedListItem.parentNode) && parent.nodeType === 1;) {
+        copiedListItem = parent;
+      }
+      // Put it on the list of lines for later processing.
+      listItems.push(copiedListItem);
+    }
+  
+    // Split lines while there are lines left to split.
+    for (var i = 0;  // Number of lines that have been split so far.
+         i < listItems.length;  // length updated by breakAfter calls.
+         ++i) {
+      walk(listItems[i]);
+    }
+  
+    // Make sure numeric indices show correctly.
+    if (opt_startLineNum === (opt_startLineNum|0)) {
+      listItems[0].setAttribute('value', opt_startLineNum);
+    }
+  
+    var ol = document.createElement('OL');
+    ol.className = 'linenums';
+    var offset = Math.max(0, ((opt_startLineNum - 1 /* zero index */)) | 0) || 0;
+    for (var i = 0, n = listItems.length; i < n; ++i) {
+      li = listItems[i];
+      // Stick a class on the LIs so that stylesheets can
+      // color odd/even rows, or any other row pattern that
+      // is co-prime with 10.
+      li.className = 'L' + ((i + offset) % 10);
+      if (!li.firstChild) {
+        li.appendChild(document.createTextNode('\xA0'));
+      }
+      ol.appendChild(li);
+    }
+  
+    node.appendChild(ol);
+  }
+
+  /**
+   * Breaks {@code job.sourceCode} around style boundaries in
+   * {@code job.decorations} and modifies {@code job.sourceNode} in place.
+   * @param {Object} job like <pre>{
+   *    sourceCode: {string} source as plain text,
+   *    spans: {Array.<number|Node>} alternating span start indices into source
+   *       and the text node or element (e.g. {@code <BR>}) corresponding to that
+   *       span.
+   *    decorations: {Array.<number|string} an array of style classes preceded
+   *       by the position at which they start in job.sourceCode in order
+   * }</pre>
+   * @private
+   */
+  function recombineTagsAndDecorations(job) {
+    var isIE = /\bMSIE\b/.test(navigator.userAgent);
+    var newlineRe = /\n/g;
+  
+    var source = job.sourceCode;
+    var sourceLength = source.length;
+    // Index into source after the last code-unit recombined.
+    var sourceIndex = 0;
+  
+    var spans = job.spans;
+    var nSpans = spans.length;
+    // Index into spans after the last span which ends at or before sourceIndex.
+    var spanIndex = 0;
+  
+    var decorations = job.decorations;
+    var nDecorations = decorations.length;
+    // Index into decorations after the last decoration which ends at or before
+    // sourceIndex.
+    var decorationIndex = 0;
+  
+    // Remove all zero-length decorations.
+    decorations[nDecorations] = sourceLength;
+    var decPos, i;
+    for (i = decPos = 0; i < nDecorations;) {
+      if (decorations[i] !== decorations[i + 2]) {
+        decorations[decPos++] = decorations[i++];
+        decorations[decPos++] = decorations[i++];
+      } else {
+        i += 2;
+      }
+    }
+    nDecorations = decPos;
+  
+    // Simplify decorations.
+    for (i = decPos = 0; i < nDecorations;) {
+      var startPos = decorations[i];
+      // Conflate all adjacent decorations that use the same style.
+      var startDec = decorations[i + 1];
+      var end = i + 2;
+      while (end + 2 <= nDecorations && decorations[end + 1] === startDec) {
+        end += 2;
+      }
+      decorations[decPos++] = startPos;
+      decorations[decPos++] = startDec;
+      i = end;
+    }
+  
+    nDecorations = decorations.length = decPos;
+  
+    var decoration = null;
+    while (spanIndex < nSpans) {
+      var spanStart = spans[spanIndex];
+      var spanEnd = spans[spanIndex + 2] || sourceLength;
+  
+      var decStart = decorations[decorationIndex];
+      var decEnd = decorations[decorationIndex + 2] || sourceLength;
+  
+      var end = Math.min(spanEnd, decEnd);
+  
+      var textNode = spans[spanIndex + 1];
+      var styledText;
+      if (textNode.nodeType !== 1  // Don't muck with <BR>s or <LI>s
+          // Don't introduce spans around empty text nodes.
+          && (styledText = source.substring(sourceIndex, end))) {
+        // This may seem bizarre, and it is.  Emitting LF on IE causes the
+        // code to display with spaces instead of line breaks.
+        // Emitting Windows standard issue linebreaks (CRLF) causes a blank
+        // space to appear at the beginning of every line but the first.
+        // Emitting an old Mac OS 9 line separator makes everything spiffy.
+        if (isIE) { styledText = styledText.replace(newlineRe, '\r'); }
+        textNode.nodeValue = styledText;
+        var document = textNode.ownerDocument;
+        var span = document.createElement('SPAN');
+        span.className = decorations[decorationIndex + 1];
+        var parentNode = textNode.parentNode;
+        parentNode.replaceChild(span, textNode);
+        span.appendChild(textNode);
+        if (sourceIndex < spanEnd) {  // Split off a text node.
+          spans[spanIndex + 1] = textNode
+              // TODO: Possibly optimize by using '' if there's no flicker.
+              = document.createTextNode(source.substring(end, spanEnd));
+          parentNode.insertBefore(textNode, span.nextSibling);
+        }
+      }
+  
+      sourceIndex = end;
+  
+      if (sourceIndex >= spanEnd) {
+        spanIndex += 2;
+      }
+      if (sourceIndex >= decEnd) {
+        decorationIndex += 2;
+      }
+    }
+  }
+
+
+  /** Maps language-specific file extensions to handlers. */
+  var langHandlerRegistry = {};
+  /** Register a language handler for the given file extensions.
+    * @param {function (Object)} handler a function from source code to a list
+    *      of decorations.  Takes a single argument job which describes the
+    *      state of the computation.   The single parameter has the form
+    *      {@code {
+    *        sourceCode: {string} as plain text.
+    *        decorations: {Array.<number|string>} an array of style classes
+    *                     preceded by the position at which they start in
+    *                     job.sourceCode in order.
+    *                     The language handler should assigned this field.
+    *        basePos: {int} the position of source in the larger source chunk.
+    *                 All positions in the output decorations array are relative
+    *                 to the larger source chunk.
+    *      } }
+    * @param {Array.<string>} fileExtensions
+    */
+  function registerLangHandler(handler, fileExtensions) {
+    for (var i = fileExtensions.length; --i >= 0;) {
+      var ext = fileExtensions[i];
+      if (!langHandlerRegistry.hasOwnProperty(ext)) {
+        langHandlerRegistry[ext] = handler;
+      } else if (window['console']) {
+        console['warn']('cannot override language handler %s', ext);
+      }
+    }
+  }
+  function langHandlerForExtension(extension, source) {
+    if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) {
+      // Treat it as markup if the first non whitespace character is a < and
+      // the last non-whitespace character is a >.
+      extension = /^\s*</.test(source)
+          ? 'default-markup'
+          : 'default-code';
+    }
+    return langHandlerRegistry[extension];
+  }
+  registerLangHandler(decorateSource, ['default-code']);
+  registerLangHandler(
+      createSimpleLexer(
+          [],
+          [
+           [PR_PLAIN,       /^[^<?]+/],
+           [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
+           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
+           // Unescaped content in an unknown language
+           ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
+           ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],
+           [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/],
+           ['lang-',        /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],
+           // Unescaped content in javascript.  (Or possibly vbscript).
+           ['lang-js',      /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
+           // Contains unescaped stylesheet content
+           ['lang-css',     /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
+           ['lang-in.tag',  /^(<\/?[a-z][^<>]*>)/i]
+          ]),
+      ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
+  registerLangHandler(
+      createSimpleLexer(
+          [
+           [PR_PLAIN,        /^[\s]+/, null, ' \t\r\n'],
+           [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
+           ],
+          [
+           [PR_TAG,          /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
+           [PR_ATTRIB_NAME,  /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
+           ['lang-uq.val',   /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
+           [PR_PUNCTUATION,  /^[=<>\/]+/],
+           ['lang-js',       /^on\w+\s*=\s*\"([^\"]+)\"/i],
+           ['lang-js',       /^on\w+\s*=\s*\'([^\']+)\'/i],
+           ['lang-js',       /^on\w+\s*=\s*([^\"\'>\s]+)/i],
+           ['lang-css',      /^style\s*=\s*\"([^\"]+)\"/i],
+           ['lang-css',      /^style\s*=\s*\'([^\']+)\'/i],
+           ['lang-css',      /^style\s*=\s*([^\"\'>\s]+)/i]
+           ]),
+      ['in.tag']);
+  registerLangHandler(
+      createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CPP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'types': C_TYPES
+        }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': 'null,true,false'
+        }), ['json']);
+  registerLangHandler(sourceDecorator({
+          'keywords': CSHARP_KEYWORDS,
+          'hashComments': true,
+          'cStyleComments': true,
+          'verbatimStrings': true,
+          'types': C_TYPES
+        }), ['cs']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JAVA_KEYWORDS,
+          'cStyleComments': true
+        }), ['java']);
+  registerLangHandler(sourceDecorator({
+          'keywords': SH_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true
+        }), ['bsh', 'csh', 'sh']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PYTHON_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'tripleQuotedStrings': true
+        }), ['cv', 'py']);
+  registerLangHandler(sourceDecorator({
+          'keywords': PERL_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': true
+        }), ['perl', 'pl', 'pm']);
+  registerLangHandler(sourceDecorator({
+          'keywords': RUBY_KEYWORDS,
+          'hashComments': true,
+          'multiLineStrings': true,
+          'regexLiterals': true
+        }), ['rb']);
+  registerLangHandler(sourceDecorator({
+          'keywords': JSCRIPT_KEYWORDS,
+          'cStyleComments': true,
+          'regexLiterals': true
+        }), ['js']);
+  registerLangHandler(sourceDecorator({
+          'keywords': COFFEE_KEYWORDS,
+          'hashComments': 3,  // ### style block comments
+          'cStyleComments': true,
+          'multilineStrings': true,
+          'tripleQuotedStrings': true,
+          'regexLiterals': true
+        }), ['coffee']);
+  registerLangHandler(createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']);
+
+  function applyDecorator(job) {
+    var opt_langExtension = job.langExtension;
+
+    try {
+      // Extract tags, and convert the source code to plain text.
+      var sourceAndSpans = extractSourceSpans(job.sourceNode);
+      /** Plain text. @type {string} */
+      var source = sourceAndSpans.sourceCode;
+      job.sourceCode = source;
+      job.spans = sourceAndSpans.spans;
+      job.basePos = 0;
+
+      // Apply the appropriate language handler
+      langHandlerForExtension(opt_langExtension, source)(job);
+
+      // Integrate the decorations and tags back into the source code,
+      // modifying the sourceNode in place.
+      recombineTagsAndDecorations(job);
+    } catch (e) {
+      if ('console' in window) {
+        console['log'](e && e['stack'] ? e['stack'] : e);
+      }
+    }
+  }
+
+  /**
+   * @param sourceCodeHtml {string} The HTML to pretty print.
+   * @param opt_langExtension {string} The language name to use.
+   *     Typically, a filename extension like 'cpp' or 'java'.
+   * @param opt_numberLines {number|boolean} True to number lines,
+   *     or the 1-indexed number of the first line in sourceCodeHtml.
+   */
+  function prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
+    var container = document.createElement('PRE');
+    // This could cause images to load and onload listeners to fire.
+    // E.g. <img onerror="alert(1337)" src="nosuchimage.png">.
+    // We assume that the inner HTML is from a trusted source.
+    container.innerHTML = sourceCodeHtml;
+    if (opt_numberLines) {
+      numberLines(container, opt_numberLines);
+    }
+
+    var job = {
+      langExtension: opt_langExtension,
+      numberLines: opt_numberLines,
+      sourceNode: container
+    };
+    applyDecorator(job);
+    return container.innerHTML;
+  }
+
+  function prettyPrint(opt_whenDone) {
+    function byTagName(tn) { return document.getElementsByTagName(tn); }
+    // fetch a list of nodes to rewrite
+    var codeSegments = [byTagName('pre'), byTagName('code'), byTagName('xmp')];
+    var elements = [];
+    for (var i = 0; i < codeSegments.length; ++i) {
+      for (var j = 0, n = codeSegments[i].length; j < n; ++j) {
+        elements.push(codeSegments[i][j]);
+      }
+    }
+    codeSegments = null;
+
+    var clock = Date;
+    if (!clock['now']) {
+      clock = { 'now': function () { return +(new Date); } };
+    }
+
+    // The loop is broken into a series of continuations to make sure that we
+    // don't make the browser unresponsive when rewriting a large page.
+    var k = 0;
+    var prettyPrintingJob;
+
+    var langExtensionRe = /\blang(?:uage)?-([\w.]+)(?!\S)/;
+    var prettyPrintRe = /\bprettyprint\b/;
+
+    function doWork() {
+      var endTime = (window['PR_SHOULD_USE_CONTINUATION'] ?
+                     clock['now']() + 250 /* ms */ :
+                     Infinity);
+      for (; k < elements.length && clock['now']() < endTime; k++) {
+        var cs = elements[k];
+        var className = cs.className;
+        if (className.indexOf('prettyprint') >= 0) {
+          // If the classes includes a language extensions, use it.
+          // Language extensions can be specified like
+          //     <pre class="prettyprint lang-cpp">
+          // the language extension "cpp" is used to find a language handler as
+          // passed to PR.registerLangHandler.
+          // HTML5 recommends that a language be specified using "language-"
+          // as the prefix instead.  Google Code Prettify supports both.
+          // http://dev.w3.org/html5/spec-author-view/the-code-element.html
+          var langExtension = className.match(langExtensionRe);
+          // Support <pre class="prettyprint"><code class="language-c">
+          var wrapper;
+          if (!langExtension && (wrapper = childContentWrapper(cs))
+              && "CODE" === wrapper.tagName) {
+            langExtension = wrapper.className.match(langExtensionRe);
+          }
+
+          if (langExtension) {
+            langExtension = langExtension[1];
+          }
+
+          // make sure this is not nested in an already prettified element
+          var nested = false;
+          for (var p = cs.parentNode; p; p = p.parentNode) {
+            if ((p.tagName === 'pre' || p.tagName === 'code' ||
+                 p.tagName === 'xmp') &&
+                p.className && p.className.indexOf('prettyprint') >= 0) {
+              nested = true;
+              break;
+            }
+          }
+          if (!nested) {
+            // Look for a class like linenums or linenums:<n> where <n> is the
+            // 1-indexed number of the first line.
+            var lineNums = cs.className.match(/\blinenums\b(?::(\d+))?/);
+            lineNums = lineNums
+                  ? lineNums[1] && lineNums[1].length ? +lineNums[1] : true
+                  : false;
+            if (lineNums) { numberLines(cs, lineNums); }
+
+            // do the pretty printing
+            prettyPrintingJob = {
+              langExtension: langExtension,
+              sourceNode: cs,
+              numberLines: lineNums
+            };
+            applyDecorator(prettyPrintingJob);
+          }
+        }
+      }
+      if (k < elements.length) {
+        // finish up in a continuation
+        setTimeout(doWork, 250);
+      } else if (opt_whenDone) {
+        opt_whenDone();
+      }
+    }
+
+    doWork();
+  }
+
+   /**
+    * Find all the {@code <pre>} and {@code <code>} tags in the DOM with
+    * {@code class=prettyprint} and prettify them.
+    *
+    * @param {Function?} opt_whenDone if specified, called when the last entry
+    *     has been finished.
+    */
+  window['prettyPrintOne'] = prettyPrintOne;
+   /**
+    * Pretty print a chunk of code.
+    *
+    * @param {string} sourceCodeHtml code as html
+    * @return {string} code as html, but prettier
+    */
+  window['prettyPrint'] = prettyPrint;
+   /**
+    * Contains functions for creating and registering new language handlers.
+    * @type {Object}
+    */
+  window['PR'] = {
+        'createSimpleLexer': createSimpleLexer,
+        'registerLangHandler': registerLangHandler,
+        'sourceDecorator': sourceDecorator,
+        'PR_ATTRIB_NAME': PR_ATTRIB_NAME,
+        'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE,
+        'PR_COMMENT': PR_COMMENT,
+        'PR_DECLARATION': PR_DECLARATION,
+        'PR_KEYWORD': PR_KEYWORD,
+        'PR_LITERAL': PR_LITERAL,
+        'PR_NOCODE': PR_NOCODE,
+        'PR_PLAIN': PR_PLAIN,
+        'PR_PUNCTUATION': PR_PUNCTUATION,
+        'PR_SOURCE': PR_SOURCE,
+        'PR_STRING': PR_STRING,
+        'PR_TAG': PR_TAG,
+        'PR_TYPE': PR_TYPE
+      };
+})();
diff --git a/gears/docs/routes.php b/gears/docs/routes.php
new file mode 100644
index 0000000..21e5ed1
--- /dev/null
+++ b/gears/docs/routes.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Documentation Homepage
+|--------------------------------------------------------------------------
+|
+| The landing page for the documentation.
+|
+*/
+
+Route::get('(:bundle)', array('as' => 'docs.home', function()
+{
+	return View::make('gear: docs page')->with('content', md('home'));
+}));
+
+/*
+|--------------------------------------------------------------------------
+| Documentation Viewing
+|--------------------------------------------------------------------------
+|
+| Viewing a specific page within the documentation.
+|
+*/
+
+Route::get('(:bundle)/(:all)', array('as' => 'docs.page', function()
+{
+	$file = str_replace('-', '', rtrim(implode('/', func_get_args()), '/'));
+
+	if(file_exists(__DIR__ . DS . 'documentation' . DS . $file . '.md'))
+	{
+		return View::make('gear: docs page')->with('content', md($file));
+	}
+	elseif(file_exists(__DIR__ . DS . 'documentation' . DS . $file . DS . 'home.md'))
+	{
+		return View::make('gear: docs page')->with('content', md($file . DS . 'home.md'));
+	}
+
+	return Response::error('404');
+}));
\ No newline at end of file
diff --git a/gears/docs/start.php b/gears/docs/start.php
new file mode 100644
index 0000000..e65f265
--- /dev/null
+++ b/gears/docs/start.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Markdown Parsing Function
+|--------------------------------------------------------------------------
+|
+| This parsing function let's us easily parse a Markdown file.
+|
+*/
+
+function md($file)
+{
+	// Before we parse with the Markdown parser we'll prefix any links with the plugins handler.
+	$uri = URL::to_route('docs.page');
+
+	$contents = preg_replace('/(\[.*?\])\(\/(.*?)\)/s', '$1(' . $uri . '/$2)', file_get_contents(__DIR__ . DS . 'documentation' . DS . $file . '.md'));
+
+	return Feather\Gear\Markdown\Parse($contents);
+}
+
+/*
+|--------------------------------------------------------------------------
+| Navigation Item Function
+|--------------------------------------------------------------------------
+|
+| Determines if the navigation item is to be selected or not.
+|
+*/
+
+function navigation($uri)
+{
+	return ends_with(URI::current(), $uri) ? 'active' : null;
+}
\ No newline at end of file
diff --git a/gears/docs/views/contents.blade.php b/gears/docs/views/contents.blade.php
new file mode 100644
index 0000000..803bbd8
--- /dev/null
+++ b/gears/docs/views/contents.blade.php
@@ -0,0 +1,45 @@
+<ul class="nav nav-list">
+	<li class="nav-header">Contents</li>
+
+	<li>
+		<ul class="nav nav-list">
+			<li class="nav-header">Installation</li>
+
+			<li class="divider"></li>
+
+			<li class="nav-header">Authentication</li>
+
+			<li>
+				<ul class="nav nav-list">
+					<li class="nav-header">Single Sign On</li>
+
+					<li class="{{ navigation('auth/single-sign-on/introduction') }}">
+						{{ HTML::link_to_route('docs.page', 'Introduction', array('auth/single-sign-on/introduction')) }}
+					</li>
+
+					<li class="{{ navigation('auth/single-sign-on/oneconnect') }}">
+						{{ HTML::link_to_route('docs.page', 'OneConnect', array('auth/single-sign-on/oneconnect')) }}
+					</li>
+
+					<li class="{{ navigation('auth/single-sign-on/harmonize') }}">
+						{{ HTML::link_to_route('docs.page', 'Harmonize', array('auth/single-sign-on/harmonize')) }}
+					</li>
+				</ul>
+			</li>
+
+			<li class="divider"></li>
+
+			<li class="{{ navigation('migrations') }}">
+				{{ HTML::link_to_route('docs.page', 'Migrations', array('migrations')) }}
+			</li>
+
+			<li class="divider"></li>
+
+			<li class="nav-header">Gears</li>
+
+			<li class="{{ navigation('gears/events') }}">
+				{{ HTML::link_to_route('docs.page', 'Events', array('gears/events')) }}
+			</li>
+		</ul>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/gears/docs/views/page.blade.php b/gears/docs/views/page.blade.php
new file mode 100644
index 0000000..9aab0cb
--- /dev/null
+++ b/gears/docs/views/page.blade.php
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="utf-8">
+		<title>Feather Forums - Documentation</title>
+
+		{{ HTML::style('bundles/feather/gears/docs/css/bootstrap.css') }}
+		{{ HTML::style('bundles/feather/gears/docs/css/docs.css') }}
+	</head>
+
+	<body>
+
+		<div class="navbar navbar-fixed-top">
+			<div class="navbar-inner">
+				<div class="container-fluid">
+
+					<a class="brand" href="{{ URL::to_route('docs.home') }}">Feather Forums: Documentation</a>
+
+				</div>
+			</div>
+		</div>
+
+		<div class="container-fluid">
+
+			<div class="row-fluid">
+
+				<div class="span3 well sidebar-nav">
+					
+					@include('gear: docs contents')
+
+				</div>
+
+				<div class="span9">
+
+					{{ $content }}
+
+				</div>
+
+			</div>
+
+		</div>
+
+		{{ HTML::script('bundles/feather/gears/docs/js/jquery.js') }}
+		{{ HTML::script('bundles/feather/gears/docs/js/bootstrap.js') }}
+		{{ HTML::script('bundles/feather/gears/docs/js/prettify.js') }}
+
+		<script type="text/javascript">
+			$(document).ready(function()
+			{
+				$('pre').each(function()
+				{
+					$(this).addClass('prettyprint linenums');
+				});
+
+				prettyPrint();
+			});
+		</script>
+	</body>
+</html>
\ No newline at end of file

From 38b602a100886e0542940ea74c2b77086f7a76de Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Mon, 24 Sep 2012 01:12:33 +0930
Subject: [PATCH 130/136] Initial commit of markdown gear.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 gears/markdown/markdown.gear.php | 2855 ++++++++++++++++++++++++++++++
 1 file changed, 2855 insertions(+)
 create mode 100644 gears/markdown/markdown.gear.php

diff --git a/gears/markdown/markdown.gear.php b/gears/markdown/markdown.gear.php
new file mode 100644
index 0000000..212feb7
--- /dev/null
+++ b/gears/markdown/markdown.gear.php
@@ -0,0 +1,2855 @@
+<?php namespace Feather\Gear\Markdown;
+
+#
+# Markdown Extra  -  A text-to-HTML conversion tool for web writers
+#
+# PHP Markdown & Extra
+# Copyright (c) 2004-2012 Michel Fortin  
+# <http://michelf.com/projects/php-markdown/>
+#
+# Original Markdown
+# Copyright (c) 2004-2006 John Gruber  
+# <http://daringfireball.net/projects/markdown/>
+#
+
+define( 'MARKDOWN_VERSION',  "1.0.1o" ); # Sun 8 Jan 2012
+define( 'MARKDOWNEXTRA_VERSION',  "1.2.5" ); # Sun 8 Jan 2012
+
+#
+# Global default settings:
+#
+
+# Change to ">" for HTML output
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+
+# Define the width of a tab for code blocks.
+@define( 'MARKDOWN_TAB_WIDTH',     4 );
+
+# Optional title attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+
+# Optional class attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+
+
+### Standard Function Interface ###
+
+@define( 'MARKDOWN_PARSER_CLASS',  'Feather\\Gear\\Markdown\\MarkdownFeather_Parser' );
+
+function Parse($text) {
+#
+# Initialize the parser and return the result of its transform method.
+#
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
+}
+
+#
+# Markdown Parser Class
+#
+
+class Markdown_Parser {
+
+	# Regex to match balanced [brackets].
+	# Needed to insert a maximum bracked depth while converting to PHP.
+	var $nested_brackets_depth = 6;
+	var $nested_brackets_re;
+	
+	var $nested_url_parenthesis_depth = 4;
+	var $nested_url_parenthesis_re;
+
+	# Table of hash values for escaped characters:
+	var $escape_chars = '\`*_{}[]()>#+-.!';
+	var $escape_chars_re;
+
+	# Change to ">" for HTML output.
+	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+	var $tab_width = MARKDOWN_TAB_WIDTH;
+	
+	# Change to `true` to disallow markup or entities.
+	var $no_markup = false;
+	var $no_entities = false;
+	
+	# Predefined urls and titles for reference links and images.
+	var $predef_urls = array();
+	var $predef_titles = array();
+
+
+	function __construct() {
+	#
+	# Constructor function. Initialize appropriate member variables.
+	#
+		$this->_initDetab();
+		$this->prepareItalicsAndBold();
+	
+		$this->nested_brackets_re = 
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('\])*', $this->nested_brackets_depth);
+	
+		$this->nested_url_parenthesis_re = 
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+		
+		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+		
+		# Sort document, block, and span gamut in ascendent priority order.
+		asort($this->document_gamut);
+		asort($this->block_gamut);
+		asort($this->span_gamut);
+	}
+
+
+	# Internal hashes used during transformation.
+	var $urls = array();
+	var $titles = array();
+	var $html_hashes = array();
+	
+	# Status flag to avoid invalid nesting.
+	var $in_anchor = false;
+	
+	
+	function setup() {
+	#
+	# Called before the transformation process starts to setup parser 
+	# states.
+	#
+		# Clear global hashes.
+		$this->urls = $this->predef_urls;
+		$this->titles = $this->predef_titles;
+		$this->html_hashes = array();
+		
+		$in_anchor = false;
+	}
+	
+	function teardown() {
+	#
+	# Called after the transformation process to clear any variable 
+	# which may be taking up memory unnecessarly.
+	#
+		$this->urls = array();
+		$this->titles = array();
+		$this->html_hashes = array();
+	}
+
+
+	function transform($text) {
+	#
+	# Main function. Performs some preprocessing on the input text
+	# and pass it through the document gamut.
+	#
+		$this->setup();
+	
+		# Remove UTF-8 BOM and marker character in input, if present.
+		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+
+		# Standardize line endings:
+		#   DOS to Unix and Mac to Unix
+		$text = preg_replace('{\r\n?}', "\n", $text);
+
+		# Make sure $text ends with a couple of newlines:
+		$text .= "\n\n";
+
+		# Convert all tabs to spaces.
+		$text = $this->detab($text);
+
+		# Turn block-level HTML blocks into hash entries
+		$text = $this->hashHTMLBlocks($text);
+
+		# Strip any lines consisting only of spaces and tabs.
+		# This makes subsequent regexen easier to write, because we can
+		# match consecutive blank lines with /\n+/ instead of something
+		# contorted like /[ ]*\n+/ .
+		$text = preg_replace('/^[ ]+$/m', '', $text);
+
+		# Run document gamut methods.
+		foreach ($this->document_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		$this->teardown();
+
+		return $text . "\n";
+	}
+	
+	var $document_gamut = array(
+		# Strip link definitions, store in hashes.
+		"stripLinkDefinitions" => 20,
+		
+		"runBasicBlockGamut"   => 30,
+		);
+
+
+	function stripLinkDefinitions($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: ^[id]: url "optional title"
+		$text = preg_replace_callback('{
+							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							  [ ]*
+							  \n?				# maybe *one* newline
+							  [ ]*
+							(?:
+							  <(.+?)>			# url = $2
+							|
+							  (\S+?)			# url = $3
+							)
+							  [ ]*
+							  \n?				# maybe one newline
+							  [ ]*
+							(?:
+								(?<=\s)			# lookbehind for whitespace
+								["(]
+								(.*?)			# title = $4
+								[")]
+								[ ]*
+							)?	# title is optional
+							(?:\n+|\Z)
+			}xm',
+			array(&$this, '_stripLinkDefinitions_callback'),
+			$text);
+		return $text;
+	}
+	function _stripLinkDefinitions_callback($matches) {
+		$link_id = strtolower($matches[1]);
+		$url = $matches[2] == '' ? $matches[3] : $matches[2];
+		$this->urls[$link_id] = $url;
+		$this->titles[$link_id] =& $matches[4];
+		return ''; # String that will replace the block
+	}
+
+
+	function hashHTMLBlocks($text) {
+		if ($this->no_markup)  return $text;
+
+		$less_than_tab = $this->tab_width - 1;
+
+		# Hashify HTML blocks:
+		# We only want to do this for block-level HTML tags, such as headers,
+		# lists, and tables. That's because we still want to wrap <p>s around
+		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+		# phrase emphasis, and spans. The list of tags we're looking for is
+		# hard-coded:
+		#
+		# *  List "a" is made of tags which can be both inline or block-level.
+		#    These will be treated block-level when the start tag is alone on 
+		#    its line, otherwise they're not matched here and will be taken as 
+		#    inline later.
+		# *  List "b" is made of tags which are always block-level;
+		#
+		$block_tags_a_re = 'ins|del';
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+						   'script|noscript|form|fieldset|iframe|math';
+
+		# Regular expression for the content of a block tag.
+		$nested_tags_level = 4;
+		$attr = '
+			(?>				# optional tag attributes
+			  \s			# starts with whitespace
+			  (?>
+				[^>"/]+		# text outside quotes
+			  |
+				/+(?!>)		# slash not followed by ">"
+			  |
+				"[^"]*"		# text inside double quotes (tolerate ">")
+			  |
+				\'[^\']*\'	# text inside single quotes (tolerate ">")
+			  )*
+			)?	
+			';
+		$content =
+			str_repeat('
+				(?>
+				  [^<]+			# content without tag
+				|
+				  <\2			# nested opening tag
+					'.$attr.'	# attributes
+					(?>
+					  />
+					|
+					  >', $nested_tags_level).	# end of opening tag
+					  '.*?'.					# last level nested tag content
+			str_repeat('
+					  </\2\s*>	# closing nested tag
+					)
+				  |				
+					<(?!/\2\s*>	# other tags with a different name
+				  )
+				)*',
+				$nested_tags_level);
+		$content2 = str_replace('\2', '\3', $content);
+
+		# First, look for nested blocks, e.g.:
+		# 	<div>
+		# 		<div>
+		# 		tags for inner block must be indented.
+		# 		</div>
+		# 	</div>
+		#
+		# The outermost tags must start at the left margin for this to match, and
+		# the inner nested divs must be indented.
+		# We need to do this before the next, more liberal match, because the next
+		# match will start at the first `<div>` and stop at the first `</div>`.
+		$text = preg_replace_callback('{(?>
+			(?>
+				(?<=\n\n)		# Starting after a blank line
+				|				# or
+				\A\n?			# the beginning of the doc
+			)
+			(						# save in $1
+
+			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
+			  # in between.
+					
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_b_re.')# start tag = $2
+						'.$attr.'>			# attributes followed by > and \n
+						'.$content.'		# content, support nesting
+						</\2>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+
+			| # Special version for tags of group a.
+
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_a_re.')# start tag = $3
+						'.$attr.'>[ ]*\n	# attributes followed by >
+						'.$content2.'		# content, support nesting
+						</\3>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+					
+			| # Special case just for <hr />. It was easier to make a special 
+			  # case than to make the other regex more complicated.
+			
+						[ ]{0,'.$less_than_tab.'}
+						<(hr)				# start tag = $2
+						'.$attr.'			# attributes
+						/?>					# the matching end tag
+						[ ]*
+						(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # Special case for standalone HTML comments:
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<!-- .*? -->
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # PHP and ASP-style processor instructions (<? and <%)
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<([?%])			# $2
+						.*?
+						\2>
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+					
+			)
+			)}Sxmi',
+			array(&$this, '_hashHTMLBlocks_callback'),
+			$text);
+
+		return $text;
+	}
+	function _hashHTMLBlocks_callback($matches) {
+		$text = $matches[1];
+		$key  = $this->hashBlock($text);
+		return "\n\n$key\n\n";
+	}
+	
+	
+	function hashPart($text, $boundary = 'X') {
+	#
+	# Called whenever a tag must be hashed when a function insert an atomic 
+	# element in the text stream. Passing $text to through this function gives
+	# a unique text-token which will be reverted back when calling unhash.
+	#
+	# The $boundary argument specify what character should be used to surround
+	# the token. By convension, "B" is used for block elements that needs not
+	# to be wrapped into paragraph tags at the end, ":" is used for elements
+	# that are word separators and "X" is used in the general case.
+	#
+		# Swap back any tag hash found in $text so we do not have to `unhash`
+		# multiple times at the end.
+		$text = $this->unhash($text);
+		
+		# Then hash the block.
+		static $i = 0;
+		$key = "$boundary\x1A" . ++$i . $boundary;
+		$this->html_hashes[$key] = $text;
+		return $key; # String that will replace the tag.
+	}
+
+
+	function hashBlock($text) {
+	#
+	# Shortcut function for hashPart with block-level boundaries.
+	#
+		return $this->hashPart($text, 'B');
+	}
+
+
+	var $block_gamut = array(
+	#
+	# These are all the transformations that form block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		"doHeaders"         => 10,
+		"doHorizontalRules" => 20,
+		
+		"doLists"           => 40,
+		"doCodeBlocks"      => 50,
+		"doBlockQuotes"     => 60,
+		);
+
+	function runBlockGamut($text) {
+	#
+	# Run block gamut tranformations.
+	#
+		# We need to escape raw HTML in Markdown source before doing anything 
+		# else. This need to be done for each block, and not only at the 
+		# begining in the Markdown function since hashed blocks can be part of
+		# list items and could have been indented. Indented blocks would have 
+		# been seen as a code block in a previous pass of hashHTMLBlocks.
+		$text = $this->hashHTMLBlocks($text);
+		
+		return $this->runBasicBlockGamut($text);
+	}
+	
+	function runBasicBlockGamut($text) {
+	#
+	# Run block gamut tranformations, without hashing HTML blocks. This is 
+	# useful when HTML blocks are known to be already hashed, like in the first
+	# whole-document pass.
+	#
+		foreach ($this->block_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		# Finally form paragraph and restore hashed blocks.
+		$text = $this->formParagraphs($text);
+
+		return $text;
+	}
+	
+	
+	function doHorizontalRules($text) {
+		# Do Horizontal Rules:
+		return preg_replace(
+			'{
+				^[ ]{0,3}	# Leading space
+				([-*_])		# $1: First marker
+				(?>			# Repeated marker group
+					[ ]{0,2}	# Zero, one, or two spaces.
+					\1			# Marker character
+				){2,}		# Group repeated at least twice
+				[ ]*		# Tailing spaces
+				$			# End of line.
+			}mx',
+			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+			$text);
+	}
+
+
+	var $span_gamut = array(
+	#
+	# These are all the transformations that occur *within* block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		# Process character escapes, code spans, and inline HTML
+		# in one shot.
+		"parseSpan"           => -30,
+
+		# Process anchor and image tags. Images must come first,
+		# because ![foo][f] looks like an anchor.
+		"doImages"            =>  10,
+		"doAnchors"           =>  20,
+		
+		# Make links out of things like `<http://example.com/>`
+		# Must come after doAnchors, because you can use < and >
+		# delimiters in inline links like [this](<url>).
+		"doAutoLinks"         =>  30,
+		"encodeAmpsAndAngles" =>  40,
+
+		"doItalicsAndBold"    =>  50,
+		"doHardBreaks"        =>  60,
+		);
+
+	function runSpanGamut($text) {
+	#
+	# Run span gamut tranformations.
+	#
+		foreach ($this->span_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		return $text;
+	}
+	
+	
+	function doHardBreaks($text) {
+		# Do hard breaks:
+		return preg_replace_callback('/ {2,}\n/', 
+			array(&$this, '_doHardBreaks_callback'), $text);
+	}
+	function _doHardBreaks_callback($matches) {
+		return $this->hashPart("<br$this->empty_element_suffix\n");
+	}
+
+
+	function doAnchors($text) {
+	#
+	# Turn Markdown link shortcuts into XHTML <a> tags.
+	#
+		if ($this->in_anchor) return $text;
+		$this->in_anchor = true;
+		
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+			)
+			}xs',
+			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+			  \(			# literal paren
+				[ \n]*
+				(?:
+					<(.+?)>	# href = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# href = $4
+				)
+				[ \n]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# Title = $7
+				  \6		# matching quote
+				  [ \n]*	# ignore any spaces/tabs between closing quote and )
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_doAnchors_inline_callback'), $text);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link text][1]
+		# or [link text](/foo)
+		#
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
+			  \]
+			)
+			}xs',
+			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		$this->in_anchor = false;
+		return $text;
+	}
+	function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+
+		if ($link_id == "") {
+			# for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+		
+		# lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeAttribute($url);
+			
+			$result = "<a href=\"$url\"";
+			if ( isset( $this->titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+		
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+	function _doAnchors_inline_callback($matches) {
+		$whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+		
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+
+	function doImages($text) {
+	#
+	# Turn Markdown image shortcuts into <img> tags.
+	#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs', 
+			array(&$this, '_doImages_reference_callback'), $text);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+			  \s?			# One optional whitespace character
+			  \(			# literal paren
+				[ \n]*
+				(?:
+					<(\S*)>	# src url = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# src url = $4
+				)
+				[ \n]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# title = $7
+				  \6		# matching quote
+				  [ \n]*
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_doImages_inline_callback'), $text);
+
+		return $text;
+	}
+	function _doImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
+		}
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		if (isset($this->urls[$link_id])) {
+			$url = $this->encodeAttribute($this->urls[$link_id]);
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (isset($this->titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+	function _doImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeAttribute($url);
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\""; # $title already quoted
+		}
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+
+	function doHeaders($text) {
+		# Setext-style headers:
+		#	  Header 1
+		#	  ========
+		#  
+		#	  Header 2
+		#	  --------
+		#
+		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_callback_setext($matches) {
+		# Terrible hack to check we haven't found an empty list item.
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+			return $matches[0];
+		
+		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doLists($text) {
+	#
+	# Form HTML ordered (numbered) and unordered (bulleted) lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[\.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+		$markers_relist = array(
+			$marker_ul_re => $marker_ol_re,
+			$marker_ol_re => $marker_ul_re,
+			);
+
+		foreach ($markers_relist as $marker_re => $other_marker_re) {
+			# Re-usable pattern to match any entirel ul or ol list:
+			$whole_list_re = '
+				(								# $1 = whole list
+				  (								# $2
+					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
+					('.$marker_re.')			# $4 = first list item marker
+					[ ]+
+				  )
+				  (?s:.+?)
+				  (								# $5
+					  \z
+					|
+					  \n{2,}
+					  (?=\S)
+					  (?!						# Negative lookahead for another list item marker
+						[ ]*
+						'.$marker_re.'[ ]+
+					  )
+					|
+					  (?=						# Lookahead for another kind of list
+					    \n
+						\3						# Must have the same indentation
+						'.$other_marker_re.'[ ]+
+					  )
+				  )
+				)
+			'; // mx
+			
+			# We use a different prefix before nested lists than top-level lists.
+			# See extended comment in _ProcessListItems().
+		
+			if ($this->list_level) {
+				$text = preg_replace_callback('{
+						^
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+			else {
+				$text = preg_replace_callback('{
+						(?:(?<=\n)\n|\A\n?) # Must eat the newline
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+		}
+
+		return $text;
+	}
+	function _doLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[\.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+		
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
+		
+		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		
+		$list .= "\n";
+		$result = $this->processListItems($list, $marker_any_re);
+		
+		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+		return "\n". $result ."\n\n";
+	}
+
+	var $list_level = 0;
+
+	function processListItems($list_str, $marker_any_re) {
+	#
+	#	Process the contents of a single ordered or unordered list, splitting it
+	#	into individual list items.
+	#
+		# The $this->list_level global keeps track of when we're inside a list.
+		# Each time we enter a list, we increment it; when we leave a list,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+		
+		$this->list_level++;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		$list_str = preg_replace_callback('{
+			(\n)?							# leading line = $1
+			(^[ ]*)							# leading whitespace = $2
+			('.$marker_any_re.'				# list marker and space = $3
+				(?:[ ]+|(?=\n))	# space only required if item is not empty
+			)
+			((?s:.*?))						# list item text   = $4
+			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
+			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+			}xm',
+			array(&$this, '_processListItems_callback'), $list_str);
+
+		$this->list_level--;
+		return $list_str;
+	}
+	function _processListItems_callback($matches) {
+		$item = $matches[4];
+		$leading_line =& $matches[1];
+		$leading_space =& $matches[2];
+		$marker_space = $matches[3];
+		$tailing_blank_line =& $matches[5];
+
+		if ($leading_line || $tailing_blank_line || 
+			preg_match('/\n{2,}/', $item))
+		{
+			# Replace marker with the appropriate whitespace indentation
+			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $this->runBlockGamut($this->outdent($item)."\n");
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = $this->doLists($this->outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->runSpanGamut($item);
+		}
+
+		return "<li>" . $item . "</li>\n";
+	}
+
+
+	function doCodeBlocks($text) {
+	#
+	#	Process Markdown `<pre><code>` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A\n?)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?>
+					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array(&$this, '_doCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+
+	function makeCodeSpan($code) {
+	#
+	# Create a code span markup for $code. Called from handleSpanToken.
+	#
+		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		return $this->hashPart("<code>$code</code>");
+	}
+
+
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S|^)(?<!_)_(?!_)',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S|^)(?<!_)__(?!_)',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S|^)(?<!_)___(?!_)',
+		);
+	var $em_strong_prepared_relist;
+	
+	function prepareItalicsAndBold() {
+	#
+	# Prepare regular expressions for searching emphasis tokens in any
+	# context.
+	#
+		foreach ($this->em_relist as $em => $em_re) {
+			foreach ($this->strong_relist as $strong => $strong_re) {
+				# Construct list of allowed token expressions.
+				$token_relist = array();
+				if (isset($this->em_strong_relist["$em$strong"])) {
+					$token_relist[] = $this->em_strong_relist["$em$strong"];
+				}
+				$token_relist[] = $em_re;
+				$token_relist[] = $strong_re;
+				
+				# Construct master expression from list.
+				$token_re = '{('. implode('|', $token_relist) .')}';
+				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+			}
+		}
+	}
+	
+	function doItalicsAndBold($text) {
+		$token_stack = array('');
+		$text_stack = array('');
+		$em = '';
+		$strong = '';
+		$tree_char_em = false;
+		
+		while (1) {
+			#
+			# Get prepared regular expression for seraching emphasis tokens
+			# in current context.
+			#
+			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+			
+			#
+			# Each loop iteration search for the next emphasis token. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			$text_stack[0] .= $parts[0];
+			$token =& $parts[1];
+			$text =& $parts[2];
+			
+			if (empty($token)) {
+				# Reached end of text span: empty stack without emitting.
+				# any more emphasis.
+				while ($token_stack[0]) {
+					$text_stack[1] .= array_shift($token_stack);
+					$text_stack[0] .= array_shift($text_stack);
+				}
+				break;
+			}
+			
+			$token_len = strlen($token);
+			if ($tree_char_em) {
+				# Reached closing marker while inside a three-char emphasis.
+				if ($token_len == 3) {
+					# Three-char closing marker, close em and strong.
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong><em>$span</em></strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$em = '';
+					$strong = '';
+				} else {
+					# Other closing marker: close one em or strong and
+					# change current token state to match the other
+					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$tag = $token_len == 2 ? "strong" : "em";
+					$span = $text_stack[0];
+					$span = $this->runSpanGamut($span);
+					$span = "<$tag>$span</$tag>";
+					$text_stack[0] = $this->hashPart($span);
+					$$tag = ''; # $$tag stands for $em or $strong
+				}
+				$tree_char_em = false;
+			} else if ($token_len == 3) {
+				if ($em) {
+					# Reached closing marker for both em and strong.
+					# Closing strong marker:
+					for ($i = 0; $i < 2; ++$i) {
+						$shifted_token = array_shift($token_stack);
+						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<$tag>$span</$tag>";
+						$text_stack[0] .= $this->hashPart($span);
+						$$tag = ''; # $$tag stands for $em or $strong
+					}
+				} else {
+					# Reached opening three-char emphasis marker. Push on token 
+					# stack; will be handled by the special condition above.
+					$em = $token{0};
+					$strong = "$em$em";
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$tree_char_em = true;
+				}
+			} else if ($token_len == 2) {
+				if ($strong) {
+					# Unwind any dangling emphasis marker:
+					if (strlen($token_stack[0]) == 1) {
+						$text_stack[1] .= array_shift($token_stack);
+						$text_stack[0] .= array_shift($text_stack);
+					}
+					# Closing strong marker:
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong>$span</strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$strong = '';
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$strong = $token;
+				}
+			} else {
+				# Here $token_len == 1
+				if ($em) {
+					if (strlen($token_stack[0]) == 1) {
+						# Closing emphasis marker:
+						array_shift($token_stack);
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<em>$span</em>";
+						$text_stack[0] .= $this->hashPart($span);
+						$em = '';
+					} else {
+						$text_stack[0] .= $token;
+					}
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$em = $token;
+				}
+			}
+		}
+		return $text_stack[0];
+	}
+
+
+	function doBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*>[ ]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array(&$this, '_doBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	function _doBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content, 
+		# so we need to fix that:
+		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
+			array(&$this, '_doBlockQuotes_callback2'), $bq);
+
+		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+	}
+	function _doBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+				# Is a paragraph.
+				$value = $this->runSpanGamut($value);
+				$value = preg_replace('/^([ ]*)/', "<p>", $value);
+				$value .= "</p>";
+				$grafs[$key] = $this->unhash($value);
+			}
+			else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf = $value;
+				$block = $this->html_hashes[$graf];
+				$graf = $block;
+//				if (preg_match('{
+//					\A
+//					(							# $1 = <div> tag
+//					  <div  \s+
+//					  [^>]*
+//					  \b
+//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
+//					  1
+//					  \2
+//					  [^>]*
+//					  >
+//					)
+//					(							# $3 = contents
+//					.*
+//					)
+//					(</div>)					# $4 = closing tag
+//					\z
+//					}xs', $block, $matches))
+//				{
+//					list(, $div_open, , $div_content, $div_close) = $matches;
+//
+//					# We can't call Markdown(), because that resets the hash;
+//					# that initialization code should be pulled into its own sub, though.
+//					$div_content = $this->hashHTMLBlocks($div_content);
+//					
+//					# Run document gamut methods on the content.
+//					foreach ($this->document_gamut as $method => $priority) {
+//						$div_content = $this->$method($div_content);
+//					}
+//
+//					$div_open = preg_replace(
+//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+//				}
+				$grafs[$key] = $graf;
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	function encodeAttribute($text) {
+	#
+	# Encode text for a double-quoted HTML attribute. This function
+	# is *not* suitable for attributes enclosed in single quotes.
+	#
+		$text = $this->encodeAmpsAndAngles($text);
+		$text = str_replace('"', '&quot;', $text);
+		return $text;
+	}
+	
+	
+	function encodeAmpsAndAngles($text) {
+	#
+	# Smart processing for ampersands and angle brackets that need to 
+	# be encoded. Valid character entities are left alone unless the
+	# no-entities mode is set.
+	#
+		if ($this->no_entities) {
+			$text = str_replace('&', '&amp;', $text);
+		} else {
+			# Ampersand-encoding based entirely on Nat Irons's Amputator
+			# MT plugin: <http://bumppo.net/projects/amputator/>
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+								'&amp;', $text);;
+		}
+		# Encode remaining <'s
+		$text = str_replace('<', '&lt;', $text);
+
+		return $text;
+	}
+
+
+	function doAutoLinks($text) {
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
+			array(&$this, '_doAutoLinks_url_callback'), $text);
+
+		# Email addresses: <address@domain.foo>
+		$text = preg_replace_callback('{
+			<
+			(?:mailto:)?
+			(
+				(?:
+					[-!#$%&\'*+/=?^_`.{|}~\w\x80-\xFF]+
+				|
+					".*?"
+				)
+				\@
+				(?:
+					[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
+				|
+					\[[\d.a-fA-F:]+\]	# IPv4 & IPv6
+				)
+			)
+			>
+			}xi',
+			array(&$this, '_doAutoLinks_email_callback'), $text);
+
+		return $text;
+	}
+	function _doAutoLinks_url_callback($matches) {
+		$url = $this->encodeAttribute($matches[1]);
+		$link = "<a href=\"$url\">$url</a>";
+		return $this->hashPart($link);
+	}
+	function _doAutoLinks_email_callback($matches) {
+		$address = $matches[1];
+		$link = $this->encodeEmailAddress($address);
+		return $this->hashPart($link);
+	}
+
+
+	function encodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+	#
+	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	#   With some optimizations by Milian Wolff.
+	#
+		$addr = "mailto:" . $addr;
+		$chars = preg_split('/(?<!^)(?!$)/', $addr);
+		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		
+		foreach ($chars as $key => $char) {
+			$ord = ord($char);
+			# Ignore non-ascii chars.
+			if ($ord < 128) {
+				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+				# roughly 10% raw, 45% hex, 45% dec
+				# '@' *must* be encoded. I insist.
+				if ($r > 90 && $char != '@') /* do nothing */;
+				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+				else              $chars[$key] = '&#'.$ord.';';
+			}
+		}
+		
+		$addr = implode('', $chars);
+		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
+		$addr = "<a href=\"$addr\">$text</a>";
+
+		return $addr;
+	}
+
+
+	function parseSpan($str) {
+	#
+	# Take the string $str and parse it into tokens, hashing embeded HTML,
+	# escaped characters and handling code spans.
+	#
+		$output = '';
+		
+		$span_re = '{
+				(
+					\\\\'.$this->escape_chars_re.'
+				|
+					(?<![`\\\\])
+					`+						# code span marker
+			'.( $this->no_markup ? '' : '
+				|
+					<!--    .*?     -->		# comment
+				|
+					<\?.*?\?> | <%.*?%>		# processing instruction
+				|
+					<[/!$]?[-a-zA-Z0-9:_]+	# regular tags
+					(?>
+						\s
+						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
+					)?
+					>
+			').'
+				)
+				}xs';
+
+		while (1) {
+			#
+			# Each loop iteration seach for either the next tag, the next 
+			# openning code span marker, or the next escaped character. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+			
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			}
+			else {
+				break;
+			}
+		}
+		
+		return $output;
+	}
+	
+	
+	function handleSpanToken($token, &$str) {
+	#
+	# Handle $token provided by parseSpan by determining its nature and 
+	# returning the corresponding value that should replace it.
+	#
+		switch ($token{0}) {
+			case "\\":
+				return $this->hashPart("&#". ord($token{1}). ";");
+			case "`":
+				# Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+					$str, $matches))
+				{
+					$str = $matches[2];
+					$codespan = $this->makeCodeSpan($matches[1]);
+					return $this->hashPart($codespan);
+				}
+				return $token; // return as text since no ending marker found.
+			default:
+				return $this->hashPart($token);
+		}
+	}
+
+
+	function outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+	}
+
+
+	# String length function for detab. `_initDetab` will create a function to 
+	# hanlde UTF-8 if the default function does not exist.
+	var $utf8_strlen = 'mb_strlen';
+	
+	function detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the 
+		# appropriate number of space between each blocks.
+		
+		$text = preg_replace_callback('/^.*\t.*$/m',
+			array(&$this, '_detab_callback'), $text);
+
+		return $text;
+	}
+	function _detab_callback($matches) {
+		$line = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+		
+		# Split in blocks.
+		$blocks = explode("\t", $line);
+		# Add each blocks to the line.
+		$line = $blocks[0];
+		unset($blocks[0]); # Do not add first block twice.
+		foreach ($blocks as $block) {
+			# Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width - 
+				$strlen($line, 'UTF-8') % $this->tab_width;
+			$line .= str_repeat(" ", $amount) . $block;
+		}
+		return $line;
+	}
+	function _initDetab() {
+	#
+	# Check for the availability of the function in the `utf8_strlen` property
+	# (initially `mb_strlen`). If the function is not available, create a 
+	# function that will loosely count the number of UTF-8 characters with a
+	# regular expression.
+	#
+		if (function_exists($this->utf8_strlen)) return;
+		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
+			$text, $m);');
+	}
+
+
+	function unhash($text) {
+	#
+	# Swap back in all the tags hashed by _HashHTMLBlocks.
+	#
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+			array(&$this, '_unhash_callback'), $text);
+	}
+	function _unhash_callback($matches) {
+		return $this->html_hashes[$matches[0]];
+	}
+
+}
+
+
+#
+# Markdown Extra Parser Class
+#
+
+class MarkdownExtra_Parser extends Markdown_Parser {
+
+	# Prefix for footnote ids.
+	var $fn_id_prefix = "";
+	
+	# Optional title attribute for footnote links and backlinks.
+	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+	
+	# Optional class attribute for footnote links and backlinks.
+	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+	
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+
+	function __construct() {
+	#
+	# Constructor function. Initialize the parser object.
+	#
+		# Add extra escapable characters before parent constructor 
+		# initialize the table.
+		$this->escape_chars .= ':|';
+		
+		# Insert extra document, block, and span transformations. 
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+			);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+			);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+			);
+		
+		parent::__construct();
+	}
+	
+	
+	# Extra variables used during extra transformations.
+	var $footnotes = array();
+	var $footnotes_ordered = array();
+	var $abbr_desciptions = array();
+	var $abbr_word_re = '';
+	
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+	
+	
+	function setup() {
+	#
+	# Setting up Extra-specific variables.
+	#
+		parent::setup();
+		
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		$this->footnote_counter = 1;
+		
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			if ($this->abbr_word_re)
+				$this->abbr_word_re .= '|';
+			$this->abbr_word_re .= preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+	
+	function teardown() {
+	#
+	# Clearing Extra-specific variables.
+	#
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		
+		parent::teardown();
+	}
+	
+	
+	### HTML Block Parser ###
+	
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+	
+	# Tags treated as block tags only if the opening tag is alone on it's line:
+	var $context_block_tags_re = 'script|noscript|math|ins|del';
+	
+	# Tags where markdown="1" default to span mode:
+	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+	
+	# Tags which must not have their contents modified, no matter where 
+	# they appear:
+	var $clean_tags_re = 'script|math';
+	
+	# Tags that do not need to be closed.
+	var $auto_close_tags_re = 'hr|img';
+	
+
+	function hashHTMLBlocks($text) {
+	#
+	# Hashify HTML Blocks and "clean tags".
+	#
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded.
+	#
+	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
+	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	# These two functions are calling each other. It's recursive!
+	#
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		
+		return $text;
+	}
+	function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
+										$enclosing_tag_re = '', $span = false)
+	{
+	#
+	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	#
+	# *   $indent is the number of space to be ignored when checking for code 
+	#     blocks. This is important because if we don't take the indent into 
+	#     account, something like this (which looks right) won't work as expected:
+	#
+	#     <div>
+	#         <div markdown="1">
+	#         Hello World.  <-- Is this a Markdown code block or text?
+	#         </div>  <-- Is this a Markdown code block or a real tag?
+	#     <div>
+	#
+	#     If you don't like this, just don't indent the tag on which
+	#     you apply the markdown="1" attribute.
+	#
+	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
+	#     tag with that name. Nested tags supported.
+	#
+	# *   If $span is true, text inside must treated as span. So any double 
+	#     newline will be replaced by a single newline so that it does not create 
+	#     paragraphs.
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re = 
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*<!--.*?-->)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+		
+		# Regex to match any tag.
+		$block_tag_re =
+			'{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						(?>				# Tag name.
+							'.$this->block_tags_re.'			|
+							'.$this->context_block_tags_re.'	|
+							'.$this->clean_tags_re.'        	|
+							(?!\s)'.$enclosing_tag_re.'
+						)
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				|
+					# Code span marker
+					`+
+				'. ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?: ^[ ]*\n | ^ | \n[ ]*\n )
+					[ ]{'.($indent+4).'}[^\n]* \n
+					(?>
+						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?> ^ | \n )
+					[ ]{0,'.($indent).'}~~~+[ ]*\n
+				' : '' ). ' # End (if not is span).
+				)
+			}xs';
+
+		
+		$depth = 0;		# Current depth inside the tag tree.
+		$parsed = "";	# Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($block_tag_re, $text, 2, 
+								PREG_SPLIT_DELIM_CAPTURE);
+			
+			# If in Markdown span mode, add a empty-string span-level hash 
+			# after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "$void\n";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+			
+			$parsed .= $parts[0]; # Text before current tag.
+			
+			# If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+			
+			$tag  = $parts[1]; # Tag to handle.
+			$text = $parts[2]; # Remaining text after current tag.
+			$tag_re = preg_quote($tag); # For use in a regular expression.
+			
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
+					$text, $matches))
+				{
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					# Unmatched marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Fenced code block marker.
+			#
+			else if (preg_match('{^\n?[ ]{0,'.($indent+3).'}~}', $tag)) {
+				# Fenced code block marker: find matching end marker.
+				$tag_re = preg_quote(trim($tag));
+				if (preg_match('{^(?>.*\n)+?[ ]{0,'.($indent).'}'.$tag_re.'[ ]*\n}', $text, 
+					$matches)) 
+				{
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					# No end marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Indented code block.
+			#
+			else if ($tag{0} == "\n" || $tag{0} == " ") {
+				# Indented code block: pass it unchanged, will be handled 
+				# later.
+				$parsed .= $tag;
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            Opening Context Block tag (like ins and del) 
+			#               used as a block tag (tag is alone on it's line).
+			#
+			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
+				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+					preg_match($newline_before_re, $parsed) &&
+					preg_match($newline_after_re, $text)	)
+				)
+			{
+				# Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+				
+				# Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Need to parse tag and following text using the HTML parser.
+				# (don't check for markdown attribute)
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+				
+				$parsed .= $block_text;
+			}
+			#
+			# Check for: Tag with same name as enclosing tag.
+			#
+			else if ($enclosing_tag_re !== '' &&
+				# Same name as enclosing tag.
+				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
+			{
+				#
+				# Increase/decrease nested tag count.
+				#
+				if ($tag{1} == '/')						$depth--;
+				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+
+				if ($depth < 0) {
+					#
+					# Going out of parent element. Clean up and break so we
+					# return to the calling function.
+					#
+					$text = $tag . $text;
+					break;
+				}
+				
+				$parsed .= $tag;
+			}
+			else {
+				$parsed .= $tag;
+			}
+		} while ($depth >= 0);
+		
+		return array($parsed, $text);
+	}
+	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+	#
+	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	#
+	# *   Calls $hash_method to convert any blocks.
+	# *   Stops when the first opening tag closes.
+	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	#     (it is not inside clean tags)
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+		
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter		
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter	
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+		
+		# Regex to match any tag.
+		$tag_re = '{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						[\w:$]+			# Tag name.
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				)
+			}xs';
+		
+		$original_text = $text;		# Save original text in case of faliure.
+		
+		$depth		= 0;	# Current depth inside the tag tree.
+		$block_text	= "";	# Temporary text holder for current text.
+		$parsed		= "";	# Parsed text that will be returned.
+
+		#
+		# Get the name of the starting tag.
+		# (This pattern makes $base_tag_name_re safe without quoting.)
+		#
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+			$base_tag_name_re = $matches[1];
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			if (count($parts) < 3) {
+				#
+				# End of $text reached with unbalenced tag(s).
+				# In that case, we return original text unchanged and pass the
+				# first character as filtered to prevent an infinite loop in the 
+				# parent function.
+				#
+				return array($original_text{0}, substr($original_text, 1));
+			}
+			
+			$block_text .= $parts[0]; # Text before current tag.
+			$tag         = $parts[1]; # Tag to handle.
+			$text        = $parts[2]; # Remaining text after current tag.
+			
+			#
+			# Check for: Auto-close tag (like <hr/>)
+			#			 Comments and Processing Instructions.
+			#
+			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				#
+				# Increase/decrease nested tag count. Only do so if
+				# the tag's name match base tag's.
+				#
+				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
+					if ($tag{1} == '/')						$depth--;
+					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				}
+				
+				#
+				# Check for `markdown="1"` attribute and handle it.
+				#
+				if ($md_attr && 
+					preg_match($markdown_attr_re, $tag, $attr_m) &&
+					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+				{
+					# Remove `markdown` attribute from opening tag.
+					$tag = preg_replace($markdown_attr_re, '', $tag);
+					
+					# Check if text inside this tag must be parsed in span mode.
+					$this->mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+					
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+					
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+					
+					# Get enclosing tag name for the ParseMarkdown function.
+					# (This pattern makes $tag_name_re safe without quoting.)
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name_re = $matches[1];
+					
+					# Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
+							$tag_name_re, $span_mode);
+					
+					# Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
+													$block_text);
+					}
+					
+					# Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+					
+					# Start over a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+			
+		} while ($depth > 0);
+		
+		#
+		# Hash last block text that wasn't processed inside the loop.
+		#
+		$parsed .= $this->$hash_method($block_text);
+		
+		return array($parsed, $text);
+	}
+
+
+	function hashClean($text) {
+	#
+	# Called whenever a tag must be hashed when a function insert a "clean" tag
+	# in $text, it pass through this function and is automaticaly escaped, 
+	# blocking invalid nested overlap.
+	#
+		return $this->hashPart($text, 'C');
+	}
+
+
+	function doHeaders($text) {
+	#
+	# Redefined to add id attribute support.
+	#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#  
+		#	  Header 2  {#header2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3}
+		#	...
+		#	###### Header 6   {#header2}
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
+				[ ]*
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_attr($attr) {
+		if (empty($attr))  return "";
+		return " id=\"$attr\"";
+	}
+	function _doHeaders_callback_setext($matches) {
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+			return $matches[0];
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doTables($text) {
+	#
+	# Form HTML tables.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_doTable_leadingPipe_callback'), $text);
+		
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+	function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+		
+		# Remove leading pipe for each row.
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+		
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+	function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+		
+		# Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+			else									$attr[$n] = '';
+		}
+		
+		# Parsing span elements, including code spans, character escapes, 
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+		
+		# Write column headers.
+		$text = "<table>\n";
+		$text .= "<thead>\n";
+		$text .= "<tr>\n";
+		foreach ($headers as $n => $header)
+			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		$text .= "</tr>\n";
+		$text .= "</thead>\n";
+		
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+		
+		$text .= "<tbody>\n";
+		foreach ($rows as $row) {
+			# Parsing span elements, including code spans, character escapes, 
+			# and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+			
+			# Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+			
+			$text .= "<tr>\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			$text .= "</tr>\n";
+		}
+		$text .= "</tbody>\n";
+		$text .= "</table>";
+		
+		return $this->hashBlock($text) . "\n";
+	}
+
+	
+	function doDefLists($text) {
+	#
+	# Form HTML definition lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,'.$less_than_tab.'}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,'.$less_than_tab.'}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				'.$whole_list_re.'
+			}mx',
+			array(&$this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+	function _doDefLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "<dl>\n" . $result . "\n</dl>";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+
+	function processDefListItems($list_str) {
+	#
+	#	Process the contents of a single definition list, splitting it
+	#	into individual term and definition list items.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)					# leading line
+			(								# definition terms = $1
+				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				(?![:][ ]|[ ])				# negative lookahead for a definition 
+											#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?				# actual term (not whitespace).	
+			)			
+			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
+											#   with a definition mark.
+			}xm',
+			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+
+		# Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?						# leading line = $1
+			(								# marker space = $2
+				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[:][ ]+						# definition mark (colon)
+			)
+			((?s:.+?))						# definition text = $3
+			(?= \n+ 						# stop at next definition mark,
+				(?:							# next term or end of text
+					[ ]{0,'.$less_than_tab.'} [:][ ]	|
+					<dt> | \z
+				)						
+			)					
+			}xm',
+			array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+	function _processDefListItems_callback_dt($matches) {
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		foreach ($terms as $term) {
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n<dt>" . $term . "</dt>";
+		}
+		return $text . "\n";
+	}
+	function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			# Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n<dd>" . $def . "</dd>\n";
+	}
+
+
+	function doFencedCodeBlocks($text) {
+	#
+	# Adding the fenced code block syntax to regular Markdown:
+	#
+	# ~~~
+	# Code block
+	# ~~~
+	#
+		$less_than_tab = $this->tab_width;
+		
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					~{3,} # Marker: three tilde or more.
+				)
+				[ ]* \n # Whitespace and newline following marker.
+				
+				# 2: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+				
+				# Closing marker.
+				\1 [ ]* \n
+			}xm',
+			array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doFencedCodeBlocks_callback($matches) {
+		$codeblock = $matches[2];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback('/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+		$codeblock = "<pre><code>$codeblock</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+	function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("<br$this->empty_element_suffix", 
+			strlen($matches[0]));
+	}
+
+
+	#
+	# Redefining emphasis markers so that emphasis by underscore does not
+	# work in the middle of a word.
+	#
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
+		);
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+		
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+			
+			# Check if this should be enclosed in a paragraph.
+			# Clean tag hashes & block tag hashes are left alone.
+			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+			
+			if ($is_p) {
+				$value = "<p>$value</p>";
+			}
+			$grafs[$key] = $value;
+		}
+		
+		# Join grafs in one text, then unhash HTML tags. 
+		$text = implode("\n\n", $grafs);
+		
+		# Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+		
+		return $text;
+	}
+	
+	
+	### Footnotes
+	
+	function stripFootnotes($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:					
+					.+				# actual text
+				|
+					\n				# newlines but 
+					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+									# by non-indented content
+				)*
+			)		
+			}xm',
+			array(&$this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+	function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; # String that will replace the block
+	}
+
+
+	function doFootnotes($text) {
+	#
+	# Replace footnote references in $text [^id] with a special text-token 
+	# which will be replaced by the actual footnote marker in appendFootnotes.
+	#
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+	
+	function appendFootnotes($text) {
+	#
+	# Append footnote list to text.
+	#
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+			array(&$this, '_appendFootnotes_callback'), $text);
+	
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "<div class=\"footnotes\">\n";
+			$text .= "<hr". $this->empty_element_suffix ."\n";
+			$text .= "<ol>\n\n";
+			
+			$attr = " rev=\"footnote\"";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$num = 0;
+			
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+				
+				$footnote .= "\n"; # Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");				
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+					array(&$this, '_appendFootnotes_callback'), $footnote);
+				
+				$attr = str_replace("%%", ++$num, $attr);
+				$note_id = $this->encodeAttribute($note_id);
+				
+				# Add backlink to last paragraph; create new paragraph if needed.
+				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
+				if (preg_match('{</p>$}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+				} else {
+					$footnote .= "\n\n<p>$backlink</p>";
+				}
+				
+				$text .= "<li id=\"fn:$note_id\">\n";
+				$text .= $footnote . "\n";
+				$text .= "</li>\n\n";
+			}
+			
+			$text .= "</ol>\n";
+			$text .= "</div>";
+		}
+		return $text;
+	}
+	function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+		
+		# Create footnote marker only if it has a corresponding footnote *and*
+		# the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			# Transfert footnote content to the ordered list.
+			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+			unset($this->footnotes[$node_id]);
+			
+			$num = $this->footnote_counter++;
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			
+			$attr = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+			
+			return
+				"<sup id=\"fnref:$node_id\">".
+				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"</sup>";
+		}
+		
+		return "[^".$matches[1]."]";
+	}
+		
+	
+	### Abbreviations ###
+	
+	function stripAbbreviations($text) {
+	#
+	# Strips abbreviations from text, stores titles in hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)	
+			}xm',
+			array(&$this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+	function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		if ($this->abbr_word_re)
+			$this->abbr_word_re .= '|';
+		$this->abbr_word_re .= preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; # String that will replace the block
+	}
+	
+	
+	function doAbbreviations($text) {
+	#
+	# Find defined abbreviations in text and wrap them in <abbr> elements.
+	#
+		if ($this->abbr_word_re) {
+			// cannot use the /x modifier because abbr_word_re may 
+			// contain significant spaces:
+			$text = preg_replace_callback('{'.
+				'(?<![\w\x1A])'.
+				'(?:'.$this->abbr_word_re.')'.
+				'(?![\w\x1A])'.
+				'}', 
+				array(&$this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+	function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("<abbr>$abbr</abbr>");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
+
+}
+
+
+/*
+
+PHP Markdown Extra
+==================
+
+Description
+-----------
+
+This is a PHP port of the original Markdown formatter written in Perl 
+by John Gruber. This special "Extra" version of PHP Markdown features 
+further enhancements to the syntax for making additional constructs 
+such as tables and definition list.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+<http://daringfireball.net/projects/markdown/>
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+<michel.fortin@michelf.com>
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+--------------- 
+
+See the readme file for detailed release notes for this version.
+
+
+Copyright and License
+---------------------
+
+PHP Markdown & Extra  
+Copyright (c) 2004-2009 Michel Fortin  
+<http://michelf.com/>  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+<http://daringfireball.net/>   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+*	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+*	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+*	Neither the name "Markdown" nor the names of its contributors may
+	be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+*/
+
+
+
+
+/**
+ * MarkdownExtra for Feather, passes URLs through the URL class.
+ */
+class MarkdownFeather_Parser extends MarkdownExtra_Parser {
+
+	/**
+	 * Extended to pass URLs through Laravel.
+	 *
+	 * @internal
+	 * @param  array  $matches
+	 * @return string
+	 * @uses Laravel\URL::to()
+	 */
+	function _doAnchors_inline_callback($matches)
+	{
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url       = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title     = isset($matches[7]) ? $matches[7] : null;
+
+		$url = $this->encodeAttribute($url);
+
+		// BEGIN: Modification to pass URLs through Laravel
+		if ($url[0] !== '#' and is_null(parse_url($url, PHP_URL_SCHEME)))
+		{
+			$url = \Feather\URL::to($url);
+		}
+		// END
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+	/**
+	 * Extended to pass URLs through Laravel.
+	 *
+	 * @internal
+	 * @param  array  $matches
+	 * @return string
+	 * @uses Laravel\URL::to_asset()
+	 */
+	function _doImages_inline_callback($matches)
+	{
+		$alt_text = $matches[2];
+		$url      = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title    = isset($matches[7]) ? $matches[7] : null;
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeAttribute($url);
+
+		// BEGIN: Modification to pass URLs through Laravel
+		if ($url[0] !== '#' and is_null(parse_url($url, PHP_URL_SCHEME)))
+		{
+			$url = \Feather\URL::to_asset($url);
+		}
+		// END
+
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\""; # $title already quoted
+		}
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+}

From c0a2e4e2f51b7bd3d59209fde41df7f162e7d4e0 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Mon, 24 Sep 2012 01:15:51 +0930
Subject: [PATCH 131/136] Initial commit of the harmonize gear.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 gears/harmonize/config/initialize.php | 34 +++++++++++++++++++++++++++
 gears/harmonize/gear.json             | 12 ++++++++++
 gears/harmonize/harmonize.gear.php    | 32 +++++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 gears/harmonize/config/initialize.php
 create mode 100644 gears/harmonize/gear.json
 create mode 100644 gears/harmonize/harmonize.gear.php

diff --git a/gears/harmonize/config/initialize.php b/gears/harmonize/config/initialize.php
new file mode 100644
index 0000000..25885fd
--- /dev/null
+++ b/gears/harmonize/config/initialize.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Harmonize Initialization
+|--------------------------------------------------------------------------
+|
+| This closure should contain the logic for fetching a logged in user of
+| your application. The 'id', 'username', and 'email' of that user need to
+| be passed as credentials to the authorize method.
+|
+| That's it! Feather will take care of the rest and attempt to sign your
+| authenticated user in.
+|
+*/
+
+return function($feather)
+{
+	// Feather uses a custom driver for authentication. You should use the driver
+	// your application uses for authentication to fetch the logged in user. Below
+	// we are using the 'fluent' driver to fetch the logged in user.
+	if($user = Auth::driver('fluent')->user())
+	{
+		$credentials = array(
+			'id'	   => $user->id,
+			'username' => $user->username,
+			'email'	   => $user->email
+		);
+
+		// Attempt to authorize the user. Feather will deal with the response,
+		// all that needs to be done is the credentials passed in.
+		return $feather['sso']->authorize($credentials);
+	}
+}
\ No newline at end of file
diff --git a/gears/harmonize/gear.json b/gears/harmonize/gear.json
new file mode 100644
index 0000000..51a79f5
--- /dev/null
+++ b/gears/harmonize/gear.json
@@ -0,0 +1,12 @@
+{
+	"name":"Harmonize",
+	"description":"A Laravel application integration gear that allows Single Sign On.",
+	"version":"1.0.0",
+	"author":
+	{
+		"name":"Jason Lewis",
+		"email":"jason.lewis1991@gmail.com",
+		"website":"http://jasonlewis.me"
+	},
+	"dependencies":{}
+}
\ No newline at end of file
diff --git a/gears/harmonize/harmonize.gear.php b/gears/harmonize/harmonize.gear.php
new file mode 100644
index 0000000..7abbfe5
--- /dev/null
+++ b/gears/harmonize/harmonize.gear.php
@@ -0,0 +1,32 @@
+<?php namespace Feather\Gear\Harmonize;
+
+use Feather\Components\Gear\Foundation;
+
+class Harmonize extends Foundation {
+
+	/**
+	 * Tell Harmonize to listen for its event to be fired so that it can run.
+	 * 
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$this->listen('auth: bootstrap harmonize', 'bootstrap');
+	}
+
+	/**
+	 * Bootstrap the Harmonize plugin. Run the users initializer.
+	 * 
+	 * @return mixed
+	 */
+	public function bootstrap()
+	{
+		$initializer = $this->feather['config']->get('gear: harmonize initialize');
+
+		if($response = $initializer($this->feather))
+		{
+			return $response;
+		}
+	}
+
+}
\ No newline at end of file

From 72c82065cd52242b365270a1d0bff1a0b4bc1bac Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Mon, 24 Sep 2012 01:48:40 +0930
Subject: [PATCH 132/136] Finally added in some extra permission checking on
 places.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 components/auth/authorizer.php | 38 ++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/components/auth/authorizer.php b/components/auth/authorizer.php
index dfd575f..27b2d5c 100644
--- a/components/auth/authorizer.php
+++ b/components/auth/authorizer.php
@@ -80,9 +80,9 @@ public function can($action, $resource = null)
 				{
 					if($this->feather['config']->has("feather: auth.rules.{$verb}.{$action}"))
 					{
-						$callback = $this->feather['config']->get("feather: auth.rules.{$verb}.{$action}");
+						$resolver = $this->feather['config']->get("feather: auth.rules.{$verb}.{$action}");
 
-						return $callback($resource);
+						return $resolver($resource);
 					}
 
 					continue;
@@ -94,6 +94,40 @@ public function can($action, $resource = null)
 			}
 		}
 
+		// If we have a resource and it's an instance of Place then we need to perform a couple extra
+		// permission checks on it.
+		if($resource instanceof \Feather\Core\Place)
+		{
+			// Some places are not postable, make sure we aren't trying to start a discussion
+			// in a non-postable place.
+			if(in_array($verb, array('start')) and !$resource->postable)
+			{
+				return false;
+			}
+
+			foreach($resource->permissions as $permission)
+			{
+				if(array_key_exists($permission->role_id, $this->user->roles))
+				{
+					if($permission->{"{$verb}_{$action}"})
+					{
+						return true;
+					}
+				}
+			}
+		}
+
+		// Regardless, we need to run through the authentication rules in the configuration file.
+		else
+		{
+			if($this->feather['config']->has("feather: auth.rules.{$verb}.{$action}"))
+			{
+				$resolver = $this->feather['config']->get("feather: auth.rules.{$verb}.{$action}");
+
+				return $resolver($resource);
+			}
+		}
+
 		// Sorry chum, but you can't do that!
 		return false;
 	}

From f3744fea52a50bdf66c74602120b6dc9b02bf3ee Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Mon, 24 Sep 2012 02:57:19 +0930
Subject: [PATCH 133/136] Fixed bug with date component regarding the meta
 date.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 components/support/date.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/support/date.php b/components/support/date.php
index 113bc9a..21b22b0 100644
--- a/components/support/date.php
+++ b/components/support/date.php
@@ -73,7 +73,9 @@ public function set($date)
 	 */
 	public function meta($date)
 	{
-		return '<span title="' . $this->show('long') . '">' . $date->relative('short') . '</span>';
+		$this->set($date);
+
+		return '<span title="' . $this->show('long') . '">' . $this->relative('short') . '</span>';
 	}
 
 	/**

From 4067073788a934894d0a57c7d46bf51ed7aee920 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Mon, 24 Sep 2012 02:59:03 +0930
Subject: [PATCH 134/136] A whole lot of refactoring and porting. Index page is
 now working again.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 applications/core/controllers/index.php       |   6 +-
 applications/core/language/en/place.php       |  16 +
 applications/core/models/discussion.php       | 299 ++++++++++++++++
 .../core/models/discussion/participant.php    |  21 ++
 applications/core/models/nothing.php          |  16 +
 applications/core/models/permission.php       |  31 ++
 .../core/models/permission/profile.php        |  24 ++
 applications/core/models/place.php            | 324 ++++++++++++++++++
 applications/core/models/place/moderator.php  |  34 ++
 applications/core/models/user/role.php        |  14 +
 applications/core/routes.php                  |  20 +-
 applications/core/views/index/home.blade.php  |  58 ++++
 .../core/views/index/overview.blade.php       |   1 -
 .../views/place/partial/children.blade.php    |  36 ++
 .../views/place/partial/discussion.blade.php  |  66 ++++
 applications/core/views/place/view.blade.php  |  43 +++
 16 files changed, 998 insertions(+), 11 deletions(-)
 create mode 100644 applications/core/language/en/place.php
 create mode 100644 applications/core/models/discussion.php
 create mode 100644 applications/core/models/discussion/participant.php
 create mode 100644 applications/core/models/nothing.php
 create mode 100644 applications/core/models/permission.php
 create mode 100644 applications/core/models/permission/profile.php
 create mode 100644 applications/core/models/place/moderator.php
 create mode 100644 applications/core/models/user/role.php
 create mode 100644 applications/core/views/index/home.blade.php
 delete mode 100644 applications/core/views/index/overview.blade.php
 create mode 100644 applications/core/views/place/partial/children.blade.php
 create mode 100644 applications/core/views/place/partial/discussion.blade.php
 create mode 100644 applications/core/views/place/view.blade.php

diff --git a/applications/core/controllers/index.php b/applications/core/controllers/index.php
index 99f8794..3508889 100644
--- a/applications/core/controllers/index.php
+++ b/applications/core/controllers/index.php
@@ -10,9 +10,9 @@ class Feather_Core_Index_Controller extends Feather_Base_Controller {
 	 */
 	public function get_index()
 	{
-		//$places = Feather\Models\Place::overview($this->feather['config']->get('feather: db.overview.discussions_per_place'));
+		$places = Feather\Core\Place::index($this->config->get('feather: db.overview.discussions_per_place'));
 
-		$this->layout->nest('content', 'core::index.overview');
+		$this->layout->nest('content', 'feather core::index.home', compact('places'));
 	}
 
 	/**
@@ -23,7 +23,7 @@ public function get_index()
 	 */
 	public function get_login()
 	{
-		if($this->feather['auth']->online())
+		if($this->auth->online())
 		{
 			return $this->redirect->to_route('feather');
 		}
diff --git a/applications/core/language/en/place.php b/applications/core/language/en/place.php
new file mode 100644
index 0000000..344cb05
--- /dev/null
+++ b/applications/core/language/en/place.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Place Language Strings
+|--------------------------------------------------------------------------
+|
+| English language rules for place related tasks.
+|
+*/
+
+return array(
+
+	'no_discussions' => 'There are no discussions to show for this place.'
+
+);
\ No newline at end of file
diff --git a/applications/core/models/discussion.php b/applications/core/models/discussion.php
new file mode 100644
index 0000000..a2f1862
--- /dev/null
+++ b/applications/core/models/discussion.php
@@ -0,0 +1,299 @@
+<?php namespace Feather\Core;
+
+use DB;
+use Str;
+use Cache;
+use FeatherModelException;
+
+class Discussion extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'discussions';
+
+	/**
+	 * Timestamps are enabled.
+	 * 
+	 * @var bool
+	 */
+	public static $timestamps = true;
+
+	/**
+	 * A discussion has one author.
+	 *
+	 * @return object
+	 */
+	public function author()
+	{
+		return $this->belongs_to('Feather\\Core\\User', 'user_id');
+	}
+
+	/**
+	 * A discussion might have a recent poster, otherwise it has nothing.
+	 * 
+	 * @return object
+	 */
+	public function recent()
+	{
+		if($this->last_reply_user_id)
+		{
+			return $this->belongs_to('Feather\\Core\\User', 'last_reply_user_id');
+		}
+		else
+		{
+			return new Nothing;
+		}
+	}
+
+	/**
+	 * A discussion has a place.
+	 * 
+	 * @return object
+	 */
+	public function place()
+	{
+		return $this->belongs_to('Feather\\Core\\Place', 'place_id');
+	}
+
+	/**
+	 * A discussion can have many participants.
+	 * 
+	 * @return object
+	 */
+	public function participants()
+	{
+		return $this->has_many('Feather\\Core\\Discussion\\Participant', 'discussion_id');
+	}
+
+	/**
+	 * Getter for a discussions slug.
+	 * 
+	 * @return string
+	 */
+	public function get_slug()
+	{
+		return Str::slug($this->get_attribute('title'));
+	}
+
+	/**
+	 * Getter for the replies. Turns it into a readable format.
+	 * 
+	 * @return string
+	 */
+	public function get_short_replies()
+	{
+		return $this->shortner($this->get_attribute('replies'));
+	}
+
+	/**
+	 * Getter for the views. Turns it into a readable format.
+	 * 
+	 * @return string
+	 */
+	public function get_short_views()
+	{
+		return $this->shortner($this->get_attribute('views'));
+	}
+
+	/**
+	 * Shorten the replies and views numbers
+	 * 
+	 * @param  int  $number
+	 * @return string
+	 */
+	protected function shortner($number)
+	{
+		// Oh wow, under a 1,000... Not bad.
+		if($number < 1000)
+		{
+			$number = number_format($number);
+		}
+		// Hold up, getting up in the thousands!
+		elseif($number < 1000000)
+		{
+			$number = number_format($number / 1000, 1) . 'K';
+		}
+		// Ah-hoy! A million!
+		elseif($number < 1000000000)
+		{
+			$number = number_format($number / 1000000, 1) . 'M';
+		}
+		// CRIKEY! A biollion!?
+		else
+		{
+			$number = number_format($number / 1000000000, 1) . 'B';
+		}
+
+		return str_replace('.0', '', $number);
+	}
+
+	/**
+	 * Start a new discussion.
+	 * 
+	 * @param  array  $input
+	 * @return object
+	 */
+	public static function start($input)
+	{
+		return static::edit(new static, $input);
+	}
+
+	/**
+	 * Edit an existing discussion.
+	 * 
+	 * @param  object  $discussion
+	 * @param  array   $input
+	 * @return object
+	 */
+	public static function edit($discussion, $input)
+	{
+		$increment = false;
+
+		// If the discussion exists then we are only going to increment the total
+		// discussions for the place if the discussion is being saved from a draft
+		// to public viewing.
+		if($discussion->exists)
+		{
+			$increment = $discussion->draft ? (isset($input['draft']) ? false : true) : false;
+		}
+
+		// If the discussion doesn't exist we only increment the total discussions
+		// if the discussion is being started, not drafted.
+		else
+		{
+			$increment = isset($input['start']);
+		}
+
+		$place = Place::find($input['place']);
+
+		$discussion->fill(array(
+			'place_id' => $input['place'],
+			'user_id'  => $input['user'],
+			'title'	   => isset($input['draft']) ? (empty($input['title']) ? 'Untitled Discussion' : $input['title']) : $input['title'],
+			'body'	   => $input['body'],
+			'private'  => empty($input['participants']) ? 0 : 1,
+			'draft'	   => isset($input['draft']) ? 1 : 0
+		));
+
+		if(!$discussion->save())
+		{
+			throw new FeatherModelException;
+		}
+
+		// If starting a discussion or saving a drafted discussion for public viewing we
+		// increment the places total discussions by one.
+		if($increment)
+		{
+			$place->total_discussions += 1;
+
+			$place->save();
+
+			// We can now increment the users discussion count by one if the place allows
+			// for a user post count increase.
+			if($place->user_post_increment)
+			{
+				$user = User::find($input['user']);
+
+				$user->total_discussions += 1;
+
+				$user->save();
+			}
+		}
+
+		$participants = array();
+
+		foreach(explode(',', $input['participants']) as $participant)
+		{
+			$participants[] = trim($participant);
+		}
+
+		$participants = array_filter($participants);
+
+		// Grab all the participants info from the database, make sure they're all valid then
+		// use their IDs.
+		if($participants and $users = User::where_in('username', $participants)->get())
+		{
+			$participants = array();
+
+			foreach($users as $key => $user)
+			{
+				$participants[$user->id] = array(
+					'user_id'		=> $user->id,
+					'discussion_id' => $discussion->id
+				);
+			}
+		}
+
+		// If this discussion is private we need to add the participants to the participants
+		// table. Sync the table, remove any that were removed and add any new ones.
+		if($discussion->participants)
+		{
+			// First thing is to delete any participants where the IDs are not in the
+			// submitted participants for this discussion.
+			if($participants)
+			{
+				Discussion\Participants::where_not_in('user_id', array_keys($participants))->where_discussion_id($discussion->id)->delete();
+			}
+			else
+			{
+				Discussion\Participants::where_discussion_id($discussion->id)->delete();
+			}
+
+			// Spin through the discussions existing participants and remove them from the
+			// array if they are already participating.
+			foreach($discussion->participants as $participant)
+			{
+				if(isset($participants[$participant->id]))
+				{
+					unset($participants[$participant->id]);
+				}
+			}
+		}
+
+		if($participants)
+		{
+			Discussion\Participants::insert($participants);
+		}
+
+		// Clear the cache for this discussion, as well as the place it belongs, all places,
+		// and the current user.
+		Cache::forget("discussion_{$discussion->id}");
+
+		Cache::forget("place_{$discussion->place_id}");
+
+		Cache::forget('places');
+
+		Cache::forget("user_{$discussion->user_id}");
+
+		return $discussion;
+	}
+
+	/**
+	 * Converts participant IDs into a comma separated string.
+	 * 
+	 * @return string
+	 */
+	public function participants_to_string()
+	{
+		$ids = $participants = array();
+
+		foreach($this->participants as $participant)
+		{
+			$ids[] = $participant->user_id;
+		}
+
+		if($ids and $users = User::where_in('id', $ids)->get())
+		{
+			foreach($users as $user)
+			{
+				$participants[] = $user->username;
+			}
+		}
+
+		return implode(', ', $participants);
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/models/discussion/participant.php b/applications/core/models/discussion/participant.php
new file mode 100644
index 0000000..bca4037
--- /dev/null
+++ b/applications/core/models/discussion/participant.php
@@ -0,0 +1,21 @@
+<?php namespace Feather\Core\Discussion;
+
+use Feather\Core\Base;
+
+class Participant extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'discussion_participants';
+
+	/**
+	 * Timestamps are disabled.
+	 * 
+	 * @var bool
+	 */
+	public static $timestamps = false;
+
+}
\ No newline at end of file
diff --git a/applications/core/models/nothing.php b/applications/core/models/nothing.php
new file mode 100644
index 0000000..3bc668c
--- /dev/null
+++ b/applications/core/models/nothing.php
@@ -0,0 +1,16 @@
+<?php namespace Feather\Core;
+
+class Nothing {
+
+	/**
+	 * Nothing only needs to return no results, because a there is nothing in
+	 * this relationship.
+	 * 
+	 * @return array
+	 */
+	public function results()
+	{
+		return array();
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/models/permission.php b/applications/core/models/permission.php
new file mode 100644
index 0000000..0d6c46c
--- /dev/null
+++ b/applications/core/models/permission.php
@@ -0,0 +1,31 @@
+<?php namespace Feather\Core;
+
+use Feather\Core\Base;
+
+class Permission extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'permissions';
+
+	/**
+	 * Timestamps are disabled.
+	 * 
+	 * @var bool
+	 */
+	public static $timestamps = false;
+
+	/**
+	 * Permissions can belong to a profile.
+	 * 
+	 * @return object
+	 */
+	public function profile()
+	{
+		return $this->belongs_to('Feather\\Core\\Permission\\Profile', 'profile_id');
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/models/permission/profile.php b/applications/core/models/permission/profile.php
new file mode 100644
index 0000000..482b4a4
--- /dev/null
+++ b/applications/core/models/permission/profile.php
@@ -0,0 +1,24 @@
+<?php namespace Feather\Core\Permission;
+
+use Feather\Core\Base;
+
+class Profile extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'permission_profiles';
+
+	/**
+	 * A profile has many permissions.
+	 * 
+	 * @return object
+	 */
+	public function permissions()
+	{
+		return $this->has_many('Feather\\Admin\\Core\\Permission', 'profile_id');
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/models/place.php b/applications/core/models/place.php
index 850f5e1..8093d8d 100644
--- a/applications/core/models/place.php
+++ b/applications/core/models/place.php
@@ -1,5 +1,9 @@
 <?php namespace Feather\Core;
 
+use DB;
+use Cache;
+use Feather\Auth;
+
 class Place extends Ness {
 
 	/**
@@ -46,4 +50,324 @@ public function discussions()
 		return $this->has_many('Feather\\Models\\Discussion', 'place_id');
 	}
 
+	/**
+	 * Returns all enriched places.
+	 * 
+	 * @return array
+	 */
+	public static function all()
+	{
+		return Cache::remember('places', function()
+		{
+			$table = DB::connection(FEATHER_DATABASE)->config['prefix'] . Place::$table;
+
+			$sql = "SELECT node.*, (COUNT( parent.name ) -1) AS depth
+				FROM {$table} AS node
+				CROSS JOIN places AS parent
+				WHERE node.lft BETWEEN parent.lft
+				AND parent.rgt
+				GROUP BY node.id
+				ORDER BY node.lft";
+
+			return Place::enrichment(DB::connection(FEATHER_DATABASE)->query($sql));
+		}, static::cache_time);
+	}
+
+	public static function index($discussions_per_place)
+	{
+		$places = static::filter_by_permissions(static::all());
+
+		list($sorted, $pivot) = static::sort($places);
+
+		// Spin through the sorted places and build an array of all the IDs including the child places.
+		// We'll then fetch the discussions for each place. This isn't exactly ideal but generally there
+		// shouldn't be a whole lot of root level places.
+		$discussions = array();
+
+		foreach($sorted as $place)
+		{
+			$ids = (array) $place->id;
+
+			foreach($place->children as $child) $ids[] = $child->id;
+
+			foreach(Discussion::with(array('author', 'participants'))->where_in('place_id', $ids)->order_by('updated_at', 'desc')->take($discussions_per_place * 3)->get() as $discussion)
+			{
+				$discussions[] = $discussion;
+			}
+		}
+
+		// Tally the total number of discussions within each place.
+		$totals = static::tally_discussions($places);
+
+		// Returns a refined array consisting of all places with the correct discussions
+		// and totals assigned to it.
+		return static::refine($discussions, $places, $sorted, $pivot, $totals, $discussions_per_place);
+	}
+
+	/**
+	 * Filters discussions into the correct parent place and tallies up the remaining discussions for
+	 * each.
+	 * 
+	 * @param  array   $discussions
+	 * @param  array   $places
+	 * @param  array   $sorted
+	 * @param  array   $intermediate
+	 * @param  string  $limit
+	 * @param  int     $totals
+	 * @return array
+	 */
+	protected static function refine($discussions, $places, $sorted, $pivot, $totals, $limit)
+	{
+		// Discussions need to be ordered by their updated_at datetime field and then placed into their
+		// respective ancestors array.
+		$ordered = array();
+
+		foreach($discussions as $discussion)
+		{
+			if(Auth::cannot('view: discussion', $discussion))
+			{
+				continue;
+			}
+
+			$discussion->place = $places[$discussion->place_id];
+
+			// If the discussions place is a child then we need to use it's parent ID.
+			$id = $discussion->place->child ? $discussion->place->parent_id : $discussion->place->id;
+
+			$ordered[$id]["{$discussion->updated_at} {$discussion->id}"] = $discussion;
+
+			// Re-order the ordered discussions by key and in reverse. Newest first.
+			krsort($ordered[$id]);
+		}
+
+		// Loop over the ordered results and add the latest discussions to each until
+		// the limit is reached.
+		$filtered = array();
+
+		foreach($ordered as $id => $discussions)
+		{
+			foreach($discussions as $discussion)
+			{
+				if(!array_key_exists($id, $filtered) or count($filtered[$id]) < $limit)
+				{
+					$filtered[$id][] = $discussion;
+				}
+				else
+				{
+					break;
+				}
+			}
+		}
+
+		// Loop over the places array and tally up the total discussions for each place.
+		foreach($places as $place)
+		{
+			// If the discussions place is a child then we need to use it's parent ID.
+			$id = isset($place->parent_id) ? $place->parent_id : $place->id;
+
+			// Update the discussion counter for the root level place.
+			$sorted[$pivot[$id]]->total->discussions += $totals[$place->id];
+
+			// To achieve a cascading discussion count, the child and all its ancestors also
+			// get the places discussions added to their total.
+			foreach($sorted[$pivot[$id]]->children as $key => $child)
+			{
+				if($place->id == $child->id or ($place->lft > $child->lft and $place->rgt < $child->rgt))
+				{
+					$sorted[$pivot[$id]]->relationships['children'][$key]->total->discussions += $totals[$place->id];
+				}
+			}
+		}
+
+		foreach($places as $place)
+		{
+			$place->discussions = array();
+
+			if(array_key_exists($place->id, $filtered))
+			{
+				$place->discussions = $filtered[$place->id];
+
+				$place->total->remaining = $place->total->discussions - count($filtered[$place->id]);
+			}
+		}
+
+		return $sorted;
+	}
+
+	/**
+	 * Count the total number of discussions for each place.
+	 * 
+	 * @param  array  $places
+	 * @return array
+	 */
+	protected static function tally_discussions($places)
+	{
+		// Creates an array where the keys are the place IDs and the value for each is 0.
+		$totals = array_fill_keys(array_keys(array_flip(array_keys($places))), 0);
+
+		if(empty($places)) return $totals;
+
+		$aggregates = Discussion::select(array('place_id', DB::raw('COUNT(*) as aggregate')))
+						->where_in('place_id', array_keys($places))
+						->group_by('place_id')
+						->get();
+
+		foreach($aggregates as $aggregate)
+		{
+			$totals[$aggregate->place_id] = $aggregate->aggregate;
+		}
+
+		return $totals;
+	}
+
+	/**
+	 * Takes an array of places and transforms it into a multi-dimensional array of places
+	 * sorted into their greatest grand parent.
+	 * 
+	 * @param  array  $places
+	 * @return array
+	 */
+	protected static function sort($places)
+	{
+		$sorted = $pivot = array();
+
+		foreach($places as $place)
+		{
+			if($place->parent and !$place->depth)
+			{
+				$sorted[] = $place;
+
+				$pivot[$place->id] = count($sorted) - 1;
+
+				$gauge = $place->depth;
+			}
+			else
+			{
+				$place->parent_id = $sorted[count($sorted) - 1]->id;
+
+				$sorted[count($sorted) - 1]->relationships['children'][] = $place;
+			}
+		}
+
+		return array($sorted, $pivot);
+	}
+
+	/**
+	 * Filters out places a user cannot view due to permissions.
+	 * 
+	 * @param  array  $places
+	 * @return array
+	 */
+	protected static function filter_by_permissions($places)
+	{
+		// Store the previous ID here so that we can check if the last place was a parent,
+		// and if we remove a child we'll check to see if it is no longer a parent.
+		$previous = null;
+
+		// If a childs parent is not visible to a user then the child is also deemed
+		// not visible.
+		$until = null;
+
+		// Make sure the user has the correct permissions to view the places.
+		foreach((array) $places as $place)
+		{
+			if(Auth::cannot('view: place', $place) or $place->rgt < $until)
+			{
+				// If the previous item is a parent then we'll subtract its right value until
+				// it no longer becomes a parent.
+				if($previous and $places[$previous]->parent)
+				{
+					$places[$previous]->rgt -= ($place->rgt - $place->lft) + 1;
+
+					if($places[$previous]->rgt - $places[$previous]->lft <= 1)
+					{
+						$places[$previous]->parent = false;
+					}
+				}
+
+				// If this place is a parent then we remove all of its children as well.
+				if($place->parent)
+				{
+					$until = $place->rgt;
+				}
+
+				unset($places[$place->id]);
+
+				continue;
+			}
+
+			$previous = $place->id;
+		}
+
+
+		return $places;
+	}
+
+	/**
+	 * Enriches an array of places with some extremely useful properties that are used throughout
+	 * the system.
+	 * 
+	 * @param  array   $places
+	 * @param  string  $selected
+	 * @return array
+	 */
+	protected static function enrichment($places, $selected = null)
+	{
+		$enriched = array();
+
+		foreach($places as $place)
+		{
+			if(!$place instanceof Place)
+			{
+				$place = new static((array) $place, true);
+			}
+
+			$place->attributes = array_merge($place->attributes, array(
+				'parent'   => ($place->rgt - $place->lft) > 1,
+				'child'	   => ($place->depth > 0),
+				'selected' => ($place->slug == $selected),
+				'total'	   => (object) array('discussions' => 0, 'remaining' => 0)
+			));
+
+			$place->relationships = array_merge($place->relationships, array(
+				'children'	  => array(),
+				'moderators'  => array(),
+				'permissions' => array()
+			));
+
+			// Setting the original to be the same as the attributes prevents all the special properties from
+			// being seen as dirty and thus saved when we save a place.
+			$place->original = $place->attributes;
+
+			$enriched[$place->id] = $place;
+		}
+
+		if($enriched)
+		{
+			// Fetch all of the permissions for all of the places. Once we have the permissions we'll
+			// loop over all the permissions and assign them to their correct place.
+			$permissions = Permission::where_in('place_id', array_keys($enriched))->get();
+
+			foreach($permissions as $permission)
+			{
+				$enriched[$permission->place_id]->relationships['permissions'][$permission->id] = $permission;
+			}
+
+			unset($permissions);
+
+			// We'll do the same with the moderators as we did with the permissions. Find them all then assign
+			// them to the correct place.
+			$moderators = Place\Moderator::with('details')->where_in('place_id', array_keys($enriched))->get();
+
+			foreach($moderators as $moderator)
+			{
+				$enriched[$moderator->place_id]->relationships['moderators'][$moderator->id] = $moderator;
+			}
+
+			unset($moderators);
+		}
+
+		return $enriched;
+	}
+
 }
\ No newline at end of file
diff --git a/applications/core/models/place/moderator.php b/applications/core/models/place/moderator.php
new file mode 100644
index 0000000..18a5295
--- /dev/null
+++ b/applications/core/models/place/moderator.php
@@ -0,0 +1,34 @@
+<?php namespace Feather\Core\Place;
+
+use Feather\Core\Base;
+
+class Moderator extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'place_moderators';
+
+	/**
+	 * A moderator has details, that is, their user account.
+	 * 
+	 * @return object
+	 */
+	public function details()
+	{
+		return $this->belongs_to('Feather\\Core\\User', 'user_id');
+	}
+
+	/**
+	 * A moderator belongs to a place.
+	 * 
+	 * @return object
+	 */
+	public function place()
+	{
+		return $this->belongs_to('Feather\\Core\\Place', 'place_id');
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/models/user/role.php b/applications/core/models/user/role.php
new file mode 100644
index 0000000..45aa141
--- /dev/null
+++ b/applications/core/models/user/role.php
@@ -0,0 +1,14 @@
+<?php namespace Feather\Core\User;
+
+use Feather\Core\Base;
+
+class Role extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'user_roles';
+	
+}
\ No newline at end of file
diff --git a/applications/core/routes.php b/applications/core/routes.php
index dceb16b..0550cf9 100644
--- a/applications/core/routes.php
+++ b/applications/core/routes.php
@@ -1,5 +1,11 @@
 <?php
 
+/*
+|--------------------------------------------------------------------------
+| Feather Homepage
+|--------------------------------------------------------------------------
+*/
+
 Route::get('(:bundle)', array('as' => 'feather', 'uses' => 'feather core::index@index'));
 
 /*
@@ -18,8 +24,8 @@
 |--------------------------------------------------------------------------
 */
 
-Route::get('(:bundle)/members', array('as' => 'members', 'uses' => 'feather::members@index'));
-Route::get('(:bundle)/profile/(:any)', array('as' => 'profile', 'uses' => 'feather::profile@index'));
+Route::get('(:bundle)/members', array('as' => 'members', 'uses' => 'feather core::members@index'));
+Route::get('(:bundle)/profile/(:any)', array('as' => 'profile', 'uses' => 'feather core::profile@index'));
 
 /*
 |--------------------------------------------------------------------------
@@ -27,7 +33,7 @@
 |--------------------------------------------------------------------------
 */
 
-Route::get('(:bundle)/place/(:num)-(:any)/(:page?)', array('as' => 'place', 'uses' => 'feather::place@place'));
+Route::get('(:bundle)/place/(:num)-(:any)/(:page?)', array('as' => 'place', 'uses' => 'feather core::place@place'));
 
 /*
 |--------------------------------------------------------------------------
@@ -35,10 +41,10 @@
 |--------------------------------------------------------------------------
 */
 
-Route::any('(:bundle)/discussion/start', array('as' => 'start.discussion', 'uses' => 'feather::discussion@start'));
-Route::any('(:bundle)/place/(:num)-(:any)/start', 'feather::discussion@start');
-Route::any('(:bundle)/discussion/(:num)-(:any)/(:page?)', array('as' => 'discussion', 'uses' => 'feather::discussion@index'));
-Route::any('(:bundle)/discussion/(:num)-(:any)/edit', array('as' => 'discussion.edit', 'uses' => 'feather::discussion@edit'));
+Route::any('(:bundle)/discussion/start', array('as' => 'start.discussion', 'uses' => 'feather core::discussion@start'));
+Route::any('(:bundle)/place/(:num)-(:any)/start', 'feather core::discussion@start');
+Route::any('(:bundle)/discussion/(:num)-(:any)/(:page?)', array('as' => 'discussion', 'uses' => 'feather core::discussion@index'));
+Route::any('(:bundle)/discussion/(:num)-(:any)/edit', array('as' => 'discussion.edit', 'uses' => 'feather core::discussion@edit'));
 
 /*
 |--------------------------------------------------------------------------
diff --git a/applications/core/views/index/home.blade.php b/applications/core/views/index/home.blade.php
new file mode 100644
index 0000000..ec091aa
--- /dev/null
+++ b/applications/core/views/index/home.blade.php
@@ -0,0 +1,58 @@
+@if(empty($places))
+
+	<h1>There's nothing here</h1>
+
+	<p>
+		You may not have the correct permissions to view any places or discussions. Or <em>someone</em> is a little lazy and hasn't created any yet.
+	</p>
+@else
+
+	<ul class="discussions">
+
+	@foreach($places as $place)
+
+		<li class="place">
+			<h1>
+				@event('view.before: place.title')
+
+				{{ HTML::link_to_route('place', $place->name, array($place->id, $place->slug)) }}
+
+				@event('view.after: place.title')
+
+				@event('view.before: place.discussion.counter')
+
+				<span class="discussion-counter" title="Discussions">{{ number_format($place->total->discussions) }}</span>
+
+				@event('view.after: place.discussion.counter')
+			</h1>
+			
+			@include('feather core::place.partial.children')
+		</li>
+
+		@if(count($place->discussions))
+
+			@foreach($place->discussions as $discussion)
+
+				@include('feather core::place.partial.discussion')
+
+			@endforeach
+
+			<li class="more">
+				<a href="{{ URL::to_route('place', array($place->id, $place->slug)) }}" class="btn btn-soft btn-fat">See {{ number_format($place->total->remaining) }} more discussion{{ $place->total->remaining == 1 ? null : 's' }} <span>&rarr;</span></a>
+			</li>
+
+		@else
+
+			<li class="empty">
+
+				<h3>{{ __('feather core::place.no_discussions', array('place' => $place->name)) }}</h3>
+				
+			</li>
+
+		@endif
+
+	@endforeach
+
+	</ul>
+
+@endif
\ No newline at end of file
diff --git a/applications/core/views/index/overview.blade.php b/applications/core/views/index/overview.blade.php
deleted file mode 100644
index 3c002eb..0000000
--- a/applications/core/views/index/overview.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-Oh la la
\ No newline at end of file
diff --git a/applications/core/views/place/partial/children.blade.php b/applications/core/views/place/partial/children.blade.php
new file mode 100644
index 0000000..4839036
--- /dev/null
+++ b/applications/core/views/place/partial/children.blade.php
@@ -0,0 +1,36 @@
+@if($place->parent)
+
+	@assign($depth, 1)
+
+	@assign($difference, 0 - $place->depth)
+
+	<ul class="children">
+
+		@foreach($place->children as $key => $child)
+			
+			{{-- Only show the children up to the 5th level, 3 levels of dropdown. --}}
+			@if($child->depth + $difference < 5)
+
+				{{ ($child->depth + $difference > $depth) ? '<ul class="nested">' : null }}
+
+				{{ ($child->depth + $difference < $depth) ? str_repeat('</ul></li>', ($depth - ($child->depth + $difference))) : null }}
+
+				<li{{ ($child->parent and $child->depth + $difference == 1) ? ' class="parent-child"' : null }}>
+					{{ HTML::link_to_route('place', $child->name, array($child->id, $child->slug)) }}
+
+					@event('view.before: place.discussion.counter')
+
+					<span class="discussion-counter" title="Discussions">{{ number_format($child->total->discussions) }}</span>
+
+					@event('view.after: place.discussion.counter')
+
+					{{ ($child->parent and ($child->depth + $difference) == 1) ? '<span class="dropdown-arrow"></span>' : null }}
+
+				{{ (!$child->parent and $key < count($place->children) - 1) ? '</li>' : null }}
+
+			@endif
+
+		@endforeach
+
+	{{ str_repeat('</li></ul>', $depth) }}
+@endif
\ No newline at end of file
diff --git a/applications/core/views/place/partial/discussion.blade.php b/applications/core/views/place/partial/discussion.blade.php
new file mode 100644
index 0000000..1d57c81
--- /dev/null
+++ b/applications/core/views/place/partial/discussion.blade.php
@@ -0,0 +1,66 @@
+{{-- TODO: Make this theme related as it contains theme things, like tooltips. --}}
+<li class="discussion group">
+	<div class="place">
+		{{ HTML::link_to_route('place', $discussion->place->name, array($discussion->place->id, $discussion->place->slug), array('title' => $discussion->place->description, 'class' => 'btn btn-soft tooltip-ui-places')) }}
+	</div>
+
+	<div class="meta">
+
+		@event('view.before: place.discussion.title')
+
+		@if($discussion->private)
+			<span class="label label-private">Private</span>
+		@endif
+
+		@if($discussion->draft)
+			<span class="label label-draft">Draft</span>
+		@endif
+
+		{{ HTML::link_to_route('discussion', $discussion->title, array($discussion->id, $discussion->slug, null), array('class' => 'title')) }}
+
+		@event('view.after: place.discussion.title')
+
+		@event('view.before: place.discussion.meta')
+
+		<p>
+		@if($discussion->recent)
+			Last reply by <a href="">Dayle</a>, on <span title="24th June, 2012 at 6:45am">23th June</span>
+		@elseif($discussion->author)
+			Started by {{ HTML::link_to_route('profile', $discussion->author->username, array($discussion->author->slug)) }}, {{ Feather\Date::meta($discussion->created_at) }}
+		@endif
+		</p>
+
+		<div class="options">
+			@if(Feather\Auth::activated())
+				{{ HTML::link('', '', array('class' => 'watch tooltip-ui', 'title' => 'Watch Discussion')) }}
+			@endif
+
+			@if(Feather\Auth::is(array('admin', 'moderator')))
+			{{ HTML::link('', '', array('class' => 'tools tooltip-ui', 'title' => 'Discussion Tools')) }}
+			@endif
+		</div>
+
+		@event('view.after: place.discussion.meta')
+	</div>
+
+	<div class="stats">
+		
+		@event('view.before: place.discussion.stats')
+
+		<div class="views">
+			<span class="title">Views</span>
+			<span class="number" title="{{ $discussion->views }} views">{{ $discussion->short_views }}</span>
+		</div>
+		<div class="replies">
+			<span class="title">Replies</span>
+			<span class="number" title="{{ $discussion->replies }} replies">{{ $discussion->short_replies }}</span>
+		</div>
+		<div class="watchers">
+			<span class="title">Watchers</span>
+			<span title="0 watchers" class="number">0</span>
+		</div>
+
+		@event('view.after: place.discussion.stats')
+
+	</div>
+</li>
\ No newline at end of file
diff --git a/applications/core/views/place/view.blade.php b/applications/core/views/place/view.blade.php
new file mode 100644
index 0000000..90dbd31
--- /dev/null
+++ b/applications/core/views/place/view.blade.php
@@ -0,0 +1,43 @@
+<div class="place">
+	<h2>
+		{{ HTML::link_to_route('place', $place->name, array($place->id, $place->slug)) }}
+
+		<span class="discussion-counter" title="Discussions">{{ number_format($place->total->discussions) }}</span>
+	</h2>
+
+	@include('feather::place.partial.children')
+
+	@if($place->description)
+		<div class="place-description">
+			{{ $place->description }}
+		</div>
+	@endif
+</div>
+
+<ul class="discussions">
+
+	@if(count($place->discussions))
+
+		<li class="extra"><h3>Discussions</h3></li>
+	
+		@foreach($place->discussions as $discussion)
+
+			@include('feather::place.partial.discussion')
+
+		@endforeach
+
+		{{ $place->pagination }}
+
+	@else
+
+		<li class="empty">
+
+			<div class="alert">
+				{{ __('feather::place.no_discussions', array('place' => $place->name)) }}
+			</div>
+			
+		</li>
+
+	@endif
+
+</ul>
\ No newline at end of file

From ad48ecce8bf0efeb0d0cdd4ae097268d8498d087 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Tue, 25 Sep 2012 14:14:36 +0930
Subject: [PATCH 135/136] A whole bunch of stuff has been added back in. Lots
 of refactoring and making things run awesome.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 applications/core/controllers/api.php         |  37 ++
 applications/core/controllers/api/v1/user.php |  63 ++++
 applications/core/controllers/base.php        |   8 +-
 applications/core/controllers/discussion.php  | 316 ++++++++++++++++
 applications/core/controllers/place.php       |  18 +
 applications/core/language/en/discussion.php  | 146 ++++++++
 applications/core/language/en/titles.php      |   2 +-
 applications/core/models/base.php             |  60 +++
 applications/core/models/discussion.php       | 103 +++++-
 .../core/models/discussion/participant.php    |  10 +
 applications/core/models/nothing.php          |  16 -
 applications/core/models/place.php            | 189 +++++++++-
 applications/core/routes.php                  |  37 +-
 applications/core/start.php                   |   1 +
 applications/core/validation/discussion.php   |  33 ++
 .../core/views/discussion/edit.blade.php      |  90 +++++
 .../core/views/discussion/preview.blade.php   |   5 +
 .../core/views/discussion/start.blade.php     |  78 ++++
 .../core/views/discussion/view.blade.php      |   0
 applications/core/views/error/page.blade.php  |   7 +
 applications/core/views/place/view.blade.php  |  14 +-
 bootstrap/views.php                           |   7 +-
 components/pagination/paginator.php           |  43 ++-
 components/support/breadcrumbs.php            |  18 +-
 components/support/date.php                   |   4 +-
 gears/recaptcha/recaptcha.gear.php            |   2 +-
 gears/splendid/public/css/splendid.css        |  49 +++
 gears/splendid/public/img/sprites.png         | Bin 0 -> 3835 bytes
 gears/splendid/public/js/splendid.js          | 350 ++++++++++++++++++
 gears/splendid/splendid.gear.php              |  41 ++
 start.php                                     |  12 +
 themes/basic/public/css/theme.css             |  67 +++-
 themes/basic/views/template.blade.php         |   2 +-
 33 files changed, 1758 insertions(+), 70 deletions(-)
 create mode 100644 applications/core/controllers/api.php
 create mode 100644 applications/core/controllers/api/v1/user.php
 create mode 100644 applications/core/controllers/discussion.php
 create mode 100644 applications/core/controllers/place.php
 create mode 100644 applications/core/language/en/discussion.php
 delete mode 100644 applications/core/models/nothing.php
 create mode 100644 applications/core/validation/discussion.php
 create mode 100644 applications/core/views/discussion/edit.blade.php
 create mode 100644 applications/core/views/discussion/preview.blade.php
 create mode 100644 applications/core/views/discussion/start.blade.php
 create mode 100644 applications/core/views/discussion/view.blade.php
 create mode 100644 applications/core/views/error/page.blade.php
 create mode 100644 gears/splendid/public/css/splendid.css
 create mode 100644 gears/splendid/public/img/sprites.png
 create mode 100644 gears/splendid/public/js/splendid.js
 create mode 100644 gears/splendid/splendid.gear.php

diff --git a/applications/core/controllers/api.php b/applications/core/controllers/api.php
new file mode 100644
index 0000000..e11b365
--- /dev/null
+++ b/applications/core/controllers/api.php
@@ -0,0 +1,37 @@
+<?php
+
+class Feather_API_Controller extends Feather_Base_Controller {
+	
+	/**
+	 * API routes are RESTful
+	 * 
+	 * @var bool
+	 */
+	public $restful = true;
+
+	/**
+	 * API routes are not geared.
+	 * 
+	 * @var bool
+	 */
+	public $geared = false;
+
+	/**
+	 * Adjust the response header and content depending on the requested format.
+	 * 
+	 * @param  object  $response
+	 * @return void
+	 */
+	public function after($response)
+	{
+		switch(File::extension(URI::current()))
+		{
+			case 'json':
+				$response->header('content-type', 'application/json');
+
+				$response->content = json_encode($response->content);
+			break;
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/applications/core/controllers/api/v1/user.php b/applications/core/controllers/api/v1/user.php
new file mode 100644
index 0000000..5dad2d1
--- /dev/null
+++ b/applications/core/controllers/api/v1/user.php
@@ -0,0 +1,63 @@
+<?php
+
+class Feather_Core_API_V1_User_Controller extends Feather_API_Controller {
+
+	/**
+	 * Search for users by their username.
+	 * 
+	 * @return array
+	 */
+	public function get_find()
+	{
+		$users = array();
+
+		foreach(Feather\Core\User::where('username', 'LIKE', Input::get('term') . '%')->get() as $user)
+		{
+			$users[] = $this->data($user);
+		}
+
+		return $users;
+	}
+
+	/**
+	 * Return a bunch of user details.
+	 * 
+	 * @return array
+	 */
+	public function get_bunch()
+	{
+		if(!$usernames = json_decode(Input::get('data')))
+		{
+			return array();
+		}
+
+		$users = array();
+
+		foreach(Feather\Core\User::where_in('username', $usernames)->get() as $user)
+		{
+			$users[] = $this->data($user);
+		}
+
+		return $users;
+	}
+
+	/**
+	 * Returns a user data array.
+	 * 
+	 * @param  object  $user
+	 * @return array
+	 */
+	protected function data($user)
+	{
+		return array(
+			'id' 				=> $user->id,
+			'username' 			=> $user->username,
+			'email' 			=> $user->email,
+			'created_at' 		=> $user->created_at,
+			'total_discussions' => $user->total_discussions,
+			'total_replies' 	=> $user->total_replies,
+			'avatar' 			=> $user->avatar
+		);
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/controllers/base.php b/applications/core/controllers/base.php
index 10141a4..bfd8be4 100644
--- a/applications/core/controllers/base.php
+++ b/applications/core/controllers/base.php
@@ -46,22 +46,22 @@ public function __construct()
 	 * Determines if a place is valid, if it is return the place.
 	 * 
 	 * @param  int  $id
-	 * @return Feather\Models\Place
+	 * @return Feather\Core\Place
 	 */
 	protected function place($id)
 	{
-		return is_numeric($id) ? Feather\Models\Place::with('permissions')->find($id) : null;
+		return is_numeric($id) ? Feather\Core\Place::with('permissions')->find($id) : null;
 	}
 
 	/**
 	 * Determines if a discussion is valid, if it is return the discussion.
 	 * 
 	 * @param  int  $id
-	 * @return Feather\Models\Discussion
+	 * @return Feather\Core\Discussion
 	 */
 	protected function discussion($id)
 	{
-		return is_numeric($id) ? Feather\Models\Discussion::with('participants')->find($id) : null;
+		return is_numeric($id) ? Feather\Core\Discussion::with(array('participants', 'participants.details'))->find($id) : null;
 	}
 
 	/**
diff --git a/applications/core/controllers/discussion.php b/applications/core/controllers/discussion.php
new file mode 100644
index 0000000..cd297c6
--- /dev/null
+++ b/applications/core/controllers/discussion.php
@@ -0,0 +1,316 @@
+<?php
+
+class Feather_Core_Discussion_Controller extends Feather_Base_Controller {
+
+	/**
+	 * Register the filters for all discussion actions.
+	 * 
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->filter('before', 'csrf')->on(array('post', 'put'))->except(array('preview'));
+	}
+
+	/**
+	 * Read a discussion.
+	 * 
+	 * @return object
+	 */
+	public function get_index($id, $slug)
+	{
+		// Make sure that the user has the correct permissions to view this discussion.
+		if($discussion = $this->discussion($id) and $this->auth->can('view: discussion', $discussion))
+		{
+			// If the discussion is a draft, they cannot view it. Take them straight to the edit page.
+			if($discussion->draft)
+			{
+				return $this->redirect->to_route('discussion.edit', array($discussion->id, $discussion->slug));
+			}
+
+			$author= $discussion->author;
+
+			$this->breadcrumbs->drop($discussion->place)->drop($discussion->title);
+
+			$this->layout->nest('content', 'feather core::discussion.view', compact('discussion'))
+						 ->with('title', $discussion->title);
+		}
+
+		// User cannot view this discussion so the discussion is not found.
+		else
+		{
+			$this->breadcrumbs->drop(__('feather core::discussion.discussion_not_found.title'));
+
+			$error = array(
+				'title' => __('feather core::discussion.discussion_not_found.title'),
+				'error' => __('feather core::discussion.discussion_not_found.message'),
+				'type'	=> 'error'
+			);
+
+			$this->layout->nest('content', 'feather core::error.page', compact('error'))
+						 ->with('title', __('feather core::discussion.discussion_not_found.title'));
+		}
+	}
+
+	/**
+	 * Allows a new discussion to be started on a given place. If no place is provided the
+	 * user can select a place.
+	 * 
+	 * @param  int  $place
+	 * @return void
+	 */
+	public function get_start($place = null)
+	{
+		$places = Feather\Core\Place::options(array(
+			'selected'	  => $place,
+			'permissions' => true,
+			'action'	  => 'start: discussions',
+			'cascade'	  => false
+		));
+
+		$place = $this->place($place);
+
+		// Make sure the user has the correct permissions to start a discussion and that there are
+		// places to start a discussion on.
+		if($this->auth->can('start: discussions', $place) and $places)
+		{
+			$this->breadcrumbs->drop(__('feather core::titles.start_discussion'));
+
+			$preview = (Input::had('preview') and Input::had('body')) ? 
+					   View::make('feather core::discussion.preview')->with('body', Feather\Gear\Markdown\Parse(Input::old('body'))) : 
+					   null;
+
+			$this->layout->nest('content', 'feather core::discussion.start', compact('places', 'preview'))
+						 ->with('title', __('feather core::titles.start_discussion'));
+		}
+		else
+		{
+			// The user cannot start a discussion on this place in particular.
+			if($this->auth->cannot('start: discussions', $place))
+			{
+				$this->breadcrumbs->drop(__('feather core::discussion.cannot_start_discussion.title'));
+
+				$error = array(
+					'title' => __('feather core::discussion.cannot_start_discussion.title'),
+					'error' => __('feather core::discussion.cannot_start_discussion.message'),
+					'type'	=> 'error'
+				);
+
+				$this->layout->with('title', __('feather core::discussion.cannot_start_discussion.title'));
+			}
+
+			// The user cannot start a discussion on any available places.
+			else
+			{
+				$this->breadcrumbs->drop(__('feather core::discussion.no_places_for_discussion.title'));
+
+				$error = array(
+					'title' => __('feather core::discussion.no_places_for_discussion.title'),
+					'error' => __('feather core::discussion.no_places_for_discussion.message'),
+					'type'	=> 'error'
+				);
+
+				$this->layout->with('title', __('feather core::discussion.no_places_for_discussion.title'));
+			}
+
+			$this->layout->nest('content', 'feather core::error.page', compact('error'));
+		}
+	}
+
+	/**
+	 * Attempts to start a new discussion on the place provided.
+	 * 
+	 * @param  int  $place
+	 * @return void
+	 */
+	public function post_start($place = null)
+	{
+		if(Input::has('preview'))
+		{
+			return $this->redirect->to_self()->with_input();
+		}
+
+		if($this->auth->cannot('start: discussions', $this->place(Input::get('place'))))
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_alert('error', 'feather core::discussion.cannot_start_discussion.message');
+		}
+
+		Input::merge(array('user' => $this->auth->user->id));
+
+		try
+		{
+			$this->validator->get('discussion.start')->against(Input::get())->passes();
+		}
+		catch (FeatherValidationException $errors)
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_errors($errors->get());
+		}
+
+		try
+		{
+			$discussion = Feather\Core\Discussion::start(Input::get());
+		}
+		catch (FeatherModelException $errors)
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_alert('error', 'feather core::discussion.cannot_start_discussion.message');
+		}
+
+		if(Input::has('draft'))
+		{
+			return $this->redirect->to_route('discussion.edit', array($discussion->id, $discussion->slug))
+								  ->with_alert('success', 'feather core::discussion.draft_saved');
+		}
+		else
+		{
+			return $this->redirect->to_route('discussion', array($discussion->id, $discussion->slug))
+								  ->with_alert('success', 'feather core::discussion.started');
+		}
+	}
+
+	/**
+	 * Allows users to edit a discussion if it belongs to them, or if they are a moderator or
+	 * administrator.
+	 * 
+	 * @param  int     $id
+	 * @param  string  $slug
+	 * @return void
+	 */
+	public function get_edit($id, $slug)
+	{
+		// Make sure the user has the correct permissions to edit this discussion.
+		if($discussion = $this->discussion($id) and $this->auth->can('edit: discussion', $discussion))
+		{
+			$this->breadcrumbs->drop($discussion->place)->drop(__('feather core::titles.edit_discussion', array('discussion' => $discussion->title)));
+
+			$participants = $discussion->participants_to_string();
+
+			$places = Feather\Core\Place::options(array(
+				'selected'	  => $discussion->place_id,
+				'permissions' => true,
+				'action'	  => 'start: discussions',
+				'cascade'	  => false
+			));
+
+			$preview = (Input::had('preview') and Input::had('body')) ? 
+						   View::make('feather core::discussion.preview')->with('body', Feather\Gear\Markdown\Parse(Input::old('body'))) : 
+						   null;
+			
+			$this->layout->nest('content', 'feather core::discussion.edit', compact('discussion', 'places', 'participants', 'preview'))
+						 ->with('title', __('feather core::titles.edit_discussion', array('discussion' => $discussion->title)));
+		}
+		else
+		{
+			// The discussion the user is attempting to edit could not be found.
+			if(!$discussion)
+			{
+				$this->breadcrumbs->drop(__('feather core::discussion.discussion_not_found.title'));
+
+				$error = array(
+					'title' => __('feather core::discussion.discussion_not_found.title'),
+					'error' => __('feather core::discussion.discussion_not_found.message'),
+					'type'	=> 'error'
+				);
+
+				$this->layout->with('title', __('feather core::discussion.discussion_not_found.title'));
+			}
+
+			// The user does not have the permission to edit this discussion.
+			else
+			{
+				$this->breadcrumbs->drop(__('feather core::discussion.cannot_edit_discussion.title'));
+
+				$error = array(
+					'title' => __('feather core::discussion.cannot_edit_discussion.title'),
+					'error' => __('feather core::discussion.cannot_edit_discussion.message'),
+					'type'	=> 'error'
+				);
+
+				$this->layout->with('title', __('feather core::discussion.cannot_edit_discussion.title'));
+			}
+
+			$this->layout->nest('content', 'feather core::error.page', compact('error'));
+		}
+	}
+
+	/**
+	 * Attempts to edit a discussion.
+	 * 
+	 * @param  int     $id
+	 * @param  string  $slug
+	 * @return void
+	 */
+	public function put_edit($id, $slug)
+	{
+		if(Input::has('preview'))
+		{
+			return $this->redirect->to_self()->with_input();
+		}
+
+		if(!$discussion = $this->discussion($id))
+		{
+			return $this->redirect->to_route('feather')
+								  ->with_alert('error', 'feather core::discussion.invalid');
+		}
+
+		if($this->auth->cannot('start: discussions', $this->place(Input::get('place'))))
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_alert('error', 'feather core::discussion.cannot_start_discussion.message');
+		}
+
+		Input::merge(array('user' => $this->auth->user->id));
+
+		try
+		{
+			$this->validator->get('discussion.edit')->against(Input::get())->passes();
+		}
+		catch (FeatherValidationException $errors)
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_errors($errors->get());
+		}
+
+		try
+		{
+			$discussion = Feather\Core\Discussion::edit($discussion, Input::get());
+		}
+		catch (FeatherModelException $errors)
+		{
+			return $this->redirect->to_self()
+								  ->with_input()
+								  ->with_alert('error', 'feather core::discussion.edit_failure.message');
+		}
+
+		if(Input::has('draft'))
+		{
+			return $this->redirect->to_route('discussion.edit', array($discussion->id, $discussion->slug))
+								  ->with_alert('success', 'feather core::discussion.draft_saved');
+		}
+		else
+		{
+			$redirect = $this->redirect->to_route('discussion', array($discussion->id, $discussion->slug));
+
+			if(Input::has('save'))
+			{
+				$redirect->with_alert('success', 'feather core::discussion.saved');
+			}
+			else
+			{
+				$redirect->with_alert('success', 'feather core::discussion.started');
+			}
+
+			return $redirect;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/controllers/place.php b/applications/core/controllers/place.php
new file mode 100644
index 0000000..d83e453
--- /dev/null
+++ b/applications/core/controllers/place.php
@@ -0,0 +1,18 @@
+<?php
+
+class Feather_Core_Place_Controller extends Feather_Base_Controller {
+
+	public function get_index($id, $slug)
+	{
+		if(!$place = Feather\Core\Place::one($id, $this->config->get('feather: db.discussions.per_page')))
+		{
+			
+		}
+		
+		$this->breadcrumbs->drop($place);
+
+		$this->layout->nest('content', 'feather core::place.view', compact('place'))
+					 ->with('title', $place->name);
+	}
+
+}
\ No newline at end of file
diff --git a/applications/core/language/en/discussion.php b/applications/core/language/en/discussion.php
new file mode 100644
index 0000000..205aa8e
--- /dev/null
+++ b/applications/core/language/en/discussion.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Discussion Language Strings
+|--------------------------------------------------------------------------
+|
+| English language rules for discussion related tasks.
+|
+*/
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Discussion Not Found
+	|--------------------------------------------------------------------------
+	|
+	| English language message for when a discussion cannot be found.
+	|
+	*/
+
+	'discussion_not_found' => array(
+		'title' => 'Discussion Not Found',
+		'message' => '<strong>Oh shoot!</strong> We were unable to locate the discussion you have request. This may be due to a number of reasons, including the discussion being removed or incorrect permissions.'
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cannot Edit Discussion
+	|--------------------------------------------------------------------------
+	|
+	| English language message for when a discussion cannot be found.
+	|
+	*/
+
+	'cannot_edit_discussion' => array(
+		'title' => 'Cannot Edit Discussion',
+		'message' => '<strong>Hold up there!</strong> You do not have the correct permissions to be editing this discussion.'
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| No Places For Discussions
+	|--------------------------------------------------------------------------
+	|
+	| English language message for when their are no places available to start
+	| a new discussion.
+	|
+	*/
+
+	'no_places_for_discussion' => array(
+		'title' => 'Cannot Start Discussion',
+		'message' => '<strong>Uh-oh!</strong> You are current unable to start a new discussion because there appear to be no places you can start your discussion. Please try starting a new discussion when there are possible places.'
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cannot Start Discussion
+	|--------------------------------------------------------------------------
+	|
+	| English language message for when user has incorrect permissions to start
+	| a discussion on the selected place.
+	|
+	*/
+
+	'cannot_start_discussion' => array(
+		'title' => 'Cannot Start Discussion',
+		'message' => '<strong>Hold up there!</strong> You do not have the correct permissions to start a discussion on this place.'
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Edit Failure
+	|--------------------------------------------------------------------------
+	|
+	| English language message for when user failed to edit a discussion.
+	|
+	*/
+
+	'edit_failure' => array(
+		'title' => 'Discussion Edit Failure',
+		'message' => '<strong>Oh shoot!</strong> The discussion could not be edited, there may have been a database related problem. Please try again.'
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Discussion Validation Messages
+	|--------------------------------------------------------------------------
+	|
+	| English language messages for individual field errors.
+	|
+	*/
+
+	'messages' => array(
+		'body'  => array('is_required' => 'You need to write something for your discussion.'),
+		'title' => array('is_required' => 'You need a title for your discussion.'),
+		'place' => array('is_required' => 'You need to select a place for your discussion.')
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Discussion Form Labels
+	|--------------------------------------------------------------------------
+	|
+	| English language messages for discussion page form labels.
+	|
+	*/
+
+	'labels' => array(
+		'place' => array(
+			'title'  => 'Place',
+			'helper' => 'Where do you want to start this discussion?'
+		),
+		'title' => array(
+			'title' => 'Discussion title'
+		),
+		'participants' => array(
+			'title'  => 'Discussion participants',
+			'helper' => 'List a person or group of people who can participate in this discussion, by default anyone can participate.'
+		),
+		'save_draft' => array(
+			'title'  => 'Save Draft',
+			'helper' => 'Don\'t worry, people can\'t see it.'
+		)
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Discussion Strings
+	|--------------------------------------------------------------------------
+	|
+	| English language strings for discussion related tasks.
+	|
+	*/
+
+	'anyone_can_participate' => 'Anyone can participate in this discussion.',
+	'start_discussion'		 => 'Start Discussion',
+	'save_discussion'		 => 'Save Discussion',
+	'save_draft' 			 => 'Save Draft',
+	'preview_discussion'	 => 'Preview Discussion',
+	'draft_saved' 			 => '<strong>Awesome!</strong> Your changes to the discussion draft have been saved.',
+	'started'				 => '<strong>Great stuff!</strong> Your discussions has now been started. Take a look!',
+	'saved'					 => '<strong>Thanks for that!</strong> Your changes to the discussion have been saved.'
+
+);
\ No newline at end of file
diff --git a/applications/core/language/en/titles.php b/applications/core/language/en/titles.php
index d8488ef..cb6057f 100644
--- a/applications/core/language/en/titles.php
+++ b/applications/core/language/en/titles.php
@@ -16,5 +16,5 @@
 	'rules'				   => 'Rules',
 	'connect_to_community' => 'Connect to Community',
 	'start_discussion'	   => 'Start Discussion',
-	'edit_discussion'	   => 'Edit Discussion'
+	'edit_discussion'	   => 'Editing Discussion: :discussion'
 );
\ No newline at end of file
diff --git a/applications/core/models/base.php b/applications/core/models/base.php
index 833f0be..e553e13 100644
--- a/applications/core/models/base.php
+++ b/applications/core/models/base.php
@@ -1,5 +1,7 @@
 <?php namespace Feather\Core;
 
+use Str;
+use Cache;
 use Event;
 use Eloquent;
 use Feather\Config;
@@ -13,6 +15,17 @@ class Base extends Eloquent {
 	 */
 	public static $connection = FEATHER_DATABASE;
 
+	/**
+	 * Array of cachable items.
+	 * 
+	 * @var array
+	 */
+	public static $cachable =  array(
+		'place' => array('place', 'place_id'),
+		'user'  => array('user', 'user_id'),
+		'author' => array('user', 'user_id')
+	);
+
 	/**
 	 * Cache time in minutes.
 	 * 
@@ -36,4 +49,51 @@ protected static function log($sql, $time, $bindings = array())
 		}
 	}
 
+	/**
+	 * Find a model by its primary key.
+	 *
+	 * @param  string  $id
+	 * @param  array   $columns
+	 * @return Model
+	 */
+	public function _find($id, $columns = array('*'))
+	{
+		$key = explode('\\', get_called_class());
+		$key = Str::lower(array_pop($key));
+
+		if(isset(static::$cachable[$key]))
+		{
+			list($group, $foreign) = static::$cachable[$key];
+
+			if(Cache::has("{$group}_{$id}"))
+			{
+				return Cache::get("{$group}_{$id}");
+			}
+		}
+
+		return $this->query()->where(static::$key, '=', $id)->first($columns);
+	}
+
+	/**
+	 * Handle the dynamic retrieval of attributes and associations.
+	 *
+	 * @param  string  $key
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		if(isset(static::$cachable[$key]) and !isset($this->attributes[$key]) and !isset($this->relationships[$key]))
+		{
+			list($group, $foreign) = static::$cachable[$key];
+
+			if(Cache::has("{$group}_{$this->$foreign}"))
+			{
+				return Cache::get("{$group}_{$this->$foreign}");
+			}
+		}
+
+		// Of course if it's not in there we'll just continue on as per normal.
+		return parent::__get($key);
+	}
+
 }
\ No newline at end of file
diff --git a/applications/core/models/discussion.php b/applications/core/models/discussion.php
index a2f1862..72b3e5a 100644
--- a/applications/core/models/discussion.php
+++ b/applications/core/models/discussion.php
@@ -38,14 +38,7 @@ public function author()
 	 */
 	public function recent()
 	{
-		if($this->last_reply_user_id)
-		{
-			return $this->belongs_to('Feather\\Core\\User', 'last_reply_user_id');
-		}
-		else
-		{
-			return new Nothing;
-		}
+		return $this->belongs_to('Feather\\Core\\User', 'last_reply_user_id');
 	}
 
 	/**
@@ -172,7 +165,7 @@ public static function edit($discussion, $input)
 		$discussion->fill(array(
 			'place_id' => $input['place'],
 			'user_id'  => $input['user'],
-			'title'	   => isset($input['draft']) ? (empty($input['title']) ? 'Untitled Discussion' : $input['title']) : $input['title'],
+			'title'	   => isset($input['draft']) ? (empty($input['title']) ? 'Untitled Discussion' : $input['title']) : (isset($input['title']) ? $input['title'] : $discussion->title),
 			'body'	   => $input['body'],
 			'private'  => empty($input['participants']) ? 0 : 1,
 			'draft'	   => isset($input['draft']) ? 1 : 0
@@ -235,11 +228,11 @@ public static function edit($discussion, $input)
 			// submitted participants for this discussion.
 			if($participants)
 			{
-				Discussion\Participants::where_not_in('user_id', array_keys($participants))->where_discussion_id($discussion->id)->delete();
+				Discussion\Participant::where_not_in('user_id', array_keys($participants))->where_discussion_id($discussion->id)->delete();
 			}
 			else
 			{
-				Discussion\Participants::where_discussion_id($discussion->id)->delete();
+				Discussion\Participant::where_discussion_id($discussion->id)->delete();
 			}
 
 			// Spin through the discussions existing participants and remove them from the
@@ -255,7 +248,7 @@ public static function edit($discussion, $input)
 
 		if($participants)
 		{
-			Discussion\Participants::insert($participants);
+			Discussion\Participant::insert($participants);
 		}
 
 		// Clear the cache for this discussion, as well as the place it belongs, all places,
@@ -271,6 +264,92 @@ public static function edit($discussion, $input)
 		return $discussion;
 	}
 
+	/**
+	 * Returns an enriched array of discussions with relationships loaded.
+	 * 
+	 * @param  array  $discussions
+	 * @return array
+	 */
+	public static function enrichment($discussions)
+	{
+		if(!is_array($discussions))
+		{
+			$discussions = array($discussions);
+		}
+
+		$ids = array(
+			'participants' => array(),
+			'author'	   => array(),
+			'recent'	   => array()
+		);
+
+		foreach($discussions as $discussion)
+		{
+			$ids['author'][] = $discussion->user_id;
+
+			$ids['participants'][] = $discussion->id;
+
+			if($discussion->last_reply_user_id)
+			{
+				$ids['recent'][] = $discussion->last_reply_user_id;
+			}
+		}
+
+		$ids['author'] = array_unique($ids['author']);
+
+		$ids['recent'] = array_unique($ids['recent']);
+
+		// Here we will run three queries, one to fetch all the authors, another to fetch all the participants
+		// and the last will fetch the last poster details, if any.
+		$authors_raw = User::where_in('id', $ids['author'])->get();
+
+		$participants_raw = Discussion\Participant::with('details')->where_in('discussion_id', $ids['participants'])->get();
+
+		$recently_raw = $ids['recent'] ? User::where_in('id', $ids['recent'])->get() : array();
+
+		// We now need to sort the arrays better, because at the moment accessing objects within the arrays
+		// is very hard. The keys for each array need to be the corrosponding foreign keys for the relationships.
+		$authors = array();
+		foreach($authors_raw as $author) $authors[$author->id] = $author;
+
+		$participants = array();
+		foreach($participants_raw as $participant) $participants[$participant->discussion_id][$participant->id] = $participant;
+
+		$recently = array();
+
+		if($recently_raw)
+		{
+			foreach($recently_raw as $recent) $recently[$recent->id] = $recent;
+		}
+
+		// Now that the arrays are sorted all lovely like we can spin through our discsussions again and
+		// assign the relationships to each discussion.
+		foreach($discussions as $discussion)
+		{
+			$discussion->relationships['author'] = $authors[$discussion->user_id];
+
+			if(isset($participants[$discussion->id]))
+			{
+				$discussion->relationships['participants'] = $participants[$discussion->id];
+			}
+			else
+			{
+				$discussion->relationships['participants'] = null;	
+			}
+
+			if($discussion->last_reply_user_id)
+			{
+				$discussion->relationships['recent'] = $recently[$discussion->last_reply_user_id];
+			}
+			else
+			{
+				$discussion->relationships['recent'] = null;
+			}
+		}
+
+		return $discussions;
+	}
+
 	/**
 	 * Converts participant IDs into a comma separated string.
 	 * 
diff --git a/applications/core/models/discussion/participant.php b/applications/core/models/discussion/participant.php
index bca4037..21e04f6 100644
--- a/applications/core/models/discussion/participant.php
+++ b/applications/core/models/discussion/participant.php
@@ -18,4 +18,14 @@ class Participant extends Base {
 	 */
 	public static $timestamps = false;
 
+	/**
+	 * A participant has details, this is their user account.
+	 * 
+	 * @return object
+	 */
+	public function details()
+	{
+		return $this->belongs_to('Feather\\Core\\User', 'user_id');
+	}
+
 }
\ No newline at end of file
diff --git a/applications/core/models/nothing.php b/applications/core/models/nothing.php
deleted file mode 100644
index 3bc668c..0000000
--- a/applications/core/models/nothing.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php namespace Feather\Core;
-
-class Nothing {
-
-	/**
-	 * Nothing only needs to return no results, because a there is nothing in
-	 * this relationship.
-	 * 
-	 * @return array
-	 */
-	public function results()
-	{
-		return array();
-	}
-
-}
\ No newline at end of file
diff --git a/applications/core/models/place.php b/applications/core/models/place.php
index 8093d8d..b8ab33d 100644
--- a/applications/core/models/place.php
+++ b/applications/core/models/place.php
@@ -3,6 +3,7 @@
 use DB;
 use Cache;
 use Feather\Auth;
+use Feather\Paginator;
 
 class Place extends Ness {
 
@@ -27,7 +28,7 @@ class Place extends Ness {
 	 */
 	public function permissions()
 	{
-		return $this->has_many('Feather\\Models\\Permission', 'place_id');
+		return $this->has_many('Feather\\Core\\Permission', 'place_id');
 	}
 
 	/**
@@ -37,7 +38,7 @@ public function permissions()
 	 */
 	public function moderators()
 	{
-		return $this->has_many('Feather\\Models\\Place\\Moderator', 'place_id');
+		return $this->has_many('Feather\\Core\\Place\\Moderator', 'place_id');
 	}
 
 	/**
@@ -47,7 +48,7 @@ public function moderators()
 	 */
 	public function discussions()
 	{
-		return $this->has_many('Feather\\Models\\Discussion', 'place_id');
+		return $this->has_many('Feather\\Core\\Discussion', 'place_id');
 	}
 
 	/**
@@ -73,6 +74,82 @@ public static function all()
 		}, static::cache_time);
 	}
 
+	/**
+	 * Select only one place and limit the number of discussions per page.
+	 * 
+	 * @param  int  $id
+	 * @param  int  $discussions_per_page
+	 * @return Feather\Core\Place
+	 */
+	public static function one($id, $discussions_per_page = 20)
+	{
+		$place = Cache::remember("place_{$id}", function() use ($id)
+		{
+			$table = DB::connection(FEATHER_DATABASE)->config['prefix'] . Place::$table;
+
+			$sql = "SELECT node.*, (COUNT( parent.name ) -1) AS depth
+				FROM {$table} AS node
+				CROSS JOIN places AS parent
+				WHERE node.id = {$id}
+				AND node.lft BETWEEN parent.lft
+				AND parent.rgt
+				GROUP BY node.id
+				ORDER BY node.lft";
+
+			$place = Place::enrichment(DB::connection(FEATHER_DATABASE)->query($sql));
+
+			return reset($place);
+		}, static::cache_time);
+
+		$places = static::filter_by_permissions(array($place->id => $place) + static::enrichment($place->children()));
+
+		list($sorted, $pivot) = static::sort($places);
+
+		// Tally the total number of discussions within each place.
+		$totals = static::tally_discussions($places);
+
+		$page = Paginator::page($total_results = array_sum($totals), $discussions_per_page);
+
+		$skip = ($page - 1) * $discussions_per_page;
+
+		// With our paginator variables we can now select only the discussions we want from the database.
+		$discussions = !$places ? array() : Discussion::where_in('place_id', array_keys($places))
+			->order_by('updated_at', 'desc')
+			->skip($skip)
+			->take($discussions_per_page)
+			->get();
+
+		if($discussions)
+		{
+			$discussions = Discussion::enrichment($discussions, array('author', 'recent', 'participants'));
+		}
+
+		$places = static::refine($discussions, $places, $sorted, $pivot, $totals, $discussions_per_page);
+
+		if(empty($places))
+		{
+			return array();
+		}
+
+		$place = reset($places);
+
+		// Create a new paginator instance. We get the current page from the total amount of discussions.
+		// We'll then extract a slice from the discussions array based on the offset amount and the amount per page.
+		$pagination = Paginator::make($place->discussions, $total_results, $discussions_per_page);
+
+		return $place->fill(array(
+			'discussions' => $pagination->results,
+			'pagination'  => $pagination->links()
+		));
+	}
+
+	/**
+	 * Returns an array of places for the index page of Feather. Places will receive a set amount of
+	 * newest discussions from any of the places within the root place.
+	 * 
+	 * @param  int  $discussions_per_place
+	 * @return array
+	 */
 	public static function index($discussions_per_place)
 	{
 		$places = static::filter_by_permissions(static::all());
@@ -90,7 +167,7 @@ public static function index($discussions_per_place)
 
 			foreach($place->children as $child) $ids[] = $child->id;
 
-			foreach(Discussion::with(array('author', 'participants'))->where_in('place_id', $ids)->order_by('updated_at', 'desc')->take($discussions_per_place * 3)->get() as $discussion)
+			foreach(Discussion::enrichment(Discussion::where_in('place_id', $ids)->order_by('updated_at', 'desc')->take($discussions_per_place * 3)->get()) as $discussion)
 			{
 				$discussions[] = $discussion;
 			}
@@ -132,7 +209,7 @@ protected static function refine($discussions, $places, $sorted, $pivot, $totals
 			$discussion->place = $places[$discussion->place_id];
 
 			// If the discussions place is a child then we need to use it's parent ID.
-			$id = $discussion->place->child ? $discussion->place->parent_id : $discussion->place->id;
+			$id = isset($discussion->place->parent_id) ? $discussion->place->parent_id : $discussion->place->id;
 
 			$ordered[$id]["{$discussion->updated_at} {$discussion->id}"] = $discussion;
 
@@ -179,7 +256,7 @@ protected static function refine($discussions, $places, $sorted, $pivot, $totals
 			}
 		}
 
-		foreach($places as $place)
+		foreach($sorted as $place)
 		{
 			$place->discussions = array();
 
@@ -231,9 +308,13 @@ protected static function sort($places)
 	{
 		$sorted = $pivot = array();
 
+		// The gauge is set when the first parent is encountered. Children will then be sorted if their
+		// depth is greater than that of the gauge.
+		$gauge = null;
+
 		foreach($places as $place)
 		{
-			if($place->parent and !$place->depth)
+			if(is_null($gauge) or $place->depth == $gauge)
 			{
 				$sorted[] = $place;
 
@@ -370,4 +451,98 @@ protected static function enrichment($places, $selected = null)
 		return $enriched;
 	}
 
+	/**
+	 * Returns an HTML select box options list.
+	 * 
+	 * @param  array  $parameters
+	 * @return array
+	 */
+	public static function options($parameters = array())
+	{
+		// Build a default parameters array. I decided to use an array here because a whole bunch of
+		// parameters is just unwieldly. This is somewhat nicer.
+		$parameters = (object) array_merge(array(
+			'places'   	  => null,
+			'disable'  	  => array(),
+			'postable' 	  => false,
+			'cascade'  	  => true,
+			'selected'	  => null,
+			'padder'	  => '---',
+			'permissions' => false,
+			'action'	  => null
+		), $parameters);
+
+		if(is_null($parameters->places))
+		{
+			$parameters->places = static::all();
+		}
+
+		// The disabling variable will store a currently being disabled place. If we are cascading the
+		// disabling, that is, disabling a places children as well, then we'll use this variable to check
+		// if the places are children.
+		$disabling = null;
+
+		// The hiding variable is the same as the disabling variable except it's permission based. If a
+		// user cannot view a place then all children of that place will be hidden as well.
+		$hiding = null;
+
+		$attributes = array(
+			'disabled' => ' disabled="disabled"',
+			'selected' => ' selected="selected"'
+		);
+
+		$callback = function($place) use ($parameters)
+		{
+			return str_pad(" {$place->name}", ($place->depth * strlen($parameters->padder)) + strlen($place->name), $parameters->padder, STR_PAD_LEFT);
+		};
+
+		$options = array();
+
+		foreach($parameters->places as $key => $place)
+		{
+			$disabled = $parameters->postable and !$place->postable ? $attributes['disabled'] : '';
+			$selected = $place->id == $parameters->selected ? $attributes['selected'] : '';
+
+			// If the place is to be disabled then set the disabled attribute. Also sets the cascading
+			// for children if it's enabled. We also check if an action has been passed in and if so run
+			// that through our access control. This is handy for disabling places when starting a discussion.
+			if(in_array($place->id, (array) $parameters->disable) or ($parameters->action and Auth::cannot($parameters->action, $place)))
+			{
+				if($parameters->cascade)
+				{
+					$disabling = $place;
+				}
+
+				$disabled = $attributes['disabled'];
+			}
+
+			// Otherwise if the diasbling variable is an object check to see if the current place is a
+			// child of the originally disabled place, if it is then disable it as well.
+			elseif(is_object($disabling) and $place->lft > $disabling->lft and $place->rgt < $disabling->rgt)
+			{
+				$disabled = $attributes['disabled'];
+			}
+
+			// If the hiding variable is an object check to see if the current place is a child of the
+			// originally hidden place, if it is hide the child as well.
+			elseif(is_object($hiding) and $place->lft > $hiding->lft and $place->rgt < $hiding->rgt)
+			{
+				continue;
+			}
+
+			// If the user cannot view this place then we'll hide it, as well as that, we'll hide
+			// any children of this place.
+			if($parameters->permissions and Auth::cannot('view: place', $place))
+			{
+				$hiding = $place;
+
+				continue;
+			}
+
+			$options[] = '<option value="' . $place->id . '"' . $disabled . $selected . '>' . $callback($place) . '</option>';
+		}
+
+		return implode(PHP_EOL, $options);
+	}
+
 }
\ No newline at end of file
diff --git a/applications/core/routes.php b/applications/core/routes.php
index 0550cf9..7d47cdd 100644
--- a/applications/core/routes.php
+++ b/applications/core/routes.php
@@ -33,7 +33,7 @@
 |--------------------------------------------------------------------------
 */
 
-Route::get('(:bundle)/place/(:num)-(:any)/(:page?)', array('as' => 'place', 'uses' => 'feather core::place@place'));
+Route::get('(:bundle)/place/(:num)-(:any)/(:page?)', array('as' => 'place', 'uses' => 'feather core::place@index'));
 
 /*
 |--------------------------------------------------------------------------
@@ -45,6 +45,7 @@
 Route::any('(:bundle)/place/(:num)-(:any)/start', 'feather core::discussion@start');
 Route::any('(:bundle)/discussion/(:num)-(:any)/(:page?)', array('as' => 'discussion', 'uses' => 'feather core::discussion@index'));
 Route::any('(:bundle)/discussion/(:num)-(:any)/edit', array('as' => 'discussion.edit', 'uses' => 'feather core::discussion@edit'));
+Route::post('(:bundle)/discussion/preview', 'feather core::discussion@preview');
 
 /*
 |--------------------------------------------------------------------------
@@ -52,4 +53,36 @@
 |--------------------------------------------------------------------------
 */
 
-Route::get('(:bundle)/rules', array('as' => 'rules', 'uses' => 'feather core::index@rules'));
\ No newline at end of file
+Route::get('(:bundle)/rules', array('as' => 'rules', 'uses' => 'feather core::index@rules'));
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+*/
+
+Route::get('(:bundle)/api/(:any)/(:any).(json)', 'feather core::api.(:1).(:2)@index');
+Route::get('(:bundle)/api/(:any)/(:any)/(:any).(json)', 'feather core::api.(:1).(:2)@(:3)');
+
+/*
+|--------------------------------------------------------------------------
+| Feather Catch-all
+|--------------------------------------------------------------------------
+|
+| This catch-all route allows plugins to create new controllers and actions
+| on the fly.
+|
+*/
+
+Route::get('(:bundle)/(:all)', function($parameters)
+{
+	$parameters = explode('/', $parameters);
+
+	// Update the Request::$route property so that it contains the controller
+	// and controller_action properties.
+	Request::$route->controller = array_shift($parameters);
+
+	Request::$route->controller_action = empty($parameters) ? 'index' : array_shift($parameters);
+
+	return IoC::resolve('controller: base')->execute(Request::$route->controller_action, $parameters);
+});
\ No newline at end of file
diff --git a/applications/core/start.php b/applications/core/start.php
index 4a1fbea..1177091 100644
--- a/applications/core/start.php
+++ b/applications/core/start.php
@@ -24,6 +24,7 @@
 */
 
 Autoloader::map(array(
+	'Feather_API_Controller' => path('core') . 'controllers' . DS . 'api' . EXT,
 	'Feather_Base_Controller' => path('core') . 'controllers' . DS . 'base' . EXT
 ));
 
diff --git a/applications/core/validation/discussion.php b/applications/core/validation/discussion.php
new file mode 100644
index 0000000..940b579
--- /dev/null
+++ b/applications/core/validation/discussion.php
@@ -0,0 +1,33 @@
+<?php
+
+return array(
+
+	'start' => function($validator)
+	{
+		$validator->rule('body', 'required')
+				  ->rule('place', 'required')
+				  ->message('body.required', 'discussion.messages.body.is_required')
+				  ->message('place.required', 'discussion.messages.place.is_required');
+
+		if(isset($validator->input['start']))
+		{
+			$validator->rule('title', 'required')
+					  ->message('title.required', 'discussion.messages.title.is_required');
+		}
+	},
+
+	'edit' => function($validator)
+	{
+		$validator->rule('body', 'required')
+				  ->rule('place', 'required')
+				  ->message('body.required', 'discussion.messages.body.is_required')
+				  ->message('place.required', 'discussion.messages.place.is_required');
+
+		if(isset($validator->input['start']) or isset($validator->input['draft']))
+		{
+			$validator->rule('title', 'required')
+					  ->message('title.required', 'discussion.messages.title.is_required');
+		}
+	}
+
+);
\ No newline at end of file
diff --git a/applications/core/views/discussion/edit.blade.php b/applications/core/views/discussion/edit.blade.php
new file mode 100644
index 0000000..3da4eae
--- /dev/null
+++ b/applications/core/views/discussion/edit.blade.php
@@ -0,0 +1,90 @@
+{{ $preview }}
+
+<h2>{{ __('feather core::titles.edit_discussion', array('discussion' => $discussion->title)) }}</h2>
+
+<div class="manage-discussion">
+	{{ Form::open(null, 'put') }}
+
+	<fieldset>
+
+		<dl>
+
+			<dt>{{ Form::label('place', __('feather core::discussion.labels.place.title')) }}</dt>
+			<dd>
+				<select name="place" id="place">
+					{{ $places }}
+				</select>
+
+				<div class="description">
+					{{ __('feather core::discussion.labels.place.helper') }}
+				</div>
+
+				@error('place')
+			</dd>
+
+			@if($discussion->draft)
+			<dt>{{ Form::label('title', __('feather core::discussion.labels.title.title')) }}</dt>
+			<dd>
+				{{ Form::text('title', Input::old('title', $discussion->title)) }}
+
+				@error('title')
+			</dd>
+			@endif
+
+			<dt>{{ Form::label('participants', __('feather core::discussion.labels.participants.title')) }}</dt>
+			<dd>
+				<div class="discussion-participants">
+					{{ Form::text('participants', Input::old('participants', $participants), array('autocomplete' => 'off')) }}
+
+					<div class="autocomplete"></div>
+				</div>
+
+				<div class="description">
+					{{ __('feather core::discussion.labels.participants.helper') }}
+				</div>
+
+				<div class="participants">
+					<span class="anyone label label-inverse">{{ __('feather core::discussion.anyone_can_participate') }}</span>
+				</div>
+			</dd>
+
+		</dl>
+
+		<div class="discussion-textarea">
+			@event('view: before discussion.body')
+
+			{{ Form::textarea('body', Input::old('body', $discussion->body)) }}
+
+			@event('view: after discussion.body')
+		</div>
+
+		@error('body')
+		
+	</fieldset>
+
+	<fieldset>
+		<div class="halves">
+			<div class="half-left">
+
+				@if($discussion->draft)
+
+					{{ Form::submit(__('feather core::discussion.start_discussion'), array('name' => 'start', 'class' => 'btn btn-primary btn-big')) }}
+
+					{{ Form::submit(__('feather core::discussion.save_draft'), array('name' => 'draft', 'class' => 'btn btn-inverse tooltip-ui-right', 'title' => __('feather core::discussion.labels.save_draft.helper'))) }}
+
+				@else
+
+					{{ Form::submit(__('feather core::discussion.save_discussion'), array('name' => 'save', 'class' => 'btn btn-primary btn-big')) }}
+
+				@endif
+
+			</div>
+
+			<div class="half-right text-right">
+				{{ Form::submit(__('feather core::discussion.preview_discussion'), array('name' => 'preview', 'class' => 'btn btn-inverse')) }}
+			</div>
+		</div>
+	</fieldset>
+
+	{{ Form::token() . Form::close() }}
+</div>
\ No newline at end of file
diff --git a/applications/core/views/discussion/preview.blade.php b/applications/core/views/discussion/preview.blade.php
new file mode 100644
index 0000000..0d949e0
--- /dev/null
+++ b/applications/core/views/discussion/preview.blade.php
@@ -0,0 +1,5 @@
+<h2>Discussion Preview</h2>
+
+<div class="discussion-body discussion-preview">
+	{{ $body }}
+</div>
\ No newline at end of file
diff --git a/applications/core/views/discussion/start.blade.php b/applications/core/views/discussion/start.blade.php
new file mode 100644
index 0000000..3df3f4a
--- /dev/null
+++ b/applications/core/views/discussion/start.blade.php
@@ -0,0 +1,78 @@
+{{ $preview }}
+
+<h2>{{ __('feather core::titles.start_discussion') }}</h2>
+
+<div class="manage-discussion">
+	{{ Form::open(null, 'post') }}
+
+	<fieldset>
+
+		<dl>
+
+			<dt>{{ Form::label('place', __('feather core::discussion.labels.place.title')) }}</dt>
+			<dd>
+				<select name="place" id="place">
+					<option value="">Please select one</option>
+					{{ $places }}
+				</select>
+
+				<div class="description">
+					{{ __('feather core::discussion.labels.place.helper') }}
+				</div>
+
+				@error('place')
+			</dd>
+
+			<dt>{{ Form::label('title', __('feather core::discussion.labels.title.title')) }}</dt>
+			<dd>
+				{{ Form::text('title', Input::old('title')) }}
+
+				@error('title')
+			</dd>
+
+			<dt>{{ Form::label('participants', __('feather core::discussion.labels.participants.title')) }}</dt>
+			<dd>
+				<div class="discussion-participants">
+					{{ Form::text('participants', Input::old('participants'), array('autocomplete' => 'off')) }}
+
+					<div class="autocomplete"></div>
+				</div>
+
+				<div class="description">
+					{{ __('feather core::discussion.labels.participants.helper') }}
+				</div>
+
+				<div class="participants">
+					<span class="anyone label label-inverse">{{ __('feather core::discussion.anyone_can_participate') }}</span>
+				</div>
+			</dd>
+
+		</dl>
+
+		<div class="discussion-textarea">
+			@event('view: before discussion.body')
+
+			{{ Form::textarea('body', Input::old('body')) }}
+
+			@event('view: after discussion.body')
+		</div>
+
+		@error('body')
+		
+	</fieldset>
+
+	<fieldset>
+		<div class="halves">
+			<div class="half-left">
+				{{ Form::submit(__('feather core::discussion.start_discussion'), array('name' => 'start', 'class' => 'btn btn-primary btn-big')) }}
+				{{ Form::submit(__('feather core::discussion.save_draft'), array('name' => 'draft', 'class' => 'btn btn-inverse tooltip-ui-right', 'title' => __('feather core::discussion.labels.save_draft.helper'))) }}
+			</div>
+
+			<div class="half-right text-right">
+				{{ Form::submit(__('feather core::discussion.preview_discussion'), array('name' => 'preview', 'class' => 'btn btn-inverse')) }}
+			</div>
+		</div>
+	</fieldset>
+
+	{{ Form::token() . Form::close() }}
+</div>
\ No newline at end of file
diff --git a/applications/core/views/discussion/view.blade.php b/applications/core/views/discussion/view.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/applications/core/views/error/page.blade.php b/applications/core/views/error/page.blade.php
new file mode 100644
index 0000000..c2eb0ae
--- /dev/null
+++ b/applications/core/views/error/page.blade.php
@@ -0,0 +1,7 @@
+<h2>{{ $error['title'] }}</h2>
+
+<div class="alert alert-{{ $error['type'] }}">
+	{{ $error['error'] }}
+</div>
+
+{{ HTML::Link_to_route('feather', '&larr; Back to places') }}
\ No newline at end of file
diff --git a/applications/core/views/place/view.blade.php b/applications/core/views/place/view.blade.php
index 90dbd31..eaf5e81 100644
--- a/applications/core/views/place/view.blade.php
+++ b/applications/core/views/place/view.blade.php
@@ -1,11 +1,11 @@
 <div class="place">
-	<h2>
+	<h1>
 		{{ HTML::link_to_route('place', $place->name, array($place->id, $place->slug)) }}
 
 		<span class="discussion-counter" title="Discussions">{{ number_format($place->total->discussions) }}</span>
-	</h2>
+	</h1>
 
-	@include('feather::place.partial.children')
+	@include('feather core::place.partial.children')
 
 	@if($place->description)
 		<div class="place-description">
@@ -22,7 +22,7 @@
 	
 		@foreach($place->discussions as $discussion)
 
-			@include('feather::place.partial.discussion')
+			@include('feather core::place.partial.discussion')
 
 		@endforeach
 
@@ -31,11 +31,7 @@
 	@else
 
 		<li class="empty">
-
-			<div class="alert">
-				{{ __('feather::place.no_discussions', array('place' => $place->name)) }}
-			</div>
-			
+			<h3>{{ __('feather core::place.no_discussions', array('place' => $place->name)) }}</h3>
 		</li>
 
 	@endif
diff --git a/bootstrap/views.php b/bootstrap/views.php
index f8a4030..5e167e9 100644
--- a/bootstrap/views.php
+++ b/bootstrap/views.php
@@ -9,6 +9,7 @@
 use Event;
 use Blade;
 use Bundle;
+use Session;
 
 /*
 |--------------------------------------------------------------------------
@@ -105,7 +106,7 @@
 {
 	if(!isset($view->title)) $view->title = 'Index';
 
-	if(!isset($view->alert)) $view->alert = null;
+	if(!isset($view->alert)) $view->alert = Session::has('alert') ? (object) Session::get('alert') : null;
 };
 
 View::composer('feather core::template', $defaults);
@@ -188,14 +189,14 @@
 
 	if(str_contains($uri, 'place'))
 	{
-		$url = preg_replace('/\/p([0-9]+)/', '', $uri) . (ends_with($uri, 'start') ? null : '/start');
+		$url = preg_replace('/\/p[0-9]+/', '', $uri) . (ends_with($uri, 'start') ? null : '/start');
 
 		preg_match('/(\d+)-.*?/', $uri, $matches);
 
 		// If the user cannot start discussions on the selected place, don't show the button.
 		if($feather['auth']->cannot('start: discussions', Core\Place::find(array_pop($matches))))
 		{
-			return null;
+			$url = URL::to_route('start.discussion');
 		}
 	}
 	else
diff --git a/components/pagination/paginator.php b/components/pagination/paginator.php
index 4b961cd..7bffc5a 100644
--- a/components/pagination/paginator.php
+++ b/components/pagination/paginator.php
@@ -1,11 +1,48 @@
-<?php namespace Feather\Components\Support;
+<?php namespace Feather\Components\Pagination;
 
 use URI;
 use HTML;
 use Request;
+use Feather\Components\Foundation\Component;
 
 class Paginator extends \Laravel\Paginator {
 
+	/**
+	 * Overload the constructor so that we can get instances of it with the facades.
+	 * 
+	 * @param  array  $results
+	 * @param  int    $page
+	 * @param  int    $total
+	 * @param  int    $per_page
+	 * @param  int    $last
+	 * @return void
+	 */
+	public function __construct($results = null, $page = null, $total = null, $per_page = null, $last = null)
+	{
+		$this->page = $page;
+		$this->last = $last;
+		$this->total = $total;
+		$this->results = $results;
+		$this->per_page = $per_page;
+	}
+
+	/**
+	 * Create a new Paginator instance.
+	 *
+	 * @param  array      $results
+	 * @param  int        $total
+	 * @param  int        $per_page
+	 * @return Paginator
+	 */
+	public static function make($results, $total, $per_page)
+	{
+		$page = static::page($total, $per_page);
+
+		$last = ceil($total / $per_page);
+
+		return new static($results, $page, $total, $per_page, $last);
+	}
+
 	/**
 	 * Get the current page from the last segment of the URI.
 	 *
@@ -24,12 +61,12 @@ public static function page($total, $per_page)
 		// than the last page. For example, if the current page is not an integer or
 		// less than one, one will be returned. If the current page is greater than
 		// the last page, the last page will be returned.
-		if (is_numeric($page) and $page > $last = ceil($total / $per_page))
+		if (is_numeric($page) and $page > ($last = ceil($total / $per_page)))
 		{
 			return ($last > 0) ? $last : 1;
 		}
 
-		return (static::valid($page)) ? $page : 1;
+		return $page;
 	}
 
 	/**
diff --git a/components/support/breadcrumbs.php b/components/support/breadcrumbs.php
index 1ee2f93..b9b6c9e 100644
--- a/components/support/breadcrumbs.php
+++ b/components/support/breadcrumbs.php
@@ -2,7 +2,7 @@
 
 use URL;
 use HTML;
-use Feather\Models;
+use Feather\Core;
 use Feather\Components\Foundation\Component;
 
 class Breadcrumbs extends Component {
@@ -18,11 +18,11 @@ class Breadcrumbs extends Component {
 	 * Drop a crumb.
 	 * 
 	 * @param  array|object  $crumb
-	 * @return void
+	 * @return Feather\Components\Support\Breadcrumbs
 	 */
 	public function drop($crumb)
 	{
-		if($crumb instanceof Models\Place)
+		if($crumb instanceof Core\Place)
 		{
 			$this->place($crumb);
 		}
@@ -34,6 +34,10 @@ public function drop($crumb)
 			{
 				$crumb = array((string) $crumb);
 			}
+			elseif(!is_array($crumb))
+			{
+				$crumb = array($crumb);
+			}
 
 			// Fetch the title of the crumb and the crumbs link. If the crumb does not have
 			// a supplied link then use the current page.
@@ -43,6 +47,8 @@ public function drop($crumb)
 
 			$this->crumbs[] = (object) compact('link', 'title');
 		}
+
+		return $this;
 	}
 
 	/**
@@ -67,7 +73,7 @@ public function trail($element = 'li')
 	/**
 	 * Adds a place to the trail.
 	 * 
-	 * @param  Feather\Models\Place  $place
+	 * @param  Feather\Core\Place  $place
 	 * @return array
 	 */
 	protected function place($place)
@@ -75,13 +81,13 @@ protected function place($place)
 		// Add each of the ancestors of this place to the crumbs.
 		foreach($place->crumbs() as $crumb)
 		{
-			$this->crumbs[] = array(
+			$this->crumbs[] = (object) array(
 				'link'  => URL::to_route('place', array($crumb->id, $crumb->slug)),
 				'title' => $crumb->name
 			);
 		}
 
-		return $this->crumbs[] = array(
+		return $this->crumbs[] = (object) array(
 			'link'  => URL::to_route('place', array($place->id, $place->slug)),
 			'title' => $place->name
 		);
diff --git a/components/support/date.php b/components/support/date.php
index 21b22b0..e50fbdd 100644
--- a/components/support/date.php
+++ b/components/support/date.php
@@ -192,11 +192,11 @@ public function relative($format = 'long')
 
 		if($days == 0)
 		{
-			return __('feather::common.today')->get() . ', ' . $this->show('time');
+			return __('feather core::common.today')->get() . ', ' . $this->show('time');
 		}
 		elseif($days == 1)
 		{
-			return __('feather::common.yesterday')->get() . ', ' . $this->show('time');
+			return __('feather core::common.yesterday')->get() . ', ' . $this->show('time');
 		}
 
 		return $this->show($format);
diff --git a/gears/recaptcha/recaptcha.gear.php b/gears/recaptcha/recaptcha.gear.php
index 8c0ae2c..3af2467 100644
--- a/gears/recaptcha/recaptcha.gear.php
+++ b/gears/recaptcha/recaptcha.gear.php
@@ -11,7 +11,7 @@
 class Recaptcha extends Foundation {
 
 	/**
-	 * Register the event listeners for the reCAPTCHA plugin.
+	 * Register the event listeners for the reCAPTCHA gear.
 	 * 
 	 * @return void
 	 */
diff --git a/gears/splendid/public/css/splendid.css b/gears/splendid/public/css/splendid.css
new file mode 100644
index 0000000..a92a25e
--- /dev/null
+++ b/gears/splendid/public/css/splendid.css
@@ -0,0 +1,49 @@
+.splendid-container {
+	float: left;
+	margin: 0 0 8px;
+}
+
+.splendid-container li {
+	float: left;
+	width: 16px;
+	height: 16px;
+	padding: 6px;
+	border: 1px solid #dcdcdc;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	background-color: #f2f2f2;
+	margin: 0 4px 0 0;
+	text-indent: -9999px;
+	cursor: pointer;
+}
+
+.splendid-container li:hover {
+	border-color: #d1d1d1;
+}
+
+.splendid-container li > a {
+	display: block;
+	background: url('../img/sprites.png') no-repeat 0 0;
+	width: 16px;
+	height: 16px;
+}
+
+.splendid-container li.h2 > a { background-position: -16px 0; }
+.splendid-container li.h3 > a { background-position: -32px 0; }
+.splendid-container li.h4 > a { background-position: -48px 0; }
+.splendid-container li.h5 > a { background-position: -64px 0; }
+.splendid-container li.h6 > a { background-position: -80px 0; }
+.splendid-container li.ol > a { background-position: -96px 0; }
+.splendid-container li.ul > a { background-position: -112px 0; }
+.splendid-container li.quote > a { background-position: -128px 0; }
+.splendid-container li.italic > a { background-position: -144px 0; }
+.splendid-container li.bold > a { background-position: -160px 0; }
+.splendid-container li.code > a { background-position: -176px 0; }
+.splendid-container li.picture > a { background-position: -192px 0; }
+.splendid-container li.link > a { background-position: -208px 0; }
+.splendid-container li.preview > a { background-position: -224px 0; }
+
+.discussion-textarea textarea {
+	clear: both;
+}
\ No newline at end of file
diff --git a/gears/splendid/public/img/sprites.png b/gears/splendid/public/img/sprites.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc4e78e7e9de5d01be5ca5c37a22385a3a959c3
GIT binary patch
literal 3835
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

literal 0
HcmV?d00001

diff --git a/gears/splendid/public/js/splendid.js b/gears/splendid/public/js/splendid.js
new file mode 100644
index 0000000..da065d0
--- /dev/null
+++ b/gears/splendid/public/js/splendid.js
@@ -0,0 +1,350 @@
+(function($)
+{
+	$.fn.splendid = function(opts)
+	{
+		var options = $.extend({}, $.fn.splendid.defaults, opts);
+
+		return this.each(function()
+		{
+			var properties = {
+				element: $(this),
+				interactions: null,
+				selection: {
+					start: 0,
+					end: 0,
+					length: 0
+				},
+				container: null,
+				value: null
+			};
+
+			// Create a new interactions instance so we can get caret positions for this element.
+			properties.interactions = new $.fn.splendid.interactions(properties.element);
+
+			// When the element loses focus we'll update it's selection property here.
+			properties.element.on('focusout', function()
+			{
+				properties.selection = properties.interactions.getSelection();
+			});
+
+			// If the user wants splendid to generate the buttons we need to inject the buttons container into
+			// the DOM.
+			if(options.generate)
+			{
+				properties.container = $(options.container);
+
+				properties.element.before(properties.container);
+			}
+
+			$.each(options.maps, function(key, value)
+			{
+				var button = {
+						element: null,
+						run: {}
+					},
+					map = this;
+
+				// If someone wants us to generate the buttons for them... then let's do that!
+				if(options.generate)
+				{
+					properties.container.append(button.element = $(options.buttons).html($('<a>')));
+
+					if('text' in this)
+					{
+						button.element.find.('a').html(this.text);
+					}
+				}
+				else
+				{
+					button.element = options.buttons.parent().find('[data-map="' + key + '"]');
+				}
+
+				// If the button has a class property then assign the class to the button.
+				if('class' in this)
+				{
+					button.element.addClass(this.class);
+				}
+
+				button.element.on({
+					click: function(event)
+					{
+						event.preventDefault();
+
+						// Run each of the methods for this button, after, before and replace. If either of
+						// these returns false then we won't do any replacements.
+						button.run.after = properties.interactions.checkReplacement(map.after);
+						button.run.before = properties.interactions.checkReplacement(map.before);
+						button.run.replace = properties.interactions.checkReplacement(map.replace);
+
+						if(button.run.before === false || button.run.after === false || button.run.replace === false)
+						{
+							return;
+						}
+
+						properties.value = properties.element.val();
+
+						// Try to replace the selected text, if there is no text selected then insert whatever
+						// we have wherever the cursor is.
+						if('replace' in map)
+						{
+							properties.value = [
+								properties.value.slice(0, properties.selection.start),
+								properties.value.slice(properties.selection.end),
+								button.run.replace
+							].join('');
+						}
+
+						// Try to insert the content after the selected text. We do the after first because
+						// otherwise our caret positions would be screwed up.
+						if('after' in map)
+						{
+							properties.value = [
+								properties.value.slice(0, properties.selection.end),
+								button.run.after,
+								properties.value.slice(properties.selection.end)
+							].join('');
+						}
+
+						// Now insert any content before the selected text.
+						if('before' in map)
+						{
+							properties.value = [
+								properties.value.slice(0, properties.selection.start),
+								button.run.before,
+								properties.value.slice(properties.selection.start)
+							].join('');
+						}
+
+						properties.element.focus();
+
+						// If there was nothing selected and there is a placeholder mapped to the button
+						// we'll insert it.
+						if(properties.selection.length == 0 && 'placeholder' in map)
+						{
+							properties.value = [
+								properties.value.slice(0, properties.selection.start + button.run.before.length),
+								map.placeholder,
+								properties.value.slice(properties.selection.start + button.run.before.length)
+							].join('');
+						}
+
+						// Update the textarea!
+						properties.element.val(properties.value);
+
+						// Set the selection to the placeholder text. That way the user can begin editing it
+						// straight away without them having to re-select it.
+						if(properties.selection.length == 0 && 'placeholder' in map)
+						{
+							properties.interactions.setSelection(
+								properties.selection.start + button.run.before.length,
+								properties.selection.start + button.run.before.length + map.placeholder.length
+							);
+						}
+					}
+				});
+			});
+		});
+	};
+
+	/**
+	 * The interactions object provides us with caret positions and other lovely
+	 * details. All can be returned in a nice object.
+	 *
+	 * A splendid object is given, which is an input field being wheatified!
+	 */
+	$.fn.splendid.interactions = function(splendid)
+	{
+		this.splendid = splendid;
+	};
+
+	$.fn.splendid.interactions.prototype.getPosition = function()
+	{
+		console.log(this.splendid);
+	};
+
+	/**
+	 * Get the selected text inside of a textarea.
+	 */
+	$.fn.splendid.interactions.prototype.getSelection = function()
+	{
+		this.splendid.focus();
+
+		var selection = {
+			start: 0,
+			end: 0,
+			length: 0,
+			text: null
+		};
+
+		// Most modern browsers provide a lovely way of getting the selection of any input box.
+		// Thanks guys, you rock.
+		if(typeof this.splendid.get(0).selectionStart == "number" && typeof this.splendid.get(0).selectionEnd == "number")
+		{
+			selection.start = this.splendid.get(0).selectionStart;
+			selection.end = this.splendid.get(0).selectionEnd;
+			selection.length = selection.end - selection.start;
+		}
+
+		// Oh, hello ugly block of code. This has to be for Internet Explorer. God why can't
+		// they just be like everyone else.
+		else
+		{
+			var ie = {
+				range: document.selection.createRange(),
+				normalized: this.splendid.val().replace(/\r\n/g, "\n"),
+				selection: this.splendid.get(0).createTextRange(),
+				endRange: this.splendid.get(0).createTextRange()
+			};
+
+			ie.selection.moveToBookmark(ie.range.getBookmark());
+
+			// Check if the start and end of the selection are at the very end of the input, since
+			// moveStart/moveEnd doesn't return what we want in those cases.
+			ie.endRange.collapse(false);
+
+			if(ie.selection.compareEndPoints("StartToEnd", ie.endRange) > -1)
+			{
+				selection.start = selection.end = this.splendid.val().length;
+				selection.length = selection.end - selection.start;
+			}
+			else
+			{
+				selection.start = -ie.selection.moveStart("character", -this.splendid.val().length);
+
+                if(ie.selection.compareEndPoints("EndToEnd", ie.endRange) > -1)
+                {
+					selection.end = this.splendid.val().length;
+				}
+				else
+				{
+					selection.end = -ie.selection.moveEnd("character", -this.splendid.val().length);
+					selection.end += ie.normalized.slice(0, selection.end).split("\n").length - 1;
+				}
+
+				selection.length = selection.end - selection.start;
+			}
+		}
+
+		selection.text = this.splendid.val().slice(selection.start, selection.end);
+
+		return selection;
+	};
+
+	/**
+	 * Set the selection inside the textbox.
+	 */
+	$.fn.splendid.interactions.prototype.setSelection = function(start, end)
+	{
+		// Again, modern browsers rock for how easy this is!
+		if(typeof this.splendid.get(0).selectionStart == "number" && typeof this.splendid.get(0).selectionEnd == "number")
+		{
+			this.splendid.get(0).selectionStart = start;
+			this.splendid.get(0).selectionEnd = end;
+		}
+		else
+		{
+			var ie = {
+				range: this.splendid.get(0).createTextRange()
+			};
+
+			ie.range.collapse(true);
+			ie.range.moveStart('character', start);
+			ie.range.moveEnd('character', end - start);
+			ie.range.select();
+		}
+	};
+
+	/**
+	 * Check for any user prompts within the replacement text.
+	 */
+	$.fn.splendid.interactions.prototype.checkReplacement = function(replacement)
+	{
+		if(typeof replacement === 'function')
+		{
+			replacement = replacement();
+		}
+
+		var prompts = {
+			matches: null,
+			details: null,
+			response: null
+		};
+
+
+			while(prompts.matches = /\[\@(.*?)\]/g.exec(replacement))
+			{
+				// Split the prompt into it's details, so we have the title and any placeholder
+				// text to go into the prompt.
+				if(prompts.details = /\[\@([^:\]]+):?(.*?)?\]/g.exec(prompts.matches[0]))
+				{
+					if((prompts.response = prompt(prompts.details[1], (typeof prompts.details[2] != 'undefined') ? prompts.details[2] : '')) !== false)
+					{
+						replacement = replacement.replace(prompts.details[0], prompts.response);
+					}
+					else
+					{
+						return false;
+					}
+				}
+		}
+
+		return replacement;
+	};
+
+	$.fn.splendid.defaults = {
+		container: '<ul class="splendid-container">',
+		buttons: '<li class="splendid-button">',
+		maps: {},
+		generate: false
+	};
+})(jQuery);
+
+(function($)
+{
+	$('.discussion-textarea').find('textarea').splendid({
+		generate: true,
+		maps: {
+			bold: {
+				placeholder: 'Bold',
+				before: '**',
+				after: '**',
+				class: 'bold'
+			},
+			italic: {
+				placeholder: 'Italic',
+				before: '*',
+				after: '*',
+				class: 'italic'
+			},
+			ul: {
+				placeholder: 'Unordered List',
+				before: '- ',
+				class: 'ul'
+			},
+			ol: {
+				placeholder: 'Ordered List',
+				before: '1. ',
+				class: 'ol'
+			},
+		    picture: {
+				replace: '![[@Alt Text]]([@URL:http://] "[@Title]")',
+				class: 'picture'
+			},
+			link: {
+				placeholder: 'Link',
+				before: '[',
+				after: ']([@URL:http://] "[@Title]")',
+				class: 'link'
+			},
+			quote: {
+				before: '> ',
+				class: 'quote'
+			},
+			code: {
+		    	before : '~~~~\n',
+		    	after : '\n~~~~',
+		        class: 'code'
+		    }
+	    }
+	});
+})(jQuery);
\ No newline at end of file
diff --git a/gears/splendid/splendid.gear.php b/gears/splendid/splendid.gear.php
new file mode 100644
index 0000000..cc36929
--- /dev/null
+++ b/gears/splendid/splendid.gear.php
@@ -0,0 +1,41 @@
+<?php namespace Feather\Gear\Splendid;
+
+use Feather\Components\Gear\Foundation;
+
+class Splendid extends Foundation {
+
+	/**
+	 * Register the event listeners for the Splendid gear.
+	 * 
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$this->listen('assets: change scripts', 'scripting');
+
+		$this->listen('assets: change styles', 'styling');
+	}
+
+	/**
+	 * Adds the splendid.js file to the assets container.
+	 * 
+	 * @param  object  $container
+	 * @return void
+	 */
+	public function scripting($container)
+	{
+		$container->add('splendid', '../../gears/splendid/js/splendid.js');
+	}
+
+	/**
+	 * Adds the splendid.css file to the assets container.
+	 * 
+	 * @param  object  $container
+	 * @return void
+	 */
+	public function styling($container)
+	{
+		$container->add('splendid', '../../gears/splendid/css/splendid.css');
+	}
+
+}
\ No newline at end of file
diff --git a/start.php b/start.php
index 62931c4..d9657dd 100644
--- a/start.php
+++ b/start.php
@@ -4,6 +4,7 @@
 use Bundle;
 use Request;
 use Autoloader;
+use Laravel\Routing\Router;
 
 /*
 |--------------------------------------------------------------------------
@@ -52,6 +53,17 @@
 
 $feather = new Components\Foundation\Application;
 
+/*
+|--------------------------------------------------------------------------
+| Optional Router Placeholders
+|--------------------------------------------------------------------------
+|
+| Register optional router placeholders with the Laravel router.
+|
+*/
+
+Router::$optional['/(:page?)'] = '(?:/p([0-9]+)';
+
 /*
 |--------------------------------------------------------------------------
 | Feather Configuration Repository
diff --git a/themes/basic/public/css/theme.css b/themes/basic/public/css/theme.css
index 52ccd81..74a60f2 100644
--- a/themes/basic/public/css/theme.css
+++ b/themes/basic/public/css/theme.css
@@ -450,7 +450,7 @@ fieldset dd:after,
 .discussions > li {
 	display: block;
 	padding: 16px 0;
-	border-top: 1px solid #EAEAEA;
+	border-top: 1px solid #f4f4f4;
 	letter-spacing: -4px;
 	word-spacing: -4px;
 }
@@ -825,12 +825,73 @@ h1 > .discussion-counter {
 
 .discussion-textarea textarea {
 	width: 100%;
-	height: 400px;
+	height: 300px;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
+/**
+ * Pagination.
+ */
+.pagination {
+	overflow: hidden;
+	text-align: right;
+	margin: 18px 0;
+	font-size: 14px;
+}
+
+.pagination:last-child {
+	margin-bottom: 0;
+}
+
+.pagination span,
+.pagination a {
+	display: inline-block;
+	padding: 4px 10px;
+}
+
+.pagination a {
+	text-decoration: none;
+	border-bottom: 3px solid transparent;
+}
+
+
+.pagination .previous_page,
+.pagination .next_page {
+	border: none;
+	text-shadow: none;
+	color: #d7634c;
+}
+
+.pagination .previous_page.disabled,
+.pagination .next_page.disabled {
+	color: #ccc;
+}
+
+.pagination a:hover {
+	border-bottom: 3px solid rgba(215, 99, 76, 0.8);
+}
+
+.pagination span.current {
+	font-weight: bold;
+	color: #555;
+}
+
+/**
+ * Discussion preview has a bottom margin to push it above everything.
+ */
+.discussion-preview {
+	margin: 0 0 30px;
+	padding: 4px 10px;
+	background-color: #f1f1f1;
+	border: 1px solid #eaeaea;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+
+}
+
 /**
  * Forms and form related stylings.
  */
@@ -1272,7 +1333,7 @@ fieldset .decider .no {
     border-radius: 2px;
     color: #C09853;
     margin-bottom: 16px;
-    padding: 12px 16px;
+    padding: 12px 10px;
     text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
 }
 
diff --git a/themes/basic/views/template.blade.php b/themes/basic/views/template.blade.php
index 46e9c4f..b562d44 100644
--- a/themes/basic/views/template.blade.php
+++ b/themes/basic/views/template.blade.php
@@ -10,7 +10,7 @@
 		{{ Asset::container('theme')->styles() }}
 
 		<script type="text/javascript">
-			var app = { base: '{{ URL::to_route('feather') }}' };
+			var app = { base: '{{ trim(URL::to_route('feather'), '/') }}' };
 		</script>
 	</head>
 

From e425319b9ae34fc0690435fc0bf8f17e79479417 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason.lewis1991@gmail.com>
Date: Tue, 16 Oct 2012 11:32:58 +1030
Subject: [PATCH 136/136] Updated some things.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
---
 applications/core/controllers/discussion.php  |   2 +-
 applications/core/models/discussion.php       | 120 +++++++++++++++++-
 applications/core/models/place.php            |   8 +-
 applications/core/models/reply.php            |  48 +++++++
 applications/core/routes.php                  |   1 +
 .../core/views/discussion/view.blade.php      |  13 ++
 .../views/place/partial/discussion.blade.php  |   2 +-
 themes/basic/public/css/theme.css             |   6 +-
 themes/basic/public/img/sprites.png           | Bin 15604 -> 15896 bytes
 9 files changed, 192 insertions(+), 8 deletions(-)
 create mode 100644 applications/core/models/reply.php

diff --git a/applications/core/controllers/discussion.php b/applications/core/controllers/discussion.php
index cd297c6..a3b903b 100644
--- a/applications/core/controllers/discussion.php
+++ b/applications/core/controllers/discussion.php
@@ -30,7 +30,7 @@ public function get_index($id, $slug)
 				return $this->redirect->to_route('discussion.edit', array($discussion->id, $discussion->slug));
 			}
 
-			$author= $discussion->author;
+			$discussion->build($this->config->get('feather: db.replies.per_page'));
 
 			$this->breadcrumbs->drop($discussion->place)->drop($discussion->title);
 
diff --git a/applications/core/models/discussion.php b/applications/core/models/discussion.php
index 72b3e5a..fc12f3f 100644
--- a/applications/core/models/discussion.php
+++ b/applications/core/models/discussion.php
@@ -3,6 +3,8 @@
 use DB;
 use Str;
 use Cache;
+use DateTime;
+use Feather\Paginator;
 use FeatherModelException;
 
 class Discussion extends Base {
@@ -61,6 +63,16 @@ public function participants()
 		return $this->has_many('Feather\\Core\\Discussion\\Participant', 'discussion_id');
 	}
 
+	/**
+	 * A discussion can have many replies.
+	 * 
+	 * @return object
+	 */
+	public function replies()
+	{
+		return $this->has_many('Feather\\Core\\Reply', 'discussion_id');
+	}
+
 	/**
 	 * Getter for a discussions slug.
 	 * 
@@ -151,6 +163,17 @@ public static function edit($discussion, $input)
 		if($discussion->exists)
 		{
 			$increment = $discussion->draft ? (isset($input['draft']) ? false : true) : false;
+
+			// We'll also update the created_at and updated_at timestamps here if it's being
+			// started from a draft. Otherwise an old draft wouldn't be shown at the top of the
+			// discussions list.
+			if(isset($input['start']))
+			{
+				$discussion->fill(array(
+					'created_at' => new DateTime,
+					'updated_at' => new DateTime
+				));
+			}
 		}
 
 		// If the discussion doesn't exist we only increment the total discussions
@@ -301,9 +324,9 @@ public static function enrichment($discussions)
 
 		// Here we will run three queries, one to fetch all the authors, another to fetch all the participants
 		// and the last will fetch the last poster details, if any.
-		$authors_raw = User::where_in('id', $ids['author'])->get();
+		$authors_raw = $ids['author'] ? User::where_in('id', $ids['author'])->get() : array();
 
-		$participants_raw = Discussion\Participant::with('details')->where_in('discussion_id', $ids['participants'])->get();
+		$participants_raw = $ids['participants'] ? Discussion\Participant::with('details')->where_in('discussion_id', $ids['participants'])->get() : array();
 
 		$recently_raw = $ids['recent'] ? User::where_in('id', $ids['recent'])->get() : array();
 
@@ -350,6 +373,99 @@ public static function enrichment($discussions)
 		return $discussions;
 	}
 
+	/**
+	 * Builds a discussion bringing in it's replies and all related data. This essentially
+	 * rewrites most of the object since the discussion itself is included as a reply.
+	 * 
+	 * @param  int  $replies_per_page
+	 * @return array
+	 */
+	public function build($replies_per_page = 15)
+	{
+		// Determine what discussions to select. Remembering to include the discussion itself as a reply.
+		// Otherwise our pages would be all messed up.
+		$page = Paginator::page($total_results = $this->replies()->count(), $replies_per_page);
+
+		$skip = ($page - 1) * $replies_per_page;
+
+		// If we are on the first page we need to include the actual discussion, so when selecting the replies
+		// only take the replies per page minus one.
+		$take = ($page == 1) ? ($replies_per_page - 1) : $replies_per_page;
+
+
+
+		// Spin through the replies and build an array of IDs, we need to get some extra details for each of the replies,
+		// such as author, editor, and deleter.
+		$replies = $users = array();
+
+		$ids = array($this->user_id);
+
+		foreach((array) $this->replies()->skip($skip)->take($take)->get() as $reply)
+		{
+			$replies[$reply->id] = $reply;
+
+			$ids[] = $reply->user_id;
+
+			if($reply->edited_id)
+			{
+				$ids[] = $reply->edited_id;
+			}
+
+			if($reply->deleted_id)
+			{
+				$ids[] = $reply->deleted_id;
+			}
+		}
+
+		$ids = array_unique($ids);
+
+		foreach(($ids ? User::where_in('id', $ids)->get() : array()) as $user)
+		{
+			$users[$user->id] = $user;
+		}
+
+		// Add the related user accounts to each reply.
+		foreach($replies as $reply)
+		{
+			$reply->relationships['author'] = $users[$reply->user_id];
+
+			$reply->relationships['deleter'] = $reply->deleted ? $users[$reply->deleted_id] : array();
+
+			$reply->relationships['editor'] = $reply->edited ? $users[$reply->edited_id] : array();
+		}
+
+		if($page == 1)
+		{
+			// We'll turn the discussion into a reply and merge it into the replies, then we'll perform our pagination
+			// of the discussion.
+			$discussion = new Reply(array(
+				'user_id'		=> $this->user_id,
+				'discussion_id' => $this->id,
+				'created_at'	=> $this->created_at,
+				'updated_at'	=> $this->updated_at,
+				'body'			=> $this->body,
+				'deleted'		=> 0,
+				'edited'		=> 0
+			), true);
+
+			$discussion->relationships['author'] = $users[$this->user_id];
+
+			$discussion->relationships['deleter'] = array();
+
+			$discussion->relationships['editor'] = array();
+
+			$replies = array($discussion) + $replies;
+		}
+
+		$pagination = Paginator::make($replies, $total_results, $replies_per_page);
+
+		$this->relationships['replies'] = $pagination->results;
+
+		$this->pagination = $pagination->links();
+
+		return $this;
+	}
+
 	/**
 	 * Converts participant IDs into a comma separated string.
 	 * 
diff --git a/applications/core/models/place.php b/applications/core/models/place.php
index b8ab33d..25c370b 100644
--- a/applications/core/models/place.php
+++ b/applications/core/models/place.php
@@ -133,8 +133,6 @@ public static function one($id, $discussions_per_page = 20)
 
 		$place = reset($places);
 
-		// Create a new paginator instance. We get the current page from the total amount of discussions.
-		// We'll then extract a slice from the discussions array based on the offset amount and the amount per page.
 		$pagination = Paginator::make($place->discussions, $total_results, $discussions_per_page);
 
 		return $place->fill(array(
@@ -265,6 +263,11 @@ protected static function refine($discussions, $places, $sorted, $pivot, $totals
 				$place->discussions = $filtered[$place->id];
 
 				$place->total->remaining = $place->total->discussions - count($filtered[$place->id]);
+
+				if($place->total->remaining < 0)
+				{
+					$place->total->remaining = 0;
+				}
 			}
 		}
 
@@ -286,6 +289,7 @@ protected static function tally_discussions($places)
 
 		$aggregates = Discussion::select(array('place_id', DB::raw('COUNT(*) as aggregate')))
 						->where_in('place_id', array_keys($places))
+						->where_draft(0)
 						->group_by('place_id')
 						->get();
 
diff --git a/applications/core/models/reply.php b/applications/core/models/reply.php
new file mode 100644
index 0000000..48fc724
--- /dev/null
+++ b/applications/core/models/reply.php
@@ -0,0 +1,48 @@
+<?php namespace Feather\Core;
+
+class Reply extends Base {
+
+	/**
+	 * The table name.
+	 * 
+	 * @var string
+	 */
+	public static $table = 'replies';
+
+	/**
+	 * Timestamps are enabled.
+	 * 
+	 * @var bool
+	 */
+	public static $timestamps = true;
+
+	/**
+	 * A reply has an author.
+	 * 
+	 * @return object
+	 */
+	public function author()
+	{
+		return $this->has_one('Feather\\Core\\User', 'user_id');
+	}
+
+	/**
+	 * A reply may have an editor.
+	 * 
+	 * @return object
+	 */
+	public function editor()
+	{
+		return $this->has_one('Feather\\Core\\User', 'edited_by');
+	}
+
+	/**
+	 * A reply may have a deleter.
+	 * 
+	 * @return object
+	 */
+	public function deleter()
+	{
+		return $this->has_one('Feather\\Core\\User', 'deleted_by');
+	}
+}
\ No newline at end of file
diff --git a/applications/core/routes.php b/applications/core/routes.php
index 7d47cdd..11884a2 100644
--- a/applications/core/routes.php
+++ b/applications/core/routes.php
@@ -43,6 +43,7 @@
 
 Route::any('(:bundle)/discussion/start', array('as' => 'start.discussion', 'uses' => 'feather core::discussion@start'));
 Route::any('(:bundle)/place/(:num)-(:any)/start', 'feather core::discussion@start');
+Route::get('(:bundle)/discussion/(:num)-(:any)/latest', array('as' => 'discussion.latest', 'uses' => 'feather core::discussion@index'));
 Route::any('(:bundle)/discussion/(:num)-(:any)/(:page?)', array('as' => 'discussion', 'uses' => 'feather core::discussion@index'));
 Route::any('(:bundle)/discussion/(:num)-(:any)/edit', array('as' => 'discussion.edit', 'uses' => 'feather core::discussion@edit'));
 Route::post('(:bundle)/discussion/preview', 'feather core::discussion@preview');
diff --git a/applications/core/views/discussion/view.blade.php b/applications/core/views/discussion/view.blade.php
index e69de29..d784ede 100644
--- a/applications/core/views/discussion/view.blade.php
+++ b/applications/core/views/discussion/view.blade.php
@@ -0,0 +1,13 @@
+<h2>{{ $discussion->title }}</h2>
+
+<div class="replies">
+	@foreach($discussion->replies as $reply)
+
+	<div class="reply">
+
+		
+
+	</div>
+
+	@endforeach
+</div>
\ No newline at end of file
diff --git a/applications/core/views/place/partial/discussion.blade.php b/applications/core/views/place/partial/discussion.blade.php
index 1d57c81..2a54ad7 100644
--- a/applications/core/views/place/partial/discussion.blade.php
+++ b/applications/core/views/place/partial/discussion.blade.php
@@ -26,7 +26,7 @@
 		@if($discussion->recent)
 			Last reply by <a href="">Dayle</a>, on <span title="24th June, 2012 at 6:45am">23th June</span>
 		@elseif($discussion->author)
-			Started by {{ HTML::link_to_route('profile', $discussion->author->username, array($discussion->author->slug)) }}, {{ Feather\Date::meta($discussion->created_at) }}
+			Started by {{ HTML::link_to_route('profile', $discussion->author->username, array($discussion->author->slug)) }}, <a href="{{ URL::to_route('discussion.latest', array($discussion->id, $discussion->slug)) }}">{{ Feather\Date::meta($discussion->created_at) }}</a>
 		@endif
 		</p>
 
diff --git a/themes/basic/public/css/theme.css b/themes/basic/public/css/theme.css
index 74a60f2..3d87c80 100644
--- a/themes/basic/public/css/theme.css
+++ b/themes/basic/public/css/theme.css
@@ -716,15 +716,17 @@ h1 > .discussion-counter {
 }
 
 .discussions > li.discussion > .meta > p {
-	color: #777;
+	color: #999;
 	margin: 0 12px 0 0;
 }
 
 .discussions > li.discussion > .meta > p a {
-	color: #444;
+	color: #555;
 	text-decoration: none;
 }
 
+.discussions > li.discussion > .meta > p a:hover { text-decoration: underline; }
+
 .discussions > li.discussion > .meta > span + a { margin: 0 0 0 4px; }
 
 /**
diff --git a/themes/basic/public/img/sprites.png b/themes/basic/public/img/sprites.png
index c8f56d75f3530b5e71ad9597b4b06029ed314b1a..6768ab32b2b676825ce0f2348f263d293dee829b 100644
GIT binary patch
delta 14959
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
F{0~E?rV#)D

delta 14653
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