Index: lams_central/web/WEB-INF/tags/Alert.tag =================================================================== diff -u --- lams_central/web/WEB-INF/tags/Alert.tag (revision 0) +++ lams_central/web/WEB-INF/tags/Alert.tag (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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_central/web/WEB-INF/tags/Page.tag =================================================================== diff -u --- lams_central/web/WEB-INF/tags/Page.tag (revision 0) +++ lams_central/web/WEB-INF/tags/Page.tag (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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_central/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_central/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -r65a41bd80f751917e945f17beb5f0d34926066ac -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision 65a41bd80f751917e945f17beb5f0d34926066ac) +++ lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/errorpages/403.jsp (.../403.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_central/web/errorpages/403.jsp (.../403.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/errorpages/404.jsp (.../404.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_central/web/errorpages/404.jsp (.../404.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -6,6 +6,7 @@ + @@ -16,21 +17,21 @@ -
+ + + + + -

- -

- -

+ -

+
- +
Index: lams_central/web/errorpages/error.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/errorpages/error.jsp (.../error.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_central/web/errorpages/error.jsp (.../error.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -r65a41bd80f751917e945f17beb5f0d34926066ac -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/less/defaultHTML_learner.less (.../defaultHTML_learner.less) (revision 65a41bd80f751917e945f17beb5f0d34926066ac) +++ lams_central/web/less/defaultHTML_learner.less (.../defaultHTML_learner.less) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -44,9 +44,6 @@ } - - - /* Spacer classes */ .voffset2 { margin-top: @xs-space; @@ -73,6 +70,18 @@ } +.loffset2 { + margin-left: @xs-space; +} + +.loffset5 { + margin-left: @md-space; +} + +.loffset10 { + margin-left: @lg-space; +} + /* Comments/Forum classes */ .msg .panel-heading { @@ -118,7 +127,7 @@ 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; @@ -132,6 +141,12 @@ 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-folder}/@{body-bg-image}'); } Index: lams_central/web/questions/questionChoice.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/questions/questionChoice.jsp (.../questionChoice.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_central/web/questions/questionChoice.jsp (.../questionChoice.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -136,13 +136,17 @@ -
-
+ + + + + + + + -
+ -

-

@@ -237,12 +241,13 @@ -
- - +
+ +
-
+ + \ No newline at end of file Index: lams_central/web/questions/questionFile.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/questions/questionFile.jsp (.../questionFile.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_central/web/questions/questionFile.jsp (.../questionFile.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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 =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r5725c3e52ad6b3767aa82f1c6be5769f115041aa --- lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa) @@ -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}

+
+
-
-
-

 

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