Index: lams_tool_chat/web/includes/css/chat.css =================================================================== diff -u -ra79f1040f9d36c6adcb499f38fc38d838cda8a0b -r6507889accce02f9e65102334afcae852270c79b --- lams_tool_chat/web/includes/css/chat.css (.../chat.css) (revision a79f1040f9d36c6adcb499f38fc38d838cda8a0b) +++ lams_tool_chat/web/includes/css/chat.css (.../chat.css) (revision 6507889accce02f9e65102334afcae852270c79b) @@ -1,5 +1,20 @@ -/* LEARNING PAGE STYLES */ +/* ==================== COMMON ==================== */ +.message { + padding-bottom: 4px; +} +.private_message { + font-style: italic; + background-color: #e6e6fa; +} + +.messageFrom { + font-weight: bold; +} + + +/* ==================== LEARNING PAGE STYLES ==================== */ + #chat_content { width: 560px; padding: 12px; @@ -32,19 +47,6 @@ padding: 2px; } -.message { - padding-bottom: 4px; -} - -.private_message { - font-style: italic; - background-color: #e6e6fa; -} - -.messageFrom { - font-weight: bold; -} - .selected { background-color: lime; padding: 2px; @@ -60,5 +62,3 @@ #msgArea { width: 410px; } - -/* END LEARNING PAGE STYLES */ \ No newline at end of file Index: lams_tool_chat/web/includes/javascript/learning.js =================================================================== diff -u -ra79f1040f9d36c6adcb499f38fc38d838cda8a0b -r6507889accce02f9e65102334afcae852270c79b --- lams_tool_chat/web/includes/javascript/learning.js (.../learning.js) (revision a79f1040f9d36c6adcb499f38fc38d838cda8a0b) +++ lams_tool_chat/web/includes/javascript/learning.js (.../learning.js) (revision 6507889accce02f9e65102334afcae852270c79b) @@ -1,6 +1,6 @@ /* ******* Constants ******* */ -var GROUPCHAT_MSG = "groupchat_message"; +var GROUPCHAT_MSG = ""; var PRIVATE_MSG = "private_message"; var PALETTE = ["#0000FF", "#006699", "#0066FF", "#6633FF", "#00CCFF", "#009900", "#00CC33", "#339900", "#008080", "#66FF66", "#CC6600", "#FF6600", "#FF9900", "#CC6633", "#FF9933", "#990000", "#A50021", "#990033", "#CC3300", "#FF6666", "#330033", "#663399", "#6633CC", "#660099", "#FF00FF", "#999900", "#808000", "#FFFF00", "#666633", "#292929", "#666666"]; /* ******* Helper Functions ******* */ @@ -121,10 +121,9 @@ /* ******* Chat functions ******* */ function generateMessageHTML(nick, message, type) { var colour = getColour(nick); - var fromElem = createElem("span", {attrClass:"messageFrom"}, {color:colour}, nick); + var fromElem = createElem("div", {attrClass:"messageFrom"}, null, nick); var msgElem = createElem("div", {attrClass:"message " + type}, {color:colour}, null); msgElem.innerHTML = message; - msgElem.insertBefore(document.createElement("br"), msgElem.firstChild); msgElem.insertBefore(fromElem, msgElem.firstChild); return msgElem; } Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -r33391c953262f959b73665ca2de84f1817dd56b7 -r6507889accce02f9e65102334afcae852270c79b --- lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 33391c953262f959b73665ca2de84f1817dd56b7) +++ lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 6507889accce02f9e65102334afcae852270c79b) @@ -8,6 +8,10 @@ <c:out value="${chatDTO.title}" escapeXml="false" /> + + @@ -23,52 +27,60 @@
-
-

- -

- -
- -
- +
+
- -
-

- ${session.sessionName} -

-

+

+ +

+ +
+ +
+ + + +
+

+ ${session.sessionName} +

+ - ${message.from} : ${message.body}
+
+ ${message.from} +
+ +
-

-
- -

- -

- - - -

- ${user.firstName} - ${user.lastName} -
- ${user.notebookEntry} -

- - - - +
+ +

+ +

+ + + +

+ ${user.firstName} + ${user.lastName} +
+ ${user.notebookEntry} +

+ + + + + +
+
@@ -80,4 +92,3 @@ - Index: lams_tool_chat/web/pages/monitoring/chatHistory.jsp =================================================================== diff -u -r62b52bd80ce1275cd03d2ffcc092e01e25383a06 -r6507889accce02f9e65102334afcae852270c79b --- lams_tool_chat/web/pages/monitoring/chatHistory.jsp (.../chatHistory.jsp) (revision 62b52bd80ce1275cd03d2ffcc092e01e25383a06) +++ lams_tool_chat/web/pages/monitoring/chatHistory.jsp (.../chatHistory.jsp) (revision 6507889accce02f9e65102334afcae852270c79b) @@ -41,13 +41,13 @@ - -
- ${message.from} -
- ${message.body} - edit + +
+
${message.from}
+ + edit
+