Changeset 5992

Timestamp:

05/21/08 23:33:00 (8 months ago)

Author:

inureyes

Message:

#981

• 스킨 검색 추가
  

Location:

trunk

Files:

• components/Textcube.Function.Setting.php (modified) (1 diff)
• doc/changes_ko (modified) (1 diff)
• interface/owner/skin/index.php (modified) (4 diffs)
• lib/blog.skin.php (modified) (1 diff)
• skin/coolant/index.xml (modified) (1 diff)
• style/admin/whitedream/plugin.css (modified) (1 diff)
• style/admin/whitedream/skin.css (modified) (1 diff)
• style/admin/whitedream/skin.ie.css (modified) (1 diff)

trunk/components/Textcube.Function.Setting.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+
+global $__gCacheBlogSettings; // share blog.service.php
 class setting {
     function fetchConfigVal( $DATA ){

trunk/doc/changes_ko

@@ -21 +21 @@
  * 관리자  : 관리 패널 UI에서 큰 메뉴의 하위 메뉴를 마우스 얹기로 보기 지원 (#961)
  * 관리자  : 플러그인 메뉴에서 플러그인 검색 지원 (#981)
+ * 관리자  : 스킨 선택 메뉴에서 설치된 스킨 검색 지원 (#981)
  * 스킨    : 스킨 편집시 스킨의 부분만을 편집할 수 있도록 영역별 탭 지원 (#952)
  * 스킨    : 현재 편집중인 스킨의 html을 내려 받는 기능 추가 (#952)

trunk/interface/owner/skin/index.php

@@ -6 +6 @@
 require ROOT . '/lib/piece/owner/header.php';
 
+if(isset($_POST['search'])) {
+    $search = $_POST['search'];
+} else $search = null;
+
 $skins = array();
 $dirHandler = dir(ROOT . "/skin");
 while ($file = $dirHandler->read()) {
+    $skin = array();
     if ($file == '.' || $file == '..')
         continue;
@@ -18 +23 @@
     if (file_exists(ROOT . "/skin/$file/preview.gif"))
         $preview = "{$service['path']}/skin/$file/preview.gif";
-    array_push($skins, array('name' => $file, 'path' => ROOT . "/skin/$file/", 'preview' => $preview));
+    
+    if (file_exists(ROOT . "/skin/$file/index.xml")) {
+        $xml = file_get_contents(ROOT . "/skin/$file/index.xml");
+        $xmls = new XMLStruct();
+        $xmls->open($xml, $service['encoding']);
+        $skin['skinName']     = $xmls->getValue('/skin/information/name');
+        $skin['version']  = $xmls->getValue('/skin/information/version');
+        $skin['license']  = $xmls->getValue('/skin/information/license');
+        $skin['maker']    = $xmls->getValue('/skin/author/name');
+        $skin['homepage'] = $xmls->getValue('/skin/author/homepage');
+        $skin['email']    = $xmls->getValue('/skin/author/email');
+        $skin['description'] = $xmls->getValue('/skin/information/description');
+    }
+
+    if(!empty($search) && 
+        (stristr($skin['skinName'],$search) === false) && 
+        (stristr($skin['maker'],$search) === false) &&
+        (stristr($skin['homepage'],$search) === false) &&
+        (stristr($skin['email'],$search) === false) &&
+        (stristr($skin['description'],$search) === false)) continue; // Search.
+
+    $skin['name'] = $file;
+    $skin['path'] = ROOT . "/skin/$file/";
+    $skin['preview'] = $preview;
+    
+    array_push($skins, $skin);
 }
 
@@ -180 +210 @@
                                             <table cellspacing="0" cellpadding="0">
 <?php
-    if (file_exists(ROOT . "/skin/{$skin['name']}/index.xml")) {
-        $xml = file_get_contents(ROOT . "/skin/{$skin['name']}/index.xml");
-        $xmls = new XMLStruct();
-        $xmls->open($xml, $service['encoding']);
-        writeValue('<span class="skin-name">' . $xmls->getValue('/skin/information/name') . '</span> <span class="version">ver.' . $xmls->getValue('/skin/information/version') . '</span>', _t('제목'), "title");
-        writeValue($xmls->getValue('/skin/information/license'), _t('저작권'), "license");
-        writeValue($xmls->getValue('/skin/author/name'), _t('만든이'), "maker");
-        writeValue($xmls->getValue('/skin/author/homepage'), _t('홈페이지'), "homepage");
-        writeValue($xmls->getValue('/skin/author/email'), _t('e-mail'), "email");
-        writeValue($xmls->getValue('/skin/information/description'), _t('설명'), "explain");
+    if (isset($skin['skinName'])) {
+        writeValue('<span class="skin-name">' . $skin['skinName'] . '</span> <span class="version">ver.' . $skin['version']. '</span>', _t('제목'), "title");
+        writeValue($skin['license'], _t('저작권'), "license");
+        writeValue($skin['maker'], _t('만든이'), "maker");
+        writeValue($skin['homepage'], _t('홈페이지'), "homepage");
+        writeValue($skin['email'], _t('e-mail'), "email");
+        writeValue($skin['description'], _t('설명'), "explain");
     } else {
         writeValue($skin['name'], _t('제목'));
@@ -207 +234 @@
 ?>
                             </div>
-                        </div>
-                                
+                            <hr class="hidden" />
+                            <form id="skin-search-form" class="data-subbox" method="post" action="<?php echo $blogURL;?>/owner/skin">
+                                <h2><?php echo _t('검색');?></h2>
+                                <div class="section">
+                                    <label for="search"><?php echo _t('제목');?>, <?php echo _t('내용');?></label>
+                                    <input type="text" id="search" class="input-text" name="search" value="<?php echo htmlspecialchars($search);?>" onkeydown="if (event.keyCode == '13') {  document.getElementById('search-form').submit();return false; }" />
+                                    <input type="submit" class="search-button input-button" value="<?php echo _t('검색');?>" onclick="document.getElementById('search-form').submit();return false;" />
+                                </div>
+                            </form>
+                        </div>
                         <div id="part-skin-more" class="part">
                             <h2 class="caption"><span class="main-text"><?php echo _t('스킨을 구하려면');?></span></h2>

trunk/lib/blog.skin.php

@@ -85 +85 @@
     function Skin($name, $previewMode = false) {
         global $service, $blogURL, $suri, $blog;
-        //$this->noneCommentMessage = setting::getBlogSettingGlobal('noneCommentMessage');
-        //$this->singleCommentMessage = setting::getBlogSettingGlobal('singleCommentMessage');
-        //$this->noneTrackbackMessage = setting::getBlogSettingGlobal('noneTrackbackMessage');
-        //$this->singleTrackbackMessage = setting::getBlogSettingGlobal('singleTrackbackMessage');
         if($previewMode == true || ($service['skincache'] != true) || !$this->loadCache()) {
-            $this->noneCommentMessage = $blog['noneCommentMessage'];
-            $this->singleCommentMessage = $blog['singleCommentMessage'];
-            $this->noneTrackbackMessage = $blog['noneTrackbackMessage'];
-            $this->singleTrackbackMessage = $blog['singleTrackbackMessage'];
+            requireComponent('Textcube.Function.Setting');
+            $this->noneCommentMessage = setting::getBlogSettingGlobal('noneCommentMessage',null);
+            $this->singleCommentMessage = setting::getBlogSettingGlobal('singleCommentMessage',null);
+            $this->noneTrackbackMessage = setting::getBlogSettingGlobal('noneTrackbackMessage',null);
+            $this->singleTrackbackMessage = setting::getBlogSettingGlobal('singleTrackbackMessage',null);
+            //$this->noneCommentMessage = $blog['noneCommentMessage'];
+            //$this->singleCommentMessage = $blog['singleCommentMessage'];
+            //$this->noneTrackbackMessage = $blog['noneTrackbackMessage'];
+            //$this->singleTrackbackMessage = $blog['singleTrackbackMessage'];
             $this->microformatDebug = array();
             

trunk/skin/coolant/index.xml

@@ -35 +35 @@
         <commentMessage>
             <none>No Comment</none>
-            <single>1 Comment</single>
+            <single>a comment</single>
         </commentMessage>
         <trackbackMessage>
             <none>No Trackback</none>
-            <single>1 Trackback</single>
+            <single>A trackback</single>
         </trackbackMessage>
         <contentWidth>450</contentWidth>

trunk/style/admin/whitedream/plugin.css

@@ -452 +452 @@
     margin                           : 0 auto;
 }
-
-
 
 #plugin-search-form

trunk/style/admin/whitedream/skin.css

@@ -138 +138 @@
 {
     margin-bottom                    : 100px;
+}
+
+#skin-search-form
+{
+    background-color                 : transparent;
+    border                           : none;
+    margin                           : 0;
+    position                         : absolute;
+    right                            : 35px;
+    text-align                       : right;
+    top                              : 275px;
+    width                            : 25em;
+    z-index                          : 1;
+}
+   
+#skin-search-form label
+{
+    display                          : none;
 }
 

trunk/style/admin/whitedream/skin.ie.css

@@ -7 +7 @@
 {
     border                           : 1px solid #FFFFFF;
+}
+
+#skin-search-form .input-button
+{
+    line-height                      : 1.6em !important;
 }