[Yanel-commits] rev 25524 - in
public/yanel/trunk/src/contributions/resources/resource-creator:
htdocs/js src/java/org/wyona/yanel/impl/resources
josias at wyona.com
josias at wyona.com
Wed Jun 27 14:01:16 CEST 2007
Author: josias
Date: 2007-06-27 14:01:16 +0200 (Wed, 27 Jun 2007)
New Revision: 25524
Modified:
public/yanel/trunk/src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js
public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
Log:
-adds resource type to the lookup listing
-adds sorttable function to the lookup listing
see bug #5294, thanks to Simon
Modified: public/yanel/trunk/src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js 2007-06-27 10:03:47 UTC (rev 25523)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/htdocs/js/ajaxlookup.js 2007-06-27 12:01:16 UTC (rev 25524)
@@ -1,3 +1,3 @@
function ajaxlookup(resourcetype, lookin) {
- new Ajax.Updater('lookup', '', { method: 'get', onLoading: createProgressBar('lookupfiles'), parameters: {lookup: 'true', 'yanel.resource.viewid': 'source', lookin: lookin, 'resource-type': resourcetype} });
+ new Ajax.Updater('lookup', '', { method: 'get', onLoading: createProgressBar('lookupfiles'), onComplete: sorttable.reinit, parameters: {lookup: 'true', 'yanel.resource.viewid': 'source', lookin: lookin, 'resource-type': resourcetype} });
}
\ No newline at end of file
Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java 2007-06-27 10:03:47 UTC (rev 25523)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java 2007-06-27 12:01:16 UTC (rev 25524)
@@ -191,6 +191,7 @@
sb.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-css/progressBar.css\"/>");
sb.append("<script src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-js/prototype.js\" type=\"text/javascript\"></script>");
sb.append("<script src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-js/progressBar.js\" type=\"text/javascript\"></script>");
+ sb.append("<script src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-js/sorttable.js\" type=\"text/javascript\"></script>");
sb.append("<script src=\"" + PathUtil.getResourcesHtdocsPath(this)+ "js/ajaxlookup.js\" type=\"text/javascript\"></script>");
sb.append("</head>");
sb.append("<body>");
@@ -619,7 +620,7 @@
String resName = rtps.substring(rtps.indexOf("::") + 2);
sb.append("<table id=\"resourceCreatorSaveAsTable\"><tr><td colspan=\"2\">Save as:</td></tr>");
- sb.append("<tr><td>Look in: " + node.getPath() + "   </td><td>New folder: <input type=\"text\" name=\"create-new-folder\"/><input type=\"image\" src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-img/icons/folder-new.png\" alt=\"make a new folder\"/> ");
+ sb.append("<tr><td>Look in: " + node.getPath() + "   </td><td>New folder: <input type=\"text\" name=\"create-new-folder\"/> <input type=\"image\" src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-img/icons/folder-new.png\" alt=\"make a new folder\"/> ");
String parent = "/";
if (!node.getPath().equals("/")) {
@@ -637,23 +638,35 @@
sb.append("<tr><td colspan=\"2\">");
sb.append("<div id=\"lookupfiles\">");
- sb.append("<table id=\"lookupfilesTable\">");
- sb.append("<tr><th align=\"left\">Name</th><th align=\"left\">Resource Type</th></tr>");
+ sb.append("<table id=\"lookupfilesTable\" class=\"sortable\">");
+ sb.append("<thead>");
+ sb.append("<tr><th>Type</th><th>Name</th><th>Resource Type</th></tr>");
+ sb.append("</thead>");
+ sb.append("<tbody>");
Node[] children = node.getChildren();
for (int i = 0; i < children.length; i++) {
+ String resourceTypeName;
+ try {
+ resourceTypeName = yanel.getResourceManager().getResource(request, response, realm, children[i].getPath()).getResourceTypeLocalName();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ resourceTypeName = "?";
+ }
if (children[i].isCollection()) {
// TODO: Also append resource specific parameters (AJAX ...)
if (ajaxBrowser) {
- sb.append("<tr><td>Collection: <a href='JavaScript:ajaxlookup(\"" + resNamespace + "::" + resName + "\", \"" + node.getPath() + children[i].getName() + "/\")'>" + children[i].getName() + "</a></td><td>TBD</td></tr>");
+ sb.append("<tr><td sorttable_customkey=\"Collection\"><img src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-img/icons/folder.png\" alt=\"Collection:\"/></td><td><a href='JavaScript:ajaxlookup(\"" + resNamespace + "::" + resName + "\", \"" + node.getPath() + children[i].getName() + "/\")'>" + children[i].getName() + "</a></td><td>" + resourceTypeName + "</td></tr>");
} else {
- sb.append("<tr><td>Collection: <a href=\"?lookin=" + node.getPath() + children[i].getName() + "/&resource-type=" + resNamespace + "::" + resName + "\">" + children[i].getName() + "</a></td><td>TBD</td></tr>");
+ sb.append("<tr><td sorttable_customkey=\"Collection\"><img src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-img/icons/folder.png\" alt=\"Collection:\"/></td><td><a href=\"?lookin=" + node.getPath() + children[i].getName() + "/&resource-type=" + resNamespace + "::" + resName + "\">" + children[i].getName() + "</a></td><td>" + resourceTypeName + "</td></tr>");
}
} else if (children[i].isResource()) {
- sb.append("<tr><td>Resource: "+children[i].getName()+"</td><td>TBD</td></tr>");
+ sb.append("<tr><td sorttable_customkey=\"Resource\"><img src=\"" + PathUtil.getGlobalHtdocsPath(this) + "yanel-img/icons/text-x-generic.png\" alt=\"Resource:\"/></td><td>"+children[i].getName()+"</td><td>" + resourceTypeName + "</td></tr>");
} else {
- sb.append("<tr><td>Neither Collection nor Resource: "+children[i].getName()+"</td><td>-</td></tr>");
+ sb.append("<tr><td>?</td><td>"+children[i].getName()+"</td><td>-</td></tr>");
}
}
+
+ sb.append("</tbody>");
sb.append("</table>");
sb.append("</div>");
sb.append("</td></tr>");
More information about the Yanel-commits
mailing list