refs #1288

  * 글 추가 메뉴를 세분화함.
  * 처음 사용자들이 어려워하는 부분 수정합니다.

Author: inureyes

interface/common/owner/header.php

@@ -153,15 +153,21 @@
 	}
 	if(Acl::check('group.editors')) {
 		$blogContentMenuItem['entry'] = array(
-			array('menu'=>'post','title'=>_t('글쓰기'),'link'=>'/owner/entry/post'),
 			array('menu'=>'entry','title'=>_t('글 목록'),'link'=>'/owner/entry'),
+			array('menu'=>'post','title'=>_t('글 쓰기'),'link'=>'/owner/entry/post'),
+			array('menu'=>'notice','title'=>_t('공지 쓰기'),'link'=>'/owner/entry/post?category=-2'),
+			array('menu'=>'keylog','title'=>_t('키워드 만들기'),'link'=>'/owner/entry/post?category=-1'),
+			array('menu'=>'template','title'=>_t('서식 만들기'),'link'=>'/owner/entry/post?category=-4'),
 			array('menu'=>'category','title'=>_t('분류 관리'),'link'=>'/owner/entry/category'),
 			array('menu'=>'tag','title'=>_t('태그 관리'),'link'=>'/owner/entry/tag')
 		);
 	} else {
 		$blogContentMenuItem['entry'] = array(
+			array('menu'=>'entry','title'=>_t('글 목록'),'link'=>'/owner/entry'),
 			array('menu'=>'post','title'=>_t('글쓰기'),'link'=>'/owner/entry/post'),
-			array('menu'=>'entry','title'=>_t('글 목록'),'link'=>'/owner/entry')
+			array('menu'=>'post','title'=>_t('공지 쓰기'),'link'=>'/owner/entry/post?category=-2'),
+			array('menu'=>'post','title'=>_t('키워드 만들기'),'link'=>'/owner/entry/post?category=-1'),
+			array('menu'=>'post','title'=>_t('서식 만들기'),'link'=>'/owner/entry/post?category=-4')
 		);
 	}
 	if(Acl::check('group.administrators')) {
@@ -381,7 +387,7 @@
 <?php
 	}
 }
-if($blogMenu['topMenu']=='entry' && in_array($blogMenu['contentMenu'],array('post','edit'))) {
+if($blogMenu['topMenu']=='entry' && in_array($blogMenu['contentMenu'],array('post','edit','keylog','template','notice'))) {
 ?>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/editor3.js"></script>
 <?php
@@ -455,9 +461,27 @@
 							<ul id="submenu-<?php echo $menuItem['menu'];?>" class="sub-menu">
 <?php
 	$firstChildClass = ' firstChild';
-	if (isset($_POST['category'])) $currentCategory = $_POST['category'];
+	if(isset($_POST['category']) && isset($_GET['category'])) {
+		$_POST['category'] == $_GET['category'];
+	}
+/*	if (isset($_POST['category'])) $currentCategory = $_POST['category'];
 	else if (isset($_GET['category'])) $currentCategory = $_GET['category'];
-	else $currentCategory = null;
+	else $currentCategory = null;*/
+	if($blogMenu['contentMenu'] == 'post' && isset($_GET['category'])) {
+		switch($_GET['category']) {
+			case -1:
+				$blogMenu['contentMenu'] = 'keylog';
+				break;
+			case -2:
+				$blogMenu['contentMenu'] = 'notice';
+				break;
+			case -4:
+				$blogMenu['contentMenu'] = 'template';
+				break;
+			default:
+		}
+	}
+	$currentCategory = null;
 	if(isset($_POST['status'])) {
 		if(($blogMenu['contentMenu'] == 'comment') && ($_POST['status'] == 'guestbook'))
 			$blogMenu['contentMenu'] = 'guestbook';
@@ -470,7 +494,7 @@
 	else if(in_array($blogMenu['contentMenu'],array('coverpage','sidebar')))
 		$blogMenu['contentMenu'] = 'widget';
 
-	foreach($blogContentMenuItem[$menuItem['menu']] as $contentMenuItem) { 
+	foreach($blogContentMenuItem[$menuItem['menu']] as &$contentMenuItem) {
 		$PostIdStr = null;
 		if(strstr($contentMenuItem['menu'], 'adminMenu?name=') !== false) {
 			$pluginMenuValue = explode('/',substr($contentMenuItem['menu'], 15));

interface/owner/entry/edit/index.php

@@ -68,7 +68,19 @@
 if (isset($_POST['returnURL']) && !empty($_POST['returnURL'])) {
 	$_GET['returnURL'] = $_POST['returnURL'];
 }
-
+switch($entry['category']) {
+	case -1:
+		$titleText = _t('키워드');
+		break;
+	case -2:
+		$titleText = _t('공지');
+		break;
+	case -4:
+		$titleText = _t('서식');
+		break;
+	default:
+		$titleText = _t('글');
+}
 
 if (defined('__TEXTCUBE_POST__')) {
 	printOwnerEditorScript();
@@ -583,11 +595,10 @@ function returnToList() {
 							<div id="part-editor" class="part">
 								<h2 class="caption"><span class="main-text"><?php
 
-
 if (defined('__TEXTCUBE_POST__')) {
-	echo _t('글을 작성합니다');
+	echo _f('%1 작성',$titleText);
 } else {
-	echo _t('선택한 글을 수정합니다');
+	echo _f('선택한 %1 수정',$titleText);
 }
 ?></span></h2>
 

interface/owner/entry/index.php

@@ -715,15 +715,15 @@ function closeWhatIsEolin() {
 							<h2 class="caption"><span class="main-text">
 <?php
 	if(isset($tabsClass['template']) && $tabsClass['template'] == true) {
-		echo _t('등록된 서식 목록입니다');
+		echo _t('서식 목록입니다');
 	} else if ($categoryId == -1) { 
-		echo _f('등록된 %1 키워드 목록입니다', $visibilityText);
+		echo _f('%1 키워드 목록입니다', $visibilityText);
 	} else if ($categoryId == -2) {
-		echo _f('등록된 %1 공지 목록입니다', $visibilityText);
+		echo _f('%1 공지 목록입니다', $visibilityText);
 	} else if ($categoryId == -5) {
 		echo _f('공지와 키로그를 포함한 %1 글의 목록입니다', $visibilityText);
 	} else {
-		echo _f('등록된 %1 글 목록입니다', $visibilityText);
+		echo _f('%1 글 목록입니다', $visibilityText);
 	}
 ?>
 							</span></h2>
@@ -733,7 +733,7 @@ function closeWhatIsEolin() {
 								<input type="hidden" name="visibility" value="<?php echo $_POST['visibility'];?>" />
 
 								<ul id="entry-tabs-box" class="tabs-box">
-									<li class="entry-post"><a href="<?php echo $blogURL;?>/owner/entry/post"><?php echo _t('새 글 쓰기');?></a></li>
+									<li class="entry-post"><a href="<?php echo $blogURL;?>/owner/entry/post<?php echo (isset($_POST['category']) ? '?category='.$_POST['category'] : '')?>"><?php echo _t('새 글 쓰기');?></a></li>
 									<li class="entry-all<?php echo isset($tabsClass['all']) ? ' selected' : NULL;?>"><a href="<?php echo $blogURL;?>/owner/entry?page=1<?php echo $tab['postfix'];?>"><?php echo _t('모든 글');?></a>
 										<label for="category"><?php echo _t('종류');?></label>
 										<select id="category" name="category" onchange="document.getElementById('category-form-top').page.value=1; document.getElementById('category-form-top').submit()">