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

reverse merge from 1.6.0 (r10060)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10701 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 09:52:40 +00:00
parent 696a3164c3
commit fe75a29691
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
addons/member_communication/member_communication.addon.php
View file

@ -4,7 +4,7 @@ if(!defined('__XE__')) exit();
/** /**
* @file member_communication.addon.php * @file member_communication.addon.php
* @author NHN (developers@xpressengine.com) * @author NHN (developers@xpressengine.com)
* @brief Promote user communication * @brief Promote user communication
* *
* - Pop-up the message if new message comes in * - Pop-up the message if new message comes in
* - When calling MemberModel::getMemberMenu, feature to send a message is added * - When calling MemberModel::getMemberMenu, feature to send a message is added
@ -46,7 +46,7 @@ if($called_position == 'before_module_init' && $this->module != 'member') {
$mid = Context::get('cur_mid'); $mid = Context::get('cur_mid');
// Creates communication model object // Creates communication model object
$oCommunicationModel = &getModel('communication'); $oCommunicationModel = &getModel('communication');
// Add a feature to display own message box. // Add a feature to display own message box.
if($logged_info->member_srl == $member_srl) { if($logged_info->member_srl == $member_srl) {
// Add your own viewing Note Template // Add your own viewing Note Template
$oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', '', 'self'); $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
@ -55,7 +55,7 @@ if($called_position == 'before_module_init' && $this->module != 'member') {
// If not, Add menus to send message and to add friends // If not, Add menus to send message and to add friends
} else { } else {
// Get member information // Get member information
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if(!$target_member_info->member_srl) return; if(!$target_member_info->member_srl) return;
// Get logged-in user information // Get logged-in user information

10
addons/member_communication/tpl/member_communication.js
View file

@ -6,13 +6,19 @@ window.xeNotifyMessage = function(text, count){
$bar = $('<div class="message info" />') $bar = $('<div class="message info" />')
.hide() .hide()
.prependTo(document.body); .prependTo(document.body);
.css({
'position' : 'absolute',
'z-index' : '100',
})
.appendTo(document.body);
} }
text = text.replace('%d', count); text = text.replace('%d', count);
h = $bar.html('<p><a href="'+current_url.setQuery('act','dispCommunicationMessages')+'">'+text+'</a></p>').height(); h = $bar.html('<p><a href="'+current_url.setQuery('act','dispCommunicationMessages')+'">'+text+'</a></p>').height();
$bar.show().animate({top:0}); $bar.css('top', -h-4).show().animate({top:0});
// hide after 10 seconds // hide after 10 seconds
setTimeout(function(){ setTimeout(function(){
$bar.slideUp(); $bar.slideUp();
}, 10000); }, 5000);
}; };
})(jQuery); })(jQuery);