Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_central/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:44 -0000 1.3.2.3 +++ lams_central/web/WEB-INF/tlds/lams/lams.tld 26 Feb 2016 20:01:56 -0000 1.3.2.4 @@ -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_central/web/css/defaultHTML_learner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v diff -u -r1.32.2.7 -r1.32.2.8 --- lams_central/web/css/defaultHTML_learner.css 23 Feb 2016 17:20:54 -0000 1.32.2.7 +++ lams_central/web/css/defaultHTML_learner.css 26 Feb 2016 20:01:56 -0000 1.32.2.8 @@ -44,6 +44,15 @@ .roffset10 { margin-right: 10px; } +.loffset2 { + margin-left: 2px; +} +.loffset5 { + margin-left: 5px; +} +.loffset10 { + margin-left: 10px; +} /* Comments/Forum classes */ .msg .panel-heading { padding: 3px; @@ -79,7 +88,8 @@ border-radius: 0px; box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88); } -.panel-learner-page-title { +.panel-learner-page-title, +.panel-admin-page-title { -moz-border-bottom-colors: none; -moz-border-left-colors: none; -moz-border-right-colors: none; @@ -92,6 +102,11 @@ color: inherit; min-height: 48px; } +.panel-admin-page { + border-radius: 0px; + box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88); + margin-top: 20px; +} body.stripes { background: url('/lams/images/css/light-fabric.jpg'); } Index: lams_central/web/errorpages/403.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/403.jsp,v diff -u -r1.6.14.1 -r1.6.14.2 --- lams_central/web/errorpages/403.jsp 26 Feb 2016 07:17:34 -0000 1.6.14.1 +++ lams_central/web/errorpages/403.jsp 26 Feb 2016 20:01:56 -0000 1.6.14.2 @@ -1,5 +1,4 @@ -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> @@ -10,29 +9,26 @@ - - <fmt:message key="403.title" /> - - + + <fmt:message key="403.title" /> + + - + -
+ + + -

- -

+ - -
- + + + + - - - - + Index: lams_central/web/errorpages/404.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/404.jsp,v diff -u -r1.6.14.1 -r1.6.14.2 --- lams_central/web/errorpages/404.jsp 26 Feb 2016 07:17:34 -0000 1.6.14.1 +++ lams_central/web/errorpages/404.jsp 26 Feb 2016 20:01:56 -0000 1.6.14.2 @@ -6,6 +6,7 @@ + @@ -16,21 +17,21 @@ -
+ + + + + -

- -

- -

+ -

+
- + Index: lams_central/web/errorpages/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/error.jsp,v diff -u -r1.8.2.1 -r1.8.2.2 --- lams_central/web/errorpages/error.jsp 26 Feb 2016 07:17:34 -0000 1.8.2.1 +++ lams_central/web/errorpages/error.jsp 26 Feb 2016 20:01:56 -0000 1.8.2.2 @@ -1,5 +1,4 @@ -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> @@ -9,71 +8,69 @@ - - <fmt:message key="heading.general.error" /> - - - + + <fmt:message key="heading.general.error" /> + + - - + } + + - + -
+ + + + + <%-- Error Messages --%> -

- -

+

+ +

- <%-- Error Messages --%> +
+ +
-

- - -

- -
+
+ : - - - - - -
- - -
- +
- - - + + Index: lams_central/web/less/defaultHTML_learner.less =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/less/Attic/defaultHTML_learner.less,v diff -u -r1.1.2.2 -r1.1.2.3 Binary files differ Index: lams_central/web/questions/questionChoice.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/questions/questionChoice.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_central/web/questions/questionChoice.jsp 9 Feb 2016 18:52:57 -0000 1.1.2.1 +++ lams_central/web/questions/questionChoice.jsp 26 Feb 2016 20:01:56 -0000 1.1.2.2 @@ -136,13 +136,17 @@ -
-
+ + + + + + + + -
+ -

-

@@ -237,12 +241,13 @@ -
- - +
+ +
-
+ + \ No newline at end of file Index: lams_central/web/questions/questionFile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/questions/questionFile.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_central/web/questions/questionFile.jsp 9 Feb 2016 18:52:57 -0000 1.1.2.1 +++ lams_central/web/questions/questionFile.jsp 26 Feb 2016 20:01:56 -0000 1.1.2.2 @@ -1,62 +1,71 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-core" prefix="c"%> <fmt:message key="title.lams" /> :: <fmt:message key="label.questions.file.title" /> - - + + - +.button { + float: right; + margin-left: 10px; +} + +#buttonsDiv { + padding: 15px 0px 15px 0px; +} + +div#errorArea { + display: none; +} + + -
-
- -
- -
-

- -
- - - - -
- - -
-
-
- + + + + + +
+ + + + +
+ + + +
+ +
+ + +
+
+ + + \ No newline at end of file Index: lams_central/web/toolcontent/import.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/import.jsp,v diff -u -r1.17.12.2 -r1.17.12.3 --- lams_central/web/toolcontent/import.jsp 9 Feb 2016 18:52:57 -0000 1.17.12.2 +++ lams_central/web/toolcontent/import.jsp 26 Feb 2016 20:01:56 -0000 1.17.12.3 @@ -28,24 +28,24 @@ + + + + -
-

- -

+ -

+
-

-

-   -

+
+
" method="post" enctype="multipart/form-data" id="importForm">

- + - + +  

@@ -56,5 +56,6 @@ + \ No newline at end of file Index: lams_central/web/toolcontent/importresult.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/importresult.jsp,v diff -u -r1.18.12.1 -r1.18.12.2 --- lams_central/web/toolcontent/importresult.jsp 9 Feb 2016 18:52:57 -0000 1.18.12.1 +++ lams_central/web/toolcontent/importresult.jsp 26 Feb 2016 20:01:56 -0000 1.18.12.2 @@ -1,65 +1,71 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> - - <fmt:message key="title.import.result" /> - - - - + + <fmt:message key="title.import.result" /> + + + + + - + + + - -
- -

- -

+ + + -

+

+   +

-

-

+

+ +

+

+ +

${toolError}

 - + - <%-- display new learing desing in Flash side even some tool import failed --%> + <%-- display new learning design Flash side even some tool import failed --%> <%@include file="import_passon.jsp"%> -

-

-
- -

${ldError}

- -
+

+ +

+
+ : +
+ + +

${ldError}

+ + -
-
-

 

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