Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
diff -u -re3a47c58f5067dbc8a4bf1fe06642af8a8ff0381 -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a
--- lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision e3a47c58f5067dbc8a4bf1fe06642af8a8ff0381)
+++ lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
@@ -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
===================================================================
diff -u -rded807ef4781623cba0fa8b364f55e015cf2358b -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision ded807ef4781623cba0fa8b364f55e015cf2358b)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
@@ -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
===================================================================
diff -u -rded807ef4781623cba0fa8b364f55e015cf2358b -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a
--- lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision ded807ef4781623cba0fa8b364f55e015cf2358b)
+++ lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
@@ -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
===================================================================
diff -u -rded807ef4781623cba0fa8b364f55e015cf2358b -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a
--- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision ded807ef4781623cba0fa8b364f55e015cf2358b)
+++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
@@ -9,6 +9,11 @@
<fmt:message key="title.import" />
+
@@ -23,7 +28,7 @@
:
- " class="buttonStyle"/>
+ " class="buttonStyle"/>
Index: lams_central/web/toolcontent/importresult.jsp
===================================================================
diff -u -red20bed15ca5e798c5424bf08e39d08f971d8509 -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a
--- lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision ed20bed15ca5e798c5424bf08e39d08f971d8509)
+++ lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
@@ -9,10 +9,6 @@