Subversion Repositories SmartDukaan

Rev

Rev 35640 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35640 Rev 36040
Line 1203... Line 1203...
1203
					var typeLabel = activityType == "ESCALATED" ? "Escalated"
1203
					var typeLabel = activityType == "ESCALATED" ? "Escalated"
1204
						: activityType == "ESCALATED_FINAL" ? "Final Escalation"
1204
						: activityType == "ESCALATED_FINAL" ? "Final Escalation"
1205
						: activityType == "ASSIGNED" ? "Assigned"
1205
						: activityType == "ASSIGNED" ? "Assigned"
1206
						: activityType == "CATEGORY_CHANGED" ? "Category Changed"
1206
						: activityType == "CATEGORY_CHANGED" ? "Category Changed"
1207
						: activityType;
1207
						: activityType;
-
 
1208
 
-
 
1209
					// Show message for ASSIGNED/ESCALATED activities if available
-
 
1210
					var activityMessage = "";
-
 
1211
					if ((activityType == "ASSIGNED" || activityType == "ESCALATED" || activityType == "ESCALATED_FINAL") && escapedMessage && escapedMessage.trim() !== "") {
-
 
1212
						activityMessage = "<div style=\"font-size:12px;color:#555;margin-top:3px;\">" + escapedMessage + "</div>";
-
 
1213
					}
-
 
1214
 
1208
					var systemMessage = "<div class=\"system-activity\">"
1215
					var systemMessage = "<div class=\"system-activity\">"
1209
						+ "<span>" + escapeHtml(typeLabel) + " &middot; " + formattedTime + "</span>"
1216
						+ "<span>" + escapeHtml(typeLabel) + " &middot; " + formattedTime + "</span>"
-
 
1217
						+ activityMessage
1210
						+ "</div>";
1218
						+ "</div>";
1211
					$(".activity-container .modal-body").append(
1219
					$(".activity-container .modal-body").append(
1212
						systemMessage);
1220
						systemMessage);
1213
 
1221
 
1214
				}
1222
				}