From d408705a9af9fca6b6a18aaf2beb2d6095a38701 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 26 Nov 2008 02:33:03 +0000
Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=9E=98=EB=8B=9B=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=EC=97=90=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=ED=83=9C=EA=B7=B8=EB=A5=BC=20=EA=B8=B0=EB=B3=B8=20?=
 =?UTF-8?q?=ED=83=9C=EA=B7=B8=ED=83=AD=20=EC=9D=B4=ED=9B=84=EC=97=90?=
 =?UTF-8?q?=EB=8F=84=20=EC=B6=94=EA=B0=80=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4982 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/planet/lang/en.lang.php             |  2 ++
 modules/planet/lang/jp.lang.php             |  4 +++-
 modules/planet/lang/ko.lang.php             |  6 ++++--
 modules/planet/lang/zh-CN.lang.php          |  2 ++
 modules/planet/lang/zh-TW.lang.php          |  2 ++
 modules/planet/planet.admin.controller.php  |  8 ++++++++
 modules/planet/planet.admin.view.php        |  1 +
 modules/planet/planet.view.php              | 12 +++++++++++-
 modules/planet/skins/xe_planet/header.html  |  2 +-
 modules/planet/skins/xe_planet/main.html    |  6 ++++++
 modules/planet/tpl/filter/insert_config.xml |  1 +
 modules/planet/tpl/setup.html               | 11 +++++++++--
 12 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/modules/planet/lang/en.lang.php b/modules/planet/lang/en.lang.php
index 526cd5982..9b46df93d 100644
--- a/modules/planet/lang/en.lang.php
+++ b/modules/planet/lang/en.lang.php
@@ -161,6 +161,8 @@
 
     $lang->planet_tagtab = "Tags for Main Tab";
     $lang->about_planet_tagtab = "You can set multiple tags seperated by comma(,), These tags displayed as tabs in the main page.";
+    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
+    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
     $lang->planet_smstag = "SMS Tag";
     $lang->about_planet_smstag = "You can set multiple tags seperated by comma(,), These tags automatically added if the posting is registered via SMS";
 
diff --git a/modules/planet/lang/jp.lang.php b/modules/planet/lang/jp.lang.php
index 7b8f2d01f..bd1d6658f 100644
--- a/modules/planet/lang/jp.lang.php
+++ b/modules/planet/lang/jp.lang.php
@@ -163,6 +163,8 @@
 
     $lang->planet_tagtab = "메인 추가 Tag 탭";
     $lang->about_planet_tagtab = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, 지정한 Tag는 메인에 탭으로 출력 됩니다. 글쓰기 창에도 출력됩니다.";
+    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
+    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
     $lang->planet_smstag = "SMS 등록 Tag";
     $lang->about_planet_smstag = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, SMS로 등록시에 등록 되는 Tag";
 
@@ -171,4 +173,4 @@
     $lang->planet_use_me2day = "미투데이 연동";
     $lang->about_use_me2day = "글 작성시 me2day에 보내게 됩니다.";
     $lang->msg_search_thisplanet = "이 플래닛에서 검색";
-?>
\ No newline at end of file
+?>
diff --git a/modules/planet/lang/ko.lang.php b/modules/planet/lang/ko.lang.php
index 5fd81c6b5..cc8900617 100644
--- a/modules/planet/lang/ko.lang.php
+++ b/modules/planet/lang/ko.lang.php
@@ -162,8 +162,10 @@
     $lang->planet_mobile_number = '전화번호';
     $lang->msg_success_set_phone_number = '전화번호가 등록되었습니다.';
 
-    $lang->planet_tagtab = "메인 추가 Tag 탭";
-    $lang->about_planet_tagtab = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, 지정한 Tag는 메인에 탭으로 출력 됩니다. 글쓰기 창에도 출력됩니다.";
+    $lang->planet_tagtab = "추가 Tag 탭";
+    $lang->about_planet_tagtab = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, 지정한 Tag는 메인에 탭으로 출력 됩니다.";
+    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
+    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
     $lang->planet_smstag = "SMS 등록 Tag";
     $lang->about_planet_smstag = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, SMS로 등록시에 등록 되는 Tag";
 
diff --git a/modules/planet/lang/zh-CN.lang.php b/modules/planet/lang/zh-CN.lang.php
index aaa5299e2..c5fc27da1 100644
--- a/modules/planet/lang/zh-CN.lang.php
+++ b/modules/planet/lang/zh-CN.lang.php
@@ -164,6 +164,8 @@
 
     $lang->planet_tagtab = "添加首页Tag标签页";
     $lang->about_planet_tagtab = "用逗号(,)来区分而难多个Tag标签页。";
+    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
+    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
     $lang->planet_smstag = "添加SMS标签";
     $lang->about_planet_smstag = "用SMS发送时自动添加的标签，用逗号(,)来区分多个标签。";
 
diff --git a/modules/planet/lang/zh-TW.lang.php b/modules/planet/lang/zh-TW.lang.php
index a357efe52..b037474f7 100644
--- a/modules/planet/lang/zh-TW.lang.php
+++ b/modules/planet/lang/zh-TW.lang.php
@@ -161,6 +161,8 @@
 
     $lang->planet_tagtab = "標籤頁";
     $lang->about_planet_tagtab = "以「,」區分多個標籤，這些標籤將顯示在標籤頁。";
+    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
+    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
     $lang->planet_smstag = "SMS標籤";
     $lang->about_planet_smstag = "以「,」區分多個標籤， 以 SMS傳送時將自動新增標籤。";
 
diff --git a/modules/planet/planet.admin.controller.php b/modules/planet/planet.admin.controller.php
index 2645ce935..d50073fd9 100644
--- a/modules/planet/planet.admin.controller.php
+++ b/modules/planet/planet.admin.controller.php
@@ -50,6 +50,14 @@
             $tagtab = array_unique($tagtab);
             $config->tagtab = $tagtab;
 
+            $tagtab_after = explode(',',Context::get('planet_tagtab_after'));
+            for($i=0,$c=count($tagtab_after);$i<$c;$i++){
+                if(trim($tagtab_after[$i])) continue;
+                $tagtab_after[$i] = trim($tagtab_after[$i]);
+            }
+            $tagtab_after = array_unique($tagtab_after);
+            $config->tagtab_after = $tagtab_after;
+
 
             $smstag = explode(',',Context::get('planet_smstag'));
             for($i=0,$c=count($smstag);$i<$c;$i++){
diff --git a/modules/planet/planet.admin.view.php b/modules/planet/planet.admin.view.php
index dadbe323c..b41aa6c64 100644
--- a/modules/planet/planet.admin.view.php
+++ b/modules/planet/planet.admin.view.php
@@ -34,6 +34,7 @@
             $group_list = $oMemberModel->getGroups();
             Context::set('group_list', $group_list);
             if(is_array($this->config->tagtab)) Context::set('tagtab', join(',',$this->config->tagtab));
+            if(is_array($this->config->tagtab_after)) Context::set('tagtab_after', join(',',$this->config->tagtab_after));
             if(is_array($this->config->smstag)) Context::set('smstag', join(',',$this->config->smstag));
 
 
diff --git a/modules/planet/planet.view.php b/modules/planet/planet.view.php
index 07f965719..8809f9fd4 100644
--- a/modules/planet/planet.view.php
+++ b/modules/planet/planet.view.php
@@ -93,7 +93,6 @@
                 }
             }
 
-
             $tagtab = null;
             if($type == 'tagtab'){
                 $tagtab = Context::get('tagtab');
@@ -154,6 +153,17 @@
                 Context::set('tagtab_list', $tagtab_list);
             }
 
+            // tagtab_after을 만든다
+            if(is_array($this->config->tagtab_after) && $this->config->tagtab_after[0]){
+                $tagtab_after_list = array();
+                foreach($this->config->tagtab_after as $key => $val){
+                    $args->tag = $val;
+                    $output = executeQuery('planet.getTotalTagSearchContents', $args);
+                    $tagtab_after_list[$val] = $output->data->count;
+                }
+                Context::set('tagtab_after_list', $tagtab_after_list);
+            }
+
             // 템플릿 지정
             $this->setTemplateFile('main');
         }
diff --git a/modules/planet/skins/xe_planet/header.html b/modules/planet/skins/xe_planet/header.html
index 4ff129ecf..d9ded4d04 100644
--- a/modules/planet/skins/xe_planet/header.html
+++ b/modules/planet/skins/xe_planet/header.html
@@ -81,7 +81,7 @@
             </div>
         </div>
 
-<!--@if(!($act=='dispPlanetLogin' || $act=='dispPlanetContentTagSearch' || $act=='dispPlanetTagSearch' || $act=='dispPlanetContentSearch'))-->
+<!--@if($date && !($act=='dispPlanetLogin' || $act=='dispPlanetContentTagSearch' || $act=='dispPlanetTagSearch' || $act=='dispPlanetContentSearch'))-->
         <div class="timeNav">
             <a class="prev" href="{getUrl('date',$prev_date)}" title="{$lang->cmd_prev}">&lt;</a>
             <strong>{zdate($date,'Y')}</strong>{$lang->unit_year}
diff --git a/modules/planet/skins/xe_planet/main.html b/modules/planet/skins/xe_planet/main.html
index cf6484691..01871dacc 100644
--- a/modules/planet/skins/xe_planet/main.html
+++ b/modules/planet/skins/xe_planet/main.html
@@ -11,6 +11,12 @@
     <li <!--@if($type=='all')-->class="active"<!--@end-->><a href="{getUrl('type','all','page','','tagtab')}">{$lang->planet_total_articles}<sup>{number_format($total_content)}</sup></a></li>
     <li <!--@if($type=='wantyou')-->class="active"<!--@end-->><a href="{getUrl('type','wantyou','page','','tagtab')}">{$lang->planet_wantyou}<sup>{number_format($total_wantyou)}</sup></a></li>
     <li <!--@if($type=='best')-->class="active"<!--@end-->><a href="{getUrl('type','best','page','','tagtab')}">{$lang->planet_best}<sup>{number_format($total_best)}</sup></a></li>
+
+<!--@if(is_array($config->tagtab_after) && count($config->tagtab_after)>0)-->
+    <!--@foreach($tagtab_after_list as $key => $val)-->
+    <li <!--@if($tagtab==$key)-->class="active"<!--@end-->><a href="{getUrl('type','tagtab','page','','tagtab',$key)}">{$key}<sup>{number_format($val)}</sup></a></li>
+    <!--@end-->
+<!--@end-->
 </ul>
 
 <!-- 실시간 인기 태그-->
diff --git a/modules/planet/tpl/filter/insert_config.xml b/modules/planet/tpl/filter/insert_config.xml
index bc28ee9d8..e477e1a97 100644
--- a/modules/planet/tpl/filter/insert_config.xml
+++ b/modules/planet/tpl/filter/insert_config.xml
@@ -16,6 +16,7 @@
         <param name="manager" target="manager" />
         <param name="write_document" target="write_document" />
         <param name="planet_tagtab" target="planet_tagtab" />
+        <param name="planet_tagtab_after" target="planet_tagtab_after" />
         <param name="planet_smstag" target="planet_smstag" />
         <param name="use_mobile" target="use_mobile" />
         <param name="use_me2day" target="use_me2day" />
diff --git a/modules/planet/tpl/setup.html b/modules/planet/tpl/setup.html
index 913e8b3e8..c561925b2 100644
--- a/modules/planet/tpl/setup.html
+++ b/modules/planet/tpl/setup.html
@@ -45,14 +45,21 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->planet_tagtab}</div></th>
         <td colspan="3">
-            <input type="text" name="planet_tagtab" value="{htmlspecialchars($tagtab)}" class="inputTypeTextArea w400" />
+            <input type="text" name="planet_tagtab" value="{htmlspecialchars($tagtab)}" class="inputTypeText w400" />
             <p>{$lang->about_planet_tagtab}</p>
         </td>
     </tr>
+    <tr class="row2">
+        <th scope="row"><div>{$lang->planet_tagtab_after}</div></th>
+        <td colspan="3">
+            <input type="text" name="planet_tagtab_after" value="{htmlspecialchars($tagtab_after)}" class="inputTypeText w400" />
+            <p>{$lang->about_planet_tagtab_after}</p>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><div>{$lang->planet_smstag}</div></th>
         <td colspan="3">
-            <input type="text" name="planet_smstag" value="{htmlspecialchars($smstag)}" class="inputTypeTextArea w400" />
+            <input type="text" name="planet_smstag" value="{htmlspecialchars($smstag)}" class="inputTypeText w400" />
             <p>{$lang->about_planet_smstag}</p>
         </td>
     </tr>