Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -r9948b6f3d51147a1325de6e18651a1d9bce1cea4 -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 9948b6f3d51147a1325de6e18651a1d9bce1cea4) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -246,7 +246,7 @@ + Configuration.get(ConfigurationKeys.SERVER_URL) + "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=" + org.getOrganisationId() + "'," + "850,400,0,0);"; - moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "mycourses-mark-img", + moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "my-grades-button", null, null)); } catch (UnsupportedEncodingException e) { DisplayGroupAction.log.error( Index: lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java =================================================================== diff -u -ra84f7b5f49832aa06c2f46539370e6753e75a78e -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java (.../LessonOrderServlet.java) (revision a84f7b5f49832aa06c2f46539370e6753e75a78e) +++ lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java (.../LessonOrderServlet.java) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -61,7 +61,9 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + // even though response is empty, it is needed so Firefox does not show parsing error + response.setContentType("text/html;charset=utf-8"); + Integer orgId = WebUtil.readIntParam(request, "orgId", false); String ids = request.getParameter("ids"); Index: lams_central/web/css/addLesson.css =================================================================== diff -u -r931eaed79f94e4f3dd4a0bc69ba35f47792e810e -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_central/web/css/addLesson.css (.../addLesson.css) (revision 931eaed79f94e4f3dd4a0bc69ba35f47792e810e) +++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -1,6 +1,7 @@ div#tabs { - width: 786px; + width: 789px; height: 574px; + border: none; } div.tabContent { Index: lams_central/web/groupContentsLesson.jsp =================================================================== diff -u -r9948b6f3d51147a1325de6e18651a1d9bce1cea4 -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_central/web/groupContentsLesson.jsp (.../groupContentsLesson.jsp) (revision 9948b6f3d51147a1325de6e18651a1d9bce1cea4) +++ lams_central/web/groupContentsLesson.jsp (.../groupContentsLesson.jsp) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -37,7 +37,7 @@ >
-

+
Index: lams_central/web/images/icons/book_edit.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r56a78648ef24c607f16cb249439a2d624f6b8f12 Binary files differ Index: lams_central/web/images/icons/cog.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r56a78648ef24c607f16cb249439a2d624f6b8f12 Binary files differ Index: lams_central/web/images/icons/email_go.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r56a78648ef24c607f16cb249439a2d624f6b8f12 Binary files differ Index: lams_central/web/images/icons/page_add.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r56a78648ef24c607f16cb249439a2d624f6b8f12 Binary files differ Index: lams_central/web/images/icons/wrench.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r56a78648ef24c607f16cb249439a2d624f6b8f12 Binary files differ Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== diff -u -r9948b6f3d51147a1325de6e18651a1d9bce1cea4 -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 9948b6f3d51147a1325de6e18651a1d9bce1cea4) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -273,27 +273,33 @@ $(".split-ui-button", container).each(function(){ var buttonContainer = $(this); var buttons = buttonContainer.children(); - buttons.first().button(); - if (buttons.length > 1) { - buttons.last().button({ - text : false, - icons : { - primary : "ui-icon-triangle-1-s" - } - }); - } - buttons.last().click(function() { - var menu = $(this).parent().next().show().position({ - my : "left top", - at : "left bottom", - of : $(this) - }); - $(document).one("click", function() { - menu.hide(); - }); - return false; - }).parent().buttonset().next().hide().menu(); + buttons.first().button() + .next().button({ + text : false, + icons : { + primary : "ui-icon-triangle-1-s" + } + }); + + buttonContainer.buttonset().next().hide().menu(); + + buttons.each(function(){ + var button = $(this); + if (!button.attr('onclick')) { + button.click(function() { + var menu = $(this).parent().next().show().position({ + my : "right top", + at : "right bottom", + of : $(this).parent() + }); + $(document).one("click", function() { + menu.hide(); + }); + return false; + }); + } + }); }); } Fisheye: Tag 56a78648ef24c607f16cb249439a2d624f6b8f12 refers to a dead (removed) revision in file `lams_central/web/monitorLesson.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -r542060e9b2e8aa5fe7e79115cab2f061f13ebaed -r56a78648ef24c607f16cb249439a2d624f6b8f12 --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 542060e9b2e8aa5fe7e79115cab2f061f13ebaed) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) @@ -3,6 +3,7 @@ width: 99%; height: 574px; overflow: hidden; + border: none; } .ui-tabs .ui-tabs-panel {