Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12420] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-04-03 13:51:10
|
Revision: 12420
http://sourceforge.net/p/xoops/svn/12420
Author: txmodxoops
Date: 2014-04-03 13:51:04 +0000 (Thu, 03 Apr 2014)
Log Message:
-----------
Updated work in progress
Added Fields Form
Pleace: if you test this, is needed new installation
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmlform.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmltable.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/style.css
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -41,7 +41,8 @@
$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
// Define main template
$template_main = 'tdmcreate_fields.html';
-
+ $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
+ $GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());
@@ -118,15 +119,17 @@
'field_null' => $_POST['field_null'],
'field_default' => $_POST['field_default'],
'field_key' => $_POST['field_key'],
- 'field_elements' => $_POST['field_elements'],
- 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
+ 'field_autoincrement' => (($_REQUEST['field_element'] == 1) ? '1' : '0'),
+ 'field_element' => $_POST['field_element'],
+ 'field_inlist' => (($_REQUEST['field_inlist'] == 1) ? '1' : '0'),
+ 'field_inform' => (($_REQUEST['field_inform'] == 1) ? '1' : '0'),
+ 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'),
'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'),
- 'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'),
- 'field_mainfield' => (($_REQUEST['field_mainfield'] == 1) ? '1' : '0'),
+ 'field_block' => (($_REQUEST['field_block'] == 1) ? '1' : '0'),
+ 'field_main' => (($_REQUEST['field_main'] == 1) ? '1' : '0'),
'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'),
- 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0'),
- 'field_fields' => $_POST['field_fields'],
- 'field_parameters' => $_POST['field_parameters'])
+ 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0')
+ )
);
if ($fieldsHandler->insert($obj)) {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -30,6 +30,7 @@
$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
// Define main template
$template_main = 'tdmcreate_modules.html';
+ $GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -38,7 +38,6 @@
$template_main = 'tdmcreate_tables.html';
$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
-
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$GLOBALS['xoopsTpl']->assign('button_new', $adminMenu->renderButton());
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -16,39 +16,54 @@
* @package tdmcreate
* @since 2.5.5
* @author Txmod Xoops <su...@tx...>
- * @version $Id: 1.59 fieldelements.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version $Id: 1.91 fieldelements.php 11297 2014-03-24 09:11:10Z timgno $
*/
-if (!defined('XOOPS_ROOT_PATH')) { die("XOOPS root path not defined"); }
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
-class TDMCreateFieldelements extends XoopsObject
+/*
+* @Class TDMCreateFieldElements
+* @extends XoopsObject
+*/
+class TDMCreateFieldElements extends XoopsObject
{
- //Constructor
- function __construct()
+ /*
+ * @public function constructor class
+ * @param null
+ */
+ public function __construct()
{
- $this->XoopsObject();
- $this->initVar('fieldelement_id', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_value', XOBJ_DTYPE_TXTBOX);
- $this->initVar('fieldelement_name', XOBJ_DTYPE_TXTBOX);
- $this->initVar('fieldelement_admin', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_inlist', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_pid', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_user', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_block', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_mfield', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_search', XOBJ_DTYPE_INT);
- $this->initVar('fieldelement_required', XOBJ_DTYPE_INT);
+ $this->htmltable = TDMCreateHtmlTable::getInstance();
+ $this->initVar('fieldelement_fid', XOBJ_DTYPE_INT);
+ $this->initVar('fieldelement_value', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('fieldelement_name', XOBJ_DTYPE_TXTBOX);
}
- //Constructor
- function TDMCreateFieldelements()
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ public static function &getInstance()
{
- $this->__construct();
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+ return $instance;
}
}
-class TDMCreateFieldelementsHandler extends XoopsPersistableObjectHandler
+/*
+* @Class TDMCreateFieldElementsHandler
+* @extends XoopsPersistableObjectHandler
+*/
+class TDMCreateFieldElementsHandler extends XoopsPersistableObjectHandler
{
- function __construct(&$db)
+ /*
+ * @public function constructor class
+ * @param mixed $db
+ */
+ public function __construct(&$db)
{
- parent::__construct($db, 'mod_tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_id', 'fieldelement_name');
+ parent::__construct($db, 'mod_tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_fid', 'fieldelement_name');
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -19,6 +19,7 @@
* @version $Id: fields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
+require_once 'simplelabel.php';
require_once 'themeform.php';
/*
* @Class TDMCreateFields
@@ -31,16 +32,6 @@
*/
private $table = null;
- /**
- * @var string
- */
- private $htmltable = null;
-
- /**
- * @var string
- */
- private $htmltable_parameters = null;
-
/*
* @public function constructor class
* @param null
@@ -48,9 +39,8 @@
public function __construct()
{
$this->table = TDMCreateTables::getInstance();
- $this->htmltable = TDMCreateHtmlTable::getInstance();
- $this->htmltable_parameters = TDMCreateHtmlTable::getInstance();
$this->initVar('field_id', XOBJ_DTYPE_INT);
+ $this->initVar('field_mid', XOBJ_DTYPE_INT);
$this->initVar('field_tid', XOBJ_DTYPE_INT);
$this->initVar('field_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_type', XOBJ_DTYPE_TXTBOX);
@@ -59,15 +49,16 @@
$this->initVar('field_null', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_default', XOBJ_DTYPE_TXTBOX);
$this->initVar('field_key', XOBJ_DTYPE_TXTBOX);
- $this->initVar('field_auto_increment', XOBJ_DTYPE_INT);
- $this->initVar('field_display_admin', XOBJ_DTYPE_INT);
- $this->initVar('field_display_user', XOBJ_DTYPE_INT);
- $this->initVar('field_display_block', XOBJ_DTYPE_INT);
- $this->initVar('field_mainfield', XOBJ_DTYPE_INT);
- $this->initVar('field_search', XOBJ_DTYPE_INT);
- $this->initVar('field_required', XOBJ_DTYPE_INT);
- $this->initVar('field_fields',XOBJ_DTYPE_TXTAREA);
- $this->initVar('field_parameters',XOBJ_DTYPE_TXTAREA);
+ $this->initVar('field_autoincrement', XOBJ_DTYPE_INT);
+ $this->initVar('field_element', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('field_inlist', XOBJ_DTYPE_INT);
+ $this->initVar('field_inform', XOBJ_DTYPE_INT);
+ $this->initVar('field_admin', XOBJ_DTYPE_INT);
+ $this->initVar('field_user', XOBJ_DTYPE_INT);
+ $this->initVar('field_block', XOBJ_DTYPE_INT);
+ $this->initVar('field_main', XOBJ_DTYPE_INT);
+ $this->initVar('field_search', XOBJ_DTYPE_INT);
+ $this->initVar('field_required', XOBJ_DTYPE_INT);
}
/*
@@ -107,141 +98,156 @@
$field_tid = $this->getVar('field_tid');
$nb_fields = $this->getVar('field_numb');
}
-
- $header_captions = array(_AM_TDMCREATE_FIELD_NUMBER, _AM_TDMCREATE_FIELD_NAME, _AM_TDMCREATE_FIELD_TYPE, _AM_TDMCREATE_FIELD_VALUE, _AM_TDMCREATE_FIELD_ATTRIBUTE, _AM_TDMCREATE_FIELD_NULL, _AM_TDMCREATE_FIELD_DEFAULT, _AM_TDMCREATE_FIELD_KEY, _AM_TDMCREATE_FIELD_OTHERS);
- xoops_load('xoopsformloader');
+
$form = new TDMCreateThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
- $tablesHandler = xoops_getModuleHandler('tables');
- // New Object HtmlTable
- //$this->htmltable->initTable(null, 'display outer');
- // header row
- /*$this->htmltable->addRow('center bgblue');
- $this->htmltable->addCells($cells, 'first', 'header');*/
- $this->htmltable->initTable('display outer width100');
- $this->htmltable->addRow() . NWLINE;
- $this->htmltable->addCell($title, 'first', 'header', 'colspan="9"');
- $this->htmltable->addRow('center bgblue') . NWLINE;
- $this->htmltable->addCells($header_captions, 'first', 'header');
-
- for($i = 1; $i <= intval($nb_fields); $i++)
+ $tablesHandler = xoops_getModuleHandler('tables');
+ $fieldelementsHandler =& xoops_getModuleHandler('fieldelements');
+ // New Object HtmlTable
+ $form->addElement(new TDMCreateFormLabel('<table class="outer">'));
+ $form->addElement(new TDMCreateFormLabel('<thead class="center"><tr class="width5">'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NUMBER.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NAME.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_TYPE.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_VALUE.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_ATTRIBUTE.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_NULL.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_DEFAULT.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_KEY.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('<th>'._AM_TDMCREATE_FIELD_OTHERS.'</th>'));
+ $form->addElement(new TDMCreateFormLabel('</tr></thead>'));
+ $form->addElement(new TDMCreateFormLabel('<tbody>'));
+
+ $class = 'even';
+ for($i = 1; $i <= $nb_fields; $i++)
{
- $field_name = $this->isNew() ? $this->table->getVar('table_fieldname') : $this->getVar('field_name');
+ $class = $class ? 'odd' : 'even';
+ $form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
+ // Index ID
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
+ $field_name = $this->isNew() ? $table_fieldname : $this->getVar('field_name');
$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name', 15, 255, $field_name);
- // fieldtype
+ // Field Name
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
+ // Field Type
$fieldtypeHandler =& xoops_getModuleHandler('fieldtype');
$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type', $this->getVar('field_type'));
- $fieldtype_select->addOptionArray($fieldtypeHandler->getList());
- // fieldvalue
+ $fieldtype_select->addOptionArray($fieldtypeHandler->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
+ // Field Value
$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value', 5, 20, $this->getVar('field_value'));
- // fieldattributes
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
+ // Field Attributes
$fieldattrsHandler =& xoops_getModuleHandler('fieldattributes');
$field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute', $this->getVar('field_attribute'));
$field_attributes_select->addOptionArray($fieldattrsHandler->getList());
- // fieldnull
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_attributes_select->render().'</td>'));
+ // Field Null
$fieldnullHandler =& xoops_getModuleHandler('fieldnull');
$field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null', $this->getVar('field_null'));
- $field_null_select->addOptionArray($fieldnullHandler->getList());
- // fielddefault
+ $field_null_select->addOptionArray($fieldnullHandler->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_null_select->render().'</td>'));
+ // Field Default
$field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default', 15, 25, $this->getVar('field_default'));
- // fieldkey
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_default->render().'</td>'));
+ // Field Key
$fieldkeyHandler =& xoops_getModuleHandler('fieldkey');
$field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key', $this->getVar('field_key'));
$field_key_select->addOptionArray($fieldkeyHandler->getList());
- // render fields
- $htmltableDataArray = array($i, $field_name->render(), $fieldtype_select->render(), $field_value->render(), $field_attributes_select->render(), $field_null_select->render(), $field_default->render(), $field_key_select->render());
- // data row
- $this->htmltable->addRow('center bgyellow');
- $this->htmltable->addCells($htmltableDataArray, 'first', 'data');
- $this->htmltable_parameters->initTable('display');
+ $form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
+ // Field Autoincrement
if($i == 1) {
- $field_autoincrement = $this->isNew() ? 0 : $this->getVar('field_auto_increment');
- $check_field_autoincrement = new XoopsFormCheckBox(' ', 'field_auto_increment', $field_autoincrement);
+ $field_autoincrement = $this->isNew() ? 0 : $this->getVar('field_autoincrement');
+ $check_field_autoincrement = new XoopsFormCheckBox(' ', 'field_autoincrement', $field_autoincrement);
$check_field_autoincrement->addOption(1, _AM_TDMCREATE_FIELD_AUTO_INCREMENT);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_autoincrement->render(), null, 'data');
+ $form->addElement(new TDMCreateFormLabel('<td>'.$check_field_autoincrement->render().'</td></tr>'));
} elseif($i > 1) {
- // Box header row
- $this->htmltable_parameters->addRow('center bgyellow');
- $this->htmltable_parameters->addCell(_AM_TDMCREATE_FIELD_ELEMENTS, 'first', 'header');
- // fieldelements
- $fieldelementsHandler=& xoops_getModuleHandler('fieldelements');
- $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element_name', $this->getVar('field_element_name'));
+ // Box header row
+ $parameters_tray = new XoopsFormElementTray('', '<br />');
+ // Field Elements
+ $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'fieldelement_name', $this->getVar('fieldelement_name'));
$field_elements_select->addOptionArray($fieldelementsHandler->getList());
$criteria = new CriteriaCompo(new Criteria('table_id', $table_id));
$criteria->add(new Criteria('table_mid', $table_mid));
$criteria->setSort('table_name');
$criteria->setOrder('ASC');
- $tbls_arr1 = $tablesHandler->getAll($criteria);
+ $table_arr = $tablesHandler->getAll($criteria);
unset($criteria);
- foreach (array_keys($tbls_arr1) as $j)
+ foreach (array_keys($table_arr) as $j)
{
- $tbls_name1 = $tbls_arr1[$j]->getVar('table_name');
- if ( $j[$i] == 'XoopsFormTables-'.$tbls_name1 ) {
- $field_elements_select->addOption('XoopsFormTables-'.$tbls_name1, 'Table : '.$tbls_name1);
+ $form_table_name = $table_arr[$j]->getVar('table_name');
+ if ( $j[$i] == 'XoopsFormTables-'.$form_table_name ) {
+ $field_elements_select->addOption('XoopsFormTables-'.$form_table_name, 'Table : '.$form_table_name);
}
}
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($field_elements_select->render(), null, 'data');
- $field_display_admin = $this->isNew() ? 0 : $this->getVar('field_display_admin');
- $check_field_display_admin = new XoopsFormCheckBox(' ', 'field_display_admin', $field_display_admin);
- $check_field_display_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_display_admin->render(), null, 'data');
- $field_display_user = $this->isNew() ? 0 : $this->getVar('field_display_user');
- $check_field_display_user = new XoopsFormCheckBox(' ', 'field_display_user', $field_display_user);
- $check_field_display_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_display_user->render(), null, 'data');
- $field_display_block = $this->isNew() ? 0 : $this->getVar('field_display_block');
- $check_field_display_block = new XoopsFormCheckBox(' ', 'field_display_block', $field_display_block);
- $check_field_display_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_display_block->render(), null, 'data');
- $field_mnfield = $this->isNew() ? 0 : $this->getVar('field_mainfield');
- $field_mainfield = new XoopsFormRadio(' ', 'field_mainfield', $field_mnfield);
- $field_mainfield->addOption( ' ', _AM_TDMCREATE_FIELD_MAINFIELD );
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($field_mainfield->render(), null, 'data');
+ $parameters_tray->addElement($field_elements_select);
+
+ $field_inline = $this->isNew() ? 0 : $this->getVar('field_inline');
+ $check_field_inline = new XoopsFormCheckBox(' ', 'field_inline', $field_inline);
+ $check_field_inline->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parameters_tray->addElement($check_field_inline);
+
+ $field_inform = $this->isNew() ? 0 : $this->getVar('field_inform');
+ $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform', $field_inform);
+ $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parameters_tray->addElement($check_field_inform);
+
+ $field_admin = $this->isNew() ? 0 : $this->getVar('field_admin');
+ $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin', $field_admin);
+ $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parameters_tray->addElement($check_field_admin);
+
+ $field_user = $this->isNew() ? 0 : $this->getVar('field_user');
+ $check_field_user = new XoopsFormCheckBox(' ', 'field_user', $field_user);
+ $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
+ $parameters_tray->addElement($check_field_user);
+
+ $field_block = $this->isNew() ? 0 : $this->getVar('field_block');
+ $check_field_block = new XoopsFormCheckBox(' ', 'field_block', $field_block);
+ $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+ $parameters_tray->addElement($check_field_block);
+
+ $field_mnfield = $this->isNew() ? 0 : $this->getVar('field_main');
+ $field_main = new XoopsFormRadio(' ', 'field_main', $field_mnfield);
+ $field_main->addOption( ' ', _AM_TDMCREATE_FIELD_MAINFIELD );
+ $parameters_tray->addElement($field_main);
+
$field_search = $this->isNew() ? 0 : $this->getVar('field_search');
$check_field_search = new XoopsFormCheckBox(' ', 'field_search', $field_search);
- $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_search->render(), null, 'data');
+ $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
+ $parameters_tray->addElement($check_field_search);
+
$field_required = $this->isNew() ? 0 : $this->getVar('field_required');
$check_field_required = new XoopsFormCheckBox(' ', 'field_required', $field_required);
$check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
- // data row
- $this->htmltable_parameters->addRow();
- $this->htmltable_parameters->addCell($check_field_required->render(), null, 'data');
+ $parameters_tray->addElement($check_field_required);
+
+ $form->addElement(new TDMCreateFormLabel('<td>'.$parameters_tray->render().'</td></tr>'));
}
- $this->htmltable->addCell($this->htmltable_parameters->render(), null, 'data');
-
- if (!$this->isNew()) {
- $tableId_Hidden = new XoopsFormHidden('table_id', $this->table->getVar('table_id'));
- $form->addElement($tableId_Hidden);
- //$form->addElement(new XoopsFormHidden('fields_modified', true));
- }
}
- $formHidden = new XoopsFormHidden('op', 'save_fields');
- $formButton = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
- $this->htmltable->addCell($formHidden->render(), null, 'data');
- $this->htmltable->addCell($formButton->render(), null, 'data');
- $form->addElement($this->htmltable->render());
+ $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ $form->addElement(new TDMCreateFormLabel('</tbody>'));
+ $form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
+ $form_hidden = new XoopsFormHidden('op', 'save');
+ $form_button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+ $form->addElement(new TDMCreateFormLabel('<td colspan="8">'.$form_hidden->render().'</td>'));
+ $form->addElement(new TDMCreateFormLabel('<td>'.$form_button->render().'</td>'));
+ $form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
return $form;
}
}
+/*
+* @Class TDMCreateFieldsHandler
+* @extends XoopsPersistableObjectHandler
+*/
class TDMCreateFieldsHandler extends XoopsPersistableObjectHandler
{
- function __construct(&$db)
+ /*
+ * @public function constructor class
+ * @param mixed $db
+ */
+ public function __construct(&$db)
{
parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_id', 'field_tid');
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -22,13 +22,19 @@
die('XOOPS root path not defined');
}
-class AdminFooter extends HeaderFile
+class AdminFooter extends TDMCreateFile
{
/*
+ * @var string
+ */
+ private $tdmcfile = null;
+
+ /*
* @public function constructor
* @param string $modules
*/
public function __construct($module, $file_name) {
+ $this->tdmcfile = TDMCreateFile::getInstance();
$this->module = $module;
$this->file_name = $file_name;
}
@@ -56,7 +62,8 @@
$support_name = $this->getSupportName();
$support_url = $this->getSupportUrl();
$language = $this->getLanguage('_AM_', '_');
- $ret <<<EOT
+ $content = $this->getHeaderFilesComments($module, $file_name).PHP_EOL;
+ $content .= <<<EOT
\necho "<div class='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
<img src='".\$sysPathIcon32."/xoopsmicrobutton.gif' alt='XOOPS' /></a></div>";
echo "<div class='center smallsmall italic pad5'>
@@ -64,6 +71,7 @@
<a href='{$support_url}' title='Visit {$support_name}' class='tooltip' rel='external'>{$support_name}</a></div>";
xoops_cp_footer();
EOT;
- return $ret;
+ $this->tdmcfile->create($path, $file_name, $content, $created, $notcreated);
+ return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -20,7 +20,7 @@
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-class TDMCreateFile
+class TDMCreateFile extends TDMCreateAbstractFiles
{
/*
* @var string
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmlform.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmlform.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmlform.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -21,13 +21,15 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
+require_once 'htmltable.php';
+
/**
* Form HTML
*
*/
-class HtmlForm
-{
- /**
+class TDMCreateHtmlForm
+{
+ /**
* name attribute
*
* @var string
@@ -35,13 +37,6 @@
private $name = null;
/**
- * id attribute
- *
- * @var mixed
- */
- private $id = null;
-
- /**
* action attribute
*
* @var mixed
@@ -55,21 +50,14 @@
*/
private $method = null;
- /**
- * display attribute
+ /**
+ * extra attribute
*
- * @var bool
+ * @var mixed
*/
- private $display = false;
+ private $extra = null;
/**
- * hidden attribute
- *
- * @var bool
- */
- private $hidden = false;
-
- /**
* constructor
*
*/
@@ -91,50 +79,62 @@
}
/**
- * Function getForm
+ * Function getHtmlForm
*
* @param string $name "name" attribute for the <form> tag
- * @param string $id "id" attribute for the <form> tag
* @param string $action "action" attribute for the <form> tag
* @param string $method "method" attribute for the <form> tag
* @param bool $extra whether to add a javascript to the form
- * @param string $display "display" attribute for the <table> tag
- * @param string $hidden "hidden" attribute for the <form> tag
*/
- public function getForm($name = null, $id = null, $action = false, $method = 'post', $extra = false, $display = false, $hidden = false)
+ public function getInitForm($name = null, $action = false, $method = 'post', $extra = false)
{
$this->name = $name;
- $this->id = $id;
$this->action = $action;
$this->method = $method;
$this->extra = $extra;
- $this->display = $display;
- $this->hidden = $hidden;
}
/**
- * Function OpenForm
+ * Function getHeaderForm
*
+ * @param string $title
+ */
+ public function getHeaderForm($title)
+ {
+ $ret = ($title ? '<div class=" center head ">' . $title . '</div>' . NWLINE : '');
+ return $ret;
+ }
+
+ /**
+ * Function getOpenForm
+ *
* @param null
*/
public function getOpenForm()
{
- $ret = '<form name="' . $this->name . '" id="' . $this->id . '" action="' . $this->action . '" method="' . $this->method . '" onsubmit="return xoopsFormValidate_' . $this->name . '();"' . $this->extra . '>' . NWLINE;
+ $ret = '<form name="' . $this->name . '" id="' . $this->name . '" action="' . $this->action . '" method="' . $this->method . '" onsubmit="return xoopsFormValidate_' . $this->name . '();"' . $this->extra . '>' . NWLINE;
return $ret;
}
/**
+ * Function getContentForm
+ *
+ * @param null
+ */
+ public function getContentForm($class, $caption, $content)
+ {
+ $ret = '<div class="' . $class . '"><strong>' . $caption . '</strong>' . $content . '</div>' . NWLINE;
+ return $ret;
+ }
+
+ /**
* Function CloseForm
*
* @param null
*/
public function getCloseForm()
{
- if($this->display && $this->hidden) {
- $ret = $this->display . NWLINE . ' ' . $this->hidden . '</form>' . NWLINE;
- } else {
- $ret = NWLINE . '</form>' . NWLINE;
- }
+ $ret = '</form>' . NWLINE;
return $ret;
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmltable.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmltable.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/htmltable.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -240,7 +240,9 @@
*/
public function addTableRow( $class = '', $attributes = null )
{
- $this->_class = $class;
+ if(empty($class)){
+ $this->_class = $class;
+ }
if(!is_array($attributes)){
$this->attributes[] = $attributes;
} else {
@@ -259,7 +261,9 @@
public function addTableCell( $data, $class = '', $type = '', $attributes = null )
{
$this->data = $data;
- $this->_class = $class;
+ if(empty($class)){
+ $this->_class = $class;
+ }
$this->type = $type;
if(!is_array($attributes)){
$this->attributes[] = $attributes;
@@ -291,8 +295,8 @@
*/
public function render()
{
- $ret = $this->initTable($id = '', $_class = '', $border = 0, $cellspacing = 2, $cellpadding = 0, $attributes = array() );
- $ret .= $this->endTable();
+ //$ret = $this->initTable($id = '', $_class = '', $border = 0, $cellspacing = 2, $cellpadding = 0, $attributes = array() );
+ $ret = $this->endTable();
return $ret;
}
}
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -0,0 +1,47 @@
+<?php
+/**
+ * XOOPS form element
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package kernel
+ * @subpackage form
+ * @since 2.0.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version $Id: simplelabel.php 12562 2014-04-03 10:57:12Z timgno $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * A text label
+ */
+class TDMCreateFormLabel extends XoopsFormElement
+{
+ /**
+ * Constructor
+ *
+ * @param string $caption
+ */
+ function TDMCreateFormLabel($caption = '')
+ {
+ $this->setCaption($caption);
+ }
+
+ /**
+ * Prepare HTML for output
+ *
+ * @return string
+ */
+ function render()
+ {
+ return $this->getCaption();
+ }
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -83,12 +83,13 @@
$title = $this->isNew() ? sprintf(_AM_TDMCREATE_TABLE_ADD) : sprintf(_AM_TDMCREATE_TABLE_EDIT);
xoops_load('xoopsformloader');
- $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
+ $form = new XoopsThemeForm($title, 'tableform', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
$modulesHandler =& xoops_getModuleHandler('modules', 'TDMCreate');
$mods_select = new XoopsFormSelect(_AM_TDMCREATE_TABLE_MODULES, 'table_mid', $this->getVar('table_mid'));
$mods_select->addOptionArray($modulesHandler->getList());
+ $mods_select->setExtra('onchange="document.forms.tableform.table_name.parentElement.parentElement;"');
$form->addElement($mods_select, true);
$table_name = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 50, 255, $this->getVar('table_name'));
@@ -184,6 +185,9 @@
$form->addElement(new XoopsFormHidden('op', 'save'));
$form->addElement(new XoopsFormHidden('table_id', $this->getVar('table_id')));
+ /*$confirmEl = new XoopsFormHidden('confirm', 0);
+ $confirmEl->customValidationCode[] = "if(confirm('" . _AM_TDMCREATE_TABLE_CONFIRM . " ' + myform.table_mid.options[myform.table_mid.selectedIndex].innerHTML + '\\n " . _AM_TDMCREATE_TABLE_MODULE . ": ' + myform.tableform.value)) {myform.confirm.value = 1;} else {return false;};";
+ $form->addElement($confirmEl);*/
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return $form;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/themeform.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -21,9 +21,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
xoops_load('XoopsFormLoader');
-//xoops_load('XoopsForm');
-include_once('htmlform.php');
-include_once('htmltable.php');
+
/**
* Form that will output as a theme-enabled HTML table
*
@@ -31,96 +29,7 @@
*/
class TDMCreateThemeForm extends XoopsForm
{
- /**
- * @var string
- */
- private $htmltable = null;
-
/**
- * tab_header elements
- *
- * @var mixed
- */
- private $tab_header = null;
-
- /**
- * constructor
- *
- * @param string $title title of the form
- * @param string $name "name" attribute for the <form> tag
- * @param string $action "action" attribute for the <form> tag
- * @param string $method "method" attribute for the <form> tag
- * @param bool $addtoken whether to add a security token to the form
- */
- public function __construct($title, $name = null, $action = false, $method = 'post', $tab_header = false, $addtoken = false, $summary = '')
- {
- parent::__construct($title, $name, $action, $method = 'post', $addtoken = false, $summary = '');
- $this->htmltable = TDMCreateHtmlTable::getInstance();
- if( $tab_header ) {
- $this->addHeader($tab_header);
- }
- }
-
- /*
- * @static function &getInstance
- * @param null
- */
- /*public static function &getInstance()
- {
- static $instance = false;
- if (!$instance) {
- $instance = new self();
- }
- return $instance;
- }*/
-
- /**
- * Insert an empty row in the table to serve as a seperator.
- *
- * @param string $extra HTML to be displayed in the empty row.
- * @param string $class CSS class name for <td> tag
- */
- public function insertBreak($extra = '', $class = '', $colspan = '2')
- {
- $class = ($class != '') ? " class='" . preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class) . "'" : '';
- // Fix for $extra tag not showing
- if ($extra) {
- $extra = $this->htmltable->addRow();
- $extra .= $this->htmltable->addCell( $extra, $class, 'data', ' colspan="'. $colspan . '"');
- $this->addElement($extra);
- } else {
- $extra = $this->htmltable->addRow();
- $extra .= $this->htmltable->addCell( ' ', $class, 'data', ' colspan="'. $colspan . '"');
- $this->addElement($extra);
- }
- }
-
- /**
- * Add an element to the form
- *
- * @param object $ &$$header reference to a {@link XoopsFormElement}
- * @param bool $required is this a "required" element?
- */
- public function addHeader($tab_header)
- {
- if (is_string($tab_header)) {
- $this->tab_header[] = $tab_header;
- } else {
- $this->tab_header = $tab_header;
- }
- }
-
- /**
- * get an array of "header" form elements
- *
- * @return array array of {@link XoopsFormElement}s
- */
- public function getHeader()
- {
- return $this->tab_header;
- }
-
- /**
* create HTML to output the form as a theme-enabled table with validation.
*
* YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
@@ -136,37 +45,20 @@
public function render()
{
$ele_name = $this->getName();
- $ret = NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
- $hidden = '';
+ $ret = ($this->getTitle() ? '<div class=" center head ">' . $this->getTitle() . '</div>' : '');
+ $ret .= NWLINE . '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $this->getExtra() . '>' . NWLINE;
+ $hidden = '';
$class = 'even';
- foreach ($this->getElements() as $ele) {
- if (!is_object($ele)) {
+ foreach ($this->getElements() as $ele) {
+ if (!is_object($ele)) {
$ret .= $ele;
- } else if (!$ele->isHidden()) {
- if (!$ele->getNocolspan()) {
- if (($caption = $ele->getCaption()) != '') {
- $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
- $ret .= '<span class="caption-text">' . $caption . '</span>';
- $ret .= '<span class="caption-marker">*</span>';
- $ret .= '</div>';
- }
- if (($desc = $ele->getDescription()) != '') {
- $ret .= '<div class="xoops-form-element-help">' . $desc . '</div>';
- }
- } else {
- if (($caption = $ele->getCaption()) != '') {
- $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
- $ret .= '<span class="caption-text">' . $caption . '</span>';
- $ret .= '<span class="caption-marker">*</span>';
- $ret .= '</div>';
- }
- $ret .= $ele->render();
- }
+ } else if (!$ele->isHidden()) {
+ $ret .= $ele->render();
} else {
$hidden .= $ele->render();
}
}
- $ret .= NWLINE . ' ' . $hidden . '</form>' . NWLINE;
+ $ret .= NWLINE . ' ' . $hidden . NWLINE . '</form>';
$ret .= $this->renderValidationJS(true);
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css 2014-04-03 13:51:04 UTC (rev 12420)
@@ -32,4 +32,8 @@
height: 16px;
}
-.width6{ width: 6%; }
\ No newline at end of file
+.width6{ width: 6%; }
+
+.bred {background-color:rgba(255,0,0,0.3);} / * red */
+.bgreen {background-color:rgba(0,255,0,0.3);} / * green */
+.bblue {background-color:rgba(0,0,255,0.3);} / * blue */
\ No newline at end of file
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/style.css (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/style.css 2014-04-03 13:51:04 UTC (rev 12420)
@@ -0,0 +1,20 @@
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: style.css 12258 2014-01-02 09:33:29Z timgno $
+ */
+@import url(admin/style.css);
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js 2014-04-03 13:51:04 UTC (rev 12420)
@@ -30,18 +30,7 @@
obj = document.getElementById(swap);
obj.src = !(obj.src == img_minus) ? img_minus : img_plus;
}
-/*
-function moduleSelect(sel, url) {
- var mod_id = sel.options[sel.selectedIndex].value;
- window.location.href = url+mod_id;
-}
-function selectModule(sel, url) {
- var mod_id = sel.options[sel.selectedIndex].value;
- myMod = document.location.href = url+mod_id;
- myMod.focus();
-}
-
function showImgSelected2(imgId, selectId, imgDir, extra, xoopsUrl)
{
if (xoopsUrl == null) {
@@ -55,35 +44,15 @@
imgDom.src = xoopsUrl + "/images/blank.gif";
}
}
-*/
-/*
-$(document).ready( function() {
- $('tr').find('a img.imageToggle').on('click', function(e) {
- e.preventDefault();
- $('tr.toggleChild').toggle();
- $(this).nextAll('tr.toggleChild').each( function() {
- if ($(this).is('.toggleMain')) {
- return false;
- }
- $(this).toggle();
- });
- });
-});
-$(document).ready( function() {
- $('tr.toggleChild').hide();
- $('tr.toggleMain').on('click', 'a img > imageToggle', function(e) {
- e.preventDefault();
+
+$(document).ready(function() {
+ $('tr.toggleMain').find('a').on('click', 'img.imageToggle', function(e) {
+ e.preventDefault();
$(this).nextAll().each( function() {
if ($(this).filter('tr.toggleMain').length) {
return false;
- }
- $(this).filter('tr.toggleChild').toggle();
+ }
});
- });
-});*/
-$(document).ready(function() {
- $('tr.toggleMain').find('a').on('click', 'img.imageToggle', function(e){
- e.preventDefault();
$('table#show_rows tr.toggleChild').toggle();
});
});
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-04-03 13:51:04 UTC (rev 12420)
@@ -311,6 +311,10 @@
// Added in version 1.59
define('_AM_TDMCREATE_TABLE_ID', "Id");
+define('_AM_TDMCREATE_TABLE_NAME_LIST', "Table Name");
+define('_AM_TDMCREATE_TABLE_IMAGE_LIST', "Table Icon");
+define('_AM_TDMCREATE_TABLE_NBFIELDS_LIST', "Fields");
+define('_AM_TDMCREATE_TABLE_BLOCKS_LIST', "Blocks");
define('_AM_TDMCREATE_TABLE_ADMIN_LIST', "Admin");
define('_AM_TDMCREATE_TABLE_USER_LIST', "User");
define('_AM_TDMCREATE_TABLE_SUBMENU_LIST', "Submenu");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql 2014-04-03 13:51:04 UTC (rev 12420)
@@ -66,14 +66,14 @@
) ENGINE=MyISAM;
#
-# Table structure for table `mod_tdmcreate_fields` 18
+# Table structure for table `mod_tdmcreate_fields` 19
#
CREATE TABLE `mod_tdmcreate_fields` (
`field_id` int (8) unsigned NOT NULL auto_increment,
`field_mid` int (5) unsigned NOT NULL default '0',
`field_tid` int (5) unsigned NOT NULL default '0',
-`field_numb` int (5) unsigned NOT NULL default '0',
+`field_numb` int (10) unsigned NOT NULL default '0',
`field_name` varchar (255) NOT NULL default '',
`field_type` varchar (100) NOT NULL default '',
`field_value` char (4) NOT NULL default '',
@@ -81,16 +81,17 @@
`field_null` char (10) NOT NULL default '',
`field_default` varchar (150) NOT NULL default '',
`field_key` char (10) NOT NULL default '',
-`field_auto_increment` tinyint (1) unsigned NOT NULL default '0',
-`field_admin` tinyint (1) unsigned NOT NULL default '0',
-`field_user` tinyint (1) unsigned NOT NULL default '0',
-`field_blocks` tinyint (1) unsigned NOT NULL default '0',
-`field_mainfield` tinyint (1) unsigned NOT NULL default '0',
-`field_search` tinyint (1) unsigned NOT NULL default '0',
-`field_required` tinyint (1) unsigned NOT NULL default '0',
-`field_fields` text,
-`field_parameters` text,
+`field_autoincrement` tinyint(1) NOT NULL default '0',`field_element` varchar (150) NOT NULL default '',
+`field_inlist` tinyint(1) NOT NULL default '0',
+`field_inform` tinyint(1) NOT NULL default '0',
+`field_admin` tinyint(1) NOT NULL default '0',
+`field_user` tinyint(1) NOT NULL default '0',
+`field_block` tinyint(1) NOT NULL default '0',
+`field_main` tinyint(1) NOT NULL default '0',
+`field_search` tinyint(1) NOT NULL default '0',
+`field_required` tinyint(1) NOT NULL default '0',
PRIMARY KEY (`field_id`),
+KEY `field_mid` (`field_mid`),
KEY `field_tid` (`field_tid`)
) ENGINE=MyISAM;
@@ -100,7 +101,7 @@
CREATE TABLE `mod_tdmcreate_languages` (
`lng_id` int (5) unsigned NOT NULL auto_increment,
-`lng_modules` int(5) NOT NULL default '0',
+`lng_mid` int(5) unsigned NOT NULL default '0',
`lng_file` varchar (255) NULL default '' ,
`lng_def` varchar (255) NULL default '' ,
`lng_desc` varchar (255) NULL default '' ,
@@ -155,8 +156,10 @@
INSERT INTO `mod_tdmcreate_fieldattributes` (`fieldattribute_value`, `fieldattribute_name`) VALUES
('', ''),
+('binary', 'BINARY'),
('unsigned', 'UNSIGNED'),
-('ON UPDATE CURRENT_TIMESTAMP', 'on update CURRENT_TIMESTAMP');
+('unsigned_zerofill', 'UNSIGNED ZEROFILL'),
+('current_timestamp', 'CURRENT_TIMESTAMP');
#
# Table structure for table `mod_tdmcreate_fieldnull` 3
@@ -190,34 +193,26 @@
('fulltext', 'FULLTEXT');
#
-# Table structure for table `mod_tdmcreate_fieldelements` 12
+# Table structure for table `mod_tdmcreate_fieldelements` 3
#
CREATE TABLE `mod_tdmcreate_fieldelements` (
-`fieldelement_id` int(5) NOT NULL auto_increment,
-`fieldelement_value` varchar(255) NOT NULL default '',
-`fieldelement_name` varchar(255) NOT NULL default '',
-`fieldelement_admin` tinyint(1) NOT NULL default '0',
-`fieldelement_user` tinyint(1) NOT NULL default '0',
-`fieldelement_block` tinyint(1) NOT NULL default '0',
-`fieldelement_mfield` tinyint(1) NOT NULL default '0',
-`fieldelement_search` tinyint(1) NOT NULL default '0',
-`fieldelement_required` tinyint(1) NOT NULL default '0',
-PRIMARY KEY (`fieldelement_id`),
+`fieldelement_fid` int(5) NOT NULL auto_increment,`fieldelement_name` varchar(100) NOT NULL default '',
+`fieldelement_value` varchar(100) NOT NULL default '',
+PRIMARY KEY (`fieldelement_fid`),
KEY `fieldelement_value` (`fieldelement_value`),
KEY `fieldelement_name` (`fieldelement_name`)
) ENGINE=MyISAM;
-INSERT INTO `mod_tdmcreate_fieldelement` (`fieldelement_id`, `fieldelement_value`, `fieldelement_name`, `fieldelement_admin`, `fieldelement_user`, `fieldelement_block`, `fieldelement_mfield`, `fieldelement_search`, `fieldelement_required`) VALUES
-(1, '', 'None', 0, 0, 0, 0, 0, 0),
-(2, 'XoopsFormText', 'Text', 0, 0, 0, 0, 0, 0),
-(3, 'XoopsFormTextArea', 'TextArea', 0, 0, 0, 0, 0, 0),
-(4, 'XoopsFormDhtmlTextArea', 'DhtmlTextArea', 0, 0, 0, 0, 0, 0),
-(5, 'XoopsFormCheckBox', 'CheckBox', 0, 0, 0, 0, 0, 0),
-(6, 'XoopsFormRadioYN', 'RadioYN', 0, 0, 0, 0, 0, 0),
-(7, 'XoopsFormSelect', 'SelectBox', 0, 0, 0, 0, 0, 0),
-(8, 'XoopsFormSelectUser', 'SelectUser', 0, 0, 0, 0, 0, 0),
-(9, 'XoopsFormColorPicker', 'ColorPicker', 0, 0, 0, 0, 0, 0),
-(10, 'XoopsFormUploadImage', 'UploadImage', 0, 0, 0, 0, 0, 0),
-(11, 'XoopsFormUploadFile', 'UploadFile', 0, 0, 0, 0, 0, 0),
-(12, 'XoopsFormTextDateSelect', 'TextDateSelect', 0, 0, 0, 0, 0, 0);
+INSERT INTO `mod_tdmcreate_fieldelements` (`fieldelement_fid`, `fieldelement_name`, `fieldelement_value`) VALUES
+(1, 'Text', 'XoopsFormText'),
+(2, 'TextArea', 'XoopsFormTextArea'),
+(3, 'DhtmlTextArea', 'XoopsFormDhtmlTextArea'),
+(4, 'CheckBox', 'XoopsFormCheckBox'),
+(5, 'RadioYN', 'XoopsFormRadioYN'),
+(6, 'SelectBox', 'XoopsFormSelect'),
+(7, 'SelectUser', 'XoopsFormSelectUser'),
+(8, 'ColorPicker', 'XoopsFormColorPicker'),
+(9, 'UploadImage', 'XoopsFormUploadImage'),
+(10, 'UploadFile', 'XoopsFormUploadFile'),
+(11, 'TextDateSelect', 'XoopsFormTextDateSelect');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_fields.html 2014-04-03 13:51:04 UTC (rev 12420)
@@ -6,23 +6,26 @@
<thead>
<tr>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_ID}></th>
- <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NAME}></th>
- <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_IMAGE}></th>
- <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NBFIELDS}></th>
- <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_BLOCKS}></th>
+ <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NAME_LIST}></th>
+ <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_IMAGE_LIST}></th>
+ <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NBFIELDS_LIST}></th>
+ <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_BLOCKS_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_ADMIN_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_USER_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_SUBMENU_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_SEARCH_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_COMMENTS_LIST}></th>
<th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NOTIFICATIONS_LIST}></th>
- <th class='center width10'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
+ <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_PERMISSIONS_LIST}></th>
+ <th class='center width6'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
</tr>
</thead>
<tbody>
<{foreach item=table from=$tables_list}>
<tr class="<{cycle values='even,odd'}> toggleMain">
- <td class='center'><{$table.id}><br /><img src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" title="Toggle" /></td>
+ <td class='center'><{$table.id}><br />
+ <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" /></a>
+ </td>
<td class='center'><{$table.name}></td>
<td class='center'><img src="<{$pathIcon32}>/<{$table.image}>" alt="<{$table.name}>" height="30" /></td>
<td class='center'><{$table.nbfields}></td>
@@ -61,11 +64,16 @@
<img src="<{xoModuleIcons16}><{$table.notifications}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
</a>
</td>
+ <td class='center'>
+ <a href="fields.php?op=toggle&table_permissions=<{$table.permissions}>&table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+ <img src="<{xoModuleIcons16}><{$table.permissions}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+ </a>
+ </td>
<td class='xo-actions txtcenter width6'>
- <a href="tables.php?op=edit&table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>">
+ <a href="tables.php?op=edit&table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>">
<img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>" height="16" />
</a>
- <a href="fields.php?op=edit&field_tid=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_FIELDS}>">
+ <a href="fields.php?op=edit&field_tid=<{$table.id}>&field_numb=<{$table.nbfields}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_FIELDS}>">
<img src="<{xoModuleIcons16 inserttable.png}>" alt="<{$smarty.const._AM_TDMCREATE_EDIT_FIELDS}>" height="16" />
</a>
<a href="tables.php?op=delete&table_id=<{$table.id}>" title="<{$smarty.const._DELETE}>">
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_modules.html 2014-04-03 13:51:04 UTC (rev 12420)
@@ -19,7 +19,7 @@
<th class='center width5'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
</tr>
<{foreach item=module from=$modules_list}>
- <tr class="<{cycle values='odd,even'}>">
+ <tr class="<{cycle values='even,odd'}>">
<td class='center'><{$module.id}></td>
<td class='center'><{$module.name}></td>
<td class='center'><{$module.version}></td>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html 2014-04-02 12:54:37 UTC (rev 12419)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tdmcreate_tables.html 2014-04-03 13:51:04 UTC (rev 12420)
@@ -19,10 +19,10 @@
<th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_PERMISSIONS_LIST}></th>
<th class='center width6'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
</tr>
- </thead> <!--<a href="" class="linkToggle">Toggle</a> -->
+ </thead>
<tbody>
<{foreach item=module from=$modules_list}>
- <tr class="head toggleMain">
+ <tr id="module<{$module.id}>" class="<{cycle values='even,odd'}> toggleMain">
<td class='center'><{$module.id}><br />
<a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_url}>/images/icons/16/toggle.png" alt="Toggle" /></a>
</td>
@@ -120,7 +120,7 @@
<a href="tables.php?op=edit&table_id=<{$table.id}>" title="<{$smarty.const._EDIT}>">
<img src="<{xoAdminIcons edit.png}...
[truncated message content] |
