diff --git a/modules/wiki/conf/module.xml b/modules/wiki/conf/module.xml index 17c9cddd8..f4e498088 100644 --- a/modules/wiki/conf/module.xml +++ b/modules/wiki/conf/module.xml @@ -25,9 +25,11 @@ + + @@ -41,5 +43,6 @@ + diff --git a/modules/wiki/lang/en.lang.php b/modules/wiki/lang/en.lang.php index 204076751..d21ef23e2 100644 --- a/modules/wiki/lang/en.lang.php +++ b/modules/wiki/lang/en.lang.php @@ -11,6 +11,8 @@ $lang->cmd_wiki_list = 'List'; $lang->cmd_view_info = 'Wiki Information'; $lang->use_comment = 'Use Comments'; + $lang->cmd_view_document_list = '문서 목록'; + $lang->cmd_view_document_tree = '계층 보기'; $lang->about_use_comment = 'You may configure to enable comments.'; $lang->contributors = 'Contributors'; $lang->notice_old_revision = 'This is an old revision'; diff --git a/modules/wiki/lang/jp.lang.php b/modules/wiki/lang/jp.lang.php index a3ef20c81..37a16d1b9 100644 --- a/modules/wiki/lang/jp.lang.php +++ b/modules/wiki/lang/jp.lang.php @@ -11,6 +11,8 @@ $lang->cmd_wiki_list = 'リスト'; $lang->cmd_view_info = 'wiki情報'; $lang->use_comment = 'コメント機能を使う'; + $lang->cmd_view_document_list = '문서 목록'; + $lang->cmd_view_document_tree = '계층 보기'; $lang->about_use_comment = 'コメント機能をオン・オフを設定します。'; $lang->contributors = '投稿者'; $lang->notice_old_revision = '過去のバージョンです。'; diff --git a/modules/wiki/lang/ko.lang.php b/modules/wiki/lang/ko.lang.php index 9032da65f..b8e4387db 100644 --- a/modules/wiki/lang/ko.lang.php +++ b/modules/wiki/lang/ko.lang.php @@ -11,6 +11,8 @@ $lang->cmd_wiki_list = '목록'; $lang->cmd_view_info = '위키 정보'; $lang->use_comment = '댓글 사용'; + $lang->cmd_view_document_list = '문서 목록'; + $lang->cmd_view_document_tree = '계층 보기'; $lang->about_use_comment = '댓글을 활성화하거나 비활성화할 수 있습니다'; $lang->contributors = '공헌자'; $lang->notice_old_revision = '옛날 버전을 보고 계십니다'; diff --git a/modules/wiki/lang/zh-CN.lang.php b/modules/wiki/lang/zh-CN.lang.php index 725e73c1d..39cabee60 100644 --- a/modules/wiki/lang/zh-CN.lang.php +++ b/modules/wiki/lang/zh-CN.lang.php @@ -11,6 +11,8 @@ $lang->cmd_wiki_list = '目录'; $lang->cmd_view_info = '维基信息'; $lang->use_comment = 'Use comment'; + $lang->cmd_view_document_list = '문서 목록'; + $lang->cmd_view_document_tree = '계층 보기'; $lang->about_use_comment = 'You may configure to enable comments.'; $lang->contributors = 'Contributors'; $lang->notice_old_revision = 'This is an old revision'; diff --git a/modules/wiki/lang/zh-TW.lang.php b/modules/wiki/lang/zh-TW.lang.php index 8bf089a2d..21899f38b 100644 --- a/modules/wiki/lang/zh-TW.lang.php +++ b/modules/wiki/lang/zh-TW.lang.php @@ -11,6 +11,8 @@ $lang->cmd_wiki_list = '列表'; $lang->cmd_view_info = '維基資訊'; $lang->use_comment = '使用評論'; + $lang->cmd_view_document_list = '문서 목록'; + $lang->cmd_view_document_tree = '계층 보기'; $lang->about_use_comment = '可設定是否使用評論功能。'; $lang->contributors = '作者'; $lang->notice_old_revision = '此為舊版本'; diff --git a/modules/wiki/queries/getTreeList.xml b/modules/wiki/queries/getTreeList.xml new file mode 100644 index 000000000..b580fda52 --- /dev/null +++ b/modules/wiki/queries/getTreeList.xml @@ -0,0 +1,22 @@ + + + +
+ + + + +
+ + + + + + + + + + + + + diff --git a/modules/wiki/queries/getTreeMinListorder.xml b/modules/wiki/queries/getTreeMinListorder.xml new file mode 100644 index 000000000..860f434c3 --- /dev/null +++ b/modules/wiki/queries/getTreeMinListorder.xml @@ -0,0 +1,13 @@ + + + +
+ + + + + + + + + diff --git a/modules/wiki/queries/getTreeNode.xml b/modules/wiki/queries/getTreeNode.xml new file mode 100644 index 000000000..71d07f16a --- /dev/null +++ b/modules/wiki/queries/getTreeNode.xml @@ -0,0 +1,21 @@ + + +
+
+ + + +
+ + + + + + + + + + + + + diff --git a/modules/wiki/queries/insertTreeNode.xml b/modules/wiki/queries/insertTreeNode.xml new file mode 100644 index 000000000..aeaf02a0c --- /dev/null +++ b/modules/wiki/queries/insertTreeNode.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/modules/wiki/queries/updateDocumentListOrder.xml b/modules/wiki/queries/updateDocumentListOrder.xml new file mode 100644 index 000000000..154e4d9cc --- /dev/null +++ b/modules/wiki/queries/updateDocumentListOrder.xml @@ -0,0 +1,11 @@ + + +
+ + + + + + + + diff --git a/modules/wiki/queries/updateTreeListOrder.xml b/modules/wiki/queries/updateTreeListOrder.xml new file mode 100644 index 000000000..9f8f2511f --- /dev/null +++ b/modules/wiki/queries/updateTreeListOrder.xml @@ -0,0 +1,13 @@ + + +
+ + + + + + + + + + diff --git a/modules/wiki/queries/updateTreeNode.xml b/modules/wiki/queries/updateTreeNode.xml new file mode 100644 index 000000000..360721edb --- /dev/null +++ b/modules/wiki/queries/updateTreeNode.xml @@ -0,0 +1,16 @@ + + +
+ + + + + + + + + + + + + diff --git a/modules/wiki/skins/xe_wiki/css/wiki.css b/modules/wiki/skins/xe_wiki/css/wiki.css index 3ebe27139..596a6f15a 100644 --- a/modules/wiki/skins/xe_wiki/css/wiki.css +++ b/modules/wiki/skins/xe_wiki/css/wiki.css @@ -151,6 +151,7 @@ /* Search Form */ .wikiSearchForm{ position:relative; float:right; margin:0; padding:1px 0; line-height:normal;} +.wikiSearchForm.footer { clear:both; float:none; margin:20px 0; text-align:center; } .wikiSearchForm *{ margin:0; padding:0;} .wikiSearchForm fieldset{ border:0; clear:both; text-align:center;} .wikiSearchForm fieldset:after{ content:""; display:block; float:none; clear:both;} @@ -422,3 +423,6 @@ a.buttonOfficial{ _margin-top:-1px;} a.buttonOfficial a{ _vertical-align:top;} .hide { display:none; } + +/* tree */ +#tree ul.simpleTree li.noIcon { background:none; } diff --git a/modules/wiki/skins/xe_wiki/header.html b/modules/wiki/skins/xe_wiki/header.html index 2c62e4788..8ca699fad 100644 --- a/modules/wiki/skins/xe_wiki/header.html +++ b/modules/wiki/skins/xe_wiki/header.html @@ -23,15 +23,16 @@
Front Page - Title Index - - {$lang->cmd_setup} - + {$lang->cmd_view_document_list} + {$lang->cmd_view_document_tree}
+ + +
diff --git a/modules/wiki/skins/xe_wiki/img/leaf.gif b/modules/wiki/skins/xe_wiki/img/leaf.gif new file mode 100644 index 000000000..e5d301dbc Binary files /dev/null and b/modules/wiki/skins/xe_wiki/img/leaf.gif differ diff --git a/modules/wiki/skins/xe_wiki/js/wiki.js b/modules/wiki/skins/xe_wiki/js/wiki.js index c449c7bc9..a1372cc7f 100644 --- a/modules/wiki/skins/xe_wiki/js/wiki.js +++ b/modules/wiki/skins/xe_wiki/js/wiki.js @@ -11,3 +11,80 @@ function viewHistory(history_srl) { if(zone.css('display')=='block') zone.css('display','none'); else zone.css('display','block'); } +/** + * @file modules/document/tpl/js/document_category.js + * @author sol (sol@ngleader.com) + * @brief document 모듈의 category tree javascript + **/ + +var simpleTreeCollection; +function Tree(){ + var url = request_uri.setQuery('mid',current_mid).setQuery('act','getWikiTreeList'); + if(typeof(xeVid)!='undefined') url.setQuery('vid',xeVid); + + // clear tree; + jQuery('#tree > ul > li > ul').remove(); + + //ajax get data and transeform ul il + jQuery.get(url,function(data){ + jQuery(data).find("node").each(function(i){ + var title = jQuery(this).attr("title"); + var node_srl = jQuery(this).attr("node_srl"); + var parent_srl = jQuery(this).attr("parent_srl"); + + var url = request_uri; + var args = new Array("mid="+current_mid, "entry="+title); + if(typeof(xeVid)!='undefined') args[args.length] = "vid="+xeVid; + url = request_uri+'?'+args.join('&'); + + // node + var node = jQuery('
  • '+title+'
    • '); + + // insert parent child + if(parent_srl>0){ + if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('
      ')); + jQuery('#tree_'+parent_srl+'> ul').append(node); + }else{ + if(jQuery('#tree ul.simpleTree > li > ul').length==0) jQuery("
        ").appendTo('#tree ul.simpleTree > li'); + jQuery('#tree ul.simpleTree > li > ul').append(node); + } + }); + + // draw tree + simpleTreeCollection = jQuery('.simpleTree').simpleTree({ + autoclose: false, + afterClick:function(node){ + location.href = node.attr('rel'); + return false; + }, + afterMove:function(destination, source, pos){ + if(!isManageGranted) return; + if(destination.size() == 0){ + Tree(); + return; + } + var parent_srl = destination.attr('id').replace(/.*_/g,''); + var source_srl = source.attr('id').replace(/.*_/g,''); + + var target = source.prevAll("li:not([class^=line])"); + var target_srl = 0; + if(target.length >0){ + target_srl = source.prevAll("li:not([class^=line])").get(0).id.replace(/.*_/g,''); + parent_srl = 0; + } + + jQuery.exec_json("wiki.procWikiMoveTree",{ "mid":current_mid,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl}, function(data){ Tree(); }); + + }, + beforeMovedToLine : function() { return true; }, + beforeMovedToFolder : function() { return true; }, + afterAjax:function() { }, + + docToFolderConvert:true, + drag:isManageGranted + }); + jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){ + simpleTreeCollection[0].nodeToggle(this); + }); + },"xml"); +} diff --git a/modules/wiki/skins/xe_wiki/title_index.html b/modules/wiki/skins/xe_wiki/title_index.html index 6b9909837..de3f181c8 100644 --- a/modules/wiki/skins/xe_wiki/title_index.html +++ b/modules/wiki/skins/xe_wiki/title_index.html @@ -21,6 +21,28 @@
    +
    +
    + Wiki Search + + + + + + + + + {$lang->cmd_search_next} + + +
    +
    + +