fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

1. 게시물 관리에서 이동 복사시 분유없음 추가 및 bugfix

Browse source 
2. 에디터 모드 쿠키 기억
3. 비밀글 기능 옵션으로 (게시물 댓글)
4. 에디터 컴포넌트 사용하지 않을때 도움말 없앰
5. 첨부시 용량 제한 표기 오류 fix

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5091 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2008-12-16 06:21:06 +00:00
parent 91f8519086
commit 769ee33f57
19 changed files with 92 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/board/board.admin.controller.php
View file

@ -155,6 +155,7 @@
$extra_vars->search_list_count = $args->search_list_count;
$extra_vars->except_notice = $args->except_notice!='Y'?'N':'Y';
$extra_vars->consultation = $args->consultation!='Y'?'N':'Y';
$extra_vars->secret = $args->secret!='Y'?'N':'Y';
$extra_vars->admin_mail = $args->admin_mail;
$extra_vars->page_count = $args->page_count;

2
modules/board/lang/en.lang.php
View file

@ -21,6 +21,7 @@
$lang->category_group_srls = 'Accessable Group';
$lang->search_result = 'Search Result';
$lang->consultation = 'Consultation';
$lang->secret = '비밀글 기능';
$lang->admin_mail = "Administrator's Mail";
// words used in button
@ -37,6 +38,7 @@
$lang->about_except_notice = 'Notice articles will not be displayed on normal list.';
$lang->about_board = 'This module is for creating and managing boards.';
$lang->about_consultation = "Non-administrator members would see their own articles.\nNon-members would not be able to write articles when using consultation.";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = 'A mail will be sent when an article or comment is submitted.<br />Multiple mails can be sent with commas(,).';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';

2
modules/board/lang/es.lang.php
View file

@ -23,6 +23,7 @@
$lang->category_group_srls = 'Limitar el grupo';
$lang->search_result = 'Resultado de la búsqueda';
$lang->consultation = '상담 기능';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '관리자 메일';
// Palabras utilizadas en los botones
@ -39,6 +40,7 @@
$lang->about_except_notice = 'Aviso de los artículos no se mostrará en la lista normal.';
$lang->about_board = 'Este módulo es para crear y manejar los tableros.';
$lang->about_consultation = "No administrador de los miembros que consideran que su propia artocles. \ NNon miembros no serían capaces de escribir artículos al utilizar la consulta.";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';

2
modules/board/lang/fr.lang.php
View file

@ -20,6 +20,7 @@
$lang->category_group_srls = 'Groupe Accessible';
$lang->search_result = 'Résultat de la Recherche';
$lang->consultation = 'Consultation';
$lang->secret = '비밀글 기능';
$lang->admin_mail = 'Mél de l\'administrateur';
// Mots utilisés en bouton
@ -36,5 +37,6 @@
$lang->about_except_notice = "Le titre de Notice dont l'article se représentera toujours en tête de la liste ne sera exposé sur la liste générale.";
$lang->about_board = 'Ce module se sert à créer et à administrer des Panneaux d\'Affichage.';
$lang->about_consultation = "Les membres non-administratifs verront seulement les ariticles d\'eux-même.\nNon-membres ne pourraient pas écrire des articles quand la Consultation est appliqué.";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = 'Un message éléctronique sera envoyé à l\'adresse inscrite quand un article ou commentaire se soumet. <br />On peut inscrire multiple adresses délimité par les virgules.';
?>

2
modules/board/lang/jp.lang.php
View file

@ -25,6 +25,7 @@
$lang->category_group_srls = 'グループ制限';
$lang->search_result = '検索結果';
$lang->consultation = '相談機能';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '管理者メールアドレス';
// ボタンに使用する用語
@ -41,6 +42,7 @@
$lang->about_except_notice = "リストの上段に常に表示されるお知らせの書き込みを一般リストからお知らせの書き込みが表示されないようにします。";
$lang->about_board = '掲示板の生成、および管理する掲示板モジュールです。';
$lang->about_consultation = "相談機能とは、管理権限のない会員に本人の書き込みだけを表示する機能です。\n但し、相談機能を使用する際は、非会員の書き込みは自動的に禁止されます。";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '書き込みやコメントが掲載される時、登録メールアドレス宛にメールが送信されます。<br /> 複数のメールアドレスへ送信する場合は「,」(半額コンマ)区切りで登録して下さい。';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';

4
modules/board/lang/ko.lang.php
View file

@ -22,8 +22,11 @@
$lang->category_group_srls = '그룹제한';
$lang->search_result = '검색결과';
$lang->consultation = '상담 기능';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '관리자 메일';
// 버튼에 사용되는 언어
$lang->cmd_board_list = '게시판 목록';
$lang->cmd_module_config = '게시판 공통 설정';
@ -38,6 +41,7 @@
$lang->about_except_notice = '목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.';
$lang->about_board = '게시판을 생성하고 관리할 수 있는 게시판 모듈입니다.';
$lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';

2
modules/board/lang/ru.lang.php
View file

@ -25,6 +25,7 @@
$lang->category_group_srls = 'Доступные группы';
$lang->search_result = 'Результат поиска';
$lang->consultation = '상담 기능';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '관리자 메일';
// слова, использованные в кнопке
@ -41,6 +42,7 @@
$lang->about_except_notice = "목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.";
$lang->about_board = 'Этот модуль служит для создания и управления форумами.';
$lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';

2
modules/board/lang/zh-CN.lang.php
View file

@ -24,6 +24,7 @@
$lang->category_group_srls = '用户组';
$lang->search_result = '搜索结果';
$lang->consultation = '咨询功能';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '管理员电子邮件';
// 按钮语言
@ -41,6 +42,7 @@
$lang->about_except_notice = "设置公告目录项不再重复显示到普通目录当中。";
$lang->about_board = "可生成及管理版面的模块。";
$lang->about_consultation = "咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。\n使用咨询功能时系统将自动禁止非会员的发表主题权限。";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '有新的主题或评论时，将自动发电子邮件来通知管理员。<br />多数电子邮件由逗号(,)来分隔。';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
?>

2
modules/board/lang/zh-TW.lang.php
View file

@ -21,6 +21,7 @@
$lang->category_group_srls = '用戶組';
$lang->search_result = '搜尋結果';
$lang->consultation = '咨詢功能';
$lang->secret = '비밀글 기능';
$lang->admin_mail = '管理員電子郵件';
// 按鈕語言
@ -37,6 +38,7 @@
$lang->about_except_notice = '設置公告列表項目，不再重複顯示到普通列表當中。';
$lang->about_board = '可建立及管理討論板的模組。';
$lang->about_consultation = "咨詢功能是指除有管理權限的會員以外，其他會員只能瀏覽自己發表的主題。\n使用咨詢功能時系統將自動禁止非會員的發表主題權限。";
$lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
$lang->about_admin_mail = '有新的主題或評論時，將自動發電子郵件來通知管理員。<br />多數電子郵件由逗號(,)區隔。';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
?>

3
modules/board/skins/xe_board/comment_form.html
View file

@ -48,9 +48,10 @@
<input type="checkbox" name="notify_message" value="Y" <!--@if($oComment->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
<label for="notify_message">{$lang->notify}</label>
<!--@end-->
<!--@if($module_info->secret=="Y")-->
<input type="checkbox" name="is_secret" value="Y" <!--@if($oComment->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
<label for="is_secret">{$lang->secret}</label>
<!--@end-->
</div>
<div class="editor">{$oComment->getEditor()}</div>

2
modules/board/skins/xe_board/write_form.html
View file

@ -61,10 +61,12 @@
<label for="lock_comment">{$lang->lock_comment}</label>
</dd>
<!--@endif-->
<!--@if($module_info->secret=="Y")-->
<dd>
<input type="checkbox" name="is_secret" value="Y" <!--@if($oDocument->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
<label for="is_secret">{$lang->secret}</label>
</dd>
<!--@end-->
<dd>
<input type="checkbox" name="allow_comment" value="Y" <!--@if($oDocument->allowComment())-->checked="checked"<!--@end--> id="allow_comment" />
<label for="allow_comment">{$lang->allow_comment}</label>

38
modules/board/tpl/board_insert.html
View file

@ -20,7 +20,7 @@
</td>
</tr>
<!--@if($module_info->is_default!='Y')-->
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->is_default}</div></th>
<td>
<input type="checkbox" name="is_default" value="Y" <!--@if($module_info->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default" class="checkbox" />
@ -43,7 +43,7 @@
</tr>
<!--@if(!$module_srls)-->
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->browser_title}</div></th>
<td>
<input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}" class="inputTypeText w400" />
@ -64,7 +64,7 @@
<p>{$lang->about_layout}</p>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->skin}</div></th>
<td>
<select name="skin">
@ -82,7 +82,7 @@
<label for="fld_for_category">{$lang->about_use_category}</label>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->order_target}</div></th>
<td>
<select name="order_target">
@ -102,7 +102,7 @@
</select>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->list_count}</div></th>
<td>
<input type="text" name="list_count" value="{$module_info->list_count?$module_info->list_count:20}" class="inputTypeText" />
@ -116,7 +116,7 @@
<p>{$lang->about_search_list_count}</p>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->page_count}</div></th>
<td>
<input type="text" name="page_count" value="{$module_info->page_count?$module_info->page_count:10}" class="inputTypeText" />
@ -130,13 +130,20 @@
<p>{$lang->about_except_notice}</p>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->consultation}</div></th>
<td>
<input type="checkbox" name="consultation" value="Y" <!--@if($module_info->consultation=='Y')-->checked="checked"<!--@end--> />
<p>{nl2br($lang->about_consultation)}</p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->secret}</div></th>
<td>
<input type="checkbox" name="secret" value="Y" <!--@if($module_info->secret=='Y')-->checked="checked"<!--@end--> />
<p>{nl2br($lang->about_secret)}</p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->admin_mail}</div></th>
<td>
@ -144,7 +151,7 @@
<p>{$lang->about_admin_mail}</p>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->description}</div></th>
<td>
<textarea name="description" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->description)}</textarea>
@ -158,7 +165,7 @@
<p>{$lang->about_header_text}</p>
</td>
</tr>
<tr class="row2">
<tr>
<th scope="row"><div>{$lang->footer_text}</div></th>
<td>
<textarea name="footer_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
@ -172,7 +179,7 @@
<p>{$lang->about_admin_id}</p>
</td>
</tr>
<tr class="row2">
<tr>
<td colspan="2" class="center">
<span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
<span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
@ -198,7 +205,7 @@
<!--@end-->
<table cellspacing="0" class="adminTable ">
<caption>{$lang->extra_vars} {$i}</caption>
<tr class="row2">
<tr>
<th><div>{$lang->column_name}</div></th>
<td class="wide"><input type="text" name="extra_vars_{$i}_name" value="{$extra_vars_name}" class="inputTypeText w200" /> </td>
</tr>
@ -214,7 +221,7 @@
</select>
</td>
</tr>
<tr class="row2">
<tr>
<th><div>{$lang->is_required}</div></th>
<td><input type="checkbox" name="extra_vars_{$i}_is_required" value="Y" <!--@if($extra_vars_is_required=='Y')-->checked="checked"<!--@end--> /></td>
</tr>
@ -222,7 +229,7 @@
<th><div>{$lang->default_value}</div></th>
<td><input type="text" name="extra_vars_{$i}_default" value="{$extra_vars_default_value}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
</tr>
<tr class="row2">
<tr>
<th><div>{$lang->description}</div></th>
<td><input type="text" name="extra_vars_{$i}_desc" value="{$extra_vars_desc}" class="inputTypeText w400" /></td>
</tr>
@ -230,7 +237,7 @@
<th><div>{$lang->cmd_search}</div></th>
<td><input type="checkbox" name="extra_vars_{$i}_search" value="Y" <!--@if($extra_vars_search=='Y')-->checked="checked"<!--@end--> /></td>
</tr>
<tr class="row2">
<tr>
<td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></div></th>
</tr>
</table>
@ -239,3 +246,6 @@
</form>
<script type="text/javascript">//<![CDATA[
jQuery(function(){ jQuery("table.adminTable tr:nth-child(even)").attr('class','row2');});
//]]></script>

1
modules/board/tpl/filter/insert_board.xml
View file

@ -20,6 +20,7 @@
<param name="search_list_count" target="search_list_count" />
<param name="except_notice" target="except_notice" />
<param name="consultation" target="consultation" />
<param name="secret" target="secret" />
<param name="admin_mail" target="admin_mail" />
<param name="page_count" target="page_count" />
<param name="is_default" target="is_default" />

11
modules/document/document.model.php
View file

@ -655,11 +655,14 @@
function getDocumentCategories() {
$module_srl = Context::get('module_srl');
$categories= $this->getCategoryList($module_srl);
if(!$categories) return;
$lang = Context::get('lang');
$output = '';
foreach($categories as $category_srl => $category) {
$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
// 분류 없음 추가
$output = "0,0,{$lang->none_category}\n";
if($categories){
foreach($categories as $category_srl => $category) {
$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
}
}
$this->add('categories', $output);
}

2
modules/document/tpl/checked_list.html
View file

@ -14,7 +14,7 @@
<th scope="row"><div><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></div></th>
<td>
<!--@if(count($document_list))-->
<input type="checkbox" onclick="checkboxToggleAll(); return false;" /> {$lang->cmd_select}
<input type="checkbox" onclick="XE.checkboxToggleAll()" checked="checked"/> {$lang->cmd_select}
<ul class="document_list_box">
<!--@foreach($document_list as $key => $document)-->
<li class="document_list"><input type="checkbox" checked="checked" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this);"/> <address>{$document->getNickName()}</address> <span class="document_title">{$document->getTitle()}</span></li>

6
modules/editor/skins/default/editor.html
View file

@ -145,6 +145,8 @@
</div>
<!--@end-->
<!--@if($enable_default_component || $enable_component)-->
<div class="editorHelp" id="editorHelp_{$editor_sequence}">
<button type="button" class="helpButton" title="{$lang->edit->help}" onclick="showEditorHelp(event,{$editor_sequence})"><span>{$lang->edit->help}</span></button>
</div>
@ -167,7 +169,7 @@
</ul>
</li>
</ul>
<!--@end-->
</div>
<!--@if($enable_autosave)-->
@ -236,8 +238,6 @@
<!--@else-->
editorStart("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", '{$editor_height}' , '#000');
<!--@end-->
<!--@end-->
//]]></script>

25
modules/editor/tpl/js/editor.js
View file

@ -174,6 +174,24 @@ function editorStart(editor_sequence, primary_key, content_key, editor_height, f
// 자동저장 필드가 있다면 자동 저장 기능 활성화
if(typeof(fo_obj._saved_doc_title)!="undefined" ) editorEnableAutoSave(fo_obj, editor_sequence);
// 좋지는 않으나;; 스타일 변형을 막기 위해 start 할때 html이면 바꿔주자
if (xGetCookie('editor_mode') == 'html'){
var iframe_obj = editorGetIFrame(editor_sequence);
if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
textarea_obj = editorGetTextArea(editor_sequence);
textarea_obj.value = content;
xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
editorMode[editor_sequence] = 'html';
if(xGetElementById('xeEditor_'+editor_sequence)) {
xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor html';
xGetElementById('use_rich_'+editor_sequence).className = '';
xGetElementById('preview_html_'+editor_sequence).className = '';
xGetElementById('use_html_'+editor_sequence).className = 'active';
}
}
}
@ -401,6 +419,13 @@ function editorChangeHeader(obj,srl) {
**/
function editorChangeMode(mode, editor_sequence) {
if(mode == 'html' || mode ==''){
var expire = new Date();
expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
xSetCookie('editor_mode', mode, expire);
}
var iframe_obj = editorGetIFrame(editor_sequence);
if(!iframe_obj) return;

1
modules/editor/tpl/js/uploader.js
View file

@ -221,6 +221,7 @@ function reloadFileList(settings) {
var params = new Array();
params["file_list_area_id"] = settings["fileListAreaID"];
params["editor_sequence"] = settings["editorSequence"];
params["mid"] = current_mid;
var response_tags = new Array("error","message","files","upload_status","upload_target_srl","editor_sequence");
exec_xml("file","getFileList", params, completeReloadFileList, response_tags, settings);
}

7
modules/file/file.model.php
View file

@ -17,6 +17,12 @@
* @brief 특정 문서에 속한 첨부파일 목록을 return
**/
function getFileList() {
$mid = Context::get("mid");
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleInfoByMid($mid);
Context::set("module_srl",$config->module_srl);
$editor_sequence = Context::get("editor_sequence");
$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
if($upload_target_srl) {
@ -89,6 +95,7 @@
if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
if(!$config->download_grant) $config->download_grant = array();
return $config;
}