Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision b590efa8f4c159b483268a6b5f4417b6f16c37d9) @@ -99,15 +99,9 @@ if (param.equals("finish")) { return finish(mapping, form, request, response); } - if (param.equals("newImageInit")) { - return newImageInit(mapping, form, request, response); - } if (param.equals("saveNewImage")) { return saveNewImage(mapping, form, request, response); } - if (param.equals("initMultipleImages")) { - return initMultipleImages(mapping, form, request, response); - } if (param.equals("saveMultipleImages")) { return saveMultipleImages(mapping, form, request, response); } @@ -298,25 +292,6 @@ } /** - * Initial page for add imageGallery item (single file or URL). - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward newImageInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID); - request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - ImageGalleryItemForm itemForm = (ImageGalleryItemForm) form; - itemForm.setSessionMapID(sessionMapID); - return mapping.findForward(ImageGalleryConstants.SUCCESS); - } - - /** * Save file or url imageGallery item into database. * * @param mapping @@ -356,25 +331,6 @@ } /** - * Initial page for add imageGallery item (single file or URL). - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - private ActionForward initMultipleImages(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID); - request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - MultipleImagesForm multipleForm = (MultipleImagesForm) form; - multipleForm.setSessionMapID(sessionMapID); - return mapping.findForward(ImageGalleryConstants.SUCCESS); - } - - /** * Save file or url imageGallery item into database. * * @param mapping Index: lams_tool_images/web/WEB-INF/struts-config.xml =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 --- lams_tool_images/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision b590efa8f4c159b483268a6b5f4417b6f16c37d9) @@ -172,29 +172,13 @@ parameter="finish" > - - - - - - Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 --- lams_tool_images/web/pages/authoring/parts/addimage.jsp (.../addimage.jsp) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/web/pages/authoring/parts/addimage.jsp (.../addimage.jsp) (revision b590efa8f4c159b483268a6b5f4417b6f16c37d9) @@ -1,5 +1,14 @@ <%@ include file="/common/taglibs.jsp"%> - + + + + + + + + + + @@ -34,10 +43,18 @@ - - + + + + + + + + + +
Index: lams_tool_images/web/pages/authoring/parts/imagefile.jsp =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 --- lams_tool_images/web/pages/authoring/parts/imagefile.jsp (.../imagefile.jsp) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/web/pages/authoring/parts/imagefile.jsp (.../imagefile.jsp) (revision b590efa8f4c159b483268a6b5f4417b6f16c37d9) @@ -2,7 +2,14 @@ <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> <%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> -<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> + + + <%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> + + + <%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%> + + Index: lams_tool_images/web/pages/learning/learning.jsp =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 --- lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision b590efa8f4c159b483268a6b5f4417b6f16c37d9) @@ -1,5 +1,15 @@ <%@ include file="/common/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> + + + <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> + + + <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%> + + @@ -20,7 +30,6 @@ -