[Yanel-commits] rev 23335 - public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-03-21 06:42:46 +0100 (Wed, 21 Mar 2007)
New Revision: 23335

Modified:
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
Log:
save as dialog improved

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-03-21 05:16:55 UTC (rev 23334)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-03-21 05:42:46 UTC (rev 23335)
@@ -331,7 +331,6 @@
                     //sb.append("<br/><br/><input type=\"submit\" value=\"Save As\" name=\"save-as\"/>");
 
                     // TODO: Display repository navigation of this path ...
-		    sb.append("<br/><br/>Save as:<br/>");
                     Sitetree sitetree = (Sitetree) getYanel().getBeanFactory().getBean("nav-sitetree");
                     Node node = sitetree.getNode(getRealm(), getPath());
                     if (node.isCollection()) {
@@ -342,34 +341,43 @@
                     } else {
                         log.error("Neither collection nor resource: " + getPath());
                     }
-		    sb.append("Look in: " + node.getPath() + "<br/>");
+
+		    sb.append("<br/><br/>");
+
+
+		    sb.append("<table border=\"1\"><tr><td colspan=\"2\">Save as:</td></tr>");
+		    sb.append("<tr><td>Look in: " + node.getPath() + "&#160;&#160;&#160;</td><td>Create new folder: <input type=\"text\" name=\"create-new-folder\"/><input type=\"submit\" value=\"Create\"/></td></tr>");
+
+		    sb.append("<tr><td colspan=\"2\"><table border=\"1\" width=\"100%\">");
+		    sb.append("<tr><th align=\"left\">Name</th><th align=\"left\">Resource Type</th></tr>");
                     Node[] children = node.getChildren();
-		    sb.append("<table border=\"1\">");
-		    sb.append("<tr><th align=\"left\">Name</th><th align=\"left\">Resource Type</th></tr>");
                     for (int i = 0; i < children.length; i++) {
                         if (children[i].isCollection()) {
-		            sb.append("<tr><td>Collection: <a href=\"" + children[i].getName() + "\">" + children[i].getName() + "</a></td><td>TBD</td></tr>");
+		            sb.append("<tr><td>Collection: <a href=\"?lookin=" + node.getPath() + children[i].getName() + "/\">" + children[i].getName() + "</a></td><td>TBD</td></tr>");
                         } else if (children[i].isResource()) {
 		            sb.append("<tr><td>Resource: "+children[i].getName()+"</td><td>TBD</td></tr>");
                         } else {
 		            sb.append("<tr><td>Neither Collection nor Resource: "+children[i].getName()+"</td><td>-</td></tr>");
                         }
                     }
-		    sb.append("</table><br/>");
+		    sb.append("</table></td></tr>");
 
-
+		    sb.append("<tr><td colspan=\"2\">");
                     String createName = getRequest().getParameter("create-name");
                     if (createName != null) {
                         sb.append("Name: <input type=\"text\" name=\"create-name\" value=\"" + createName + "\"/>");
                     } else {
                         sb.append("Name: <input type=\"text\" name=\"create-name\"/>");
                     }
+		    sb.append("</td></tr>");
 
-                    // TODO: Display realm navigation (sitetree, topic map, ...)
 
-                    sb.append("<br/><input type=\"submit\" value=\"Save\" name=\"save\"/>");
+                    sb.append("<tr><td colspan=\"2\" align=\"right\"><input type=\"submit\" value=\"Save\" name=\"save\"/></td></tr>");
+		    sb.append("</table>");
 
                     sb.append("</form>");
+
+                    // TODO: Display realm navigation (sitetree, topic map, ...) resp. introduce another step
                 }
             }
         } catch (Exception e) {