[Registry-dev] svn commit r16793 - in
trunk/registry/modules/webapps/src/main:
java/org/wso2/registry/web/actions webapp/admin
webapp/admin/ajax webapp/admin/css webapp/admin/images
svn at wso2.org
svn at wso2.org
Sat May 10 21:42:23 PDT 2008
Author: chanaka
Date: Sat May 10 21:42:23 2008
New Revision: 16793
Log:
Lifecycle UI changes
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tree-minus.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tree-plus.jpg (contents, props changed)
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java Sat May 10 21:42:23 2008
@@ -74,7 +74,7 @@
private Map<String, String[]> availableActions = new HashMap<String, String[]>();
private String parentPath;
-
+ private String[] aspectsToAdd;
/**
* Used to populate the users in the userPermissions section
*/
@@ -508,6 +508,7 @@
}
rolePermissions = new ArrayList(rolePermissionMap.values());
+ aspectsToAdd= registry.getAvailableAspects();
} catch (UserStoreException e) {
String msg = "Could not get user manager details. Caused by: " + e.getMessage();
@@ -744,4 +745,11 @@
public Map<String, String[]> getAvailableActions() {
return availableActions;
}
+ public String[] getAspectsToAdd() {
+ return aspectsToAdd;
+ }
+
+ public void setAspectsToAdd(String[] aspectsToAdd) {
+ this.aspectsToAdd = aspectsToAdd;
+ }
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/lifecycle_list.jsp Sat May 10 21:42:23 2008
@@ -16,7 +16,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<br/>
- <h3>Available Aspects</h3>
+ <h3>Aspect Actions</h3>
<ul class="aspectList">
<%
Object lifeCycleObj = request.getSession().getAttribute(UIConstants.AJAX_LIFECYCLE_LIST);
@@ -28,29 +28,21 @@
String lifecycle = iLifecycles.next();
%>
- <li><h4><%=lifecycle%></h4>
- <table cellpadding="0" cellspacing="0" border="0" width="100%" class="data-table">
- <tr><th colspan="2"><h4>Available Actions</h4></th></tr>
-
- <%
- String[] actions = availableActions.get(lifecycle);
- for (String action : actions) {
- String actionURL = "/wso2registry" + details.getPath() +
- ";aspect[" + lifecycle + "]:" + action;
- %>
- <tr>
- <td><%=action%> </td>
- <td>
- <form action="<%=actionURL%>" method="POST">
- <!-- input type="submit" name="<%=action%>" value="Invoke Action" -->
- </form>
- </td>
- </tr>
-
- <%
- }
- %>
- </table>
+ <li><h4><a onclick="showHideCommon('actionTree_<%=k%>');showHideCommon('iconTreePlus_<%=k%>');showHideCommon('iconTreeMinus_<%=k%>')"><img id="iconTreePlus_<%=k%>" src="/wso2registry/admin/images/icon-tree-plus.jpg" alt="+" border="0" align="bottom" style="display:none;margin-right:10px;" /><img style="margin-right:10px;" id="iconTreeMinus_<%=k%>" src="/wso2registry/admin/images/icon-tree-minus.jpg" alt="-" border="0" align="bottom" /><%=lifecycle%></a></h4>
+ <div style="margin-top:5px;margin-left:20px;" id="actionTree_<%=k%>">
+
+
+ <%
+ String[] actions = availableActions.get(lifecycle);
+ for (String action : actions) {
+ String actionURL = "/wso2registry" + details.getPath() +
+ ";aspect[" + lifecycle + "]:" + action;
+ %>
+ <%=action%>
+ <%
+ }
+ %>
+ </div>
</li>
<% }} %>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css Sat May 10 21:42:23 2008
@@ -762,10 +762,13 @@
font-size:10px;
}
.aspectList{
-padding-left:10px;
+padding-left:0px;
+list-style-type:none;
+margin-right:0px;
+padding-right:0px;
}
.aspectList li{
-list-style-image:url(../images/noatunstop.png);
+list-style-image:none;
margin-bottom:10px;
}
.aspectList h4{
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tree-minus.jpg
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tree-plus.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp Sat May 10 21:42:23 2008
@@ -915,7 +915,7 @@
<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
<tr>
- <td valign="top"><h2 class="sub-headding-lifecycle">Lifecycles</h2></td>
+ <td valign="top"><h2 class="sub-headding-lifecycle">Aspects / Lifecycles</h2></td>
<td align="right" valign="top">
<table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
<tr>
@@ -948,12 +948,23 @@
<!-- Lifecycle add box -->
<div id="add-lifecycle-div" style="display:none;padding-bottom:10px;">
- <h3>Assign New Aspect</h3>
+ <h3>Associate New Aspect</h3>
<form>
<select id="lifecycle" name="lifecycle" style="width:98%">
- <option>Aspect1</option>
- <option>Aspect2</option>
+ <%
+ String[] aspectsToAdd = details.getAspectsToAdd();
+ for(int aspIndex=0;aspIndex<aspectsToAdd.length;aspIndex++){
+ %>
+ <option><%=aspectsToAdd[aspIndex]%></option>
+ <%
+ }
+ if(aspectsToAdd.length==0){
+ %>
+ <option>Default Aspect</option>
+ <%
+ }
+ %>
</select>
@@ -975,16 +986,16 @@
Iterator<String> iLifecycles = availableActions.keySet().iterator();
if(!availableActions.isEmpty()){
%>
- <h3>Available Aspects</h3>
+ <h3>Aspect Actions</h3>
<ul class="aspectList">
<%
for (int k=1;iLifecycles.hasNext();k++) {
String lifecycle = iLifecycles.next();
%>
- <li><h4><%=lifecycle%></h4>
- <table cellpadding="0" cellspacing="0" border="0" width="100%" class="data-table">
- <tr><th colspan="2"><h4>Available Actions</h4></th></tr>
+ <li><h4><a onclick="showHideCommon('actionTree_<%=k%>');showHideCommon('iconTreePlus_<%=k%>');showHideCommon('iconTreeMinus_<%=k%>')"><img id="iconTreePlus_<%=k%>" src="/wso2registry/admin/images/icon-tree-plus.jpg" alt="+" border="0" align="bottom" style="display:none;margin-right:10px;" /><img style="margin-right:10px;" id="iconTreeMinus_<%=k%>" src="/wso2registry/admin/images/icon-tree-minus.jpg" alt="-" border="0" align="bottom" /><%=lifecycle%></a></h4>
+ <div style="margin-top:5px;margin-left:20px;" id="actionTree_<%=k%>">
+
<%
String[] actions = availableActions.get(lifecycle);
@@ -992,19 +1003,11 @@
String actionURL = "/wso2registry" + details.getPath() +
";aspect[" + lifecycle + "]:" + action;
%>
- <tr>
- <td><%=action%> </td>
- <td>
- <form action="<%=actionURL%>" method="POST">
- <!-- input type="submit" name="<%=action%>" value="Invoke Action" -->
- </form>
- </td>
- </tr>
-
+ <%=action%>
<%
}
%>
- </table>
+ </div>
</li>
<% } }%>
More information about the Registry-dev
mailing list