Index: lams_central/src/java/org/lamsfoundation/lams/web/NotificationAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/NotificationAction.java,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_central/src/java/org/lamsfoundation/lams/web/NotificationAction.java	11 May 2016 07:07:58 -0000	1.1.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/NotificationAction.java	31 Oct 2016 07:35:11 -0000	1.1.2.6
@@ -63,11 +63,8 @@
 	List<Subscription> subscriptions = getEventNotificationService().getNotificationSubscriptions(null,
 		getUser().getUserID(), false, limit, offset);
 	JSONArray responseJSON = new JSONArray();
-	Event event = null;
 	for (Subscription subscription : subscriptions) {
-	    if (event == null) {
-		event = subscription.getEvent();
-	    }
+	    Event event = subscription.getEvent();
 	    JSONObject subscriptionJSON = new JSONObject();
 	    subscriptionJSON.put("subscriptionUid", subscription.getUid());
 	    subscriptionJSON.put("message", event.getMessage());
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/notificationsprivate.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/main.css,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_central/web/css/main.css	30 Oct 2016 23:26:05 -0000	1.1.2.5
+++ lams_central/web/css/main.css	31 Oct 2016 07:35:11 -0000	1.1.2.6
@@ -393,25 +393,23 @@
 	padding: 3px;
 }
 
-#dialogPrivateNotifications table tr:first-child td {
+#tablePrivateNotifications tr:first-child td {
 	font-weight: bold;
 	text-align: center;
 }
 
-#dialogPrivateNotifications td.notificationsReadCell {
+#tablePrivateNotifications td.notificationsReadCell {
 	font-size: 16px;
 	width: 30px;
 	text-align: center;
 }
 
-#dialogPrivateNotifications td.notificationsPendingCell {
+#tablePrivateNotifications td.notificationsPendingCell {
 	font-weight: bold;
 }
 
-#dialogPrivateNotifications td.notificationsClickableCell:hover {
+#tablePrivateNotifications td.notificationsClickableCell:hover {
 	cursor: pointer;
-	border-color: #9be0f9;
-	background-color: #F0F8FF;
 	/* CSS3 glow effect: */
 	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_central/web/includes/javascript/main.js	28 Oct 2016 17:05:38 -0000	1.1.2.4
+++ lams_central/web/includes/javascript/main.js	31 Oct 2016 07:35:10 -0000	1.1.2.5
@@ -458,109 +458,34 @@
 
 
 function showPrivateNotificationsDialog(){
-	showDialog("dialogPrivateNotifications", {
-		'height' : 470,
-		'width' : 600,
+	var notificationDialog = showDialog("dialogPrivateNotifications", {
+		'height' : 650,
+		'width' : 'auto',
 		'title' : LABELS.PRIVATE_NOTIFICATIONS_TITLE,
 		'close' : function(){
 			refreshPrivateNotificationCount();
-			// completely delete the dialog
 			$(this).remove();
 		},
 		'open' : function() {
-			// build the table from the scratch
-			var dialog = $(this),
-				table = $('<table />').appendTo(dialog),
-				// table header
-				headerRow = $('<tr />').appendTo(table);
-			$('<td />').text(LABELS.PRIVATE_NOTIFICATIONS_MESSAGES).appendTo(headerRow);
-			// click it to mark all notifications as read
-			$('<td class="notificationsClickableCell"/>').text(LABELS.PRIVATE_NOTIFICATIONS_READ)
-														 .attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_ALL_HINT)
-														 .click(markAllPrivateNotificationsAsRead)
-														 .appendTo(headerRow);
-			$('iframe', dialog).remove();
-			$.ajax({
-				cache : false,
-				url : LAMS_URL + "notification.do",
-				dataType : 'json',
-				data : {
-					'method' : 'getNotificationSubscriptions',
-					// maybe it will change for paging; "offset" param is also available
-					'limit'  : 10
-				},
-				success : function(notifications) {
-					if (!notifications) {
-						return;
-					}
-					
-					// build notification rows one by one
-					$.each(notifications, function(){
-						var notification = this,
-							row = $('<tr />').attr('id', 'subscription-' + notification.subscriptionUid)
-											 .appendTo(table),
-							messageCell = $('<td />').appendTo(row),
-							readCell = $('<td class="notificationsReadCell" />')
-											.appendTo(row);
-						// is it a link?
-						if (notification.message.indexOf('<a ') === 0) {
-							var link = $(notification.message);
-							// make it navigable
-							messageCell.text(link.text()).addClass('notificationsClickableCell').click(function(){
-								if (!readCell.text()) {
-									markPrivateNotificationAsRead(notification.subscriptionUid);
-								}
-								// open in a new tab/window
-								window.open(link.attr('href'), '_blank');
-							});
-						} else {
-							messageCell.text(notification.message);
-						}
-						// was it read already?
-						if (notification.pending) {
-							messageCell.addClass('notificationsPendingCell');
-							readCell.addClass('notificationsClickableCell')
-									.attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_HINT)
-									.click(function(){
-										markPrivateNotificationAsRead(notification.subscriptionUid);
-									});
-						} else {
-							readCell.html('&#10004;');
-						}
-					});
-				}
-			});
-		}
-	}, true);
-}
+			var dialog = $(this);
+			$('iframe', dialog).attr('src', LAMS_URL
+					+ 'notificationsprivate.jsp');
 
-function markAllPrivateNotificationsAsRead(){
-	$('#dialogPrivateNotifications tr[id^=subscription-]').each(function(){
-		var row = $(this),
-			read = $('td', row).last().text();
-		if (!read) {
-			markPrivateNotificationAsRead(row.attr('id').split('-')[1]);
-		}
-	});
-}
+			$(this).css("maxWidth", "600px").css("margin", "auto");
+			
+			// in case of mobile devices allow iframe scrolling
+			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
+			    setTimeout(function() {
+			    	dialog.css({
+			    		'overflow-y' : 'scroll',
+			    		'-webkit-overflow-scrolling' : 'touch'
+			    	});
+			    },500);
+			}
 
-function markPrivateNotificationAsRead(subscriptionUid){
-	$.ajax({
-		cache : false,
-		url : LAMS_URL + "notification.do",
-		data : {
-			'method' 		  : 'markNotificationAsRead',
-			'subscriptionUid' : subscriptionUid
-		},
-		success : function() {
-			// mark the message as read
-			$('#dialogPrivateNotifications tr#subscription-' + subscriptionUid + ' > td')
-				// message cell
-				.first().removeClass('notificationsPendingCell')
-				// read cell
-				.next().html('&#10004;').removeClass('notificationsClickableCell').attr('title', null).off('click');
 		}
-	});
+	}, false);
+	
 }
 
 function refreshPrivateNotificationCount(){