Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -ree92eae8682d1b4674c6f918ec79b42dd06f80ec -r84bfc2e75d6c948bef67fa8f3a6bb4e33cde45fb --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision ee92eae8682d1b4674c6f918ec79b42dd06f80ec) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 84bfc2e75d6c948bef67fa8f3a6bb4e33cde45fb) @@ -155,7 +155,7 @@ ScratchieUser groupLeader = service.checkLeaderSelectToolForSessionLeader(user, toolSessionId); // forwards to the leaderSelection page - if ((groupLeader == null) && !mode.isTeacher()) { + if (groupLeader == null) { // get group users and store it to request as DTO objects List groupUsers = service.getUsersBySession(toolSessionId); Index: lams_tool_scratchie/web/pages/learning/waitforleader.jsp =================================================================== diff -u -rc9759e81d08842b6202f62bc08a78cc13ca5bcf8 -r84bfc2e75d6c948bef67fa8f3a6bb4e33cde45fb --- lams_tool_scratchie/web/pages/learning/waitforleader.jsp (.../waitforleader.jsp) (revision c9759e81d08842b6202f62bc08a78cc13ca5bcf8) +++ lams_tool_scratchie/web/pages/learning/waitforleader.jsp (.../waitforleader.jsp) (revision 84bfc2e75d6c948bef67fa8f3a6bb4e33cde45fb) @@ -12,8 +12,10 @@ location.reload(); } - //refresh page every 30 sec - setTimeout("refresh();", 30000); + + //refresh page every 30 sec + setTimeout("refresh();", 30000); + @@ -39,13 +41,14 @@ -

- - - -

+ +

+ + + +

+ -