Changeset 5874

Timestamp:

05/05/08 07:30:21 (5 months ago)

Author:

inureyes

Message:

#897

• 소통 - 휴지통을 소통 기록 안으로 embedding
  
• 오픈아이디 목록을 소통 하위로 이동
  
• 소통 기록 탭의 postfix 관련 버그 수정
  
• TODO : 휴지통 탭으로 이동할 때 레이아웃이 영향받음. CSS를 수정해야 할 듯.
  

Location:

trunk

Files:

• interface/owner/communication/comment/index.php (modified) (1 diff)
• interface/owner/communication/notify/index.php (modified) (1 diff)
• interface/owner/communication/openid (added)
• interface/owner/communication/openid/index.php (added)
• interface/owner/communication/trackback/index.php (modified) (2 diffs)
• interface/owner/communication/trash/comment/index.php (modified) (2 diffs)
• interface/owner/communication/trash/trackback/index.php (modified) (2 diffs)
• interface/owner/setting/openid/index.php (deleted)
• lib/piece/owner/contentMenu.php (modified) (6 diffs)
• style/admin/whitedream/communication.css (modified) (1 diff)

trunk/interface/owner/communication/comment/index.php

@@ -212 +212 @@
 ?>
                             </h2>
-                            <ul id="communication-tabs-box" class="tabs-box">
-                                <li<?php echo isset($tabsClass['comment']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=comment"><?php echo _t('댓글');?></a></li>
-                                <li<?php echo isset($tabsClass['guestbook']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=guestbook"><?php echo _t('방명록');?></a></li>
-                                <li<?php echo isset($tabsClass['notify']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/notify"><?php echo _t('댓글 알리미');?></a></li>
-                                <li<?php echo isset($tabsClass['received']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=received"><?php echo _t('걸린 글');?></a></li>
-                                <li<?php echo isset($tabsClass['sent']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=sent"><?php echo _t('건 글');?></a></li>
-                            </ul>
+<?php
+require ROOT . '/lib/piece/owner/communicationTab.php';
+?>
+
 <?php
     if(isset($tabsClass['comment'])) {

trunk/interface/owner/communication/notify/index.php

@@ -165 +165 @@
 ?>
                             </h2>
-                            <ul id="communication-tabs-box" class="tabs-box">
-                                <li<?php echo isset($tabsClass['comment']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=comment"><?php echo _t('댓글');?></a></li>
-                                <li<?php echo isset($tabsClass['guestbook']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=guestbook"><?php echo _t('방명록');?></a></li>
-                                <li<?php echo isset($tabsClass['notify']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/notify"><?php echo _t('댓글 알리미');?></a></li>
-                                <li<?php echo isset($tabsClass['received']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=received"><?php echo _t('걸린 글');?></a></li>
-                                <li<?php echo isset($tabsClass['sent']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=sent"><?php echo _t('건 글');?></a></li>
-                            </ul>
-
-
+<?php
+require ROOT . '/lib/piece/owner/communicationTab.php';
+?>
                             <div class="main-explain-box">
                                 <p class="explain"><?php echo _t('다른 사람의 블로그에 단 댓글에 대한 댓글이 등록되면 알려줍니다. 알리미가 동작하기 위해서는 댓글 작성시 홈페이지 기입란에 자신의 블로그 주소를 입력하셔야 합니다.');?></p>

trunk/interface/owner/communication/trackback/index.php

@@ -242 +242 @@
 ?>
                             </h2>
-                            <ul id="communication-tabs-box" class="tabs-box">
-                                <li<?php echo isset($tabsClass['comment']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=comment"><?php echo _t('댓글');?></a></li>
-                                <li<?php echo isset($tabsClass['guestbook']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/comment?page=1<?php echo $tabsClass['postfix'];?>&amp;status=guestbook"><?php echo _t('방명록');?></a></li>
-                                <li<?php echo isset($tabsClass['notify']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/notify"><?php echo _t('댓글 알리미');?></a></li>
-                                <li<?php echo isset($tabsClass['received']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=received"><?php echo _t('걸린 글');?></a></li>
-                                <li<?php echo isset($tabsClass['sent']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/communication/trackback?page=1<?php echo $tabsClass['postfix'];?>&amp;status=sent"><?php echo _t('건 글');?></a></li>
-                            </ul>
+<?php
+require ROOT . '/lib/piece/owner/communicationTab.php';
+?>
+
 
                             <form id="category-form" class="category-box" method="post" action="<?php echo $blogURL;?>/owner/communication/trackback">
@@ -308 +305 @@
 
     $filter = new Filter();
-    if (Filter::isFiltered('ip', $trackback['ip'])) {
+    if (isset($trackback['ip']) && Filter::isFiltered('ip', $trackback['ip'])) {
         $isIpFiltered = true;
     } else {
         $isIpFiltered = false;
     }
-
-    if (!isset($siteNumber[$trackback['site']])) {
-        $siteNumber[$trackback['site']] = $i;
+    if(isset($trackback['site'])) {
+        if (!isset($siteNumber[$trackback['site']])) {
+            $siteNumber[$trackback['site']] = $i;
+            $currentSite = $i;
+        } else {
+            $currentSite = $siteNumber[$trackback['site']];
+        }
+    } else {
         $currentSite = $i;
-    } else {
-        $currentSite = $siteNumber[$trackback['site']];
-    }
-    
+    }
     $className = ($i % 2) == 1 ? 'even-line' : 'odd-line';
     $className .= ($i == sizeof($trackbacks) - 1) ? ' last-line' : '';

trunk/interface/owner/communication/trash/comment/index.php

@@ -44 +44 @@
     setBlogSetting('rowsPerPage', $_POST['perPage']);
 }
+
+$tabsClass = array();
+$tabsClass['postfix'] = null;
+$tabsClass['postfix'] .= isset($_POST['category']) ? '&category='.$_POST['category'] : '';
+$tabsClass['postfix'] .= isset($_POST['name']) ? '&name='.$_POST['name'] : '';
+$tabsClass['postfix'] .= isset($_POST['ip']) ? '&ip='.$_POST['ip'] : '';
+$tabsClass['postfix'] .= isset($_POST['search']) ? '&search='.$_POST['search'] : '';
+$tabsClass['trash'] = true;
+
 list($comments, $paging) = getTrashCommentsWithPagingForOwner($blogid, $categoryId, $name, $ip, $search, $suri['page'], $perPage);
 require ROOT . '/lib/piece/owner/header.php';
@@ -268 +277 @@
 ?>
                             </h2>
+<?php
+require ROOT . '/lib/piece/owner/communicationTab.php';
+?>
 
                             <div class="main-explain-box">
-                                <p class="explain"><?php echo _t('휴지통에 버려진 댓글은 15일이 지나면 자동으로 지워집니다. 광고 댓글의 차단 및 분석을 위하여 휴지통의 데이터를 사용하는 플러그인이 있을 수 있으므로 수동으로 지우지 않는 것을 권장합니다.');?></p>
-                            </div>                          
+                                <p class="explain"><?php echo _t('휴지통에 버려진 걸린글은 15일이 지나면 자동으로 지워집니다. 광고 걸린글의 차단 및 분석을 위하여 휴지통의 데이터를 사용하는 플러그인이 있을 수 있으므로 수동으로 지우지 않는 것을 권장합니다.');?></p>
+                            </div>  
 
                             <form id="trash-form" method="post" action="<?php echo $blogURL;?>/owner/communication/trash">

trunk/interface/owner/communication/trash/trackback/index.php

@@ -40 +40 @@
     setBlogSetting('rowsPerPage', $_POST['perPage']);
 }
+$tabsClass = array();
+$tabsClass['postfix'] = null;
+$tabsClass['postfix'] .= isset($_POST['category']) ? '&category='.$_POST['category'] : '';
+$tabsClass['postfix'] .= isset($_POST['site']) ? '&site='.$_POST['site'] : '';
+$tabsClass['postfix'] .= isset($_POST['ip']) ? '&ip='.$_POST['ip'] : '';
+$tabsClass['postfix'] .= isset($_POST['search']) ? '&search='.$_POST['search'] : '';
+$tabsClass['trash'] = true;
+
 list($trackbacks, $paging) = getTrashTrackbackWithPagingForOwner($blogid, $categoryId, $site, $ip, $search, $suri['page'], $perPage);
 require ROOT . '/lib/piece/owner/header.php';
@@ -263 +271 @@
 ?>
                             </h2>
+<?php
+require ROOT . '/lib/piece/owner/communicationTab.php';
+?>
 
                             <div class="main-explain-box">

trunk/lib/piece/owner/contentMenu.php

@@ -35 +35 @@
                 $blogContentMenuItem = array(
                     array('menu'=>'comment','title'=>_t('소통 기록'),'link'=>'/owner/communication/comment'),
-                    array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment'),
+                    array('menu'=>'openid','title'=>_t('오픈아이디 목록'),'link'=>'/owner/communication/openid'),
                     array('menu'=>'add','title'=>_t('링크 추가'),'link'=>'/owner/communication/link/add'),
                     array('menu'=>'link','title'=>_t('링크 목록'),'link'=>'/owner/communication/link'),
@@ -44 +44 @@
                 $blogContentMenuItem = array(
                     array('menu'=>'comment','title'=>_t('소통 기록'),'link'=>'/owner/communication/comment'),
-                    array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment'),
-                    array('menu'=>'reader','title'=>_t('바깥 글 읽기'),'link'=>'/owner/communication/reader')
+                    array('menu'=>'trash','title'=>_t('휴지통'),'link'=>'/owner/communication/trash/comment')
                 );
+                if($service['reader'] == true) array_push($blogContentMenuItem,array('menu'=>'reader','title'=>_t('바깥 글 읽기'),'link'=>'/owner/communication/reader'));
             }
         break;
@@ -78 +78 @@
                 array('menu'=>'teamblog','title'=>_t('필진 목록'),'link'=>'/owner/setting/teamblog'),
                 array('menu'=>'filter','title'=>_t('스팸 필터'),'link'=>'/owner/setting/filter'),
-                array('menu'=>'data','title'=>_t('데이터 관리'),'link'=>'/owner/data'),
-                array('menu'=>'openid','title'=>_t('오픈아이디 목록'),'link'=>'/owner/setting/openid')
+                array('menu'=>'data','title'=>_t('데이터 관리'),'link'=>'/owner/data')
             );
         } else if(Acl::check('group.editors')) {
@@ -146 +145 @@
     else if (isset($_GET['category'])) $currentCategory = $_GET['category'];
     else $currentCategory = null;
-    if(in_array($blogMenu['contentMenu'],array('notify','trackback')))
+    if(in_array($blogMenu['contentMenu'],array('notify','trackback','trashcomment','trashtrackback')))
         $blogMenu['contentMenu'] = 'comment';
 
@@ -161 +160 @@
             if(($blogMenu['contentMenu'] == $contentMenuItem['menu'] 
                 || (isset($_GET['name']) && ('adminMenu?name='.$_GET['name'] == $contentMenuItem['menu'])) 
-                || ($contentMenuItem['menu'] == 'trash' && strpos($blogMenu['contentMenu'],'trash') !== false)
                 || (in_array($contentMenuItem['menu'],array('blog','user')) && strpos($blogMenu['contentMenu'],'detail') !== false)
                 )) {
@@ -171 +169 @@
                         (($blogMenu['contentMenu'] == $contentMenuItem['menu'] || 
                             (isset($_GET['name']) && ('adminMenu?name='.$_GET['name'] == $contentMenuItem['menu'])) ||
-                            ($contentMenuItem['menu'] == 'trash' && strpos($blogMenu['contentMenu'],'trash') !== false) ||
                             ($contentMenuItem['menu'] == 'add' && strpos($blogMenu['contentMenu'],'add') !== false) ||
                             ($contentMenuItem['menu'] == 'blog' && strpos($blogMenu['contentMenu'],'blog') !== false && strpos($blogMenu['contentMenu'],'teamblog') === false) ||

trunk/style/admin/whitedream/communication.css

@@ -240 +240 @@
 #part-post-trash fieldset dl dd
 {
+    margin-top                       : 20px;
     margin-left                      : 30px;
-    width: 600px;
+    width                            : 600px;
 }