@@ -35,6 +35,28 @@ function path()
}
/**
+ * Convenience method to find file in a given array of directories.
+ * @param string $filename
+ * @param array $paths
+ * @return string Found file path or FALSE
+ */
+function find($filename, $paths)
+{
+ if ($filename and is_array($paths))
+ {
+ foreach ($paths as $path)
+ {
+ $fullpath = $path.DIRECTORY_SEPARATOR.$filename;
+ if (file_exists($fullpath))
+ {
+ return $fullpath;
+ }
+ }
+ }
+ return FALSE;
+}
+
+/**
* Convenience method to determine if this script was initiated by an
* XMLHTTPRequest (AJAX)
* @return boolean TRUE if called by AJAX
minim.php
@@ -3,7 +3,7 @@
<?php $this->load_helpers('logged_in_user') ?>
<?php $this->set('meta') ?>
- <link rel="shortcut icon" type="image/gif" href="<?php echo minim()->webroot ?>/images/favicon.gif">
+ <link rel="shortcut icon" type="image/gif" href="<?php $this->asset_url('/images/favicon.gif') ?>">
<?php $this->get('page_meta') ?>
<?php $this->end() ?>
@@ -27,7 +27,7 @@
<?php $this->set('content') ?>
<div id="wrapper">
<div id="masthead">
- <h1>Minim Admin</div>
+ <h1>Minim Admin</h1>
<div class="logged_in">
<?php if ($user = logged_in_user()): ?>
Logged in as <strong><?php echo $user['name'] ?></strong> - <a href="<?php echo minim('routing')->url_for('logout') ?>">Log out</a>
plugins/admin/templates/admin_base.php
@@ -56,8 +56,14 @@ if (strtolower($_SERVER['REQUEST_METHOD']) == 'post')
}
}
-minim('templates')->render('model-edit', array(
- 'model_name' => $model_name,
- 'form' => $form,
- 'errors' => $errors
-));
+minim('templates')->render(
+ array(
+ "{$model_name}-edit",
+ 'model-edit'
+ ),
+ array(
+ 'model_name' => $model_name,
+ 'form' => $form,
+ 'errors' => $errors
+ )
+);
plugins/admin/views/admin-model-edit.php
@@ -1,10 +1,10 @@
<?php
-class Minim_New_Forms implements Minim_Plugin // {{{
+class Minim_New_Forms implements Minim_Plugin
{
var $_widget_types;
var $widget_paths;
- function Minim_New_Forms() // {{{
+ function Minim_New_Forms()
{
$file = realpath(__FILE__);
$this->_widget_types = array(
@@ -21,25 +21,25 @@ class Minim_New_Forms implements Minim_Plugin // {{{
// TODO - add more default widgets
);
$this->widget_paths = array();
- } // }}}
+ }
/**
* Register a widget type
*/
- function register_widget_type($type, $file, $class_name) // {{{
+ function register_widget_type($type, $file, $class_name)
{
$this->_widget_types[$type] = array(
'file' => $file,
'class' => $class_name
);
- } // }}}
+ }
- function create() // {{{
+ function create()
{
return new Minim_Form($this);
- } // }}}
+ }
- function from_model($manager, $model=NULL) // {{{
+ function from_model($manager, $model=NULL)
{
$form = new Minim_Form($this);
try
@@ -53,28 +53,24 @@ class Minim_New_Forms implements Minim_Plugin // {{{
}
foreach ($manager->_fields as $name => $field)
{
- # try to get a widget for the form field:
- # 1. see if there's a suggested widget in the model field
- # 2. if not, go with a default text field
- # widgets can be overridden later
- $widget = 'text';
- if (isset($field->widget) and $field->widget)
- {
- $widget = $field->widget;
- }
+ // try to get a widget for the form field:
+ // widgets can be overridden later
+ $widget = $field->widget();
- # add a form field
- # TODO - add field params as argument
- $form->$widget($name, array(
- 'label' => ucfirst($name)
+ // add a form field
+ $form->$widget($name, array_merge(
+ array(
+ 'label' => ucfirst($name)
+ ),
+ $field->params
));
}
error_log(print_r($form, TRUE));
return $form;
- } // }}}
-} // }}}
+ }
+}
-class Minim_Form // {{{
+class Minim_Form
{
var $_forms;
var $_fields;
@@ -82,19 +78,19 @@ class Minim_Form // {{{
var $method;
var $attrs;
- function Minim_Form(&$fo, $action='', $method='POST', $attrs=array()) // {{{
+ function Minim_Form(&$fo, $action='', $method='POST', $attrs=array())
{
$this->_forms =& $fo;
$this->submit_url = $action;
$this->method = $method;
$this->attrs = $attrs;
$this->_fields = array();
- } // }}}
+ }
/**
* Check for form data matching this form's fields in the request
*/
- function was_submitted() // {{{
+ function was_submitted()
{
$data = $GLOBALS["_{$this->method}"];
@@ -114,12 +110,12 @@ class Minim_Form // {{{
}
$this->populate($submission);
return TRUE;
- } // }}}
+ }
/**
* Validate form submission
*/
- function is_valid() // {{{
+ function is_valid()
{
foreach ($this->_fields as &$field)
{
@@ -129,23 +125,23 @@ class Minim_Form // {{{
}
}
return TRUE;
- } // }}}
+ }
/**
* Set a form's values to those in the specified array
*/
- function populate($data) // {{{
+ function populate($data)
{
foreach ($this->_fields as $field)
{
$field->value = $data[$field->name];
}
- } // }}}
+ }
/**
* Enable syntactic sugar for adding fields to a form.
*/
- function &__call($name, $params) // {{{
+ function &__call($name, $params)
{
if (array_key_exists($name, $this->_forms->_widget_types))
{
@@ -158,12 +154,12 @@ class Minim_Form // {{{
$this->add_field($name, $field_name, $params);
}
return $this;
- } // }}}
+ }
/**
* Add a field to a form
*/
- function add_field($widget, $name, $params) // {{{
+ function add_field($widget, $name, $params)
{
$widgets = $this->_forms->_widget_types;
if (array_key_exists($widget, $widgets))
@@ -181,18 +177,18 @@ class Minim_Form // {{{
));
$this->_fields[$name] = new $widgets[$widget]['class']($params);
}
- } // }}}
+ }
- function __get($name) // {{{
+ function __get($name)
{
if (array_key_exists($name, $this->_fields))
{
return $this->_fields[$name];
}
return NULL;
- } // }}}
+ }
- function render() // {{{
+ function render()
{
$fields = '';
foreach ($this->_fields as $field)
@@ -204,58 +200,64 @@ class Minim_Form // {{{
{$fields}
</form>
HTML;
- } // }}}
-} // }}}
+ }
+}
-class Minim_Form_Field // {{{
+class Minim_Form_Field
{
var $name;
var $type;
var $label;
+ var $max_length;
var $help;
var $value;
var $initial_value;
var $form;
- function __construct($params=array()) // {{{
+ function __construct($params=array())
{
$this->name = $params['name'];
$this->type = 'text';
$this->form =& $params['form'];
- foreach (array('label', 'help', 'value', 'initial_value') as $var)
+ foreach (array('label', 'help', 'value', 'initial_value', 'max_length') as $var)
{
$this->$var = @$params[$var] ? $params[$var] : '';
}
$this->_validation_method = @$params['validate'];
- } // }}}
+ }
- function render_label() // {{{
+ function render_label()
{
return <<<HTML
<label for="{$this->name}_field">{$this->label}</label>
HTML;
- } // }}}
+ }
- function render_field() // {{{
+ function render_field()
{
$value_attr = '';
if ($this->value)
{
$value_attr = ' value="'.$this->value.'"';
}
+ $max_length = '';
+ if (@$this->max_length)
+ {
+ $max_length = ' maxlength="'.$this->max_length.'"';
+ }
return <<<HTML
-<input type="text" name="{$this->name}" id="{$this->name}_field"{$value_attr}>
+<input type="text" name="{$this->name}" id="{$this->name}_field"{$value_attr}{$max_length}>
HTML;
- } // }}}
+ }
- function render_help() // {{{
+ function render_help()
{
return <<<HTML
-<p class="formfield_help">{$this->help}</p>
+<p class="help">{$this->help}</p>
HTML;
- } // }}}
+ }
- function render_as_div() // {{{
+ function render_as_div()
{
$label = $this->render_label();
$field = $this->render_field();
@@ -267,9 +269,9 @@ HTML;
{$help}
</div>
HTML;
- } // }}}
+ }
- function is_valid() // {{{
+ function is_valid()
{
$validate = $this->_validation_method;
if ($validate)
@@ -277,5 +279,20 @@ HTML;
return $validate($this);
}
return TRUE;
- } // }}}
-} // }}}
+ }
+}
+
+class Minim_Form_TextArea extends Minim_Form_Field
+{
+ function render_field()
+ {
+ $value_attr = '';
+ if ($this->value)
+ {
+ $value_attr = $this->value;
+ }
+ return <<<HTML
+<textarea name="{$this->name}" id="{$this->name}_field">{$value_attr}</textarea>
+HTML;
+ }
+}
plugins/forms/new_forms.php
@@ -4,7 +4,7 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
var $_orm;
var $_db;
- function __construct($params, &$orm) // {{{
+ function __construct($params, $orm) // {{{
{
$this->_orm = $orm;
if (!array_key_exists('database', $params))
@@ -16,7 +16,7 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
$this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} // }}}
- function save(&$do, &$manager) // {{{
+ function save($do, $manager) // {{{
{
$fields = array_keys($manager->_fields);
$values = preg_replace('/^/', ':', $fields);
@@ -30,7 +30,7 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
/**
* Delete the specified record
*/
- function delete(&$do, &$manager) // {{{
+ function delete($do, $manager) // {{{
{
$fields = array_keys($manager->_fields);
$criteria = array();
@@ -53,7 +53,7 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
$sth->execute($values);
} // }}}
- function &get($params, &$manager) // {{{
+ function get($params, $manager) // {{{
{
$criteria = '';
foreach ($params as $key => $value)
@@ -92,7 +92,7 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
error_log("Got $num_results result(s): ".dump($results));
if ($num_results == 1)
{
- $instance =& $manager->create($results[0]);
+ $instance = $manager->create($results[0]);
$instance->_in_db = TRUE;
return $instance;
}
@@ -103,20 +103,20 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
throw new Minim_Orm_Exception("No results for get");
} // }}}
- function &get_dataobjects(&$modelset) // {{{
+ function get_dataobjects($modelset) // {{{
{
list($query, $params) = $this->build_query($modelset);
- $s =& $this->execute_query($query, $params);
+ $s = $this->execute_query($query, $params);
$objects = array();
- $manager =& $modelset->_manager;
+ $manager = $modelset->_manager;
foreach ($s->fetchAll() as $row)
{
- $objects[] =& $manager->create($row);
+ $objects[] = $manager->create($row);
}
return $objects;
} // }}}
- function count_dataobjects(&$modelset) // {{{
+ function count_dataobjects($modelset) // {{{
{
list($query, $params) = $this->build_count_query($modelset);
$s = $this->execute_query($query, $params);
@@ -128,16 +128,16 @@ class Minim_Orm_Sqlite_Backend implements Minim_Orm_Backend
return $count;
} // }}}
- function build_count_query(&$modelset) // {{{
+ function build_count_query($modelset) // {{{
{
return $this->build_query($modelset, True);
} // }}}
- function build_query(&$modelset, $count=False) // {{{
+ function build_query($modelset, $count=False) // {{{
{
$query = array();
$params = array();
- foreach ($modelset->_filters as &$filter)
+ foreach ($modelset->_filters as $filter)
{
// TODO - hide this from the developer
list($expr, $value) = $this->render($filter);
@@ -210,7 +210,7 @@ SQL;
return $s;
} // }}}
- function render(&$filter) // {{{
+ function render($filter) // {{{
{
switch ($filter->_operator)
{
plugins/orm/backends/sqlite.php
@@ -38,7 +38,7 @@ class Minim_Orm implements Minim_Plugin
*
* @param string $name Name of model to register
*/
- function ®ister($name)
+ function register($name)
{
if (array_key_exists($name, $this->_managers))
{
@@ -52,7 +52,7 @@ class Minim_Orm implements Minim_Plugin
* Get a reference to the Manager for the named model.
* Managers are lazy-loaded.
*/
- function &__get($name)
+ function __get($name)
{
if (!array_key_exists($name, $this->_managers))
{
@@ -122,7 +122,7 @@ class Minim_Orm implements Minim_Plugin
* Set the backend for the ORM, eg: MySQL DB, SQLite DB, etc
* Return FALSE on failure
*/
- function &set_backend($type, $params)
+ function set_backend($type, $params)
{
// do not load a second backend
if ($this->_backend)
@@ -160,15 +160,15 @@ class Minim_Orm implements Minim_Plugin
interface Minim_Orm_Backend
{
- function save(&$dataobject, &$manager);
+ function save($dataobject, $manager);
- function delete(&$dataobject, &$manager);
+ function delete($dataobject, $manager);
- function &get($params, &$manager);
+ function get($params, $manager);
- function count_dataobjects(&$modelset);
+ function count_dataobjects($modelset);
- function &get_dataobjects(&$modelset);
+ function get_dataobjects($modelset);
}
class Minim_Orm_Exception extends Exception {}
@@ -188,10 +188,10 @@ class Minim_Orm_Manager
var $_fields;
var $_sorting;
- function Minim_Orm_Manager($name, &$orm)
+ function Minim_Orm_Manager($name, $orm)
{
$this->_model = $name;
- $this->_orm =& $orm;
+ $this->_orm = $orm;
$this->_db_table = strtolower($name);
$this->_fields = array();
$this->_sorting = array();
@@ -200,7 +200,7 @@ class Minim_Orm_Manager
/**
* Enable syntactic sugar for adding fields to model.
*/
- function &__call($name, $args)
+ function __call($name, $args)
{
if (array_key_exists($name, $this->_orm->_field_types))
{
@@ -260,7 +260,7 @@ class Minim_Orm_Manager
/**
* Create a new DataObject instance based on this model
*/
- function &create($data=array())
+ function create($data=array())
{
$instance = new Minim_Orm_DataObject($this);
@@ -281,7 +281,7 @@ class Minim_Orm_Manager
/**
* Save specified dataobject to ORM backend
*/
- function save(&$do)
+ function save($do)
{
$this->_orm->_backend->save($do, $this);
}
@@ -289,7 +289,7 @@ class Minim_Orm_Manager
/**
* Delete specified dataobject from ORM backend
*/
- function delete(&$do)
+ function delete($do)
{
$this->_orm->_backend->delete($do, $this);
}
@@ -297,7 +297,7 @@ class Minim_Orm_Manager
/**
* Retrieve a single data object from the ORM backend
*/
- function &get($params)
+ function get($params)
{
if ($this->_orm->_backend)
{
@@ -317,7 +317,7 @@ class Minim_Orm_Manager
/**
* Get a QueryObject on the 'all' ModelSet
*/
- function &where($fieldname)
+ function where($fieldname)
{
return $this->all()->where($fieldname);
}
@@ -330,6 +330,13 @@ class Minim_Orm_Manager
*/
class Minim_Orm_Field
{
+ var $params;
+
+ function __construct($params)
+ {
+ $this->params = array();
+ }
+
/**
* Validate field value.
*/
@@ -337,6 +344,11 @@ class Minim_Orm_Field
{
return TRUE;
}
+
+ function widget()
+ {
+ return 'text';
+ }
}
/**
@@ -353,9 +365,9 @@ class Minim_Orm_ModelSet implements Iterator, Countable
var $_count;
var $_cache;
- function Minim_Orm_ModelSet(&$manager)
+ function Minim_Orm_ModelSet($manager)
{
- $this->_manager =& $manager;
+ $this->_manager = $manager;
$this->_iterator_position = 0;
$this->_filters = array();
$this->_sorting = array();
@@ -365,7 +377,7 @@ class Minim_Orm_ModelSet implements Iterator, Countable
/**
* Get a query object to apply to this modelset
*/
- function &where($fieldname)
+ function where($fieldname)
{
return $this->_filter($fieldname);
}
@@ -373,17 +385,17 @@ class Minim_Orm_ModelSet implements Iterator, Countable
/**
* @access private
*/
- function &_filter($field_name, $conjunction='AND')
+ function _filter($field_name, $conjunction='AND')
{
$qo = new Minim_Orm_QueryObject($field_name, $conjunction, $this);
- $this->_filters[] =& $qo;
+ $this->_filters[] = $qo;
return $qo;
}
/**
* Syntactic sugar for building filter chain
*/
- function &__call($name, $params)
+ function __call($name, $params)
{
if ($name == 'and')
{
@@ -445,7 +457,7 @@ class Minim_Orm_ModelSet implements Iterator, Countable
{
if (is_null($this->_count))
{
- $backend =& $this->_manager->_orm->_backend;
+ $backend = $this->_manager->_orm->_backend;
if (!$backend)
{
throw new Minim_Orm_Exception("No backend set");
@@ -460,8 +472,8 @@ class Minim_Orm_ModelSet implements Iterator, Countable
*/
function _fill_cache()
{
- $backend =& $this->_manager->_orm->_backend;
- $this->_cache =& $backend->get_dataobjects($this);
+ $backend = $this->_manager->_orm->_backend;
+ $this->_cache = $backend->get_dataobjects($this);
}
/**
@@ -504,7 +516,7 @@ class Minim_Orm_ModelSet implements Iterator, Countable
/**
* Get model instance at the current iterator position
*/
- function ¤t()
+ function current()
{
return $this->_cache[$this->_iterator_position];
}
@@ -561,7 +573,7 @@ class Minim_Orm_DataObject
var $_in_db;
var $_data;
- function Minim_Orm_DataObject(&$manager)
+ function Minim_Orm_DataObject($manager)
{
$this->_manager = $manager;
$this->_in_db = FALSE;
@@ -645,11 +657,11 @@ class Minim_Orm_QueryObject
var $_operator;
var $_operand;
- function Minim_Orm_QueryObject($fieldname, $conjunction, &$modelset)
+ function Minim_Orm_QueryObject($fieldname, $conjunction, $modelset)
{
$this->_and = $conjunction == 'AND';
$this->_field = $fieldname;
- $this->_modelset =& $modelset;
+ $this->_modelset = $modelset;
$this->_operator = '';
$this->_operand = '';
}
@@ -657,7 +669,7 @@ class Minim_Orm_QueryObject
/**
* Enable syntactic sugar for defining criteria
*/
- function &__call($name, $params)
+ function __call($name, $params)
{
switch ($name)
{
@@ -704,8 +716,27 @@ class Minim_Orm_Integer extends Minim_Orm_Field
class Minim_Orm_Text extends Minim_Orm_Field
{
+ var $params;
+
+ function __construct($params)
+ {
+ parent::__construct($params);
+ $this->params = array(
+ 'max_length' => @$params['max_length']
+ );
+ }
+
function accepts_value($value)
{
return is_string($value);
}
+
+ function widget()
+ {
+ if ($this->params['max_length'])
+ {
+ return 'text';
+ }
+ return 'textarea';
+ }
}
plugins/orm/orm.php
@@ -7,8 +7,8 @@ class Minim_TemplateEngine implements Minim_Plugin
var $_def_stack;
var $_blocks;
var $_extends;
- var $webroot = '/';
var $plugin_path;
+ var $asset_paths;
function Minim_TemplateEngine()
{
@@ -19,16 +19,44 @@ class Minim_TemplateEngine implements Minim_Plugin
$this->_extends = array();
$this->_helpers = array();
$this->plugin_path = dirname(__FILE__);
+ $this->asset_paths = array();
}
/**
* Render a template
*/
- function render($_template, $_context=array())
+ function render($templates, $context=array())
+ {
+ // make sure templates is an array
+ if (!is_array($templates))
+ {
+ $templates = array($templates);
+ }
+
+ // use the first template that can be found
+ $found = FALSE;
+ foreach ($templates as $template)
+ {
+ if ($found = $this->_find_template($template))
+ {
+ error_log("Found {$template} template at {$found}");
+ break;
+ }
+ }
+
+ if (!$found)
+ {
+ throw new Minim_TemplateEngine_Exception(
+ "No matching templates found");
+ }
+
+ $this->_render($template, $found, $context);
+ }
+
+ function _render($_template, $_template_file, $_context)
{
// prefix all variables with _ to 'hide' them from the template
error_log("Rendering $_template template");
- $_template_file = $this->_find_template($_template);
if (!$_template_file)
{
throw new Minim_TemplateEngine_Exception(
@@ -61,10 +89,12 @@ class Minim_TemplateEngine implements Minim_Plugin
{
foreach ($this->template_paths as $path)
{
+ error_log("Searching for $name.php in $path");
+
$dir = new DirectoryIterator($path);
foreach ($dir as $file)
{
- if (strtolower($file->getFilename()) == "$name.php")
+ if (strtolower($file->getFilename()) == strtolower("$name.php"))
{
return $file->getPathname();
}
@@ -112,20 +142,10 @@ class Minim_TemplateEngine implements Minim_Plugin
*/
function include_css($name)
{
- $cssfile = $this->webroot.'css/'.$name.'.css';
+ $cssfile = find("$name.css", $this->asset_paths);
echo <<<HTML
<link rel="stylesheet" type="text/css" href="$cssfile">
-HTML;
- }
- /**
- * Convenience method to include a js file
- */
- function include_js($name)
- {
- $jsfile = $this->webroot.'js/'.$name.'.js';
- echo <<<HTML
-<script type="text/javascript" src="$jsfile"></script>
HTML;
}
plugins/templates/templates.php
ebf4962264acb5e1c0d80f7d2042a3fc8518055e
Andy Driver
andy@pagezero.net
http://github.com/andyhd/minim/commit/62fd9f558fce6d036e8adeeb265f6edcf3f47d8f
62fd9f558fce6d036e8adeeb265f6edcf3f47d8f
2009-05-31T23:29:47-07:00
2009-05-31T23:29:47-07:00
Allow specifying fallback templates to render function
Tweaks to forms
2cb2083d20ce8789e8ed85f7d9613e61d4a9f8e0
Andy Driver
andy@pagezero.net