X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flibs%2FADMIN.php;h=6dbf3b3d5021a5fbe8919d9683b31b48eb607e02;hp=453d6246b5e0eabfbddcee043a718bc84e6affc4;hb=b82168398ee0160603b015a4930998f6e656c098;hpb=2f4687fe81ac6abc4812442167fc1184f89ae16b

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 453d624..6dbf3b3 100644
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -208,7 +208,6 @@ class Admin
 			$alias = array(
 				'login'	=> 'overview',
 				''		=> 'overview',
-				'admntemplateoverview' => 'admintemplateoverview'
 			);
 		}
 		if ( array_key_exists($action, $alias) && isset($alias[$action]) )
@@ -233,7 +232,7 @@ class Admin
 				self::error(_ERROR_BADTICKET);
 			}
 		}
-
+		
 		/* 3. parse according to the action */
 		if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )
 		{
@@ -251,7 +250,7 @@ class Admin
 		}
 		elseif ( $id != $CONF['AdminSkin'] )
 		{
-			self::$skin = new Skin($CONF['AdminSkin']);
+			self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions');
 			if ( self::$skin && self::existsSkinContents('adminerrorpage') )
 			{
 				self::error(_BADACTION . ENTITY::hsc($action));
@@ -3059,27 +3058,13 @@ class Admin
 		$member->isAdmin() or self::disallow();
 		
 		Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";
-		Admin::$extrahead .= '<script type=\"text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . "\");</script>\n";
+		Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";
 		
 		self::$skin->parse('templateedit');
 		return;
 	}
 	
 	/**
-	 * TODO: remove this
-	 *
-	static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {
-		static $count = 1;
-		if (!isset($template[$name])) $template[$name] = '';
-	?>
-		</tr><tr>
-			<td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>
-			<td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>
-	<?php       $count++;
-	}
-	*/
-	
-	/**
 	 * Admin::action_templateupdate()
 	 * 
 	 * @param	void
@@ -3395,9 +3380,9 @@ class Admin
 		DB::execute($query);
 		
 		// 3. Add non-empty template parts
-		self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_HEAD',					postVar('ADMINSKINTYPELIST_HEAD'));
-		self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_BODY',					postVar('ADMINSKINTYPELIST_BODY'));
-		self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_FOOT',					postVar('ADMINSKINTYPELIST_FOOT'));
+		self::addToAdminTemplate($templateid, 'NORMALSKINLIST_HEAD',					postVar('NORMALSKINLIST_HEAD'));
+		self::addToAdminTemplate($templateid, 'NORMALSKINLIST_BODY',					postVar('NORMALSKINLIST_BODY'));
+		self::addToAdminTemplate($templateid, 'NORMALSKINLIST_FOOT',					postVar('NORMALSKINLIST_FOOT'));
 		self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON',				postVar('ADMIN_CUSTOMHELPLINK_ICON'));
 		self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR',			postVar('ADMIN_CUSTOMHELPLINK_ANCHOR'));
 		self::addToAdminTemplate($templateid, 'ADMIN_BLOGLINK',							postVar('ADMIN_BLOGLINK'));
@@ -4448,6 +4433,7 @@ class Admin
 	}
 
 	/**
+	 * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!
 	 * Admin::action_adminskinieimport()
 	 * 
 	 * @param	void
@@ -4516,6 +4502,7 @@ class Admin
 	}
 	
 	/**
+	 * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!
 	 * Admin::action_adminskiniedoimport()
 	 * 
 	 * @param	void