merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -5,7 +5,7 @@
<value xml:lang="en"><![CDATA[You have %d new message(s). Do you want to check it now?]]></value>
<value xml:lang="jp"><![CDATA[%d件の新しいメッセージがあります。確認しますか]]></value>
<value xml:lang="zh-CN"><![CDATA[您有新消息。要确认吗?]]></value>
<value xml:lang="zh-TW"><![CDATA[您收到%d個新訊息。您想要檢視嗎?]]></value>
<value xml:lang="zh-TW"><![CDATA[您收到 %d 個新訊息。要檢視嗎?]]></value>
<value xml:lang="ru"><![CDATA[У Вас новые сообщения. Проверите сейчас?]]></value>
<value xml:lang="es"><![CDATA[Usted tiene un nuevo mensaje. Quiere comprobar ahora?]]></value>
<value xml:lang="vi"><![CDATA[Bạn có một tin nhắn mới. bạn có muốn kiểm tra ngay bây giờ không?]]></value>

View file

@ -1,29 +1,18 @@
(function($){
window.xeNotifyMessage = function(text, count){
var $bar;
$bar = $('div.notifyMessage');
$bar = $('div.message.info');
if(!$bar.length) {
$bar = $('<div class="notifyMessage" />')
$bar = $('<div class="message info" />')
.hide()
.css({
position : 'absolute',
background : '#ff0',
border : '1px solid #990',
textAlign : 'center'
})
.appendTo(document.body);
.prependTo(document.body);
}
text = text.replace('%d', count);
h = $bar.html('<a href="'+current_url.setQuery('act','dispCommunicationMessages')+'">'+text+'</a>').height();
$bar.css('top', -h-4).show().animate({top:0});
h = $bar.html('<p><a href="'+current_url.setQuery('act','dispCommunicationMessages')+'">'+text+'</a></p>').height();
$bar.show().animate({top:0});
// hide after 10 seconds
setTimeout(function(){
$bar.animate({top:-h-4}, function(){ $bar.hide() });
$bar.slideUp();
}, 10000);
};
})(jQuery);