|
From: Ivan1986 <iva...@us...> - 2010-08-10 08:37:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".
The branch, master has been updated
via 04f1cd3bfec49c7b3c4d8aa2503ed70aeb0e0de2 (commit)
from 8a3d41547344f9dd14c1b56587e3fa3b1aedb1d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 04f1cd3bfec49c7b3c4d8aa2503ed70aeb0e0de2
Author: TeXHaPb <te...@te...>
Date: Tue Aug 10 12:30:50 2010 +0400
Исправлена ошибка в библиотеке Language.php и орфографические ошибки
diff --git a/QFW/QuickFW/Autoload.php b/QFW/QuickFW/Autoload.php
index 1f43302..ad3c73f 100644
--- a/QFW/QuickFW/Autoload.php
+++ b/QFW/QuickFW/Autoload.php
@@ -56,7 +56,7 @@ class Autoload
{
if (empty(self::$classes))
self::$classes = array(
- 'ScafoldController' => LIBPATH.'/Modules/Scafold/ScafoldController.php',
+ 'ScaffoldController' => LIBPATH.'/Modules/Scaffold/ScaffoldController.php',
'QuickFW_Auth' => QFWPATH.'/QuickFW/Auth.php',
);
if (empty(self::$classes[$class]))
diff --git a/application/default/controllers/TableController.php b/application/default/controllers/TableController.php
index 26350c2..0c2d11d 100644
--- a/application/default/controllers/TableController.php
+++ b/application/default/controllers/TableController.php
@@ -1,13 +1,13 @@
<?php
require 'Controller.php';
-require LIBPATH.'/Modules/Scafold/ScafoldController.php';
+require LIBPATH.'/Modules/Scaffold/ScaffoldController.php';
/**
* Description of TableController
*
* @author ivan
*/
-class TableController extends ScafoldController
+class TableController extends ScaffoldController
{
public function __construct()
{
diff --git a/doc/nginx.conf b/doc/nginx.conf
index f1e202a..dbfd64a 100644
--- a/doc/nginx.conf
+++ b/doc/nginx.conf
@@ -1,4 +1,4 @@
-server {
+server {
<...>
@@ -12,20 +12,20 @@ server {
#For apache backend
location @fallback {
- proxy_pass http://127.0.0.1:8080;#Apache must have its own rewrite
+ proxy_pass http://127.0.0.1:8080;#Apache must have it's own rewrite
proxy_set_header Host $host;
}
- location ~ \.php$ { #To deny get php files like text
+ location ~ \.php$ { # To deny get php files as text
try_files $uri @fastcgi;
#For apache backend
- proxy_pass http://127.0.0.1:8080;#Apache must have its own rewrite
+ proxy_pass http://127.0.0.1:8080;#Apache must have it's own rewrite
proxy_set_header Host $host;
#For FastCGI
- #fastcgi_pass unix:/var/run/php-fpm/defailt.socket;
+ #fastcgi_pass unix:/var/run/php-fpm/default.socket;
#include fastcgi_params; #standart file in nginx
#fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -33,7 +33,7 @@ server {
#For FastCGI
location @fastcgi {
- fastcgi_pass unix:/var/run/php-fpm/defailt.socket;
+ fastcgi_pass unix:/var/run/php-fpm/default.socket;
fastcgi_index index.php;
include fastcgi_params; #standart file in nginx
diff --git a/lib/Language.php b/lib/Language.php
index e2aaf43..1180379 100644
--- a/lib/Language.php
+++ b/lib/Language.php
@@ -51,7 +51,6 @@ class Language {
*/
function load($langfile = '', $idiom = '', $return = FALSE)
{
- global $config;
$langfile = $langfile.'_lang.php';
if (in_array($langfile, $this->is_loaded, TRUE))
@@ -61,7 +60,7 @@ class Language {
if ($idiom == '')
{
- $deft_lang = $config['host']['lang'];
+ $deft_lang = QFW::$config['host']['lang'];
$idiom = is_null($deft_lang) ? 'en_EN' : $deft_lang;
}
diff --git a/lib/Modules/Scafold/Fields.php b/lib/Modules/Scaffold/Fields.php
similarity index 92%
rename from lib/Modules/Scafold/Fields.php
rename to lib/Modules/Scaffold/Fields.php
index fd7a874..c2ac617 100644
--- a/lib/Modules/Scafold/Fields.php
+++ b/lib/Modules/Scaffold/Fields.php
@@ -7,7 +7,7 @@ require_once LIBPATH.'/utils.php';
* Содержит набор полей для заполнения пользователем
*
*/
-class Scafold_Field_Info
+class Scaffold_Field_Info
{
/** @var boolean скрытое поле */
public $hide = null;
@@ -44,17 +44,17 @@ class Scafold_Field_Info
* Не содержит никаких проверок, оформлений, преобразований
*
*/
-class Scafold_Field extends Scafold_Field_Info
+class Scaffold_Field extends Scaffold_Field_Info
{
/**
* Создает полноценное поле из данных о пользователе
*
- * @param Scafold_Field_Info $info Информация о поле
+ * @param Scaffold_Field_Info $info Информация о поле
*/
public function __construct($info)
{
- $vars = get_class_vars('Scafold_Field_Info');
+ $vars = get_class_vars('Scaffold_Field_Info');
foreach ($vars as $k=>$v)
$this->$k = $info->$k;
$this->name = $info->fiendInfo['Field'];
@@ -185,17 +185,17 @@ class Scafold_Field extends Scafold_Field_Info
/**
* Класс для главного поля
*/
-class Scafold_Parent extends Scafold_Field
+class Scaffold_Parent extends Scaffold_Field
{
public function proccess($id, $value)
{
- return $_SESSION['scafold'][$this->table]['parent'];
+ return $_SESSION['scaffold'][$this->table]['parent'];
}
public function validator($id, $value)
{
//если у нас будет потеря сессии, то случится фигня
- return isset($_SESSION['scafold'][$this->table]['parent']);
+ return isset($_SESSION['scaffold'][$this->table]['parent']);
}
public function filterForm($session)
@@ -208,7 +208,7 @@ class Scafold_Parent extends Scafold_Field
* Класс для зависимых полей
* формирует select со значениями из другой таблицы
*/
-class Scafold_Foreign extends Scafold_Field
+class Scaffold_Foreign extends Scaffold_Field
{
/** @var array Зависимые поля */
protected $lookup;
@@ -242,7 +242,7 @@ class Scafold_Foreign extends Scafold_Field
* Сервисный классс для полей, вводимых пользователем
* <br>пока только обрезка при выводе, так как обязательно нагадят :)
*/
-abstract class Scafold_UserInput extends Scafold_Field
+abstract class Scaffold_UserInput extends Scaffold_Field
{
/** @var integer До скольки обрезать */
private $trim;
@@ -260,13 +260,13 @@ abstract class Scafold_UserInput extends Scafold_Field
}
//Классы для различных типов полей из базы данных
-//Соответствие в функции ScafoldController::getFieldClass
+//Соответствие в функции ScaffoldController::getFieldClass
/**
* Пока тестовый класс для типа TEXT
*/
-class Scafold_Text extends Scafold_UserInput
+class Scaffold_Text extends Scaffold_UserInput
{
/** @var integer Сколько строк */
private $rows;
@@ -291,7 +291,7 @@ class Scafold_Text extends Scafold_UserInput
/**
* Класс для типа Int
*/
-class Scafold_Int extends Scafold_Field
+class Scaffold_Int extends Scaffold_Field
{
public function validator($id, $value)
{
@@ -302,7 +302,7 @@ class Scafold_Int extends Scafold_Field
/**
* Класс для типа Varchar
*/
-class Scafold_Varchar extends Scafold_Field
+class Scaffold_Varchar extends Scaffold_Field
{
/** @var integer размер поля в базе */
private $size;
@@ -324,12 +324,12 @@ class Scafold_Varchar extends Scafold_Field
/**
* Класс для типа Char - полностью аналогичен Varchar
*/
-class Scafold_Char extends Scafold_Varchar {}
+class Scaffold_Char extends Scaffold_Varchar {}
/**
* Класс для типа ENUM
*/
-class Scafold_Enum extends Scafold_Field
+class Scaffold_Enum extends Scaffold_Field
{
/** @var array что в перечислении */
private $items;
@@ -350,7 +350,7 @@ class Scafold_Enum extends Scafold_Field
//Классы для других типов полей, указываемых пользователем
-class Scafold_Checkbox extends Scafold_Field
+class Scaffold_Checkbox extends Scaffold_Field
{
public function display($id, $value)
@@ -371,7 +371,7 @@ class Scafold_Checkbox extends Scafold_Field
* Класс для поля, в котором хранится имя файла,
* загружаемого на сервер
*/
-class Scafold_File extends Scafold_Field
+class Scaffold_File extends Scaffold_Field
{
/** @var string Путь к директории, где хранятся файлы */
private $path;
@@ -383,7 +383,7 @@ class Scafold_File extends Scafold_Field
/**
* Проверяет параметры для файлового поля
*
- * @param Scafold_Field_Info $info Информация о поле
+ * @param Scaffold_Field_Info $info Информация о поле
*/
public function __construct($info)
{
diff --git a/lib/Modules/Scafold/ScafoldController.php b/lib/Modules/Scaffold/ScaffoldController.php
similarity index 94%
rename from lib/Modules/Scafold/ScafoldController.php
rename to lib/Modules/Scaffold/ScaffoldController.php
index 6c31f06..8a7f65b 100644
--- a/lib/Modules/Scafold/ScafoldController.php
+++ b/lib/Modules/Scaffold/ScaffoldController.php
@@ -1,6 +1,6 @@
<?php
-require_once LIBPATH.'/Modules/Scafold/Fields.php';
+require_once LIBPATH.'/Modules/Scaffold/Fields.php';
/**
* Класс для быстрого создания CRUD интерфейса к таблице
@@ -13,13 +13,13 @@ require_once LIBPATH.'/Modules/Scafold/Fields.php';
* подобных им таблиц
* <br><br>Пример подключения:
* <br><br>require 'Controller.php';
- * <br>require LIBPATH.'/Modules/Scafold/ScafoldController.php';
+ * <br>require LIBPATH.'/Modules/Scaffold/ScaffoldController.php';
* <br>.....
- * <br>class TableController extends ScafoldController
+ * <br>class TableController extends ScaffoldController
*
* @author Ivan1986
*/
-abstract class ScafoldController extends Controller
+abstract class ScaffoldController extends Controller
{
/** @var string Имя таблицы */
protected $table = '';
@@ -101,12 +101,12 @@ abstract class ScafoldController extends Controller
*/
public function __construct()
{
- QFW::$view->P->addCSS('buildin/scafold.css');
+ QFW::$view->P->addCSS('built-in/scaffold.css');
$this->session();
//Создаем сессию для таблицы и ссылаемся на нее
- if (!isset($_SESSION['scafold'][$this->table]))
- $_SESSION['scafold'][$this->table] = array();
- $this->sess = &$_SESSION['scafold'][$this->table];
+ if (!isset($_SESSION['scaffold'][$this->table]))
+ $_SESSION['scaffold'][$this->table] = array();
+ $this->sess = &$_SESSION['scaffold'][$this->table];
$this->setup = true;
parent::__construct();
@@ -115,7 +115,7 @@ abstract class ScafoldController extends Controller
//Получаем данные о полях
$this->fields = $this->fields();
foreach($this->fields as $k=>$field)
- if (get_class($field) == 'Scafold_Field_Info')
+ if (get_class($field) == 'Scaffold_Field_Info')
unset($this->fields[$k]);
//порядок сортировки полей
@@ -180,7 +180,7 @@ abstract class ScafoldController extends Controller
QFW::$view->assign('parent', QFW::$view->assign('parent', array(
'list' => $parent,
'current' => $this->sess['parent'],
- ))->fetch('scafold/parent.html'));
+ ))->fetch('scaffold/parent.html'));
$parentWhere = QFW::$db->subquery('AND ?#=?',
array($this->table => $this->parentData['colum']),
$this->sess['parent']);
@@ -212,7 +212,7 @@ abstract class ScafoldController extends Controller
return QFW::$view->assign(array(
'data' => $data,
'pager' => $pager,
- ))->fetch('scafold/index.html');
+ ))->fetch('scaffold/index.html');
}
/**
@@ -299,7 +299,7 @@ abstract class ScafoldController extends Controller
'id' => $id,
'data' => $data,
'errors' => $errors,
- ))->fetch('scafold/edit.html');
+ ))->fetch('scaffold/edit.html');
}
/**
@@ -373,7 +373,7 @@ abstract class ScafoldController extends Controller
* <br><br> Вызывается только в конструкторе
*
* @param array $fieldList массив с именами полей
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function order($fieldList)
{
@@ -392,7 +392,7 @@ abstract class ScafoldController extends Controller
* @param string|DbSimple_SubQuery $id Ключ в главной таблице
* @param string|DbSimple_SubQuery $name Заголовок в главной таблице
* @param DbSimple_SubQuery $other Дополнительные условия
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function parent($colum, $table, $id, $name, $other=DBSIMPLE_SKIP)
{
@@ -418,7 +418,7 @@ abstract class ScafoldController extends Controller
* @param string $id Ссылочный ключ
* @param string $name Значение связанного поля
* @param bool $notNull Не допускать пустого значения
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function foreign($colum, $table, $id, $name, $notNull=false)
{
@@ -444,7 +444,7 @@ abstract class ScafoldController extends Controller
* @param string|array $colum Колонка или массив колонок, которые нужно скрыть
* @param boolean $hide true - скрыть<br>false - показать<br>
* по умолчанию показываются все кромя первичного ключа при редактировании
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function hide($colum, $hide=true)
{
@@ -462,7 +462,7 @@ abstract class ScafoldController extends Controller
* false - выключен<br>
* true - включен по умолчанию<br>
* mixed - произвольный параметр
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function filter($colum, $filter='')
{
@@ -477,7 +477,7 @@ abstract class ScafoldController extends Controller
* @param string|array $colum Колонка<br>
* Или массив ключи - колонки, значения описания
* @param string $desc описание
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function desc($colum, $desc='')
{
@@ -492,7 +492,7 @@ abstract class ScafoldController extends Controller
* @param string|array $colum Колонка<br>
* Или массив ключи - колонки, значения заголовки
* @param string $title Заголовок
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function title($colum, $title='')
{
@@ -507,7 +507,7 @@ abstract class ScafoldController extends Controller
* @param string $colum Колонка
* @param string $className Имя класса без префикса
* @param mixed $param Второй параметр конструктора класса
- * @return ScafoldController
+ * @return ScaffoldController
*/
protected function type($colum, $className='', $param=false)
{
@@ -530,7 +530,7 @@ abstract class ScafoldController extends Controller
* @param string|array $colum Колонка<br>
* Или массив ключи - колонки => значения
* @param string $value значение
- * @return ScafoldController
+ * @return ScaffoldController
*/
private function setColumOpt($name, $colum, $value='')
{
@@ -546,12 +546,12 @@ abstract class ScafoldController extends Controller
* Возвращает ссылку на класс заданного поля
*
* @param string $name имя поля
- * @return Scafold_Field_Info инфо о классе
+ * @return Scaffold_Field_Info инфо о классе
*/
private function getInfoClass($name)
{
if (empty($this->fields[$name]))
- $this->fields[$name] = new Scafold_Field_Info();
+ $this->fields[$name] = new Scaffold_Field_Info();
return $this->fields[$name];
}
@@ -678,9 +678,9 @@ abstract class ScafoldController extends Controller
/**
* Фабрика объектов полей
*
- * @param Scafold_Field_Info $infoClass Информация указанная пользователем
+ * @param Scaffold_Field_Info $infoClass Информация указанная пользователем
* @param array $fieldInfo Информация о поле из базы данных
- * @return Scafold_Field Класс поля
+ * @return Scaffold_Field Класс поля
*/
private function getFieldClass($infoClass, $fieldInfo)
{
@@ -690,20 +690,20 @@ abstract class ScafoldController extends Controller
if ($infoClass->type)
{
- $class = 'Scafold_'.ucfirst($infoClass->type);
+ $class = 'Scaffold_'.ucfirst($infoClass->type);
return new $class($infoClass);
}
//определяем по типам и прочей известной информации
if ($infoClass->foreign)
- return new Scafold_Foreign($infoClass);
+ return new Scaffold_Foreign($infoClass);
$match = array();
if (preg_match('#(.*?)(?:\((.+?)\)|$)#', $fieldInfo['Type'], $match))
- if (class_exists($class = 'Scafold_'.ucfirst($match[1])))
+ if (class_exists($class = 'Scaffold_'.ucfirst($match[1])))
return new $class($infoClass, isset($match[2]) ? $match[2] : false );
- return new Scafold_Field($infoClass);
+ return new Scaffold_Field($infoClass);
}
private function endTest()
diff --git a/lib/Modules/Scafold/scafold/edit.html b/lib/Modules/Scaffold/scaffold/edit.html
similarity index 93%
rename from lib/Modules/Scafold/scafold/edit.html
rename to lib/Modules/Scaffold/scaffold/edit.html
index 5877e6b..85079d8 100644
--- a/lib/Modules/Scafold/scafold/edit.html
+++ b/lib/Modules/Scaffold/scaffold/edit.html
@@ -3,7 +3,7 @@
Поле <?php echo $fields[$k]->title ?> имеет некорректное значение<br />
<?php } ?>
<?php } ?>
-<form action="<?php echo Url::C('edit/'.$id) ?>" class="scafoldEdit"
+<form action="<?php echo Url::C('edit/'.$id) ?>" class="scaffoldEdit"
method="post" id="form_<?php echo $table ?>" enctype="multipart/form-data">
<dl>
<?php foreach($data as $k=>$v) {
diff --git a/lib/Modules/Scafold/scafold/filterForm.html b/lib/Modules/Scaffold/scaffold/filterForm.html
similarity index 75%
rename from lib/Modules/Scafold/scafold/filterForm.html
rename to lib/Modules/Scaffold/scaffold/filterForm.html
index 59b0d90..74e8e37 100644
--- a/lib/Modules/Scafold/scafold/filterForm.html
+++ b/lib/Modules/Scaffold/scaffold/filterForm.html
@@ -1,5 +1,5 @@
<form action="<?php echo Url::C('filter') ?>"
- method="post" id="filter_<?php echo $table ?>" class="scafoldFilter">
+ method="post" id="filter_<?php echo $table ?>" class="scaffoldFilter">
<?php foreach ($filter as $v) {?>
<?php echo $v; ?>
<?php } ?>
diff --git a/lib/Modules/Scafold/scafold/index.html b/lib/Modules/Scaffold/scaffold/index.html
similarity index 90%
rename from lib/Modules/Scafold/scafold/index.html
rename to lib/Modules/Scaffold/scaffold/index.html
index 75b31ca..ec3650f 100644
--- a/lib/Modules/Scafold/scafold/index.html
+++ b/lib/Modules/Scaffold/scaffold/index.html
@@ -7,7 +7,7 @@
<?php echo $pager; ?>
<?php if (count($data)>0) { ?>
-<table id="table_<?php echo $table ?>" class="scafoldTable">
+<table id="table_<?php echo $table ?>" class="scaffoldTable">
<tr>
<?php foreach($data[0] as $key=>$v) {
$i = $fields[$key];
@@ -15,9 +15,9 @@
continue;
?>
<th><a href="<?php echo Url::C('sort/'.$key) ?>"><?php echo $i->title ?></a>
- <?php if (isset($order) && $order['field'] == $key) { ?><span class="scafoldSort">
+ <?php if (isset($order) && $order['field'] == $key) { ?><span class="scaffoldSort">
<?php if ($options['sortImages']) {?>
- <img src="/buildin/<?php echo $order['direction']=='ASC' ? 'az' : 'za' ?>.png"
+ <img src="/built-in/<?php echo $order['direction']=='ASC' ? 'az' : 'za' ?>.png"
alt="<?php echo $order['direction']=='ASC' ? '↓' : '↑' ?>" />
<?php } else { ?>
<span><?php echo $order['direction']=='ASC' ? '↓' : '↑' ?></span>
diff --git a/lib/Modules/Scafold/scafold/parent.html b/lib/Modules/Scaffold/scaffold/parent.html
similarity index 100%
rename from lib/Modules/Scafold/scafold/parent.html
rename to lib/Modules/Scaffold/scaffold/parent.html
diff --git a/www/buildin/scafold.css b/www/buildin/scafold.css
deleted file mode 100644
index 24bc8bb..0000000
--- a/www/buildin/scafold.css
+++ /dev/null
@@ -1,64 +0,0 @@
-div.pageslist {text-align:center;}
-
-table.scafoldTable
-{
- border:2px solid black;
- width: 100%;
-}
-
-.scafoldTable th, .scafoldTable td
-{
- border:1px dashed black;
- padding: 5px;
- margin: 0;
-}
-
-.scafoldTable td:last-child, .scafoldTable td:nth-last-child(2)
-{
- width: 25px;
-}
-
-.scafoldTable tr {vertical-align:top;}
-.scafoldTable th { background-color:#eec0c0; }
-.scafoldTable tr td { background-color:#ddd; text-align:left;}
-.scafoldTable tr:nth-child(odd) td { background-color:#c0ffc0; }
-
-.scafoldTable table.tnone {border: 1px solid black;}
-.scafoldTable table.tnone td {background-color:#FFF; border: none; padding: 0; margin: 0;}
-
-.scafoldTable .scafoldSort {
- position: relative;
-}
-
-.scafoldTable .scafoldSort * {
- position: absolute;
-}
-
-form.scafoldEdit .err {color: red;}
-
-form.scafoldEdit textarea:focus, input:focus, select:focus {
- border: 2px solid #900;
-}
-
-form.scafoldEdit dt {
- padding: 0;
- margin: 0.7em 1em 0.5em 0;
- width: 25%;
- float: left;
- clear: left;
- text-align: right;
-}
-
-form.scafoldEdit dd {
- margin: 0;
- padding: 0.5em 0;
- width: 70%;
- float: left;
-}
-
-form.scafoldEdit small
-{
- display: block;
- margin-left: 20px;
- color: #999;
-}
diff --git a/www/buildin/az.png b/www/built-in/az.png
similarity index 100%
rename from www/buildin/az.png
rename to www/built-in/az.png
diff --git a/www/built-in/scaffold.css b/www/built-in/scaffold.css
new file mode 100644
index 0000000..db373b6
--- /dev/null
+++ b/www/built-in/scaffold.css
@@ -0,0 +1,64 @@
+div.pageslist {text-align:center;}
+
+table.scaffoldTable
+{
+ border:2px solid black;
+ width: 100%;
+}
+
+.scaffoldTable th, .scaffoldTable td
+{
+ border:1px dashed black;
+ padding: 5px;
+ margin: 0;
+}
+
+.scaffoldTable td:last-child, .scaffoldTable td:nth-last-child(2)
+{
+ width: 25px;
+}
+
+.scaffoldTable tr {vertical-align:top;}
+.scaffoldTable th { background-color:#eec0c0; }
+.scaffoldTable tr td { background-color:#ddd; text-align:left;}
+.scaffoldTable tr:nth-child(odd) td { background-color:#c0ffc0; }
+
+.scaffoldTable table.tnone {border: 1px solid black;}
+.scaffoldTable table.tnone td {background-color:#FFF; border: none; padding: 0; margin: 0;}
+
+.scaffoldTable .scaffoldSort {
+ position: relative;
+}
+
+.scaffoldTable .scaffoldSort * {
+ position: absolute;
+}
+
+form.scaffoldEdit .err {color: red;}
+
+form.scaffoldEdit textarea:focus, input:focus, select:focus {
+ border: 2px solid #900;
+}
+
+form.scaffoldEdit dt {
+ padding: 0;
+ margin: 0.7em 1em 0.5em 0;
+ width: 25%;
+ float: left;
+ clear: left;
+ text-align: right;
+}
+
+form.scaffoldEdit dd {
+ margin: 0;
+ padding: 0.5em 0;
+ width: 70%;
+ float: left;
+}
+
+form.scaffoldEdit small
+{
+ display: block;
+ margin-left: 20px;
+ color: #999;
+}
diff --git a/www/buildin/za.png b/www/built-in/za.png
similarity index 100%
rename from www/buildin/za.png
rename to www/built-in/za.png
-----------------------------------------------------------------------
Summary of changes:
QFW/QuickFW/Autoload.php | 2 +-
.../default/controllers/TableController.php | 4 +-
doc/nginx.conf | 12 ++--
lib/Language.php | 3 +-
lib/Modules/{Scafold => Scaffold}/Fields.php | 36 ++++++------
.../ScaffoldController.php} | 58 +++++++++---------
.../scafold => Scaffold/scaffold}/edit.html | 2 +-
.../scafold => Scaffold/scaffold}/filterForm.html | 2 +-
.../scafold => Scaffold/scaffold}/index.html | 6 +-
.../scafold => Scaffold/scaffold}/parent.html | 0
www/buildin/scafold.css | 64 --------------------
www/{buildin => built-in}/az.png | Bin 601 -> 601 bytes
www/built-in/scaffold.css | 64 ++++++++++++++++++++
www/{buildin => built-in}/za.png | Bin 613 -> 613 bytes
14 files changed, 126 insertions(+), 127 deletions(-)
rename lib/Modules/{Scafold => Scaffold}/Fields.php (92%)
rename lib/Modules/{Scafold/ScafoldController.php => Scaffold/ScaffoldController.php} (94%)
rename lib/Modules/{Scafold/scafold => Scaffold/scaffold}/edit.html (93%)
rename lib/Modules/{Scafold/scafold => Scaffold/scaffold}/filterForm.html (75%)
rename lib/Modules/{Scafold/scafold => Scaffold/scaffold}/index.html (90%)
rename lib/Modules/{Scafold/scafold => Scaffold/scaffold}/parent.html (100%)
delete mode 100644 www/buildin/scafold.css
rename www/{buildin => built-in}/az.png (100%)
create mode 100644 www/built-in/scaffold.css
rename www/{buildin => built-in}/za.png (100%)
hooks/post-receive
--
quickfw
|
