Author: chris.laprun(a)jboss.com Date: 2008-06-24 12:23:28 -0400 (Tue, 24 Jun 2008) New Revision: 11135 Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp Log: - Generification - Some re-formatting Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 16:20:49 UTC (rev 11134) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 16:23:28 UTC (rev 11135) @@ -16,32 +16,38 @@ <% String sConfirm = renderRequest.getParameter("confirm"); String sCurrPath = (String)request.getAttribute("currpath"); - List folders = (List)request.getAttribute("folders"); - List files = (List)request.getAttribute("files"); + List<Folder> folders = (List<Folder>)request.getAttribute("folders"); + List<File> files = (List<File>)request.getAttribute("files"); String createDate = ""; String modifiedDate = ""; Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); - List messages = (List)request.getAttribute("messages"); + List<String> messages = (List<String>)request.getAttribute("messages"); %> <div class="admin-ui"> <br/> + <h3 class="sectionTitle-blue"> ${n:i18n("CMS_MANAGE")} </h3> + <div class="cms-tab-container"> <!-- Displaying any messages that may have occurred during this request --> -<%if(messages != null && !messages.isEmpty()){%> +<% + if (messages != null && !messages.isEmpty()) + { +%> <table width="100%"> <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th> - <%for(int i=0; i<messages.size(); i++){%> - <tr colspan="2" align="center"> + <% + for (String message : messages) + { + %> + <tr align="center"> <td colspan="2"> - <font color="red"> - <%=(String)messages.get(i)%> - </font> + <font color="red"><%=message%></font> </td> </tr> <%}%> @@ -92,15 +98,16 @@ <br/> <!-- folder-level action dropdown --> <div class="menu-container"> -<% - if (sConfirm != null && !"".equals(sConfirm)) - { -%> - <div class="portlet-msg-success"><%= sConfirm %></div> + <% + if (sConfirm != null && !"".equals(sConfirm)) + { + %> + <div class="portlet-msg-success"><%= sConfirm %> + </div> <br/> -<% - } -%> + <% + } + %> <div class="menu"> @@ -132,7 +139,7 @@ <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/> </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option> <% - if (manageWorkflowAccessible.booleanValue()) + if (manageWorkflowAccessible) { %> <option value="<portlet:renderURL> @@ -200,15 +207,14 @@ <% if (folders.size() > 0) { - for (int i = 0; i < folders.size(); i++) + for (Folder folder : folders) { - Folder folder = (Folder)folders.get(i); %> <tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> <td><img - src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif" - alt="${n:i18n("CMS_FOLDER")}" - border="0">&nbsp;<a href="<portlet:renderURL> + src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif" + alt="${n:i18n("CMS_FOLDER")}" + border="0">&nbsp;<a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= folder.getBasePath() %>"/> </portlet:renderURL>"><%= @@ -261,9 +267,8 @@ <% if (files.size() > 0) { - for (int j = 0; j < files.size(); j++) + for (File file : files) { - File file = (File)files.get(j); %> <tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"