#897

* 2차 UI ordering 완성 * 리더를 없애고 커뮤니케이션 하위의 '바깥 글 읽기'로 이동 * 실제 구현은 그대로 owner/reader 하위를 유지한다. 소스와 독립적인 형태를 유지하여 이후 RSS 리더만을 어플리케이션으로 만들 수도 있도록 해 놓음.
Needlworks · Mar 25, 2008 · 8dd3b6e · 8dd3b6e
1 parent 1e175f3
commit 8dd3b6e
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/components/Textcube.Control.Auth.php b/components/Textcube.Control.Auth.php
@@ -54,6 +54,7 @@
 			'/owner/communication/trackback*',
 			'/owner/communication/trash*',
 			'/owner/communication/notify*',
+			'/owner/communication/reader',
 			'/owner/plugin/admin*'
 			),
 		"group.writers" => array(
@@ -79,6 +80,7 @@
 			'/owner/communication/trash*',
 			'/owner/communication/comment*',
 			'/owner/communication/notify*',
+			'/owner/communication/reader',
 			'/owner/setting/account*',
 			'/owner/setting/teamblog/changeBlog*',
 			'/owner/reader',

diff --git a/interface/owner/center/dashboard/index.php b/interface/owner/center/dashboard/index.php
@@ -255,7 +255,7 @@ function optimizeData() {
 		}
 		if ($service['reader'] == true) {
 ?>
-									<li><a href="<?php echo $blogURL;?>/owner/reader"><?php echo _t('RSS 리더');?></a></li>
+									<li><a href="<?php echo $blogURL;?>/owner/communication/reader"><?php echo _t('RSS 리더');?></a></li>
 <?php
 		}
 ?>

diff --git a/interface/owner/communication/reader/index.php b/interface/owner/communication/reader/index.php
@@ -0,0 +1,8 @@
+<?php
+/// Copyright (c) 2004-2008, Needlworks / Tatter Network Foundation
+/// All rights reserved. Licensed under the GPL.
+/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+
+define('__TEXTCUBE_READER_SUBMENU__',true);
+require ROOT. '/interface/owner/reader/index.php';
+?>
diff --git a/interface/owner/reader/index.php b/interface/owner/reader/index.php
@@ -10,6 +10,9 @@
 );
 require ROOT . '/lib/includeForReader.php';
 require ROOT . '/lib/piece/owner/header.php';
+if(defined('__TEXTCUBE_READER_SUBMENU__')) 
+	require ROOT . '/lib/piece/owner/contentMenu.php';
+
 $setting = getReaderSetting($blogid);
 ?>
 			<script type="text/javascript">

diff --git a/lib/piece/owner/contentMenu.php b/lib/piece/owner/contentMenu.php
@@ -38,12 +38,14 @@
 					array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment'),
 					array('menu'=>'add','title'=>_t('링크 추가'),'link'=>'/owner/communication/link/add'),
 					array('menu'=>'link','title'=>_t('링크 목록'),'link'=>'/owner/communication/link'),
-					array('menu'=>'xfn','title'=>_t('친구 링크 관리'),'link'=>'/owner/communication/xfn')
+					array('menu'=>'xfn','title'=>_t('친구 링크 관리'),'link'=>'/owner/communication/xfn'),
+					array('menu'=>'reader','title'=>_t('바깥 글 읽기'),'link'=>'/owner/communication/reader')
 				);
 			} else {
 				$blogContentMenuItem = array(
 					array('menu'=>'comment','title'=>_t('소통 기록'),'link'=>'/owner/communication/comment'),
-					array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment')
+					array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment'),
+					array('menu'=>'reader','title'=>_t('바깥 글 읽기'),'link'=>'/owner/communication/reader')
 				);
 			}
 		break;

diff --git a/lib/piece/owner/header.php b/lib/piece/owner/header.php
@@ -19,7 +19,7 @@
 		array('menu'=>'center','title'=>_t('센터'),'link'=>'/owner/center/dashboard'),
 		array('menu'=>'entry','title'=>_t('글'),'link'=>'/owner/entry'),
 		array('menu'=>'communication','title'=>_t('소통'),'link'=>'/owner/communication/comment'),
-		array('menu'=>'reader','title'=>_t('리더'),'link'=>'/owner/reader'),
+//		array('menu'=>'reader','title'=>_t('리더'),'link'=>'/owner/reader'),
 		array('menu'=>'skin','title'=>_t('스킨'),'link'=>'/owner/skin'),
 		array('menu'=>'plugin','title'=>_t('플러그인'),'link'=>'/owner/plugin'),	
 		array('menu'=>'setting','title'=>_t('환경설정'),'link'=>'/owner/setting/blog')
@@ -28,7 +28,7 @@
 	$blogTopMenuItem = array(
 		array('menu'=>'center','title'=>_t('센터'),'link'=>'/owner/center/dashboard'),
 		array('menu'=>'entry','title'=>_t('글'),'link'=>'/owner/entry'),
-		array('menu'=>'reader','title'=>_t('리더'),'link'=>'/owner/reader'),
+//		array('menu'=>'reader','title'=>_t('리더'),'link'=>'/owner/reader'),
 		array('menu'=>'setting','title'=>_t('환경설정'),'link'=>'/owner/setting/account')
 		);
 }
@@ -96,7 +96,14 @@
 		$blogMenu['loadCSS'] = array('control');
 		break;
 }
-
+// exception for reader CSS. RSS reader will keep as an independent module.
+if(defined('__TEXTCUBE_READER_SUBMENU__') && $blogMenu['contentMenu'] == 'reader') {
+	$blogMenu['topMenu'] = 'communication';
+	$blogMenu['title'] = _t('소통');
+	$blogMenu['loadCSS'] = array('reader');
+	$blogMenu['loadCSSIE6'] = array('reader');
+	$blogMenu['loadCSSIE7'] = array('reader');
+}
 // mapping data management to setting
 if(isset($blogMenu['topMenu']) && $blogMenu['topMenu']=='data') $blogMenu['topMenu'] = 'setting';
 $pluginListForCSS = array();

diff --git a/style/admin/modern/communication.css b/style/admin/modern/communication.css
@@ -2,11 +2,6 @@
 
 /* Common ****************************************************************************************/
 
-#sub-menu-add
-{
-	background-image                 : none !important;
-}
-
 /* table header */
 table.data-inbox tr .date
 {

diff --git a/style/admin/retro-celebrate/communication.css b/style/admin/retro-celebrate/communication.css
@@ -2,11 +2,6 @@
 
 /* Common ****************************************************************************************/
 
-#sub-menu-add
-{
-	background-image                 : none !important;
-}
-
 /* table header */
 table.data-inbox tr .date
 {

diff --git a/style/admin/swallow/communication.css b/style/admin/swallow/communication.css
@@ -2,11 +2,6 @@
 
 /* Common ****************************************************************************************/
 
-#sub-menu-add
-{
-	background-image                 : none !important;
-}
-
 /* table header */
 table.data-inbox tr .date
 {

diff --git a/style/admin/whitedream/communication.css b/style/admin/whitedream/communication.css
@@ -2,11 +2,6 @@
 
 /* Common ****************************************************************************************/
 
-#sub-menu-add
-{
-	background-image                 : none !important;
-}
-
 /* table header */
 table.data-inbox tr .date
 {

diff --git a/style/admin/whitedream/link.css b/style/admin/whitedream/link.css
@@ -2,10 +2,6 @@
 
 /* Common ****************************************************************************************/
 
-#sub-menu-add
-{
-	background-image                 : none !important;
-}
 
 /* List ******************************************************************************************/
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,7 +255,7 @@ function optimizeData() { @@
     		}
     		if ($service['reader'] == true) {
     ?>
-    									<li><a href="<?php echo $blogURL;?>/owner/reader"><?php echo _t('RSS 리더');?></a></li>
+    									<li><a href="<?php echo $blogURL;?>/owner/communication/reader"><?php echo _t('RSS 리더');?></a></li>
     <?php
     		}
     ?>
@@ Expand Down @@