merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/layout/tpl/downloaded_mlayout_list.html

@@ -0,0 +1,54 @@
+<!--#include("header.html")-->
+
+<!-- 레이아웃의 목록 -->
+<table cellspacing="0" class="crossTable">
+<thead>
+    <tr>
+        <th scope="col" class="halfwide"><div>{$lang->layout_name}</div></th>
+        <th scope="col"><div>{$lang->version}</div></th>
+        <th scope="col"><div>{$lang->author}</div></th>
+        <th scope="col"><div>{$lang->menu_count}</div></th>
+        <th scope="col"><div>{$lang->date}</div></th>
+        <th scope="col"><div>{$lang->path}</div></th>
+        <th scope="col"><div>{$lang->cmd_make}</div></th>
+    </tr>
+</thead>
+<tbody>
+    <!--@foreach($layout_list as $key => $val)-->
+
+        <!--// 레이아웃 정보 파일(conf/info.xml)가 있는 경우-->
+        <!--@if($val->title)-->
+        <tr class="row{$cycle_idx}">
+            <th rowspan="2">
+                <div>
+                    <a href="{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}" onclick="popopen(this.href,'layout_info');return false" class="blue">{$val->title}</a> <br />
+                    ({$val->layout})
+                </div>
+            </th>
+            <td>{$val->version}</td>
+            <td>
+                <!--@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>{$val->menu_count}</td>
+            <td>{zdate($val->date, 'Y-m-d')}</td>
+            <td>{$val->path}</td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout,'layout_type','M')}" class="button"><span>{$lang->cmd_make}</span></a></td>
+        </tr>
+        <tr>
+            <td colspan="6" class="left">
+                {nl2br(trim($val->description))}
+            </td>
+        </tr>
+        <!--// 레이아웃 정보 파일(conf/info.xml)이 없는 경우 -->
+        <!--@else-->
+        <tr>
+            <td colspan="6">{$val->layout}</td>
+            <td class="tahoma">{$val->path}</td>
+            <td class="tahoma blue"><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout,'layout_type','M')}">{$lang->cmd_make}</a></td>
+        </tr>
+        <!--@end-->
+    <!--@end-->
+</tbody>
+</table>

modules/layout/tpl/filter/insert_layout.xml

@@ -5,6 +5,7 @@
     <parameter>
         <param name="layout" target="layout" />
         <param name="title" target="title" />
+		<param name="layout_type" target="layout_type" />
     </parameter>
     <response callback_func="completeInsertLayout">
         <tag name="error" />

modules/layout/tpl/header.html

@@ -8,8 +8,10 @@
 <!--@if($module == 'admin')-->
 <div class="header4">
     <ul class="localNavigation">
-        <li <!--@if($act=='dispLayoutAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminContent')}">{$lang->layout_list}</a></li>
-        <li <!--@if($act=='dispLayoutAdminDownloadedList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedList')}">{$lang->downloaded_list}</a></li>
+        <li <!--@if($act=='dispLayoutAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminContent','layout_type','')}">{$lang->layout_list}</a></li>
+        <li <!--@if($act=='dispLayoutAdminDownloadedList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedList','layout_type','')}">{$lang->downloaded_list}</a></li>
+        <li <!--@if($act=='dispLayoutAdminMobileContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminMobileContent','layout_type','')}">{$lang->mobile_layout_list}</a></li>
+        <li <!--@if($act=='dispLayoutAdminDownloadedMobileList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedMobileList','layout_type','')}">{$lang->mobile_downloaded_list}</a></li>
     </ul>
 </div>
 <!--@end-->

modules/layout/tpl/insert_layout.html

@@ -3,6 +3,7 @@
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_layout)">
+	<input type="hidden" name="layout_type" value="{$layout_type}" />
 
     <table cellspacing="0" class="rowTable">
     <tr>

modules/layout/tpl/layout_modify.html

@@ -3,7 +3,6 @@
 <!--#include("header.html")-->
 
 <h3 class="xeAdmin">{$selected_layout->layout_title}</h3>
-
 <div class="header4">
     <ul class="localNavigation">
         <li class="on"><a href="#" onclick="return false;">{$lang->cmd_layout_management}</a></li>
@@ -124,6 +123,16 @@
         {$lang->about_not_apply_menu}
     </td>
 </tr>
+<!--@if($selected_layout->layout_type == "M")-->
+<tr>
+	<th scope="row"><div>{$lang->apply_mobile_view}</div></th>
+	<td>
+        <input type="checkbox" name="apply_mobile_view" value="Y" />
+        {$lang->about_apply_mobile_view}
+    </td>
+</tr>
+<!--@end-->
+		
 
 <tr class="row2">
     <th colspan="2" class="button">

modules/layout/tpl/mindex.html

@@ -0,0 +1,50 @@
+<!--%import("filter/delete_layout.xml")-->
+
+<!--#include("header.html")-->
+
+<!-- 삭제를 위한 임시 form -->
+<form id="fo_layout" action="./" method="get" onsubmit="return procFilter(this, delete_layout)">
+    <input type="hidden" name="layout_srl" value="" />
+</form>
+
+<!-- 목록 -->
+<table cellspacing="0" class="crossTable">
+<thead>
+    <tr>
+        <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div>{$lang->layout}</div></th>
+        <th scope="col"><div>{$lang->title}</div></th>
+        <th scope="col"><div>{$lang->regdate}</div></th>
+        <th scope="col" colspan="3"><div>&nbsp;</div></th>
+    </tr>
+</thead>
+<tbody>
+    <!--@foreach($layout_list as $no => $val)-->
+    <tr class="row{$cycle_idx}">
+        <td class="number center">{$no+1}</td>
+        <td>
+            {$val->layout}
+            <!--@if($val->module_srl)-->
+            (module) 
+            <!--@end-->
+        </td>
+        <td class="wide">{htmlspecialchars($val->title)}</td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <td>
+            <!--@if(!$val->module_srl)-->
+                <a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
+            <!--@else-->
+                &nbsp;
+            <!--@end-->
+        </td>
+        <td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
+        <td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+    </tr>
+    <!--@end-->
+    <tr class="row2">
+        <th colspan="7" class="button">
+            <a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','','layout_type','M')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </th>
+    </tr>
+</tbody>
+</table>