diff --git a/common/js/common.js b/common/js/common.js index 1f5cb7e5a..889bc8729 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -206,26 +206,33 @@ for(var i=0;i'+str+' '; + html += '
  • '+str+'
  • '; } } } diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php index 5d2053fdd..25d4879c3 100644 --- a/modules/board/board.controller.php +++ b/modules/board/board.controller.php @@ -737,7 +737,7 @@ class boardController extends board } $url = getUrl('', 'mid', $mid, 'member_srl', $obj->member_srl); - getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', ''); + getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document'); } /** diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 23a53ea08..2daab2010 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -1216,9 +1216,19 @@ class boardView extends board { throw new Rhymix\Framework\Exceptions\NotPermitted; } - + $document_srl = Context::get('document_srl'); + if(!$document_srl) + { + throw new Rhymix\Framework\Exceptions\InvalidRequest; + } + $updatelog = DocumentModel::getDocumentUpdateLog($document_srl); + if(!$updatelog->toBool()) + { + return $updatelog; + } + Context::set('total_count', $updatelog->page_navigation->total_count); Context::set('total_page', $updatelog->page_navigation->total_page); Context::set('page', $updatelog->page); diff --git a/modules/editor/skins/simpleeditor/js/simpleeditor.js b/modules/editor/skins/simpleeditor/js/simpleeditor.js index 8c064d9e3..98532604d 100644 --- a/modules/editor/skins/simpleeditor/js/simpleeditor.js +++ b/modules/editor/skins/simpleeditor/js/simpleeditor.js @@ -44,7 +44,7 @@ str = String(str); str = str.replace(//gs, ''); str = str.replace(/<\/?(\?xml|meta|link|font|span|style|script|noscript|frame|noframes|(?:st1|o):[a-z0-9]+)\b[^>]*?>/ig, ''); - str = str.replace(/(id|class|style|on(?:[a-z0-9]+)|Mso(?:[a-z0-9]+))="[^"]*"/ig, ''); + str = str.replace(/\b(id|class|style|on(?:[a-z0-9]+)|Mso(?:[a-z0-9]+))="[^"]*"/ig, ''); str = str.replace(/(<\/?)div(\W)/g, '$1p$2'); if (!str.match(/<\/?p>/)) { str = '

    ' + str + '

    '; @@ -78,7 +78,7 @@ // Set editor sequence and other info to the form. insert_form[0].setAttribute('editor_sequence', editor_sequence); editorRelKeys[editor_sequence] = {}; - editorRelKeys[editor_sequence].primary = insert_form.find("input[name='" + primary_key + "']"); + editorRelKeys[editor_sequence].primary = insert_form.find("input[name='" + primary_key + "']").get(0); editorRelKeys[editor_sequence].content = content_input; editorRelKeys[editor_sequence].func = editorGetContent; diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index f80b73510..f80484914 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -105,7 +105,7 @@ @@ -134,7 +134,7 @@ diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index b9bdf74ca..731b02159 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -62,7 +62,7 @@ @@ -117,7 +117,7 @@ diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 547597a2b..bdf9b36f3 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -2566,7 +2566,7 @@ class memberController extends member /** * Nickname and click Log In to add a pop-up menu that appears when the method */ - function addMemberPopupMenu($url, $str, $icon = '', $target = 'self') + function addMemberPopupMenu($url, $str, $icon = '', $target = 'self', $class = '') { $member_popup_menu_list = Context::get('member_popup_menu_list'); if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array(); @@ -2574,7 +2574,8 @@ class memberController extends member $obj = new stdClass; $obj->url = $url; $obj->str = $str; - $obj->icon = $icon; + $obj->class = $class; + $obj->icon = $icon ?: null; $obj->target = $target; $member_popup_menu_list[] = $obj; diff --git a/modules/member/member.model.php b/modules/member/member.model.php index f10087b99..ea231b855 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -212,13 +212,13 @@ class memberModel extends member // View homepage info if($member_info->homepage && $homepage_is_public) { - $oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank'); + $oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank', 'homepage'); } // View blog info if($member_info->blog && $blog_is_public) { - $oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank'); + $oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank', 'blog'); } // Call a trigger (after)