extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Notifications: New actions Prev and Next in order to navigate through messages

Browse Source
This commit is contained in:
Hadi Nategh 2018-03-06 18:33:42 +01:00
parent 183ee014c6
commit 9f2d613c07
5 changed files with 166 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
notifications/js/notificationajaxpopup.js
View File

@ -153,7 +153,7 @@
for(var index in indexes) for(var index in indexes)
{ {
var id = indexes[index]; var id = indexes[index];
var $message, $mark, $delete, $inner_container, var $message, $mark, $delete, $inner_container, $nav_prev, $nav_next,
$more_info, $top_toolbar, $open_entry, $date, $collapse; $more_info, $top_toolbar, $open_entry, $date, $collapse;
var message_id = 'egwpopup_message_'+id; var message_id = 'egwpopup_message_'+id;
var time_label = this.getTimeLabel(notifymessages[id]['created'], notifymessages[id]['current']); var time_label = this.getTimeLabel(notifymessages[id]['created'], notifymessages[id]['current']);
@ -209,6 +209,18 @@
.click(jQuery.proxy(this.open_entry, this,[$message])) .click(jQuery.proxy(this.open_entry, this,[$message]))
.prependTo($top_toolbar); .prependTo($top_toolbar);
} }
// Previous button
$nav_prev = jQuery(document.createElement('span'))
.addClass('egwpopup_nav_prev')
.attr('title',egw.lang('previous message'))
.click(jQuery.proxy(this.nav_button, this,[$message, "prev"]))
.prependTo($top_toolbar);
// Next button
$nav_next = jQuery(document.createElement('span'))
.addClass('egwpopup_nav_next')
.attr('title',egw.lang('next message'))
.click(jQuery.proxy(this.nav_button, this,[$message, "next"]))
.prependTo($top_toolbar);
// Delete button // Delete button
$delete = jQuery(document.createElement('span')) $delete = jQuery(document.createElement('span'))
.addClass('egwpopup_delete') .addClass('egwpopup_delete')
@ -313,6 +325,7 @@
cloned.remove(); cloned.remove();
_node[0].removeClass('egwpopup_expanded'); _node[0].removeClass('egwpopup_expanded');
_node[0].css('z-index', 0); _node[0].css('z-index', 0);
this.checkNavButtonStatus();
}; };
/** /**
@ -335,8 +348,44 @@
} }
var zindex = jQuery('.egwpopup_expanded').length; var zindex = jQuery('.egwpopup_expanded').length;
_node[0].addClass('egwpopup_expanded').css('z-index', zindex++); _node[0].addClass('egwpopup_expanded').css('z-index', zindex++);
this.checkNavButtonStatus();
}; };
notifications.prototype.nav_button = function (_params, _event){
var $expanded = jQuery('.egwpopup_expanded');
var $messages = jQuery('.egwpopup_message').not('.egwpopup_message_clone');
var self = this;
var current = 0;
$messages.each(function(i, j){if (j.id == _params[0][0].id) current = i;});
$expanded.each(function(index, item){
self.collapseMessage([jQuery(item)], _event);
});
if (_params[1] == "prev")
{
$messages[current-1].click();
}
else
{
$messages[current+1].click();
}
}
notifications.prototype.checkNavButtonStatus = function (){
var top = 0;
var $expanded = jQuery('.egwpopup_expanded');
var $messages = jQuery('.egwpopup_message').not('.egwpopup_message_clone');
$expanded.removeClass('egwpopup_nav_disable');
$expanded.each(function(index, item){
if (item.style.getPropertyValue('z-index') > $expanded[top].style.getPropertyValue('z-index'))
{
top = index;
}
});
var $topNode = jQuery($expanded[top]);
if ($topNode[top] == $messages[0]) $topNode.find('.egwpopup_nav_prev').addClass('egwpopup_nav_disable');
if ($topNode[top] == $messages[$messages.length-1]) $topNode.find('.egwpopup_nav_next').addClass('egwpopup_nav_disable');
}
/** /**
* Display or hide notifcation-bell * Display or hide notifcation-bell
* *

30
pixelegg/css/mobile.css
View File

@ -3684,6 +3684,10 @@ td.lettersearch {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_prev,
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_next {
display: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded {
position: fixed; position: fixed;
top: 4vh; top: 4vh;
@ -3714,6 +3718,32 @@ td.lettersearch {
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info {
display: none; display: none;
} }
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_prev {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/left-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_nav_disable {
opacity: 0.5;
pointer-events: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_next {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/right-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark { #egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark {
cursor: auto; cursor: auto;
background: none; background: none;

30
pixelegg/css/pixelegg.css
View File

@ -3673,6 +3673,10 @@ td.lettersearch {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_prev,
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_next {
display: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded {
position: fixed; position: fixed;
top: 4vh; top: 4vh;
@ -3703,6 +3707,32 @@ td.lettersearch {
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info {
display: none; display: none;
} }
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_prev {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/left-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_nav_disable {
opacity: 0.5;
pointer-events: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_next {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/right-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark { #egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark {
cursor: auto; cursor: auto;
background: none; background: none;

26
pixelegg/less/layout_messages.less
View File

@ -136,6 +136,9 @@
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
span.egwpopup_nav_prev, span.egwpopup_nav_next {
display: none;
}
} }
.egwpopup_message.egwpopup_expanded { .egwpopup_message.egwpopup_expanded {
position: fixed; position: fixed;
@ -163,6 +166,29 @@
cursor: pointer;display: inline-block cursor: pointer;display: inline-block
} }
.egwpopup_message_more_info {display: none;} .egwpopup_message_more_info {display: none;}
span.egwpopup_nav_prev {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/left-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
.egwpopup_nav_disable {opacity:0.5; pointer-events: none;}
span.egwpopup_nav_next {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/right-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
} }
.egwpopup_message_seen { .egwpopup_message_seen {
.egwpopup_mark {cursor: auto;background:none;border-color: #666c6e;} .egwpopup_mark {cursor: auto;background:none;border-color: #666c6e;}

30
pixelegg/mobile/fw_mobile.css
View File

@ -3695,6 +3695,10 @@ td.lettersearch {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_prev,
#egwpopup #egwpopup_list .egwpopup_message span.egwpopup_nav_next {
display: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded {
position: fixed; position: fixed;
top: 4vh; top: 4vh;
@ -3725,6 +3729,32 @@ td.lettersearch {
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info { #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_message_more_info {
display: none; display: none;
} }
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_prev {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/left-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded .egwpopup_nav_disable {
opacity: 0.5;
pointer-events: none;
}
#egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded span.egwpopup_nav_next {
display: inline-block;
float: right;
width: 24px;
height: 24px;
background-image: url(../images/right-grey.png);
background-repeat: no-repeat;
background-position: center;
background-size: 16px;
cursor: pointer;
}
#egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark { #egwpopup #egwpopup_list .egwpopup_message_seen .egwpopup_mark {
cursor: auto; cursor: auto;
background: none; background: none;