Add config genaral UI

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8976 201d5d3c-b55e-5fd7-737f-ddc643e51545
2026-01-08 19:21:40 +09:00 · 2011-09-01 08:08:24 +00:00 · 2011-09-01 08:08:24 +00:00 · 3d14d28079
commit 3d14d28079
parent ee9458d1df
6 changed files with 433 additions and 335 deletions
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@ -22,7 +22,7 @@
         * @return none
         **/
        function procAdminRecompileCacheFile() {
-			// rename cache dir
+			// rename cache dir			
 			$temp_cache_dir = './files/cache_'. time();
 			FileHandler::rename('./files/cache', $temp_cache_dir);
 			FileHandler::makeDir('./files/cache');
@ -336,5 +336,15 @@

 			return new Object();
 		}
+		function procAdminRemoveIcons(){				
+			$iconname = Context::get('iconname');			
+			$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			if($file_exist) {
+				@FileHandler::removeFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			} else {
+				return new Object(-1,'fail_to_delete');
+			}
+			$this->setMessage('success_deleted');			
+		}
    }
 ?>
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@ -36,7 +36,7 @@
            Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
            Context::set('use_sso', $db_info->use_sso=='Y'?'Y':'N');
            Context::set('use_html5', $db_info->use_html5=='Y'?'Y':'N');
-            Context::set('use_spaceremover', $db_info->use_spaceremover?$db_info->use_spaceremover:'Y');
+            Context::set('use_spaceremover', $db_info->use_spaceremover?$db_info->use_spaceremover:'Y');//not use
            Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
            Context::set('use_db_session', $db_info->use_db_session=='N'?'N':'Y');
            Context::set('use_mobile_view', $db_info->use_mobile_view =='Y'?'Y':'N');
@ -99,7 +99,7 @@
 					}
 				}
 			}
-
+			
 			// Admin logo, title setup
 			$configObject = $oModuleModel->getModuleConfig('admin');
 			$gnbTitleInfo->adminTitle = $configObject->adminTitle?$configObject->adminTitle:'XE Admin';
@ -294,22 +294,32 @@
         * @return none
         **/
        function dispAdminConfig() {
-            $db_info = Context::getDBInfo();
-
-            Context::set('sftp_support', function_exists(ssh2_sftp));
+            $db_info = Context::getDBInfo();            
+			
+			Context::set('sftp_support', function_exists(ssh2_sftp));

            Context::set('selected_lang', $db_info->lang_type);
-
-            Context::set('default_url', $db_info->default_url);
-
+			
+			Context::set('default_url', $db_info->default_url);
+	
            Context::set('langs', Context::loadLangSupported());

-            Context::set('lang_selected', Context::loadLangSelected());
-
-			Context::set('use_mobile_view', $db_info->use_mobile_view=="Y"?'Y':'N');
-
+            Context::set('lang_selected', Context::loadLangSelected());	
+			
+            Context::set('admin_ip', $db_info->admin_ip);
+		
+			
+			$favicon_url = $this->iconUrlCheck('favicon.ico','faviconSample.png');
+			$mobicon_url = $this->iconUrlCheck('mobicon.png','mobiconSample.png');
+            Context::set('favicon_url', $favicon_url);
+			Context::set('mobicon_url', $mobicon_url);			
+			
            $ftp_info = Context::getFTPInfo();
            Context::set('ftp_info', $ftp_info);
+			
+			$oDocumentModel = &getModel('document');
+            $config = $oDocumentModel->getDocumentConfig();
+            Context::set('thumbnail_type',$config->thumbnail_type);

 			$oModuleModel = &getModel('module');
 			$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');
@ -318,10 +328,10 @@

            Context::set('pwd',$pwd);
            Context::set('layout','none');
-            $this->setTemplateFile('spGenaral');
+            $this->setTemplateFile('config');
        }

-        /**
+		/**
         * @brief Display Admin Menu Configuration(settings) page
         * @return none
         **/
@ -419,4 +429,13 @@
 			$this->setTemplateFile('theme');
 		}

+		function iconUrlCheck($iconname,$default_icon_name){
+			$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			if(!$file_exsit){
+				$icon_url = './modules/admin/tpl/img/'.$default_icon_name	;
+			} else {
+				$icon_url = $db_info->default_url.'files/attach/xeicon/'.$iconname;
+			}
+			return $icon_url;
+		}
    }
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@ -4,18 +4,19 @@
    <permissions />
    <actions>
        <action name="dispAdminIndex" type="view" standalone="true" index="true" />
-        <action name="dispAdminConfig" type="view" standalone="true" />
+        <action name="dispAdminConfig" type="view" standalone="true" menu_name="adminConfiguration" menu_index="true" />
        <action name="dispAdminTheme" type="view" standalone="true" menu_name="theme" menu_index="true" />
        <action name="dispAdminSetup" type="view" standalone="true" menu_name="adminMenuSetup" menu_index="true" />

-        <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
+        <action name="procAdminRemoveIcons" type="controller" standalone="true" />
+		<action name="procAdminRecompileCacheFile" type="controller" standalone="true" />		
        <action name="procAdminLogout" type="controller" standalone="true" />
        <action name="procAdminInsertThemeInfo" type="controller" standalone="true" ruleset="insertThemeInfo" />
 		<action name="procAdminToggleFavorite" type="controller" ruleset="toggleFavorite" />
 		<action name="procAdminEnviromentGatheringAgreement" type="controller" standalone="true" />
 		<action name="procAdminUpdateConfig" type="controller" standalone="true" />
 		<action name="procAdminDeleteLogo" type="controller" standalone="true" />
-
+		
        <action name="getAdminFTPList" type="model" standalone="true" />
        <action name="getSiteAllList" type="model" standalone="true" />
    </actions>
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@ -1,5 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <lang>
+	<item name="title_genaral">
+		<value xml:lang="ko"><![CDATA[일반]]></value>
+		<value xml:lang="en"><![CDATA[Genaral]]></value>
+	</item>
+	<item name="subtitle_primary">
+		<value xml:lang="ko"><![CDATA[기본]]></value>
+		<value xml:lang="en"><![CDATA[Primary]]></value>
+	</item>	
+	<item name="subtitle_advanced">
+		<value xml:lang="ko"><![CDATA[고급]]></value>
+		<value xml:lang="en"><![CDATA[Advanced]]></value>
+	</item>
+	<item name="subtitle_etc">
+		<value xml:lang="ko"><![CDATA[기타]]></value>
+		<value xml:lang="en"><![CDATA[etc]]></value>
+	</item>
 	<item name="admin_info">
 		<value xml:lang="ko"><![CDATA[관리자 정보]]></value>
 		<value xml:lang="en"><![CDATA[Administrator Info]]></value>
@ -231,16 +247,8 @@
 		<value xml:lang="vi"><![CDATA[URL mặc định]]></value>
 	</item>
 	<item name="about_default_url">
-		<value xml:lang="ko"><![CDATA[XE 가상 사이트(cafeXE 등)의 기능을 사용할 때 기본 URL을 입력하셔야 가상 사이트간 인증 연동이 되고 게시글, 모듈 등의 연결이 정상적으로 이루어집니다. (예: http://도메인/설치경로)]]></value>
-		<value xml:lang="en"><![CDATA[If you use a virtual site feature (e.g., cafeXE), input default URL (parent-site's address), then SSO would be enabled, thus connection to documents/modules works properly.]]></value>
-		<value xml:lang="jp"><![CDATA[複数のバーチャル（Virtual）サイトを運営する場合、どちらからログインしてもバーチャル（Virtual）サイトの間でログイン情報を維持出来るようにするためには、基本になるサイトでのXEをインストールしたurlを登録して下さい。 (例: http://ドメイン/インストールパス)]]></value>
-		<value xml:lang="zh-CN"><![CDATA[请输入默认站点的XE安装地址(ex: http://域名/xe)。 <br /><strong>说明：</strong>简单的说，就是绑定帐号系统。只需要登录一次，就可以在用站点模块生成的多个子站点中随意漫游。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[XE虛擬網站必須要先輸入預設的網址確保虛擬網站的運作，請輸入預設程式安裝路徑。<br />(例: http://網域名稱/安裝路徑)]]></value>
-		<value xml:lang="fr"><![CDATA[XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)]]></value>
-		<value xml:lang="ru"><![CDATA[If you use a virtual site feature (e.g., cafeXE), input default URL (parent-sites address), then SSO would be enabled, thus connection to documents/modules works properly]]></value>
-		<value xml:lang="es"><![CDATA[XE sitio virtual (cafeXE, etc) tiene que introducir la URL base, al utilizar las capacidades de trabajo virtual y el tema de autenticación sayiteugan / módulos y las conexiones se realizan correctamente. (Ej: http:// dominio / ruta de instalación)]]></value>
-		<value xml:lang="tr"><![CDATA[Eğer sanal site özelliği kullanıyorsanız (örneğin, cafeXE), varsayılan URL girdisini yapınız (üst-sitenin adresi), SSO etkinleştirilecektir, böylece belgelere/modüllere sağlanan bağlantı uygun bir şekilde çalışacaktır. ]]></value>
-		<value xml:lang="vi"><![CDATA[Nếu bạn sử dụng tính năng trang Web ảo (Ví dụ: PlanetXE, cafeXE), hãy chọn URL mặc định (địa chỉ trang chủ), khi khi kích hoạt SSO với thư mục hay Module làm việc.]]></value>
+		<value xml:lang="ko"><![CDATA[여러 사이트를 운영할 때 기본 URL이 필요합니다. XE 설치 경로를 포함한 URL을 입력하세요. (예: http://도메인/설치경로)]]></value>
+		<value xml:lang="en"><![CDATA[여러 사이트를 운영할 때 기본 URL이 필요합니다. XE 설치 경로를 포함한 URL을 입력하세요. (예: http://도메인/설치경로)]]></value>		
 	</item>
 	<item name="env_information">
 		<value xml:lang="ko"><![CDATA[환경 정보]]></value>
@ -545,54 +553,18 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="ru"><![CDATA[Сегодня]]></value>
 		<value xml:lang="tr"><![CDATA[Bugün]]></value>
 		<value xml:lang="vi"><![CDATA[Hôm nay]]></value>
-	</item>
-	<item name="cmd_lang_select">
-		<value xml:lang="ko"><![CDATA[언어선택]]></value>
-		<value xml:lang="en"><![CDATA[Language]]></value>
-		<value xml:lang="jp"><![CDATA[言語選択]]></value>
-		<value xml:lang="zh-CN"><![CDATA[多国语言支持]]></value>
-		<value xml:lang="zh-TW"><![CDATA[選擇語言]]></value>
-		<value xml:lang="fr"><![CDATA[langue]]></value>
-		<value xml:lang="ru"><![CDATA[Выбор языка]]></value>
-		<value xml:lang="es"><![CDATA[Selección de Idioma]]></value>
-		<value xml:lang="tr"><![CDATA[Dil]]></value>
-		<value xml:lang="vi"><![CDATA[Ngôn ngữ]]></value>
-	</item>
-	<item name="about_cmd_lang_select">
-		<value xml:lang="ko"><![CDATA[선택된 언어들만 서비스 됩니다.]]></value>
-		<value xml:lang="en"><![CDATA[Only selected languages will be served.]]></value>
-		<value xml:lang="jp"><![CDATA[選択した言語だけでサービスを行います。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[请选择要使用的语言。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[只提供所選擇的語言服務]]></value>
-		<value xml:lang="fr"><![CDATA[La langue choisie seulement sera servie]]></value>
-		<value xml:lang="ru"><![CDATA[Возможно использование только выбранных языков]]></value>
-		<value xml:lang="es"><![CDATA[Seleccione el idioma es sólo el servicio]]></value>
-		<value xml:lang="tr"><![CDATA[Sadece seçili dillerde hizmet verecektir.]]></value>
-		<value xml:lang="vi"><![CDATA[Chỉ chọn được những ngôn ngữ có sẵn.]]></value>
-	</item>
+	</item>		
+	<item name="about_lang_select">
+		<value xml:lang="ko"><![CDATA[지원할 언어를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[지원할 언어를 설정하세요.]]></value>		
+	</item>	
 	<item name="about_recompile_cache">
-		<value xml:lang="ko"><![CDATA[쓸모 없어졌거나 잘못된 캐시파일들을 정리할 수 있습니다.]]></value>
-		<value xml:lang="en"><![CDATA[You can delete useless or invalid cache files.]]></value>
-		<value xml:lang="jp"><![CDATA[要らないかごみのキャッシューファイルを整理します。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[整理无用的或错误的缓冲文件。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[可有效的整理錯誤的暫存檔]]></value>
-		<value xml:lang="fr"><![CDATA[Vous pouvez arranger les fichiers inutils ou les fichiers invalides d'antémémoire]]></value>
-		<value xml:lang="ru"><![CDATA[You can delete useless or invalid cache files]]></value>
-		<value xml:lang="es"><![CDATA[Inválido inútil archivo de caché puede organizar jyeotgeona]]></value>
-		<value xml:lang="tr"><![CDATA[Gereksiz veya geçersiz önbellek dosyalarını silebilirsiniz.]]></value>
-		<value xml:lang="vi"><![CDATA[Bạn có thể sắp xếp lại File Cache cho những việc đã làm hoặc bị lỗi.]]></value>
+		<value xml:lang="ko"><![CDATA[쓸모 없어졌거나 잘못된 캐시파일들을 지우시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Delete useless or invalid cache files?]]></value>	
 	</item>
 	<item name="use_ssl">
-		<value xml:lang="ko"><![CDATA[SSL 사용]]></value>
-		<value xml:lang="en"><![CDATA[Use SSL]]></value>
-		<value xml:lang="jp"><![CDATA[SSL環境設定]]></value>
-		<value xml:lang="zh-CN"><![CDATA[SSL使用]]></value>
-		<value xml:lang="zh-TW"><![CDATA[SSL功能]]></value>
-		<value xml:lang="fr"><![CDATA[Utiliser SSL]]></value>
-		<value xml:lang="ru"><![CDATA[Использовать SSL]]></value>
-		<value xml:lang="es"><![CDATA[Usar SSL]]></value>
-		<value xml:lang="tr"><![CDATA[SSL Kullan]]></value>
-		<value xml:lang="vi"><![CDATA[Sử dụng SSL]]></value>
+		<value xml:lang="ko"><![CDATA[SSL(Secure Sockets Layer)을 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would use SSL(Secure Sockets Layer)?]]></value>		
 	</item>
 	<item name="ssl_options" type="array">
 		<item name="none">
@ -779,15 +751,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="jp"><![CDATA[今週]]></value>
 		<value xml:lang="zh-TW"><![CDATA[本週]]></value>
 		<value xml:lang="tr"><![CDATA[Bu Hafta]]></value>
-	</item>
-	<item name="use_html5">
-		<value xml:lang="ko"><![CDATA[HTML5 DTD]]></value>
-		<value xml:lang="en"><![CDATA[HTML5 DTD]]></value>
-	</item>
-	<item name="about_html5">
-		<value xml:lang="ko"><![CDATA[HTML5 DTD 사용]]></value>
-		<value xml:lang="en"><![CDATA[Use HTML5 DTD]]></value>
-	</item>
+	</item>	
 	<item name="trash">
 		<value xml:lang="ko"><![CDATA[휴지통]]></value>
 		<value xml:lang="en"><![CDATA[Trash]]></value>
@ -824,10 +788,107 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="ko"><![CDATA[CDN 사용]]></value>
 		<value xml:lang="en"><![CDATA[CDN 사용]]></value>
 	</item>
+	<item name="about_use_rewrite">
+		<value xml:lang="ko"><![CDATA[짧은 주소를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[짧은 주소를 사용하시겠습니까?]]></value>
+	</item>
+	<item name="about_timezone">
+		<value xml:lang="ko"><![CDATA[현지 표준시를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[현지 표준시를 설정하세요.]]></value>
+	</item>
+	<item name="about_html_dtd">
+		<value xml:lang="ko"><![CDATA[HTML DTD를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[HTML DTD를 설정하세요.]]></value>
+	</item>
+	<item name="html5">
+		<value xml:lang="ko"><![CDATA[HTML5]]></value>
+		<value xml:lang="en"><![CDATA[HTML5]]></value>
+	</item>
+	<item name="xhtml_transitional">
+		<value xml:lang="ko"><![CDATA[XHTML 1.0 Transitional]]></value>
+		<value xml:lang="en"><![CDATA[XHTML 1.0 Transitional]]></value>
+	</item>	
+	<item name="about_html_dtd">
+		<value xml:lang="ko"><![CDATA[HTML DTD를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[HTML DTD를 설정하세요.]]></value>
+	</item>
+	<item name="about_question_mobile_view">
+		<value xml:lang="ko"><![CDATA[모바일 기기에서 접속할 때 모바일 페이지를 보여줄까요?]]></value>
+		<value xml:lang="en"><![CDATA[모바일 기기에서 접속할 때 모바일 페이지를 보여줄까요?]]></value>
+	</item>
+	<item name="about_thumbnail_type">
+		<value xml:lang="ko"><![CDATA[썸네일 생성 방식을 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[썸네일 생성 방식을 선택하세요.]]></value>
+	</item>	
+	<item name="corp">
+		<value xml:lang="ko"><![CDATA[Crop(잘라내기)]]></value>
+		<value xml:lang="en"><![CDATA[Crop(잘라내기)]]></value>
+	</item>
+	<item name="ratio">
+		<value xml:lang="ko"><![CDATA[Ratio(비율 맞추기)]]></value>
+		<value xml:lang="en"><![CDATA[Ratio(비율 맞추기)]]></value>
+	</item>
+	<item name="ratio">
+		<value xml:lang="ko"><![CDATA[Ratio(비율 맞추기)]]></value>
+		<value xml:lang="en"><![CDATA[Ratio(비율 맞추기)]]></value>
+	</item>
+	<item name="about_admin_ip_limit">
+		<value xml:lang="ko"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+		<value xml:lang="en"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+	</item>
+	<item name="about_admin_ip_limit">
+		<value xml:lang="ko"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다]]></value>
+		<value xml:lang="en"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+	</item>	
+	<item name="detail_about_admin_ip_limit">
+		<value xml:lang="ko"><![CDATA[해당 IP에 대해서만 관리자 페이지로 접근이 가능하므로 주의해주시기 바랍니다.<br /> IP대역 정보는 /files/config/db.config.php 파일에 저장됩니다.<br /> 예1) 123.45.67.* 예2) 123.76.54.32 ]]></value>
+		<value xml:lang="en"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+	</item>	
+	<item name="detail_about_ftp_info">
+		<value xml:lang="ko"><![CDATA[해당 IP에 대해서만 관리자 페이지로 접근이 가능하므로 주의해주시기 바랍니다.<br /> IP대역 정보는 /files/config/db.config.php 파일에 저장됩니다.<br /> 예1) 123.45.67.* 예2) 123.76.54.32 ]]></value>
+		<value xml:lang="en"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+	</item>	
+	<item name="about_favicon">
+		<value xml:lang="ko"><![CDATA[파비콘을 사용할까요?]]></value>
+		<value xml:lang="en"><![CDATA[파비콘을 사용할까요?]]></value>
+	</item>				
+	<item name="detail_about_use_favicon">
+		<value xml:lang="ko"><![CDATA[16 x 16 크기의 <em>favicon.ico</em> 파일만 업로드 가능.]]></value>
+		<value xml:lang="en"><![CDATA[16 x 16 크기의 <em>favicon.ico</em> 파일만 업로드 가능.]]></value>
+	</item>				
+	<item name="about_mobilehome_icon">
+		<value xml:lang="ko"><![CDATA[모바일 홈 화면 아이콘을 사용할까요?]]></value>
+		<value xml:lang="en"><![CDATA[모바일 홈 화면 아이콘을 사용할까요?]]></value>
+	</item>				
+	<item name="detail_about_mobilehome_icon">
+		<value xml:lang="ko"><![CDATA[57 x 57 또는 114 x 114 크기의 <em>mobicon.png</em> 파일만 업로드 가능.]]></value>
+		<value xml:lang="en"><![CDATA[57 x 57 또는 114 x 114 크기의 <em>mobicon.png</em> 파일만 업로드 가능.]]></value>
+	</item>						
+	<item name="about_use_sso">
+		<value xml:lang="ko"><![CDATA[SSO(Single Sign On)를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would use SSO(Single Sign On)?]]></value>
+	</item>	
 	<item name="about_cdn">
 		<value xml:lang="ko"><![CDATA[XE core의 css, js 파일을 CDN으로부터 제공받으려면 체크하세요.]]></value>
 		<value xml:lang="en"><![CDATA[XE core의 css, js 파일을 CDN으로부터 제공받으려면 체크하세요.]]></value>
-	</item>
+	</item>	
+	<item name="about_arrange_session">
+		<value xml:lang="ko"><![CDATA[세션을 정리하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Arrange session?]]></value>
+	</item>	
+	<item name="msg_not_correct_iconname">
+		<value xml:lang="ko"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
+	</item>	
+	<item name="msg_not_correct_iconname">
+		<value xml:lang="ko"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
+	</item>	
+	<item name="msg_possible_only_file">
+		<value xml:lang="ko"><![CDATA[파일만 업로드 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[파일만 업로드 가능합니다.]]></value>
+	</item>	
+	
 	<item name="save">
 		<value xml:lang="ko"><![CDATA[저장]]></value>
 		<value xml:lang="en"><![CDATA[Save]]></value>
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@ -1,238 +1,222 @@
-<!--#include("_header.html")-->
-
-<!--%import("./filter/update_env_config.xml")-->
-<!--%import("./filter/update_lang_select.xml")-->
-<!--%import("./filter/install_ftp_info.xml")-->
-<!--%import("./filter/install_ftp_path.xml")-->
-<!--%import("../../install/lang")-->
-<!--%import("../../install/tpl/js/install_admin.js",optimized=false)-->
 <!--%import("./js/config.js")-->
-
-<script type="text/javascript">
-    function insertSelectedModule(id, module_srl, mid, browser_title) {
-		jQuery('#'+id).val(module_srl);
-
-		browser_title = decodeURIComponent(browser_title.replace(/\+/g,' '));
-		jQuery('#_'+id).val( browser_title+' ('+mid+')' );
-    }
-    var xe_root = "{_XE_PATH_}";
+<!--%import("../../session/tpl/js/session.js")-->
+<!--#include("./_spHeader.html")-->
+<script>
+jQuery(function($){
+	$('#favicon').change(function(){
+		var re_favicon = /favicon\.ico$/
+		if(re_favicon.test($(this).val()) != true){
+			alert('{$lang->msg_not_correct_iconname} favicon.ico {$lang->msg_possible_only_file}');			
+			return false;
+		} 
+	});
+	$('#mobicon').change(function(){
+		var re_favicon = /mobicon\.png$/
+		if(re_favicon.test($(this).val()) != true){
+			alert('{$lang->msg_not_correct_iconname} mobicon.png {$lang->msg_possible_only_file}');
+			return false;
+		}
+	});
+	
+});
 </script>
-
-<div class="content">
-
-    <h4 class="xeAdmin">{$lang->cmd_setup}</h4>
-
-    <form action="./" method="get" onsubmit="return procFilter(this, update_env_config);">
-    <table cellspacing="0" class="rowTable">
-	<tr>
-		<th><div>{$lang->use_html5}</div></th>
-		<td>
-			<input type="checkbox" id="use_html5" name="use_html5" value="Y" checked="checked"|cond="$use_html5=='Y'" />
-			<label for="use_html5">{$lang->about_html5}</label>
-		</td>
-	</tr>
-    <tr>
-        <th><div>{$lang->use_rewrite}</div></th>
-        <td>
-            <input type="checkbox" name="use_rewrite" value="Y"  <!--@if($use_rewrite=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_rewrite}</p>
-        </td>
-    </tr>
-	<tr>
-		<th><div>{$lang->use_cdn}</div></th>
-		<td>
-			<input type="checkbox" name="use_cdn" value="Y" <!--@if($use_cdn=='Y')-->checked="checked"<!--@end--> />
-			<p>{$lang->about_cdn}</p>
-		</td>
-	</tr>
-    <tr>
-        <th><div>{$lang->use_sso}</div></th>
-        <td>
-            <input type="checkbox" name="use_sso" value="Y"  <!--@if($use_sso=='Y')-->checked="checked"<!--@end--> />
-			<p>{$lang->about_sso}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->default_url}</div></th>
-        <td>
-            <input type="text" name="default_url" value="{$default_url}" class="inputTypeText w300"/>
-            <p>{$lang->about_default_url}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->start_module}</div></th>
-        <td>
-            <input type="hidden" name="index_module_srl" id="target_module" value="{$start_module->index_module_srl}" />
-            <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="{$start_module->mid} ({htmlspecialchars($start_module->browser_title)})" readonly="readonly" />
-			<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-        </td>
-    </tr>
-    <tr>
-        <th><div>Language</div></th>
-        <td>
-            <select name="change_lang_type">
-                <!--@foreach($lang_supported as $key => $val)-->
-                    <option value="{$key}" <!--@if($key==$selected_lang)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@endforeach-->
-            </select>
-            <p>{$lang->about_lang_env}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->time_zone}</div></th>
-        <td>
-            <select name="time_zone" class="fullWidth">
-                <!--@foreach($time_zone_list as $key => $val)-->
-                <option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@endforeach-->
-            </select>
-            <p>{$lang->about_time_zone}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->qmail_compatibility}</div></th>
-        <td>
-            <input type="checkbox" name="qmail_compatibility" value="Y"  <!--@if($qmail_compatibility=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_qmail_compatibility}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_db_session}</div></th>
-        <td>
-            <input type="checkbox" name="use_db_session" value="Y"  <!--@if($use_db_session=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_db_session}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_ssl}</div></th>
-        <td>
-            <select name="use_ssl">
-            <!--@foreach($lang->ssl_options as $key => $val)-->
-                <option value="{$key}" <!--@if($key == $use_ssl)-->selected="selected"<!--@end--> >{$val}</option>
-            <!--@endforeach-->
-            </select>
-            <p>{$lang->about_use_ssl}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->server_ports}</div></th>
-        <td>
-            HTTP : <input type="text" name="http_port" class="inputTypeText" size="5" value="{$http_port}" />,
-            HTTPS: <input type="text" name="https_port" class="inputTypeText" size="5" value="{$https_port}" />
-            <p>{$lang->about_server_ports}</p>
-        </td>
-    </tr>
-	<tr>
-		<th><div>{$lang->mobile_view}</div></th>
-        <td>
-            <input type="checkbox" name="use_mobile_view" value="Y"  <!--@if($use_mobile_view=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_mobile_view}</p>
-        </td>
-	</tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </th>
-    </tr>
-    </table>
-    </form>
-
-
-    <h4 class="xeAdmin" id="ftpSetup">{$lang->ftp_form_title}</h4>
-    <p class="summary">{$lang->about_ftp_info}</p>
-    <form action="./" method="post" onsubmit="return procFilter(this, install_ftp_info);" id="ftp_form">
-    <table cellspacing="0" class="rowTable">
-
-    <tr>
-        <th scope="col"><div><label for="textfield21">{$lang->user_id}</label></div></th>
-        <td><input type="text" id="textfield21" name="ftp_user" value="{$ftp_info->ftp_user}" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield22">{$lang->password} ({$lang->about_ftp_password})</label></div></th>
-        <td><input id="textfield22" type="password" name="ftp_password" value="" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield23">{$lang->ftp_host} (default: 127.0.0.1)</label></div></th>
-        <td><input id="textfield23" type="text" name="ftp_host" value="{$ftp_info->ftp_host}" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield24">{$lang->ftp_port} (default: 21) </label></div></th>
-        <td><input id="textfield24" type="text" name="ftp_port" value="{$ftp_info->ftp_port}" class="inputTypeText" /></td>
-    </tr>
-	<tr>
-		<th scope="col"><div><label for="checkboxpasv">FTP Passive mode</label></div></th>
-		<td><input type="checkbox" id="checkboxpasv" name="ftp_pasv" value="Y" <!--@if($ftp_info->ftp_pasv!="N")-->checked="checked"<!--@end--> /></td>
-	</tr>
-    <!--@if($sftp_support)-->
-    <tr>
-        <th scope="col"><div><label for="checkbox25">{$lang->sftp}</label></div></th>
-        <td><input type="checkbox" id="checkbox25" name="sftp" value="Y" <!--@if($ftp_info->sftp=="Y")-->checked="checked"<!--@end--> /></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th scope="col" rowspan="2"><div>{$lang->msg_ftp_installed_ftp_realpath}<br /><br/>{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</div></th>
-        <td>
-            <input type="text" name="ftp_root_path" value="{$ftp_info->ftp_root_path}" class="inputTypeText w400" />
-        </td>
-    </tr>
-    <tr id="ftplist">
-        <td>
-            <div>
-					<span class="button blue strong"><input type="button" onclick="getFTPList(); return false;" value="{$lang->ftp_get_list}" /></span>
-            </div>
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button blue strong"><input type="button" onclick="removeFTPInfo(); return false;" value="{$lang->ftp_remove_info}" /></span>
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </th>
-    </tr>
-    </table>
-    </form>
+<div class="content" id="content">	
+	<form action="./" method="post" id="ftp_form" class="form" enctype="multipart/form-data" target="hidden_iframe">
+		 <input type="hidden" name="act" value="procInstallAdminConfig" />
+		<h1 class="h1">{$lang->title_genaral}</h1>
+		<fieldset class="section">
+			<h2 class="h2">{$lang->subtitle_primary}</h2>
+			<ul>
+				<li>
+					<p class="q"><label for="time_zone">{$lang->about_timezone}</label></p>
+					<p class="a">
+						<select name="time_zone" id="time_zone" class="fullWidth">
+							<!--@foreach($time_zone_list as $key => $val)-->
+							<option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
+							<!--@endforeach-->
+						</select>					
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_lang_select}</p>
+					<p class="a">
+						<!--@foreach($langs as $key => $val)-->							
+						<!--@if($key==$selected_lang)-->						
+						<input type="hidden" name="selected_lang[]" value="{$key}" />						
+						<input type="checkbox" checked="checked" disabled="disabled" />
+						<label>{$val}</label>
+						<!--@else-->						
+						<input type="checkbox" name="selected_lang[]" id="lang_{$key}" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked" <!--@end-->/>						
+						<label for="lang_{$key}">{$val}</label>
+						<!--@end-->
+						<!--@endforeach-->
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_html_dtd}</p>
+					<p class="a">
+						<input type="radio" name="use_html5" id="xhtml" value="N" <!--@if($use_html5 != 'Y')-->checked="checked" <!--@end-->/> <label for="xhtml">{$lang->xhtml_transitional}</label>
+						<input type="radio" name="use_html5" id="html5" value="Y"  <!--@if($use_html5 == 'Y')-->checked="checked" <!--@end-->/> <label for="html5">{$lang->html5}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q"><label for="">{$lang->about_use_rewrite}</label></p>
+					<p class="a">
+						<input type="radio" name="use_rewrite" id="use_rewrite_y" value="Y" <!--@if($use_rewrite == 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_rewrite" id="use_rewrite_n" value="N" <!--@if($use_rewrite != 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_question_mobile_view}</p>
+					<p class="a">
+						<input type="radio" name="use_mobile_view" id="use_mobile_view_y" value="Y" <!--@if($use_mobile_view == 'Y')-->checked="checked" <!--@end-->/> <label for="use_mobile_view_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_mobile_view" id="use_mobile_view_n" value="N" <!--@if($use_mobile_view != 'Y')-->checked="checked" <!--@end-->/> <label for="use_mobile_view_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_thumbnail_type}</p>
+					<p class="a">
+						<input type="radio" name="thumbnail_type" id="thumbnail_type_crop" value="corp" <!--@if($thumbnail_type != 'ratio')-->checked="checked" <!--@end-->/> 
+						<label for="thumbnail_type_crop">{$lang->corp}</label>						
+						<input type="radio" name="thumbnail_type" id="thumbnail_type_ratio" value="ratio" <!--@if($thumbnail_type == 'ratio')-->checked="checked" <!--@end-->/> 
+						<label for="thumbnail_type_ratio">{$lang->ratio}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q"><label for="admin_ip">{$lang->about_admin_ip_limit}</label>[<a href="#helpAdminip" class="tgAnchor">?</a>]</p>
+					<div class="tgContent layer" id="helpAdminip">
+						<p>{$lang->detail_about_admin_ip_limit}</p>
+					</div>
+					<p class="a"><input type="text" name="admin_ip" id="admin_ip" value="{$admin_ip}" /></p>
+				</li>
+				<li>
+					<p class="q"><label for="ftp_host">{$lang->ftp_host}</label> [<a href="#helpFTP" class="tgAnchor">?</a>]</p>
+					<div class="tgContent layer" id="helpFTP">
+						<p>{$lang->detail_about_ftp_info}
+					</div>
+					<p class="a"><input type="text" name="ftp_host" id="ftp_host" value="{$ftp_info->ftp_host}" /></p>
+				</li>
+				<li>
+					<p class="q"><label for="ftp_user">{$lang->user_id}</label></p>
+					<p class="a"><input type="text" name="ftp_user" id="ftp_user" value="{$ftp_info->ftp_user}" /></p>
+				<li>
+					<p class="q"><label for="ftp_password">{$lang->password}</label></p>
+					<p class="a"><input type="password" name="ftp_password" id="ftp_password" value="" /> <span class="desc">{$lang->about_ftp_password}</span></p>
+				</li>
+				<li>
+					<p class="q"><label for="ftp_port">{$lang->ftp_port}</label></p>
+					<p class="a"><input type="text" name="ftp_port" id="ftp_port" value="21" /></p>
+				</li>
+				<li>
+					<p class="q"><label for="ftp_passive">Use FTP Passive Mode?</label></p>
+					<p class="a">
+						<input type="radio" name="ftp_pasv" id="ftp_passive_y" value="Y" <!--@if($ftp_info->ftp_pasv == 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="ftp_pasv" id="ftp_passive_n" value="N" <!--@if($ftp_info->ftp_pasv != 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q"><label for="ftp_path">{$lang->msg_ftp_installed_ftp_realpath}</label></p>
+					<p class="a">
+						<input type="text" name="ftp_root_path" id="ftp_root_path" value="{$ftp_info->ftp_root_path}" />
+						<a href="#ftpSuggestion" onclick="getFTPList(); return false;" class="tgAnchor">{$lang->ftp_get_list}</a>												
+						
+					</p>
+					<div id="ftpSuggestion">						
+					</div>
+					<p class="desc">{$lang->msg_ftp_installed_realpath} : {_XE_PATH_} </p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_use_favicon}</p>
+					<p class="a faviconPreview">
+						<img src="{$favicon_url}" alt="favicon" width="16" height="16" class="fn1"> 
+						<img src="{$favicon_url}" alt="favicon Image" width="16" height="16" class="fn2"> 						
+						<a href="javascript:deleteIcon('favicon\.ico');">{$lang->cmd_delete}</a>						
+					</p>
+					<p class="a"><input type="file" name="favicon" id="favicon" title="favicon" /> <span class="desc">{$lang->detail_about_use_favicon}</span></p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_mobilehome_icon}</p>
+					<p class="a mobiconPreview">		
+						<img src="{$mobicon_url}" alt="Mobile Home Icon" width="32" height="32" />						
+						<span>www</span>
+						<a href="javascript:deleteIcon('mobicon\.png');">{$lang->cmd_delete}</a>
+					</p>
+					<p class="a"><input type="file" name="mobicon" id="mobicon" title="Mobile Home Icon"/> <span class="desc">{$lang->detail_about_mobilehome_icon}</span></p>
+				</li>
+			</ul>			
+		</fieldset>
+		<fieldset class="section">
+			<h2 class="h2">{$lang->subtitle_advanced}</h2>
+			<ul>
+				<li>
+					<p class="q"><label for="default_url">{$lang->default_url}</label></p>
+					<p class="a"><input type="text" name="default_url" id="default_url" value="{$default_url}"/></p>
+					
+					<p class="desc">{$lang->about_default_url}</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_use_sso}</p>
+					<p class="a">
+						<input type="radio" name="use_sso" id="sso_y" value="Y" <!--@if($use_sso=='Y')-->checked="checked" <!--@end-->/> <label for="sso_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_sso" id="sso_n" value="N" <!--@if($use_sso!='Y')-->checked="checked" <!--@end-->/> <label for="sso_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->use_ssl}</p>
+					<p class="a">											
+						<!--@foreach($lang->ssl_options as $key => $val)-->						
+						<input type="radio" name="use_ssl" id="ssl_{$key}" value="{$key}" <!--@if($use_ssl==$key)-->checked="checked" <!--@end-->/> <label for="ssl_{$key}">{$val}</label>						
+						<!--@endforeach-->
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_cdn}</p>
+					<p class="a">
+						<input type="radio" name="use_cdn" id="cdn_y" value="Y" <!--@if($use_cdn=='Y')-->checked="checked" <!--@end-->/> <label for="sso_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_cdn" id="cdn_n" value="N" <!--@if($use_cdn!='Y')-->checked="checked" <!--@end-->/> <label for="sso_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->server_ports}</p>
+					<p class="a">
+						<label for="">HTTP:</label> <input type="text" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:40px" />
+						&nbsp;&nbsp;
+						<label for="">HTTPS:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:40px" />
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->use_db_session}</p>
+					<p class="a">
+						<input type="radio" name="use_db_session" id="use_db_session_y" value="Y" <!--@if($use_db_session=='Y')-->checked="checked" <!--@end-->/> <label for="use_db_session_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_db_session" id="use_db_session_n" value="N" <!--@if($use_db_session!='Y')-->checked="checked" <!--@end-->/> <label for="use_db_session_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->qmail_compatibility}</p>
+					<p class="a">
+						<input type="radio" name="qmail_compatibility" id="qmail_compatibility_y" value="Y" <!--@if($qmail_compatibility=='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="qmail_compatibility" id="qmail_compatibility_n" value="N" <!--@if($qmail_compatibility!='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_n">{$lang->cmd_no}</label>
+					</p>
+				</li>
+			</ul>
+		</fieldset>
+		<fieldset class="section">
+			<h2 class="h2">{$lang->subtitle_etc}</h2>
+			<ul>
+				<li>
+					<p class="q">{$lang->about_recompile_cache}</p>
+					<p class="a"><a href="#" onclick="doRecompileCacheFile();return false;">{$lang->cmd_remake_cache}</a></p>
+				</li>
+				<li>
+					<p class="q">{$lang->about_arrange_session}</p>
+					<p class="a"><a href="#" onclick="doClearSession();return false;">{$lang->cmd_clear_session}</a></p>
+				</li>
+			</ul>
+		</fieldset>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="Save" /></span> 
+		</div>
+	</form>
+	<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
 </div>
-
-<hr />
-
-<div class="extension e2">
-    <div class="section">
-
-        <h4 class="xeAdmin">{$lang->cmd_lang_select}</h4>
-        <p class="summary">{$lang->about_cmd_lang_select}</p>
-        <form action="./" method="get" onsubmit="return procFilter(this, update_lang_select);">
-        <table cellspacing="0" class="rowTable">
-        <!--@foreach($langs as $key => $val)-->
-        <tr>
-            <td>
-				<!--@if($key==$selected_lang)-->
-					<input type="hidden" name="selected_lang[]" value="{$key}" />
-					<input type="checkbox" checked="checked" disabled="disabled" />
-					<label>{$val}</label>
-				<!--@else-->
-					<input id="lang_{$key}" type="checkbox" name="selected_lang[]" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked"<!--@end--> />
-					<label for="lang_{$key}">{$val}</label>
-				<!--@end-->
-            </td>
-        </tr>
-        <!--@endforeach-->
-        <tr>
-            <th class="button">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-            </th>
-        </tr>
-        </table>
-        </form>
-
-        <h4 class="xeAdmin">{$lang->cmd_remake_cache}</h4>
-        <p class="summary">{$lang->about_recompile_cache}</p>
-        <table cellspacing="0" class="colTable">
-        <tr>
-            <th class="button">
-                <span class="button black strong"><input type="button" value="{$lang->cmd_remake_cache}" onclick="doRecompileCacheFile(); return false;"/></span>
-            </th>
-        </tr>
-        </table>
-    </div>
-</div>
-
-<!--#include("_footer.html")-->
+<!--#include("./_spFooter.html")-->
--- a/modules/admin/tpl/js/config.js
+++ b/modules/admin/tpl/js/config.js
@ -1,5 +1,5 @@
 function getFTPList(pwd)
-{
+{	
    var form = jQuery("#ftp_form").get(0);
    if(typeof(pwd) != 'undefined')
    {
@ -7,20 +7,25 @@ function getFTPList(pwd)
    }
    else
    {
-        if(!form.ftp_root_path.value)
+        if(!form.ftp_root_path.value && typeof(form.sftp) != 'undefined' && form.sftp.checked)
        {
-            if(typeof(form.sftp) != 'undefined' && form.sftp.checked) {
-                form.ftp_root_path.value = xe_root;
-            }
-            else
-            {
-                form.ftp_root_path.value = "/";
-            }
+            form.ftp_root_path.value = xe_root;
+        }
+		else
+        {
+          form.ftp_root_path.value = "/";
        }
    }
-    var params={}, data=jQuery("#ftp_form").serializeArray();
-    jQuery.each(data, function(i, field){ params[field.name] = field.value });
-    exec_xml('admin', 'getAdminFTPList', params, completeGetFtpInfo, ['list', 'error', 'message'], params, form);
+	
+    var params= new Array();	
+	//ftp_pasv not used	
+	params['ftp_user'] = jQuery("#ftp_user").val();	
+	params['ftp_password'] =jQuery("#ftp_password").val();
+	params['ftp_host'] = jQuery("#ftp_host").val();
+	params['ftp_port'] = jQuery("#ftp_port").val();
+	params['ftp_root_path'] = jQuery("#ftp_root_path").val();
+	
+    exec_xml('admin', 'getAdminFTPList', params, completeGetFtpInfo, ['list', 'error', 'message'], params, form);	
 }

 function removeFTPInfo()
@ -37,7 +42,8 @@ function completeGetFtpInfo(ret_obj)
        alert(ret_obj['message']);
        return;
    }
-    var e = jQuery("#ftplist").empty();
+    var e = jQuery("#ftpSuggestion").empty();
+	
    var list = "";
    if(!jQuery.isArray(ret_obj['list']['item']))
    {
@ -52,7 +58,7 @@ function completeGetFtpInfo(ret_obj)
        arr.pop();
        arr.push("");
        target = arr.join("/");
-        list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+target+"')\">../</a></li>";
+        list = list + "<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>";
    }
    
    for(var i=0;i<ret_obj['list']['item'].length;i++)
@ -68,10 +74,27 @@ function completeGetFtpInfo(ret_obj)
        }
        else
        {
-            list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
+            list = list + "<li><button type='button' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</button></li>";
        }
    }
-
-    list = "<td><ul>"+list+"</ul></td>";
+    list = "<ul>"+list+"</ul>";
    e.append(jQuery(list));
 }
+
+function deleteIcon(iconname){	
+	var params = new Array();
+	params['iconname'] = iconname;
+	exec_xml('admin', 'procAdminRemoveIcons', params, iconDeleteMessage, ['error', 'message'], params);
+	
+}
+function iconDeleteMessage(ret_obj){
+ alert(ret_obj['message']);
+}
+function doRecompileCacheFile() {	
+	var params = new Array();
+	exec_xml("admin","procAdminRecompileCacheFile", params, completeCacheMessage);	
+}
+function completeCacheMessage(ret_obj) {
+    alert(ret_obj['message']);
+}
+