Index: lams_tool_leader/web/common/taglibs.jsp =================================================================== diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_leader/web/common/taglibs.jsp (.../taglibs.jsp) (revision 17ddd3aac11d9fecc83159a9c829e989754accfb) +++ lams_tool_leader/web/common/taglibs.jsp (.../taglibs.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -1,11 +1,6 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="tags-bean" prefix="bean"%> -<%@ taglib uri="tags-logic" prefix="logic"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> - - +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> \ No newline at end of file Index: lams_tool_leader/web/pages/authoring/authoring.jsp =================================================================== diff -u -r6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_leader/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 6cfcb91c5526d4bbb22cd98dbd9d04c175cba1eb) +++ lams_tool_leader/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -1,11 +1,35 @@ -<%@ include file="/common/taglibs.jsp"%> + +<%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionConstants"%> - + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + - - + @@ -14,9 +38,8 @@ - - - + +
@@ -44,7 +67,13 @@ - + + + + + + + Index: lams_tool_notebook/web/pages/authoring/conditions.jsp =================================================================== diff -u -rb55462c1bed962dba08744bf8ceac6594c3462f2 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_notebook/web/pages/authoring/conditions.jsp (.../conditions.jsp) (revision b55462c1bed962dba08744bf8ceac6594c3462f2) +++ lams_tool_notebook/web/pages/authoring/conditions.jsp (.../conditions.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -54,7 +54,7 @@
-  
Index: lams_tool_notebook/web/pages/learning/notebook.jsp =================================================================== diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_notebook/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3) +++ lams_tool_notebook/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -151,7 +151,7 @@
-
Index: lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag =================================================================== diff -u -r500ae45f4243aa718eac7436bc903b4f137a3aa7 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag (.../CommentsAuthor.tag) (revision 500ae45f4243aa718eac7436bc903b4f137a3aa7) +++ lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag (.../CommentsAuthor.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -1,5 +1,4 @@ <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> @@ -42,23 +41,23 @@
-     -   +     +  
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag =================================================================== diff -u -rb32cbfc76a3cd150823b3696160d5fd4fa6cde84 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision b32cbfc76a3cd150823b3696160d5fd4fa6cde84) +++ lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -89,7 +89,6 @@ - ${toolForm.toolSessionID} Index: lams_tool_survey/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r35a96de80ddf8f88a34d7f75eaf71748db934044 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 35a96de80ddf8f88a34d7f75eaf71748db934044) +++ lams_tool_survey/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -8,7 +8,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) +++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -8,7 +8,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> Index: lams_tool_survey/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) +++ lams_tool_survey/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -34,8 +34,8 @@ <%@ attribute name="titleKey" required="false" rtexprvalue="true"%> <%@ attribute name="page" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%> + active Index: lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag =================================================================== diff -u -r230631757ce5657c02733128542f738928cc514e -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 230631757ce5657c02733128542f738928cc514e) +++ lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -30,8 +30,8 @@ %> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%> +
Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== diff -u -r92cf398e695b34f71b03ecba27659e4b214920d8 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 92cf398e695b34f71b03ecba27659e4b214920d8) +++ lams_tool_survey/web/WEB-INF/web.xml (.../web.xml) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -133,42 +133,6 @@ - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - Index: lams_tool_survey/web/common/messages.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/common/messages.jsp (.../messages.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/common/messages.jsp (.../messages.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -1,8 +1,12 @@ <%-- Error Messages --%> <%-- Error Messages --%> - - - - - - \ No newline at end of file + + + + + + + + + + Index: lams_tool_survey/web/pages/learning/notebook.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -29,7 +29,7 @@ <%@ include file="/common/messages.jsp"%> - +
- Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -146,7 +146,7 @@
-
@@ -178,7 +178,7 @@
@@ -190,14 +190,14 @@ Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp (.../resultOtherUsers.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp (.../resultOtherUsers.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -171,7 +171,7 @@
-
@@ -200,7 +200,7 @@ - @@ -285,7 +285,7 @@ - Index: lams_tool_survey/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -52,7 +52,7 @@ - @@ -64,13 +64,13 @@ + class="btn btn-primary pull-right"> + class="btn btn-primary pull-right na"> Index: lams_tool_survey/web/pages/monitoring/daterestriction.jsp =================================================================== diff -u -rbd320e8b9a1e0e966b4a9f1ca718f06c593c34d9 -r3b3d4284d5320270195dfa1f4980c4bd21e0fea0 --- lams_tool_survey/web/pages/monitoring/daterestriction.jsp (.../daterestriction.jsp) (revision bd320e8b9a1e0e966b4a9f1ca718f06c593c34d9) +++ lams_tool_survey/web/pages/monitoring/daterestriction.jsp (.../daterestriction.jsp) (revision 3b3d4284d5320270195dfa1f4980c4bd21e0fea0) @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - +