[portal-commits] JBoss Portal SVN: r9871 - in tags/JBoss_Portal_2_6_4/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2008-02-08 06:57:11 -0500 (Fri, 08 Feb 2008)
New Revision: 9871
Modified:
tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1878: CMS admin GUI flow improvement
Modified:
tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
---
tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-02-08
11:52:53 UTC (rev 9870)
+++
tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-02-08
11:57:11 UTC (rev 9871)
@@ -1215,14 +1215,15 @@
{
aRes.setRenderParameter("confirm", "An error occurred while
setting the permissions.(" + e.toString() + ")");
success = false;
+ aRes.setRenderParameter("op",
CMSAdminConstants.OP_CONFIRMSECURE);
}
if (success)
{
aRes.setRenderParameter("confirm", "Security settings
updated successfully.");
+ aRes.setRenderParameter("op",
aReq.getParameter("returnOp"));
}
- aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMSECURE);
aRes.setRenderParameter("path",
aReq.getParameter("path"));
aRes.setRenderParameter("returnOp",
aReq.getParameter("returnOp"));
}
Modified:
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
---
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-02-08
11:52:53 UTC (rev 9870)
+++
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-02-08
11:57:11 UTC (rev 9871)
@@ -14,6 +14,7 @@
<link rel="stylesheet" type="text/css"
href="/portal-admin/css/style.css" media="screen"/>
<%
+ String sConfirm = renderRequest.getParameter("confirm");
String sCurrPath = (String)request.getAttribute("currpath");
List folders = (List)request.getAttribute("folders");
List files = (List)request.getAttribute("files");
@@ -73,6 +74,17 @@
<br/>
<!-- folder-level action dropdown -->
<div class="menu-container">
+<%
+ if (sConfirm != null && !"".equals(sConfirm))
+ {
+%>
+ <div class="portlet-msg-success"><%= sConfirm %></div>
+ <br/>
+<%
+ }
+%>
+
+
<div class="menu">
<select
onchange="window.open(this.options[this.selectedIndex].value,'_top')">
<option value="">Select Action...</option>
Modified:
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
---
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-02-08
11:52:53 UTC (rev 9870)
+++
tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-02-08
11:57:11 UTC (rev 9871)
@@ -24,6 +24,7 @@
</h3>
<div class=" cms-tab-container">
<%
+ String sConfirm = renderRequest.getParameter("confirm");
String sCurrPath = (String)request.getAttribute("currpath");
Vector vContents = (Vector)request.getAttribute("contents");
Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
@@ -94,6 +95,17 @@
<br/>
<!-- file-level action dropdown -->
<div class="menu-container" style="width:100%">
+
+<%
+ if (sConfirm != null && !"".equals(sConfirm))
+ {
+%>
+ <div class="portlet-msg-success"><%= sConfirm %></div>
+ <br/>
+<%
+ }
+%>
+
<div class="menu">
<select
onchange="window.open(this.options[this.selectedIndex].value,'_top')">