Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.9 -r1.10
--- lams_central/conf/language/ApplicationResources.properties 21 Jun 2006 06:56:28 -0000 1.9
+++ lams_central/conf/language/ApplicationResources.properties 22 Jun 2006 07:11:58 -0000 1.10
@@ -68,7 +68,7 @@
msg.import.tool.error.prefix=But there are some tool(s) imported failed
msg.import.failed=Learning design import failed
-msg.export.loading=Learning desing is exporting, please wait.
+msg.export.loading=Learning design download will start automatically in seconds, please wait...
msg.export.success=Learning design and activities export successfully.
msg.export.ld.success=Learning design export successfully.
msg.export.tool.error.prefix=But there are some tool(s) exported failed
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java 21 Jun 2006 05:21:09 -0000 1.2
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java 22 Jun 2006 07:11:58 -0000 1.3
@@ -120,6 +120,8 @@
log.error("Error Closing file. File already written out - no exception being thrown.",e);
}
}
+
+ return null;
} catch (Exception e1) {
log.error("Unable to export tool content: " + e1.toString());
request.setAttribute(ATTR_LD_ERROR_MESSAGE,ldErrorMsgs);
Index: lams_central/web/toolcontent/exportloading.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/exportloading.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/toolcontent/exportloading.jsp 21 Jun 2006 05:21:09 -0000 1.2
+++ lams_central/web/toolcontent/exportloading.jsp 22 Jun 2006 07:11:58 -0000 1.3
@@ -1,7 +1,9 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
+
+
+
@@ -10,18 +12,23 @@
<fmt:message key="title.export.loading" />
-
+
-
+
+
-
+
+
+
-
+
Index: lams_central/web/toolcontent/import.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/import.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/toolcontent/import.jsp 21 Jun 2006 05:21:09 -0000 1.2
+++ lams_central/web/toolcontent/import.jsp 22 Jun 2006 07:11:58 -0000 1.3
@@ -9,6 +9,11 @@
<fmt:message key="title.import" />
+
@@ -23,7 +28,7 @@
:
- " class="buttonStyle"/>
+ " class="buttonStyle"/>
Index: lams_central/web/toolcontent/importresult.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/importresult.jsp,v
diff -u -r1.4 -r1.5
--- lams_central/web/toolcontent/importresult.jsp 22 Jun 2006 02:28:49 -0000 1.4
+++ lams_central/web/toolcontent/importresult.jsp 22 Jun 2006 07:11:58 -0000 1.5
@@ -9,10 +9,6 @@