[xoops-svn] SF.net SVN: xoops-svn:[12674] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/class/files

[<txm...@us...>]

Revision: 12674
          http://sourceforge.net/p/xoops/svn/12674
Author:   txmodxoops
Date:     2014-07-04 09:29:45 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
 - Fixed many issues for templates & admin/menu

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php	2014-07-04 08:02:45 UTC (rev 12673)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php	2014-07-04 09:29:45 UTC (rev 12674)
@@ -45,6 +45,7 @@
 	/*
 	*  @public function write
 	*  @param string $module
+	*  @param mixed $table
 	*  @param mixed $tables
 	*  @param string $filename
 	*/
@@ -54,6 +55,28 @@
 		$this->setFileName($filename);
 	}
 	/*
+	*  @private function getAdminMenuPath
+	*  @param array $tables
+	*  @param integer $t
+	*/
+	private function getAdminMenuPath($tables, $t) {    
+		$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
+		foreach (array_keys($fields) as $f) 
+		{
+			$fieldElement = $fields[$f]->getVar('field_element');
+			if( ($fieldElement == 9) || ( $fieldElement != 10 ) ) { 
+				$ret = <<<EOT
+\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';\n
+EOT;
+			} elseif( $fieldElement == 10 ) {
+				$ret = <<<EOT
+\$adminmenu[\$i]['icon'] = 'assets/images/icons/32/{$tables[$t]->getVar('table_image')}';\n
+EOT;
+			}
+		}
+		return $ret; 
+	}
+	/*
 	*  @public function render
 	*  @param null
 	*/
@@ -83,29 +106,15 @@
 			$tablePermissions = $tables[$t]->getVar('table_permissions');
 			if ( $tables[$t]->getVar('table_admin') == 1 ) 
 			{   
-			    $menu++;					
+			    $menu++;				
 				$content .= <<<EOT
 \$adminmenu[\$i]['title'] = {$language}{$menu};
-\$adminmenu[\$i]['link'] = 'admin/{$tables[$t]->getVar('table_name')}.php';
-\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';
-// Local path
+\$adminmenu[\$i]['link'] = 'admin/{$tables[$t]->getVar('table_name')}.php';\n
 EOT;
-				$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
-				foreach (array_keys($fields) as $f) 
-				{
-					$fieldElement = $fields[$f]->getVar('field_element');
-					if( $fieldElement == 9 ) { 
-						$content .= <<<EOT
-//\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';
+				$content .= $this->getAdminMenuPath($tables, $t);
+				$content .= <<<EOT
 \$i++;\n
 EOT;
-					} elseif( $fieldElement == 10 ) {
-						$content .= <<<EOT
-//\$adminmenu[\$i]['icon'] = 'assets/images/icons/32/{$tables[$t]->getVar('table_image')}';
-\$i++;\n
-EOT;
-					}
-				}
 			}
 		}
 		if( $tablePermissions == 1 ) {

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-07-04 08:02:45 UTC (rev 12673)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-07-04 09:29:45 UTC (rev 12674)
@@ -64,10 +64,10 @@
 	public function getAdminPagesHeader($moduleDirname, $tableName) {  
 		
 		$ret = <<<EOT
-\ninclude_once 'header.php';
+include_once 'header.php';
 //It recovered the value of argument op in URL$
 \$op = {$moduleDirname}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
-// 
+// Switch options
 switch (\$op) 
 {\n
 EOT;
@@ -93,9 +93,9 @@
     default:  
 		\$limit = \${$moduleDirname}->getConfig('adminpager');
 		\$start = {$moduleDirname}_CleanVars(\$_REQUEST, 'start', 0);
-		\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$tableName}.php?op=new', 'add');
 		\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
 		\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
+		\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$tableName}.php?op=new', 'add');		
 		\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
 		\$criteria = new CriteriaCompo();
 		\$criteria->setSort('{$fpif} ASC, {$fpmf}');

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-07-04 08:02:45 UTC (rev 12673)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-07-04 09:29:45 UTC (rev 12674)
@@ -70,8 +70,8 @@
 		foreach(array_keys($fields) as $f)
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
-			$lang_fn = $language.strtoupper($fieldName);		
-			if($fields[$f]->getVar('field_inlist') == 1) { 
+			$lang_fn = $language.strtoupper($fieldName);			
+			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) { 
 				$ret .= <<<EOT
 				<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
 EOT;
@@ -121,7 +121,7 @@
 				} 		
 			}
 			$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
-			if($fields[$f]->getVar('field_inlist') == 1) {	
+			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {	
 				switch( $fieldElement ) {			    
 					case 8:			
 						$ret .= <<<EOT
@@ -184,7 +184,7 @@
 			if($f == 0) {
 				$field_id = $fieldName;							
 			}
-			if($fields[$f]->getVar('field_inlist') == 1) {	
+			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) { 
 				switch( $fieldElement ) {			    
 					case 8:			
 						$ret .= <<<EOT
@@ -241,8 +241,7 @@
 			<strong><{\$error}></strong>
 		</div>
 	<{/if}>
-<{/if}>
-<{if \$form}>
+<{else}>
 	<!-- Display form (add,edit) -->
 	<div class="spacer"><{\$form}></div>
 <{/if}>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php	2014-07-04 08:02:45 UTC (rev 12673)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php	2014-07-04 09:29:45 UTC (rev 12674)
@@ -98,7 +98,7 @@
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 //
 \$dirname = basename( dirname( __FILE__ ) ) ;
-//
+// ---------------------- Informations ---------------------- //
 \$modversion = array(
     'name' => {$language}NAME,
 	'version' => {$module->getVar('mod_version')},
@@ -193,7 +193,7 @@
 		$ret = '';
 		if ( !empty($tableName) ) {
 			$ret .= <<<EOT
-\n// Mysql file
+// ---------------------- Mysql ---------------------- //
 \$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
 // Tables\n
 EOT;
@@ -216,7 +216,7 @@
 	private function getXoopsVersionSearch($moduleDirname) 
 	{ 
 		$ret = <<<EOT
-// Search
+// ---------------------- Search ---------------------- //
 \$modversion['hasSearch'] = 1;
 \$modversion['search']['file'] = "include/search.inc.php";
 \$modversion['search']['func'] = "{$moduleDirname}_search";\n
@@ -230,7 +230,7 @@
 	private function getXoopsVersionComments($moduleDirname) 
 	{ 
 		$ret = <<<EOT
-// Comments
+// ---------------------- Comments ---------------------- //
 \$modversion['comments']['pageName'] = "comments.php";
 \$modversion['comments']['itemName'] = "com_id";
 // Comment callback functions
@@ -248,7 +248,8 @@
 	{ 
 		$tables = $this->getTables();
 		$ret = <<<EOT
-// Templates Admin
+// ---------------------- Templates ---------------------- // 
+// Admin
 \$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_about.tpl', 'description' => '', 'type' => 'admin');
 \$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_header.tpl', 'description' => '', 'type' => 'admin');
 \$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_index.tpl', 'description' => '', 'type' => 'admin');\n
@@ -278,7 +279,7 @@
 	{ 
 		$tables = $this->getTables();		
 		$ret = <<<EOT
-// Templates User
+// User
 \$modversion['templates'][] = array('file' => '{$moduleDirname}_header.tpl', 'description' => '');
 \$modversion['templates'][] = array('file' => '{$moduleDirname}_index.tpl', 'description' => '');\n
 EOT;
@@ -300,7 +301,7 @@
 	private function getXoopsVersionSubmenu($language) 
 	{ 	
 		$ret = <<<EOT
-// Submenu list\n
+// ---------------------- Submenu ---------------------- //\n
 EOT;
 		$tables = $this->getTables();
 		$i = 1;
@@ -328,7 +329,7 @@
 	{ 
 		$tables = $this->getTables();
 		$ret = <<<EOT
-//Blocks\n
+// ---------------------- Blocks ---------------------- //\n
 EOT;
 		foreach (array_keys($tables) as $i) {
 			$tableName = $tables[$i]->getVar('table_name');			
@@ -357,7 +358,7 @@
 	{ 
 		$moduleDirname = $module->getVar('mod_dirname');
 		$ret = <<<EOT
-// ------------------- Config -------------------\n
+// ------------------- Config ------------------- //\n
 EOT;
         $fields = $this->getTableFields($table->getVar('table_id'));
 		foreach (array_keys($fields) as $f) 
@@ -522,7 +523,7 @@
 			}
 		}	
 		$ret .= <<<EOT
-\n// Notifications {$moduleDirname}
+// ------------------- Notifications ------------------- //
 \$modversion['hasNotification'] = 1;
 \$modversion['notification']['lookup_file'] = 'include/notification.inc.php';
 \$modversion['notification']['lookup_func'] = '{$moduleDirname}_notify_iteminfo';