Updates from lnApp

application/bootstrap.php

@@ -89,11 +89,11 @@ Kohana::modules(array(
 Kohana::modules(array_merge(Kohana::modules(),Config::appmodules()));
 
 /**
- * Enable admin, user (account), reseller and affiliate interfaces
+ * Enable specalised interfaces
  */
 Route::set('sections', '<directory>/<controller>(/<action>(/<id>(/<sid>)))',
 	array(
-		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')' //(account|admin|affiliate|reseller|task)'
+		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')'
 	));
 
 /**

application/classes/controller/lnapp/login.php

@@ -0,0 +1,209 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides login capability
+ *
+ * @package    lnApp
+ * @subpackage Page/Login
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ * @also       [logout]
+ */
+class Controller_lnApp_Login extends Controller_TemplateDefault {
+	public function action_index() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::instance()->redirect('welcome/index');
+		}
+
+		// If there is a post and $_POST is not empty
+		if ($_POST) {
+			// Instantiate a new user
+			$user = ORM::factory('account');
+
+			// Check Auth
+			$status = $user->login($_POST);
+
+			// If the post data validates using the rules setup in the user model
+			if ($status) {
+				// Redirect to the user account
+				if ($redir = Session::instance()->get('afterlogin')) {
+					Session::instance()->delete('afterlogin');
+					Request::instance()->redirect($redir);
+					
+				} else
+					Request::instance()->redirect('welcome/index');
+
+			} else {
+				SystemMessage::add(array(
+					'title'=>_('Invalid username or password'), 
+					'type'=>'error',
+					'body'=>_('The username or password was invalid.')
+				));
+			}
+		}
+
+		Block::add(array(
+			'title'=>_('Login to server'),
+			'body'=>View::factory('login'),
+			'style'=>array('css/login.css'=>'screen'),
+		));
+
+		$this->template->control = HTML::anchor($this->request->uri(),'Login',array('id'=>'ajxbody'));
+		$this->template->content = Block::factory();
+
+		Script::add(array('type'=>'stdin','data'=>'
+			$(document).ready(function() {
+				$("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;});
+			});'
+		));
+	}
+
+	public function action_register() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::instance()->redirect('welcome/index');
+		}
+
+		// Instantiate a new user
+		$account = ORM::factory('account');
+
+		// If there is a post and $_POST is not empty
+		if ($_POST) {
+			// Check Auth
+			$status = $account->values($_POST)->check();
+
+			if (! $status) {
+				foreach ($account->validate()->errors() as $f=>$r) {
+					// $r[0] has our reason for validation failure
+					switch ($r[0]) {
+						// Generic validation reason
+						default:
+							SystemMessage::add(array(
+								'title'=>_('Validation failed'), 
+								'type'=>'error',
+								'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r[0])
+							));
+					}
+				}
+			}
+
+			$ido = ORM::factory('module')
+				->where('name','=','account')
+				->find();
+
+			$account->id = $ido->record_id->next_id($ido->id);
+			// Save the user details
+			if ($account->save()) {}
+
+		}
+
+		SystemMessage::add(array(
+			'title'=>_('Already have an account?'), 
+			'type'=>'info',
+			'body'=>_('If you already have an account, please login..')
+		));
+
+		Block::add(array(
+			'title'=>_('Register'),
+			'body'=>View::factory('bregister')
+				->set('account',$account)
+				->set('errors',$account->validate()->errors()),
+			'style'=>array('css/bregister.css'=>'screen'),
+		));
+
+		$this->template->control = HTML::anchor($this->request->uri(),'Register',array('id'=>'ajxbody'));
+		$this->template->content = Block::factory();
+		$this->template->left = HTML::anchor('login','Login').'...';
+	}
+
+	/**
+	 * Enable user password reset
+	 */
+	public function action_reset() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::instance()->redirect('welcome/index');
+		}
+
+		// If the user posted their details to reset their password
+		if ($_POST) {
+			// If the email address is correct, create a method token
+			if (! empty($_POST['email']) AND ($ao=ORM::factory('account',array('email'=>$_POST['email']))) AND $ao->loaded()) {
+				$mt = ORM::factory('module_method_token');
+
+				// Find out our password reset method id
+				// @todo move this to a more generic method, so that it can be called by other methods
+				$mo = ORM::factory('module',array('name'=>'account'));
+				$mmo = ORM::factory('module_method',array('name'=>'user_resetpassword','module_id'=>$mo->id));
+
+				// Check to see if there is already a token, if so, do nothing.
+				if ($mt->where('account_id','=',$ao->id)->and_where('method_id','=',$mmo->id)->find()) {
+					if ($mt->date_expire < time()) {
+						$mt->delete();
+						$mt->clear();
+					}
+				}
+
+				if (! $mt->loaded()) {
+					$mt->account_id = $ao->id;
+					$mt->method_id = $mmo->id;
+					$mt->date_expire = time() + 15*3600;
+					$mt->token = md5(sprintf('%s:%s:%s',$mt->account_id,$mt->method_id,$mt->date_expire));
+					$mt->save();
+
+					// Send our email with the token
+					$et = EmailTemplate::instance('account_reset_password');
+					$et->to = array($mt->account->email=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name));
+					$et->variables = array(
+						'SITE'=>URL::base(TRUE,TRUE),
+						'SITE_ADMIN'=>Config::sitename(),
+						'SITE_NAME'=>Config::sitename(),
+						'TOKEN'=>$mt->token,
+						'USER_NAME'=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name),
+					);
+					$et->send();
+				}
+
+			// Redirect to our password reset, the Auth will validate the token.
+			} elseif (! empty($_REQUEST['token'])) {
+				Request::instance()->redirect(sprintf('user/account/resetpassword?token=%s',$_REQUEST['token']));
+			}
+
+			// Show our token screen even if the email was invalid.
+			if (isset($_POST['email']))
+				Block::add(array(
+					'title'=>_('Reset your password'),
+					'body'=>View::factory('login_reset_sent'),
+					'style'=>array('css/login.css'=>'screen'),
+				));
+			else
+				Request::instance()->redirect('login');
+
+		} else {
+			Block::add(array(
+				'title'=>_('Reset your password'),
+				'body'=>View::factory('login_reset'),
+				'style'=>array('css/login.css'=>'screen'),
+			));
+		}
+
+		$this->template->content = Block::factory();
+	}
+
+	public function action_noaccess() {
+		$this->template->content = '&nbsp;';
+
+		SystemMessage::add(array(
+			'title'=>_('No access to requested resource'), 
+			'type'=>'error',
+			'body'=>_('You do not have access to the requested resource, please contact your administrator.')
+		));
+	}
+}
+?>

application/classes/controller/lnapp/templatedefault.php

@@ -61,9 +61,9 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
 		if (! Kohana::Config('config.method_security'))
 			return FALSE;
 
-		return (($this->auth_required !== FALSE && Auth::instance()->logged_in() === FALSE) ||
+		return (($this->auth_required !== FALSE && Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__) === FALSE) ||
 			(is_array($this->secure_actions) && array_key_exists($this->request->action,$this->secure_actions) &&
-			Auth::instance()->logged_in($this->secure_actions[$this->request->action]) === FALSE));
+			Auth::instance()->logged_in($this->secure_actions[$this->request->action],get_class($this).'|'.__METHOD__) === FALSE));
 	}
 
 	/**

application/classes/controller/lnapp/tree.php

@@ -86,9 +86,10 @@ $(function () {
 	 * @param id
 	 */
 	public function action_json($id=null) {
+		#if (! Auth::instance()->logged_in()) {
 		if ($this->_auth_required()) {
 			$this->treedata = array('attr'=>array('id'=>'a_login'),
-				'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'login','href'=>URL::site('/login'))));
+				'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login'))));
 
 			return;
 		}

application/classes/controller/login.php

@@ -1,209 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-/**
+class Controller_Login extends Controller_lnApp_Login {}
- * This class provides login capability
- *
- * @package    lnApp
- * @subpackage Page/Login
- * @category   Controllers
- * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
- * @also       [logout]
- */
-class Controller_Login extends Controller_TemplateDefault {
-	public function action_index() {
-		// If user already signed-in
-		if (Auth::instance()->logged_in()!= 0) {
-			// Redirect to the user account
-			Request::instance()->redirect('welcome/index');
-		}
-
-		// If there is a post and $_POST is not empty
-		if ($_POST) {
-			// Instantiate a new user
-			$user = ORM::factory('account');
-
-			// Check Auth
-			$status = $user->login($_POST);
-
-			// If the post data validates using the rules setup in the user model
-			if ($status) {
-				// Redirect to the user account
-				if ($redir = Session::instance()->get('afterlogin')) {
-					Session::instance()->delete('afterlogin');
-					Request::instance()->redirect($redir);
-					
-				} else
-					Request::instance()->redirect('welcome/index');
-
-			} else {
-				SystemMessage::add(array(
-					'title'=>_('Invalid username or password'), 
-					'type'=>'error',
-					'body'=>_('The username or password was invalid.')
-				));
-			}
-		}
-
-		Block::add(array(
-			'title'=>_('Login to server'),
-			'body'=>View::factory('login'),
-			'style'=>array('css/login.css'=>'screen'),
-		));
-
-		$this->template->control = HTML::anchor($this->request->uri(),'Login',array('id'=>'ajxbody'));
-		$this->template->content = Block::factory();
-
-		Script::add(array('type'=>'stdin','data'=>'
-			$(document).ready(function() {
-				$("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;});
-			});'
-		));
-	}
-
-	public function action_register() {
-		// If user already signed-in
-		if (Auth::instance()->logged_in()!= 0) {
-			// Redirect to the user account
-			Request::instance()->redirect('welcome/index');
-		}
-
-		// Instantiate a new user
-		$account = ORM::factory('account');
-
-		// If there is a post and $_POST is not empty
-		if ($_POST) {
-			// Check Auth
-			$status = $account->values($_POST)->check();
-
-			if (! $status) {
-				foreach ($account->validate()->errors() as $f=>$r) {
-					// $r[0] has our reason for validation failure
-					switch ($r[0]) {
-						// Generic validation reason
-						default:
-							SystemMessage::add(array(
-								'title'=>_('Validation failed'), 
-								'type'=>'error',
-								'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r[0])
-							));
-					}
-				}
-			}
-
-			$ido = ORM::factory('module')
-				->where('name','=','account')
-				->find();
-
-			$account->id = $ido->record_id->next_id($ido->id);
-			// Save the user details
-			if ($account->save()) {}
-
-		}
-
-		SystemMessage::add(array(
-			'title'=>_('Already have an account?'), 
-			'type'=>'info',
-			'body'=>_('If you already have an account, please login..')
-		));
-
-		Block::add(array(
-			'title'=>_('Register'),
-			'body'=>View::factory('bregister')
-				->set('account',$account)
-				->set('errors',$account->validate()->errors()),
-			'style'=>array('css/bregister.css'=>'screen'),
-		));
-
-		$this->template->control = HTML::anchor($this->request->uri(),'Register',array('id'=>'ajxbody'));
-		$this->template->content = Block::factory();
-		$this->template->left = HTML::anchor('login','Login').'...';
-	}
-
-	/**
-	 * Enable user password reset
-	 */
-	public function action_reset() {
-		// If user already signed-in
-		if (Auth::instance()->logged_in()!= 0) {
-			// Redirect to the user account
-			Request::instance()->redirect('welcome/index');
-		}
-
-		// If the user posted their details to reset their password
-		if ($_POST) {
-			// If the email address is correct, create a method token
-			if (! empty($_POST['email']) AND ($ao=ORM::factory('account',array('email'=>$_POST['email']))) AND $ao->loaded()) {
-				$mt = ORM::factory('module_method_token');
-
-				// Find out our password reset method id
-				// @todo move this to a more generic method, so that it can be called by other methods
-				$mo = ORM::factory('module',array('name'=>'account'));
-				$mmo = ORM::factory('module_method',array('name'=>'user_resetpassword','module_id'=>$mo->id));
-
-				// Check to see if there is already a token, if so, do nothing.
-				if ($mt->where('account_id','=',$ao->id)->and_where('method_id','=',$mmo->id)->find()) {
-					if ($mt->date_expire < time()) {
-						$mt->delete();
-						$mt->clear();
-					}
-				}
-
-				if (! $mt->loaded()) {
-					$mt->account_id = $ao->id;
-					$mt->method_id = $mmo->id;
-					$mt->date_expire = time() + 15*3600;
-					$mt->token = md5(sprintf('%s:%s:%s',$mt->account_id,$mt->method_id,$mt->date_expire));
-					$mt->save();
-
-					// Send our email with the token
-					$et = EmailTemplate::instance('account_reset_password');
-					$et->to = array($mt->account->email=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name));
-					$et->variables = array(
-						'SITE'=>URL::base(TRUE,TRUE),
-						'SITE_ADMIN'=>Config::sitename(),
-						'SITE_NAME'=>Config::sitename(),
-						'TOKEN'=>$mt->token,
-						'USER_NAME'=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name),
-					);
-					$et->send();
-				}
-
-			// Redirect to our password reset, the Auth will validate the token.
-			} elseif (! empty($_REQUEST['token'])) {
-				Request::instance()->redirect(sprintf('user/account/resetpassword?token=%s',$_REQUEST['token']));
-			}
-
-			// Show our token screen even if the email was invalid.
-			if (isset($_POST['email']))
-				Block::add(array(
-					'title'=>_('Reset your password'),
-					'body'=>View::factory('login_reset_sent'),
-					'style'=>array('css/login.css'=>'screen'),
-				));
-			else
-				Request::instance()->redirect('login');
-
-		} else {
-			Block::add(array(
-				'title'=>_('Reset your password'),
-				'body'=>View::factory('login_reset'),
-				'style'=>array('css/login.css'=>'screen'),
-			));
-		}
-
-		$this->template->content = Block::factory();
-	}
-
-	public function action_noaccess() {
-		$this->template->content = '&nbsp;';
-
-		SystemMessage::add(array(
-			'title'=>_('No access to requested resource'), 
-			'type'=>'error',
-			'body'=>_('You do not have access to the requested resource, please contact your administrator.')
-		));
-	}
-}
 ?>

application/classes/controller/templatedefault.php

@@ -11,26 +11,6 @@
  * @license    http://dev.leenooks.net/license.html
  */
 class Controller_TemplateDefault extends Controller_lnApp_TemplateDefault {
-	/**
-	 * Check and see if this controller needs authentication
-	 *
-	 * if $this->auth_required is TRUE, then the user must be logged in only.
-	 * if $this->auth_required is FALSE, AND $this->secure_actions has an array of
-	 * methods set to TRUE, then the user must be logged in AND a member of the
-	 * role.
-	 *
-	 * @return boolean
-	 */
-	protected function _auth_required() {
-		// If our global configurable is disabled, then continue
-		if (! Kohana::Config('config.method_security'))
-			return FALSE;
-
-		return (($this->auth_required !== FALSE && Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__) === FALSE) ||
-			(is_array($this->secure_actions) && array_key_exists($this->request->action,$this->secure_actions) &&
-			Auth::instance()->logged_in($this->secure_actions[$this->request->action],get_class($this).'|'.__METHOD__) === FALSE));
-	}
-
 	protected function _left() {
 		if ($this->template->left)
 			return $this->template->left;

application/classes/controller/tree.php

@@ -24,7 +24,7 @@ class Controller_Tree extends Controller_lnApp_Tree {
 	public function action_json($id=null) {
 		if ($this->_auth_required()) {
 			$this->treedata = array('attr'=>array('id'=>'a_login'),
-				'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('login'))));
+				'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login'))));
 
 			return;
 		}

application/classes/controller/welcome.php

@@ -12,8 +12,7 @@
  */
 class Controller_Welcome extends Controller_TemplateDefault {
 	public function action_index() {
-		$block = new block;
+		Block::add(array(
-		$block->add(array(
 			'title'=>'Welcome to lnApp (public)!',
 			'subtitle'=>'Using lnApp',
 			'body'=>'Sample lnApp application',
@@ -33,7 +32,7 @@ class Controller_Welcome extends Controller_TemplateDefault {
 			));
 		}
 
-		$this->template->content = $block;
+		$this->template->content = Block::factory();
 	}
 }
 ?>

application/classes/editor.php

@@ -1,7 +1,7 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * This class is for rendering system information messages.
+ * This class is for rendering the tinyMCE editor
  *
  * @package    lnApp
  * @subpackage Editor

application/classes/lnapp/config.php

@@ -12,39 +12,6 @@
  * @license    http://dev.leenooks.net/license.html
  */
 abstract class lnApp_Config extends Kohana {
-	/**
-	 * Find a list of all database enabled modules
-	 *
-	 * @uses cache
-	 */
-	public static function appmodules() {
-		$cacheable = TRUE;
-
-		if (array_key_exists('cache',Kohana::modules())) {
-			$cache = Cache::instance(static::cachetype());
-
-			if ($cacheable AND $cache->get('modules'))
-				return $cache->get('modules');
-
-		} else
-			$cache = '';
-
-		$modules = array();
-		$module_table = 'module';
-
-		if (class_exists('Model_'.ucfirst($module_table))) {
-			$mo = ORM::factory($module_table)->where('status','=',1)->find_all()->as_array();
-
-			foreach ($mo as $o)
-				$modules[$o->name] = MODPATH.$o->name;
-		}
-
-		if ($cache)
-			$cache->set('modules',$modules);
-
-		return $modules;
-	}
-
 	/**
 	 * Return our site name
 	 */
@@ -90,7 +57,13 @@ abstract class lnApp_Config extends Kohana {
 		return Kohana::config('config.site_name');
 	}
 
+	public static function logo_file() {
+		// @todo Move the logo filename to a config file
+		return Kohana::find_file(sprintf('media/%s',Config::siteid()),'img/logo-small','png');
+	}
+
 	public static function logo() {
+		// @todo Move the logo filename to a config file
 		$mediapath = Route::get('default/media');
 		$logo = $mediapath->uri(array('file'=>'img/logo-small.png'),array('alt'=>static::sitename()));
 

application/classes/model/.htaccess

@@ -1,2 +0,0 @@
-order allow,deny
-deny from all

application/config/.htaccess

@@ -1,2 +0,0 @@
-order allow,deny
-deny from all

application/config/auth.php

@@ -15,5 +15,6 @@ return array(
 	'salt_pattern' => null,
 	'lifetime'     => 1209600,
 	'session_key'  => 'auth_user',
+	'forced_key'   => 'auth_forced',
 );
 ?>

application/config/database.php

@@ -9,17 +9,29 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
+
 return array
 (
 	'default' => array
 	(
 		'type'       => 'mysql',
 		'connection' => array(
-			'hostname'   => 'mysql.leenooks.vpn',
+			/**
-			'username'   => 'gh-webbill',
+			 * The following options are available for MySQL:
-			'password'   => 'ws0593',
+			 *
+			 * string   hostname     server hostname, or socket
+			 * string   database     database name
+			 * string   username     database username
+			 * string   password     database password
+			 * boolean  persistent   use persistent connections?
+			 *
+			 * Ports and sockets may be appended to the hostname.
+			 */
+			'hostname'   => 'localhost',
+			'username'   => 'username',
+			'password'   => 'password',
 			'persistent' => FALSE,
-			'database'   => 'webghosb',
+			'database'   => 'database',
 		),
 		'table_prefix' => 'ab_',
 		'charset'      => 'utf8',

application/media/css/default.css

@@ -2,7 +2,7 @@
 
 table.box-left { border: 1px solid #AAAACC; margin-right: auto; }
 table.box-center { border: 1px solid #AAAACC; margin-left: auto; margin-right: auto; }
-table.box-full { border: 1px solid #AAAACC; width: 100%; }
+table.box-full { border: 1px solid #AAAACC; margin-right: auto; width: 100%; }
 tr.head { font-weight: bold; }
 td.head { font-weight: bold; }
 td.bold { font-weight: bold; }

application/media/js/themes/default/style.css

@@ -0,0 +1,56 @@
+/*
+ * jsTree default theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-default li, 
+.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-default li.jstree-last { background:transparent; }
+.jstree-default .jstree-open > ins { background-position:-72px 0; }
+.jstree-default .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default .jstree-hovered { background:#FFF0C0; border:1px solid #841212; padding:0 2px 0 1px; color: #841212;}
+.jstree-default .jstree-clicked { background:#FCFCFC; border:1px solid #FCFCFC; padding:0 2px 0 1px; color: #841212;}
+.jstree-default a .jstree-icon { background-position:-56px -19px; }
+.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-default.jstree-focused { background:#FCFCFC; }
+
+.jstree-default .jstree-no-dots li, 
+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default .jstree-search { font-style:italic; }
+
+.jstree-default .jstree-no-icons .checkbox { display:inline-block; }
+.jstree-default .jstree-no-checkboxes .checkbox { display:none !important; }
+.jstree-default .jstree-checked > a > .checkbox { background-position:-38px -19px; }
+.jstree-default .jstree-unchecked > a > .checkbox { background-position:-2px -19px; }
+.jstree-default .jstree-undetermined > a > .checkbox { background-position:-20px -19px; }
+.jstree-default .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
+.jstree-default .jstree-unchecked > a > .checkbox:hover { background-position:-2px -37px; }
+.jstree-default .jstree-undetermined > a > .checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-default ins { background:transparent !important; }
+#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; }
+
+.jstree-default a.jstree-search { color:aqua; }
+
+#vakata-contextmenu.jstree-default-context, 
+#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-default-context li { }
+#vakata-contextmenu.jstree-default-context a { color:black; }
+#vakata-contextmenu.jstree-default-context a:hover, 
+#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
+
+/* TODO: IE6 support - the `>` selectors */

application/views/login.php

@@ -7,6 +7,7 @@
 		<tr><td><b>Password:</b></td></tr>
 		<tr><td><?php echo Form::password('password',null,array('id'=>'login-pwd','size'=>40));?></td></tr>
 		<tr><td colspan="2">&nbsp;</td></tr>
+		<!-- @todo Password reset ability should be a config option (or auto detected) -->
 		<tr><td colspan="2"><?echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr>
 		<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Authenticate'));?></td></tr>
 	</table>