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

reverse merge from 1.6.0 (r10156, r10469, r10370, r10369, r10365, r10111, r10110, r10108, r10064, r10063, r10060, r10054, r10052, r10051, r10050, r10049, r10044, r10042, r10041, r10030, r10029, r10024, r10014, r10013)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10715 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 05:52:06 +00:00
parent 3afad81016
commit 57a0cc59b1
24 changed files with 258 additions and 77 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
* @author NHN (developers@xpressengine.com)
* @brief Promote user communication
* @brief Promote user communication
*
* - Pop-up the message if new message comes in
* - 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');
// Creates communication model object
$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) {
// Add your own viewing Note Template
$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
} else {
// Get member information
$oMemberModel = &getModel('member');
$oMemberModel = &getModel('member');
$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if(!$target_member_info->member_srl) return;
// Get logged-in user information

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

@ -5,6 +5,10 @@ window.xeNotifyMessage = function(text, count){
if(!$bar.length) {
$bar = $('<div class="message info" />')
.hide()
.css({
'position' : 'absolute',
'z-index' : '100',
})
.prependTo(document.body);
}
text = text.replace('%d', count);
@ -13,6 +17,6 @@ window.xeNotifyMessage = function(text, count){
// hide after 10 seconds
setTimeout(function(){
$bar.slideUp();
}, 10000);
}, 5000);
};
})(jQuery);