From f65139105121881e0ba549361e2492a4b12efb2c Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Wed, 7 Sep 2011 12:08:00 +0000
Subject: [PATCH] Modify add lang file (module page)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9095 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/lang/lang.xml              |  22 ++++-
 modules/module/module.admin.view.php      |   2 +-
 modules/module/tpl/module_list.html       | 110 +++++++++++++---------
 modules/module/tpl/spInstalledModule.html |  66 -------------
 4 files changed, 87 insertions(+), 113 deletions(-)
 delete mode 100644 modules/module/tpl/spInstalledModule.html

diff --git a/modules/module/lang/lang.xml b/modules/module/lang/lang.xml
index b1ed2d099..4bd04019d 100644
--- a/modules/module/lang/lang.xml
+++ b/modules/module/lang/lang.xml
@@ -1,5 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<lang>
+<lang>	
+	<item name="msg_avail_install">
+		<value xml:lang="ko"><![CDATA[이 항목 설치가 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[이 항목 설치가 가능합니다.]]></value>
+    </item>
+	<item name="msg_avail_update">
+		<value xml:lang="ko"><![CDATA[이 항목 업데이트가 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[이 항목 업데이트가 가능합니다.]]></value>
+    </item>
+	<item name="msg_avail_easy_update">
+		<value xml:lang="ko"><![CDATA[이 항목의 새로운 버전이 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is new version for this item.]]></value>
+    </item>
+	<item name="msg_do_you_like_install">
+		<value xml:lang="ko"><![CDATA[설치 하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to install?]]></value>
+	</item>
+	<item name="msg_do_you_like_update">
+		<value xml:lang="ko"><![CDATA[업데이트 하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to update?]]></value>
+	</item>
 	<item name="virtual_site">
 		<value xml:lang="ko"><![CDATA[가상 사이트]]></value>
 		<value xml:lang="en"><![CDATA[Virtual Site]]></value>
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index ad451d4ed..cadeaff8b 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -60,7 +60,7 @@
             Context::set('favoriteModuleList', $favoriteModuleList);
 			Context::set('module_list', $module_list);
             // Set a template file
-            $this->setTemplateFile('spInstalledModule');
+            $this->setTemplateFile('module_list');
 
         }
 
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index 5956650d5..4a2c2c423 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -1,46 +1,66 @@
-<!--%import("filter/insert_shortcut.xml")-->
-<!--#include("header.html")-->
+<!--%import("js/module_admin.js")-->
 
-<!-- 관리자 메뉴 바로가기 추가를 위한 임시 form -->
-<form id="fo_shortcut" action="./" method="get">
-    <input type="hidden" name="selected_module" value="" />
-</form>
-    <h4 class="xeAdmin">{$lang->module}</h4>
-    <table cellspacing="0" class="rowTable">
-    <thead>
-        <tr>
-            <th class="wide"><div>{$lang->module_name}</div></th>
-            <th><div>{$lang->version}</div></th>
-            <th><div>{$lang->author}</div></th>
-            <th><div>{$lang->table_count}</div></th>
-            <th><div>{$lang->path}</div></th>
-            <th><div>{$lang->module_action}</div></th>
-        </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($module_list as $key => $val)-->
-        <tr class="row{$cycle_idx}">
-            <td><a href="{getUrl('','module','module','act','dispModuleAdminInfo','selected_module',$val->module)}" onclick="popopen(this.href,'module_info');return false"title="{trim($val->description)}">{$val->title}</a> ({$val->module})</td>
-            <td class="center number">{$val->version}</td>
-            <td class="nowrap">
-                <!--@foreach($val->author as $author)-->
-                <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
-                <!--@endforeach-->
-            </td>
-            <td class="number center <!--@if($val->created_table_count != $val->table_count)-->alert<!--@end-->">
-                {$val->created_table_count}/{$val->table_count}
-            </td>
-            <td class="nowrap">{$val->path}</td>
-            <td class="nowrap center <!--@if($val->need_install || $val->need_update)-->alert<!--@end-->">
-                <!--@if($val->need_install)-->
-                    <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->cmd_install}</a>
-                <!--@elseif($val->need_update)-->
-                    <a href="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->cmd_update}</a>
-                <!--@else-->
-                    -
-                <!--@end-->
-            </td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
+<script type="text/javascript">
+	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
+	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
+</script>
+
+<div class="content" id="content">
+	<h1 class="h1">Installed Module</h1>
+	<div class="table even easyList">
+		<table width="100%" border="1" cellspacing="0">
+			<caption>
+			All({count($module_list)})
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col">{$lang->favorite}</th>
+					<th scope="col" class="title">{$lang->module_name}</th>
+					<th scope="col">{$lang->version}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->path}</th>
+					<th scope="col">{$lang->cmd_delete}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<!--@foreach($module_list as $key => $val)-->
+				<tr>
+					<td>
+						<!--@if(in_array($val->module,$favoriteModuleList))-->
+						<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
+						<!--@else-->
+						<a href="#" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</a>
+						<!--@end-->
+					</td>
+					<td class="title">
+						<p><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$val->title}</a></p>
+						<p>{$val->description}</p>
+							<p cond="$val->need_install" class="update">{$lang->msg_avail_install} <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->msg_do_you_like_install}</a></p>
+							<p cond="$val->need_update" class="update">{$lang->msg_avail_updaet} <a href=="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->msg_do_you_like_update}</a></p>
+							<p cond="$val->need_autoinstall_update" class="update">{$lang->msg_avail_easy_update}<a href="{$val->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a></p>
+					</td>
+					<td>{$val->version}</td>
+					<td>
+						<!--@foreach($val->author as $author)-->
+							<!--@if($author->homepage)-->
+							<a href="{$author->homepage}" onclick="window.open(this.href);return false;"  target="_blank">
+							<!--@end-->
+							{$author->name}
+							<!--@if($author->homepage)-->
+							</a>
+							<!--@end-->
+						<!--@endforeach-->
+					</td>
+					<td>{$val->path}</td>
+					<td>
+						<!--@if($val->delete_url)-->
+						<a href="{$val->delete_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a>
+						<!--@end-->
+					</td>
+				</tr>
+				<!--@end-->
+
+			</tbody>
+		</table>
+	</div>
+</div>
diff --git a/modules/module/tpl/spInstalledModule.html b/modules/module/tpl/spInstalledModule.html
deleted file mode 100644
index 6c7db3429..000000000
--- a/modules/module/tpl/spInstalledModule.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--%import("js/module_admin.js")-->
-
-<script type="text/javascript">
-	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
-	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
-</script>
-
-<div class="content" id="content">
-	<h1 class="h1">Installed Module</h1>
-	<div class="table even easyList">
-		<table width="100%" border="1" cellspacing="0">
-			<caption>
-			All({count($module_list)})
-			</caption>
-			<thead>
-				<tr>
-					<th scope="col">{$lang->favorite}</th>
-					<th scope="col" class="title">{$lang->module_name}</th>
-					<th scope="col">{$lang->version}</th>
-					<th scope="col">{$lang->author}</th>
-					<th scope="col">{$lang->path}</th>
-					<th scope="col">{$lang->cmd_delete}</th>
-				</tr>
-			</thead>
-			<tbody>
-				<!--@foreach($module_list as $key => $val)-->
-				<tr>
-					<td>
-						<!--@if(in_array($val->module,$favoriteModuleList))-->
-						<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
-						<!--@else-->
-						<a href="#" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</a>
-						<!--@end-->
-					</td>
-					<td class="title">
-						<p><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$val->title}</a></p>
-						<p>{$val->description}</p>
-							<p cond="$val->need_install" class="update">이 항목 설치가 가능합니다. <a href="#" onclick="doInstallModule('{$val->module}');return false;">설치 하시겠습니까?</a></p>
-							<p cond="$val->need_update" class="update">이 항목 업데이트가 가능합니다. <a href=="#" onclick="doUpdateModule('{$val->module}'); return false;">업데이트 하시겠습니까?</a></p>
-							<p cond="$val->need_autoinstall_update" class="update">이 항목의 새로운 버전이 있습니다. <a href="{$val->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">업데이트 하시겠습니까?</a></p>
-					</td>
-					<td>{$val->version}</td>
-					<td>
-						<!--@foreach($val->author as $author)-->
-							<!--@if($author->homepage)-->
-							<a href="{$author->homepage}" onclick="window.open(this.href);return false;"  target="_blank">
-							<!--@end-->
-							{$author->name}
-							<!--@if($author->homepage)-->
-							</a>
-							<!--@end-->
-						<!--@endforeach-->
-					</td>
-					<td>{$val->path}</td>
-					<td>
-						<!--@if($val->delete_url)-->
-						<a href="{$val->delete_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a>
-						<!--@end-->
-					</td>
-				</tr>
-				<!--@end-->
-
-			</tbody>
-		</table>
-	</div>
-</div>