Index: lams_tool_scribe/web/WEB-INF/tags/Alert.tag =================================================================== diff -u --- lams_tool_scribe/web/WEB-INF/tags/Alert.tag (revision 0) +++ lams_tool_scribe/web/WEB-INF/tags/Alert.tag (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -0,0 +1,46 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-core" prefix="c"%> + +<%@ attribute name="close" required="false" rtexprvalue="true"%> +<%@ attribute name="id" required="false" rtexprvalue="true"%> +<%@ attribute name="type" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+ + × + + +
+
+
+
+
Index: lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag =================================================================== diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag (.../DefineLater.tag) (revision fef442a88ab05c91db8a551081c4abc060d4da5e) +++ lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag (.../DefineLater.tag) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -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 Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag =================================================================== diff -u --- lams_tool_scribe/web/WEB-INF/tags/Page.tag (revision 0) +++ lams_tool_scribe/web/WEB-INF/tags/Page.tag (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -0,0 +1,34 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> + +<%@ attribute name="type" required="true" rtexprvalue="true"%> +<%@ attribute name="style" required="false" rtexprvalue="true"%> +<%@ attribute name="title" required="false" rtexprvalue="true"%> +<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%> +<%@ attribute name="headingContent" required="false" rtexprvalue="true"%> + +
+
+
+
+
+ +
+ + + + +
+
+ + + +
+
+ +
+
+
+ +
+
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -432,6 +432,14 @@ /WEB-INF/tags/DefineLater.tag + Alert + /WEB-INF/tags/Alert.tag + + + Page + /WEB-INF/tags/Page.tag + + ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag Index: lams_tool_scribe/web/common/learnerheader.jsp =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_scribe/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -15,6 +15,8 @@ + + Index: lams_tool_scribe/web/pages/learning/defineLater.jsp =================================================================== diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/defineLater.jsp (.../defineLater.jsp) (revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040) +++ lams_tool_scribe/web/pages/learning/defineLater.jsp (.../defineLater.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,10 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> -
-

- -

+ + + + + -
+ Index: lams_tool_scribe/web/pages/learning/instructions.jsp =================================================================== diff -u -rd978c625febbd80db0fbfea73f8929e128ebca9e -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/instructions.jsp (.../instructions.jsp) (revision d978c625febbd80db0fbfea73f8929e128ebca9e) +++ lams_tool_scribe/web/pages/learning/instructions.jsp (.../instructions.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,42 +1,64 @@ <%@ include file="/common/taglibs.jsp"%> -
-

- -

+ - + -

- - - -

+
+

+ + + +

+ +

+ +

+ +

+ +

+ +

+ +

+
-

- - - -

+
+

+ +

+

+ + + +

+

+ +

+

+ +

+
+ + +
-

- - - - - - -

+ + + + + +
- -
-
+ + Index: lams_tool_scribe/web/pages/learning/learning.jsp =================================================================== diff -u -r2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/learning.jsp (.../learning.jsp) (revision 2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd) +++ lams_tool_scribe/web/pages/learning/learning.jsp (.../learning.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -4,68 +4,78 @@ + + + + + -
+ -

- -

+
+ +
-

- -

- <%@include file="/pages/parts/voteDisplay.jsp"%> -
+

+ -

+ +

: ${appointedScribe}

-
-

- -

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

    - + - -

    -
  • -
-
+ + +
+
+
+
-

- - - - - -

+ +
+
+ + + +
+
+
-
- + + +
Index: lams_tool_scribe/web/pages/learning/notebook.jsp =================================================================== diff -u -r2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd) +++ lams_tool_scribe/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -10,25 +10,21 @@ } -
+ -

- -

- -

+

-

+
- + -
- + + @@ -40,8 +36,14 @@ -
-
+ + + + Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp =================================================================== diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp (.../finishButton.jsp) (revision 8aded0b18a5a7712622ae56f38923fa297449977) +++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp (.../finishButton.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -13,22 +13,22 @@ } -
+
- + - + Index: lams_tool_scribe/web/pages/learning/parts/reportBody.jsp =================================================================== diff -u -r2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/parts/reportBody.jsp (.../reportBody.jsp) (revision 2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9) +++ lams_tool_scribe/web/pages/learning/parts/reportBody.jsp (.../reportBody.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,86 +1,99 @@ - <%@ include file="/common/taglibs.jsp"%> - -

- -

-
+<%@ include file="/common/taglibs.jsp"%> -

- -

- - <%@include file="/pages/parts/voteDisplay.jsp"%> - -
- -
- - -
-

- -

- - -
    -
  • -

    - - - - -

    -
  • -
-
+
+ +
+ +<%@include file="/pages/parts/voteDisplay.jsp"%> + +

+ +

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

- -

- - -

- -

-
-
- - - -

- -

- - -
- ${scribeSessionDTO.sessionName} +
+
+ + + +
+
+
+
+
- -
-

- -

- - -
    -
  • -

    +

    +
    + +
    + +
    + +
    +
    +
+
+
+ + + + +

+ +

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

- - -
+ + +
+
+ +
+ +
- - - -
+
+
+
+ + + +
+ Index: lams_tool_scribe/web/pages/learning/report.jsp =================================================================== diff -u -r0edacde89fb315c54ed60643a06ef7d3e7b5bb89 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/report.jsp (.../report.jsp) (revision 0edacde89fb315c54ed60643a06ef7d3e7b5bb89) +++ lams_tool_scribe/web/pages/learning/report.jsp (.../report.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,6 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> -
+ <%@ include file="parts/reportBody.jsp"%> @@ -11,3 +11,5 @@
+ + \ No newline at end of file Index: lams_tool_scribe/web/pages/learning/scribe.jsp =================================================================== diff -u -r2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/scribe.jsp (.../scribe.jsp) (revision 2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd) +++ lams_tool_scribe/web/pages/learning/scribe.jsp (.../scribe.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -7,64 +7,53 @@ - + -
+ -

- -

+
+ +
-

- -

- @@ -74,65 +63,90 @@ <%@include file="/pages/parts/voteDisplay.jsp"%>
-

+

+ -

+ + -
-

- -

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

    - - - - -

    -
  • -
-
+ + + + +
+
- - - + + + + + +
+
+
- - - +
+
+ + + +
+
+
-
- - - - -
- - - -
-
+ + + + - - - - -
-
+
+ + + +
+ - + +
+ + +
+
+ + + + + + + + Index: lams_tool_scribe/web/pages/learning/waitForScribe.jsp =================================================================== diff -u -r1bddf2af8d3cd3191a23d54a718bd3f313cb1aea -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/learning/waitForScribe.jsp (.../waitForScribe.jsp) (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea) +++ lams_tool_scribe/web/pages/learning/waitForScribe.jsp (.../waitForScribe.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,15 +1,19 @@ <%@ include file="/common/taglibs.jsp"%> -
-

- -

+ + + + + + + +

- +

-
-
-
+ + + Index: lams_tool_scribe/web/pages/parts/voteDisplay.jsp =================================================================== diff -u -r2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9 -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a --- lams_tool_scribe/web/pages/parts/voteDisplay.jsp (.../voteDisplay.jsp) (revision 2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9) +++ lams_tool_scribe/web/pages/parts/voteDisplay.jsp (.../voteDisplay.jsp) (revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a) @@ -1,19 +1,15 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - -
- - progress bar - +
+
+ ${scribeSessionDTO.votePercentage}% +
+ + + + + (${scribeSessionDTO.votePercentage}%) +
+
- -

- - - - - (${scribeSessionDTO.votePercentage}%) -