Index: lams_central/web/css/jquery.jRating.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/jquery.jRating.css,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_central/web/css/jquery.jRating.css 15 Jun 2015 22:42:48 -0000 1.2.2.2 +++ lams_central/web/css/jquery.jRating.css 23 Feb 2016 14:36:01 -0000 1.2.2.3 @@ -53,8 +53,8 @@ height: 0; clear: both; } -.rating-stars-holder {width: 150px; text-align: center; float: right;} -.rating-stars-caption {padding-top: 6px;} +.rating-stars-holder {text-align: center;} +.rating-stars-caption {padding-top: 6px; font-size: 12px} .rating-stars, .rating-stars-disabled {margin: 0px auto; min-height: 20px;} .add-comment { background-image: url('../images/tick.png'); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java,v diff -u -r1.4.2.1 -r1.4.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java 15 Jun 2015 22:24:55 -0000 1.4.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java 23 Feb 2016 14:36:04 -0000 1.4.2.2 @@ -41,7 +41,7 @@ public QaQuestionDTO(QaQueContent que) { this.question = que.getQuestion(); this.displayOrder = new Integer(que.getDisplayOrder()).toString(); - this.feedback = que.getFeedback() != null ? que.getFeedback() : " "; + this.feedback = que.getFeedback() != null ? que.getFeedback() : ""; this.required = que.isRequired(); this.minWordsLimit = que.getMinWordsLimit(); this.uid = que.getUid(); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.5 -r1.5.14.1 --- lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag 27 Oct 2006 02:39:34 -0000 1.5 +++ lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag 23 Feb 2016 14:36:04 -0000 1.5.14.1 @@ -1,6 +1,6 @@ <% - /**************************************************************** + /**************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -49,10 +49,18 @@ -

- -

-
- +
+
+
+ +
+
+
+
+ +
+
\ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Rating.tag,v diff -u -r1.2.2.4 -r1.2.2.5 --- lams_tool_laqa/web/WEB-INF/tags/Rating.tag 21 Oct 2015 01:47:34 -0000 1.2.2.4 +++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag 23 Feb 2016 14:36:04 -0000 1.2.2.5 @@ -64,7 +64,7 @@ <%--Rating stars area---------------------------------------%>
-
+
@@ -85,9 +85,9 @@ -

+ ${criteriaDto.ratingCriteria.title} -

+ Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 15 Jun 2015 22:24:56 -0000 1.3.2.2 +++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 23 Feb 2016 14:36:04 -0000 1.3.2.3 @@ -448,7 +448,15 @@ /WEB-INF/tags/DefineLater.tag - ImgButtonWrapper + Alert + /WEB-INF/tags/Alert.tag + + + Page + /WEB-INF/tags/Page.tag + + + ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v diff -u -r1.39.2.7 -r1.39.2.8 --- lams_tool_laqa/web/learning/AnswersContent.jsp 9 Feb 2016 18:53:00 -0000 1.39.2.7 +++ lams_tool_laqa/web/learning/AnswersContent.jsp 23 Feb 2016 14:36:04 -0000 1.39.2.8 @@ -1,36 +1,41 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - + + + + + <fmt:message key="activity.title" /> - - +div.growlUI { + background: url(check48.png) no-repeat 10px 10px +} + +div.growlUI h1, div.growlUI h2 { + color: white; + padding: 5px 5px 5px 0px; + text-align: center; + font-size: 20px; +} + + - - + + + + + + + Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v diff -u -r1.43.2.2 -r1.43.2.3 --- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 9 Feb 2016 18:52:59 -0000 1.43.2.2 +++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 23 Feb 2016 14:36:03 -0000 1.43.2.3 @@ -1,9 +1,6 @@ - <%@ include file="/common/taglibs.jsp"%> - - @@ -17,134 +14,166 @@ if (actionMethod == 'endLearning') { document.getElementById("finishButton").disabled = true; } - document.QaLearningForm.method.value=actionMethod; + document.QaLearningForm.method.value = actionMethod; document.QaLearningForm.submit(); } - + function submitMethod(actionMethod) { submitLearningMethod(actionMethod); } -
-

- -

- + + + + + + + + + + + + + + + + + -
- - + + + + + -
- - - -
- -
+ + + - + -
-

- - : - -
- -

+
+
+
+
+ : +
+ +
+
- - + + -

- - - +

+ +
-
- -

+
+ +
- - - - - : - - - + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+ + + + + + +
+ +
+
+
+

- -
-
+
-
+ + +
+ +
- + - + - + -
- - +
+ - - - - - - - - - -
+ + + + + + + + + +
- + - +
-
+ - + + + Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v diff -u -r1.53.2.10 -r1.53.2.11 --- lams_tool_laqa/web/learning/LearnerRep.jsp 9 Feb 2016 18:53:00 -0000 1.53.2.10 +++ lams_tool_laqa/web/learning/LearnerRep.jsp 23 Feb 2016 14:36:04 -0000 1.53.2.11 @@ -1,13 +1,9 @@ - <%@ include file="/common/taglibs.jsp"%> - - - @@ -20,13 +16,12 @@ <fmt:message key="activity.title" /> - - - + - + + + - + + + + Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v diff -u -r1.32.2.10 -r1.32.2.11 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 9 Feb 2016 18:53:00 -0000 1.32.2.10 +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 23 Feb 2016 14:36:03 -0000 1.32.2.11 @@ -1,32 +1,27 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - <fmt:message key="activity.title" /> - - - + + + + - + Index: lams_tool_laqa/web/learning/WaitForLeader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/WaitForLeader.jsp,v diff -u -r1.2.2.1 -r1.2.2.2 --- lams_tool_laqa/web/learning/WaitForLeader.jsp 9 Feb 2016 18:53:00 -0000 1.2.2.1 +++ lams_tool_laqa/web/learning/WaitForLeader.jsp 23 Feb 2016 14:36:03 -0000 1.2.2.2 @@ -1,56 +1,48 @@ - <%@ include file="/common/taglibs.jsp"%> <fmt:message key="activity.title" /> - - + setTimeout("refresh();", 30000); + -
-

- -

- -

+ + +

-

+

- -
+ +
    -
    - -
    +
  • +
    • -
- -
- + + +
+
-
- +