Index: lams_admin/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_admin/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_admin/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@ - + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_central/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_central/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_central/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_central/web/css/_learner_base.scss =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -1027,6 +1027,11 @@ color:$portrait-color-6; } +// lineheight setting to use on the name if it is next to portrait, as generated by the Portrait tag. e.g. in Peer Review +.portrait-sm-lineheight { + line-height: 32px; +} + .portrait-generic-sm { @include portrait-generic($portrait-size-image-sm, 35px); } Index: lams_central/web/includes/javascript/portrait.js =================================================================== diff -u -r1957fd76826f5186dce77b204acfbbc73afbf22b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision 1957fd76826f5186dce77b204acfbbc73afbf22b) +++ lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -35,6 +35,45 @@ } } +// Define a DIV element that is the learner's portrait. Call in the ajaxProcessing (tablesorter) or +// in a formatter function (jqgrid). Is the direct eqivalent of the Portrait tag. Use this method if you need to return +// the HTML which defines a portrait. Use addPortrait if you need to add a portrait to an existing DIV. +function definePortrait( portraitId, userId, size, round, LAMS_URL, portraitLocationClasses ) { + var isRound = round == null ? true : round; + if ( portraitId && portraitId > 0) { + var retValue = '
'; + return retValue; + } else { + var retValue = '
'; + return retValue; + } +} + +// define a small header with the portrait and two lines of text next to portrait +function definePortraitMiniHeader(portraitId, userId, LAMS_URL, line1, line2, portraitOnRight, otherClasses) { + var html = ''; + html += '
' + line2 + ''; + html += '
'; + return html; +} + // Get the colour that would be used for the generic portrait. Useful when you need a consistent colour for a user. function getPortraitColourClass(userId) { return PORTRAIT_VERSION_SUFFIX + userId % NUM_COLORS; Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_gradebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_learning/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_learning/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_learning/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ - Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_monitoring/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_learning/web/grouping/show.jsp =================================================================== diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_learning/web/grouping/show.jsp (.../show.jsp) (revision 4583983b64efe1d91fbb47cdde6a759a6a30e859) +++ lams_learning/web/grouping/show.jsp (.../show.jsp) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -56,7 +56,7 @@
-    +  
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_chat/web/includes/css/chat.scss =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_chat/web/includes/css/chat.scss (.../chat.scss) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_chat/web/includes/css/chat.scss (.../chat.scss) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -27,7 +27,7 @@ border-spacing: 10px; } -@media (max-width: 768px) { +@media (max-width: 767px) { #messages { height: 100px; resize: vertical; @@ -39,7 +39,7 @@ } -@media (min-width: 769px) { +@media (min-width: 768px) { #messages { height: 200px; resize: vertical; @@ -54,15 +54,18 @@ #roster { height: 200px; + resize: vertical; overflow: auto; border: $border-thin-default; padding: 2px; } +#roster div { + margin-right: 5px; +} + #roster span { - display: inline-block; - margin-left: 5px; - font-weight: bold; + display: inline; font-size: 14px; padding-top: 7px; vertical-align: top; Index: lams_tool_chat/web/includes/css/chat_rtl.scss =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_chat/web/includes/css/chat_rtl.scss (.../chat_rtl.scss) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_chat/web/includes/css/chat_rtl.scss (.../chat_rtl.scss) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -22,31 +22,50 @@ border-spacing: 10px; } -#messages { - height: 260px; - overflow: auto; - border: $border-thin-default; - font-size: 14px; - padding: 2px; - padding-right:5px; +@media (max-width: 768px) { + #messages { + height: 100px; + resize: vertical; + overflow: auto; + border: $border-thin-default; + padding: 2px; + padding-left:5px; + } + } +@media (min-width: 769px) { + #messages { + height: 200px; + resize: vertical; + overflow: auto; + border: $border-thin-default; + padding: 2px; + padding-left:5px; + } + + +} + #roster { height: 200px; + resize: vertical; overflow: auto; border: $border-thin-default; padding: 2px; } +#roster div { + margin-right: 5px; +} + #roster span { - display: inline-block; - margin-left: 5px; - font-weight: bold; + display: inline; font-size: 14px; padding-top: 7px; vertical-align: top; } - + #sendMessageArea { border: $border-thin-default; width: 99%; Index: lams_tool_chat/web/pages/learning/learning.jsp =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_chat/web/pages/learning/learning.jsp (.../learning.jsp) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_chat/web/pages/learning/learning.jsp (.../learning.jsp) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,10 +44,10 @@
-
+
-
+
@@ -65,12 +65,12 @@
-
+
-
+
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_doku/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r2fc3c196b706f247820267da4439c301a1a77805 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_doku/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 2fc3c196b706f247820267da4439c301a1a77805) +++ lams_tool_doku/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_images/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -r73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 73761a8fc8c614e5ddbb3e1fd489b01cf1e8ed0b) +++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -44,7 +44,7 @@
- + @@ -64,7 +64,7 @@ -
+ @@ -82,7 +82,7 @@
- +
@@ -162,7 +162,8 @@ : -    +   +   (${rating.userRating}) @@ -183,7 +184,8 @@ ${rating.averageRating} : -    +   +   (${rating.userRating}) Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -r5caeb905640709607494a54e904bae4a2dced914 -refa51a5d0464d96fada4e5a70f1fb86c2d726717 --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 5caeb905640709607494a54e904bae4a2dced914) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) @@ -50,6 +50,7 @@ + - + + + + +