Changeset 687

Timestamp:

03/03/10 19:43:39 (6 months ago)

Author:

fabman

Message:

Implemented tkt #117 (LOTS of UI fixes)

Location:

trunk/src/com/calenco

Files:

• CalencoV2App.java (modified) (1 diff)
• resource/workspace/PublicationsResource.java (modified) (3 diffs)
• staticres/workspace-html.ftl (modified) (24 diffs)
• staticres/workspaces-html.ftl (modified) (8 diffs)

trunk/src/com/calenco/CalencoV2App.java

@@ -131 +131 @@
         wrouter.attach("/{wksp}/languages/{lang}", LanguageResource.class);
         wrouter.attach("/{wksp}/publications", PublicationsResource.class);
+        wrouter.attach("/{wksp}/publications{.fmt}", PublicationsResource.class);
         wrouter.attach("/{wksp}/publications/{pub}", PublicationResource.class);
         wrouter.attach("/{wksp}/pubsqueue", PublicationQueueResource.class);

trunk/src/com/calenco/resource/workspace/PublicationsResource.java

@@ -50 +50 @@
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
+import org.restlet.representation.Variant;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;
@@ -247 +248 @@
     }
 
-    @Get("json")
-    public Representation toJSON() throws ResourceException {
+    @Get
+    @Override
+    public Representation get(Variant variant) throws ResourceException {
+        String fmt = (String) getRequestAttributes().get(".fmt"); // NOI18N
+        if (fmt == null) {
+            String accept = getHttpHeader("Accept"); // NOI18N
+            MediaType mt = variant.getMediaType();
+            if (accept != null) {
+                mt = new MediaType(accept);
+            }
+            if (MediaType.APPLICATION_JSON.equals(mt)) {
+                fmt = ".json"; // NOI18N
+            }
+        }
+        if (".json".equals(fmt)) { // NOI18N
+            return toJSON();
+        } else {
+            return toXML(); // Preferred representation
+        }
+    }
+
+    private Representation toJSON() throws ResourceException {
         try {
             JSONObject pubsj = new JSONObject();
@@ -267 +288 @@
     }
 
-    @Get("xml")
-    public Representation toXML() throws ResourceException {
+    private Representation toXML() throws ResourceException {
         try {
             DomRepresentation rep = new DomRepresentation(MediaType.TEXT_XML);

trunk/src/com/calenco/staticres/workspace-html.ftl

@@ -30 +30 @@
         <style type="text/css">
             #preloader, body, html {width:100%;height:100%;margin:0;padding:0;}
-            /*#preloader {background:#fff url("http://o.aolcdn.com/dojo/1.3.2/dojox/image/resources/images/loading.gif") no-repeat center center;position:absolute;z-index:999;}*/
-            #preloader {background:#fff url("/res/img/cco-loading.gif") no-repeat center center;position:absolute;z-index:999;}
+            #preloader {background:#fff url("http://o.aolcdn.com/dojo/1.3.2/dojox/image/resources/images/loading.gif") no-repeat center center;position:absolute;z-index:999;}
+            /*#preloader {background:#fff url("/res/img/cco-loading.gif") no-repeat center center;position:absolute;z-index:999;}*/
         </style>
         <script type="text/javascript">djConfig = {parseOnLoad:false,isDebug:true,dojoBlankHtmlUrl:'/res/html/blank.html',baseUrl:'/res'};</script>
@@ -66 +66 @@
         <!--[if IE]>
         <script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
+        <script type='text/javascript'>firebug.env.height = 150</script>
         <![endif]-->
         <script type="text/javascript">
@@ -82 +83 @@
             var schref = "/workspaces/${wksp}/depstree?lang=" + (lang == "" ? "INTL" : lang);
             var plistNewState = false;
-            var wlistNewState = false;
             var editor = "${editor}";
             var pubs = [];
@@ -92 +92 @@
             var syslangs = {};
             var ctmenu;
+            var plist;
+            var revlog;
+            var wlist;
 
             /* Ticket #155
              * Firefox(other browsers?) submit automatically a form containing only one
-             * input when the ENTER key is pressed. This leads to unexpected and annoying
-             * behaviors. The only fix I found so far is to disable the ENTER key.
+             * input when the ENTER key is pressed. This leads to annoying behavior,
+             * block the ENTER key.
              */
             function blockEnter(event) {
@@ -222 +225 @@
                 });
 
-                // Publications List Dialog
-                dojo.connect(dojo.byId("plist.rld.btn"), "onclick", function(e) { showPubs(); });
-                // Workspaces List Dialog
-                dojo.connect(dojo.byId("wlist.rld.btn"), "onclick", function(e) { showWorkspaces(); });
-                // Revhistory Dialog
-                dojo.connect(dojo.byId("revlog.rld.btn"), "onclick", function(e) { showRevLog(); });
-                if (isSA) {
-                    dojo.connect(dojo.byId("wlist.new.btn"), "onclick", function(e) {
-                        wlistNewState = !wlistNewState; // Toggle it
-                        if (wlistNewState) {
-                            dojo.byId("wlist.new").setAttribute("style", "display:block;padding:5px;margin:2px;");
-                        } else { // Hide the new workspace form
-                            dojo.byId("wlist.new").setAttribute("style", "display:none;")
-                        }
-                    });
-                }
                 if (isSA || isWA) {
                     /* 'Add Language' Click Handler */
                     dojo.connect(dojo.byId("llistnew.btn"), "onclick", function(e) { addLangToWorkspace(); });
-                    /* New Pub Dialog */
-                    dojo.connect(dojo.byId("plist.new.btn"), "onclick", function(e) { createPub(); });
+                }
+
+                /* Wire blockEnter to workspace creation text input */
+                if (isSA) {
+                    dojo.connect(dijit.byId("wdescription").textbox, "onkeypress", function(e) { blockEnter(e); });
                 }
             }
@@ -324 +314 @@
             #filesMenuBar {display:block;margin-bottom:2px;}
             #fileView {padding-top:10px;}
-            .brow {padding:5px;padding-left:80%;}
+            .brow {padding:5px;}
             .brow-top {padding-top:2px;padding-bottom:7px;}
+            .dlg-cont {margin:2px;padding:3px;padding-top:0px;}
             .pflabl {width:25%;float:left;text-align:right;padding-right:1%;}
             .pfctrl {width:73%;}
@@ -362 +353 @@
                     <div>
                         <span id="wksps-btn-help"></span>
-                        <span class="button"><a id="wksplist" onclick="showWorkspaces()">Workspaces</a></span>
+                        <button id="wksplist" onclick="showWorkspaces()" dojotype="dijit.form.Button">Workspaces</button>
                     </div>
                 </div>
-                <div id="wlist" dojoType="dijit.Dialog" style="width:60%;">
-                    <div id="wlist.container">
-                        <#if user.isSA>
-                        <a id="wlist.new.btn" style="cursor:pointer;"><img src="/res/img/document-new.png" border="0" />&nbsp;New</a> <a id="wlist.rld.btn" style="cursor:pointer;"><img src="/res/img/view-refresh.png" border="0" />&nbsp;Refresh List</a>
-                        <div id="wlist.new" style="display:none;">
-                            <form id="wnewf" name="wnewf" enctype="application/x-www-form-urlencoded" method="post" action="/workspaces">
-                                <div class="frow">
-                                    <div class="pflabl">
-                                        <label for="wdescription">Workspace Name: </label>
-                                    </div>
-                                    <div class="pfctrl">
-                                        <input id="wdescription" name="description" type="text" onkeypress="return blockEnter(event)"/>
-                                    </div>
-                                </div>
-                                <div class="brow" style="padding-left:55%;">
-                                    <span class="button"><a onclick="createWorkspace()">Create</a></span>
-                                </div>
-                            </form>
+                <#if user.isSA>
+                <div id="wnew" title="Create Workspace" dojotype="dijit.Dialog" style="width:40%;">
+                    <form id="wnewf" name="wnewf" enctype="application/x-www-form-urlencoded" method="post" action="/workspaces" dojotype="dijit.form.Form">
+                        <div class="frow">
+                            <span style="width:37%;">
+                                <label for="wdescription">Workspace Name: </label>
+                            </span>
+                            <span style="width:51%;">
+                                <input id="wdescription" name="description" type="text" dojotype="dijit.form.ValidationTextBox" trim="true" required="true" invalidmessage="Workspace name is required" />
+                            </span>
                         </div>
-                        <#else>
-                        <a id="wlist.rld.btn" style="cursor:pointer;"><img src="/res/img/view-refresh.png" border="0" />&nbsp;Refresh List</a>
-                        </#if>
-                        <div id="wlist.list"></div>
-                    </div>
+                        <div class="brow"br>
+                            <button onclick="doCreateWorkspace()" dojotype="dijit.form.Button">Create</button>
+                        </div>
+                    </form>
                 </div>
+                </#if>
             </div> <#-- /Header -->
             <#-- Toolbar with action buttons and user prefs link -->
@@ -567 +550 @@
                                 <span id="lock"></span>
                             </div>
-                            <div id="plist" dojoType="dijit.Dialog" style="width: 60%;">
-                                <div id="plist.container">
-                                    <div class="brow-top">
-                                        <#if user.isSA || user.isWA>
-                                        <a id="plist.new.btn" style="cursor:pointer;"><img src="/res/img/document-new.png" border="0" />&nbsp;New</a>&nbsp;
-                                        </#if>
-                                        <a id="plist.rld.btn" style="cursor:pointer;"><img src="/res/img/view-refresh.png" border="0" />&nbsp;Refresh List</a>
-                                    </div>
-                                    <div id="plist.list"></div>
-                                </div>
-                            </div>
                             <#if user.isSA || user.isWA>
                             <div id="pnew" dojoType="dijit.Dialog" style="width:50%;">
@@ -724 +696 @@
                             </div>
                             </#if>
-                            <div id="revlog" dojoType="dijit.Dialog" style="width:60%;">
-                                <div id="revlog.container">
-                                    <a id="revlog.rld.btn" style="cursor:pointer;"><img src="/res/img/view-refresh.png" border="0" />&nbsp;Refresh</a>
-                                    <div id="revlog.list"></div>
-                                </div>
-                            </div>
                             <div id="fileviewhelp" style="float: right;"></div>
                             <div id="fileView"<#--style="margin:2px;"-->>
@@ -1155 +1121 @@
 
             function createWorkspace() {
-                dojo.xhrPost({
-                    url: "/workspaces",
-                    form: dojo.byId("wnewf"),
-                    handleAs: "text",
-                    handle: function(response, ioArgs) {
-                        if (ioArgs.xhr.status != 201) {
-                            errorDialog("Cannot Create Workspace", response);
-                            console.warn(response, ioArgs);
-                        } else {
-                            showWorkspaces();
-                        }
-                        return response;
-                    }
-                });
-                // Hide new workspace pane
-                dojo.byId("wnewf").reset();
-                wlistNewState = false;
-                dojo.byId("wlist.new").setAttribute("style", "display:none;");
+                dijit.byId("wlist.dlg").hide();
+                var nform = dojo.byId("wnewf");
+                nform.reset();
+                var dlg = dijit.byId("wnew");
+                dojo.connect(dlg, "onCancel", function(e) {dijit.byId("wlist.dlg").show();});
+                dlg.show();
+            }
+
+            function doCreateWorkspace() {
+                var nform = dijit.byId("wnewf");
+                if (nform.validate()) {
+                    dojo.xhrPost({
+                        url: "/workspaces",
+                        form: dojo.byId("wnewf"),
+                        handle: function(response, ioArgs) {
+                            if (ioArgs.xhr.status != 201) {
+                                errorDialog("Cannot Create Workspace", response);
+                                console.warn(response, ioArgs);
+                            } else {
+                                showWorkspaces();
+                            }
+                            return response;
+                        }
+                    });
+                    nform.reset();
+                    dijit.byId("wnew").hide();
+                } else {
+                    console.warn("Form not valid!", nform);
+                }
             }
 
@@ -1208 +1185 @@
                 dojo.xhrGet({
                     url: "/workspaces",
+                    handleAs: "json",
                     headers: {Accept: "application/json"},
-                    handleAs: "json",
-                    load: function(response, ioArgs) {
-                        var wlDlg = dijit.byId("wlist");
-                        wlDlg.attr("title", "Available Workspaces [" + response.count + "]");
-                        dojo.byId("wlist.list").innerHTML = wlistHTML(response.items);
-                        wlDlg.attr("content", dojo.byId("wlist.container"));
-                        dojo.connect(wlDlg, "onCancel", function(e) { dojo.empty("wlist.list"); });
-                        wlDlg.show();
-                        return response;
-                    },
-                    error: function(response, ioArgs) {
-                        errorDialog("Cannot Obtain Workspace List", response);
-                        console.warn(response, ioArgs);
-                        return response;
-                    }
-                });
-            }
-
-            function wlistHTML(wlist) {
-                if (wlist.length > 0) {
+                    preventCache: true,
+                    handle: function(response, ioArgs) {
+                        if (ioArgs.xhr.status != 200) {
+                            errorDialog("Cannot Retrieve Workspace List", response);
+                            console.warn(response, ioArgs);
+                        } else {
+                            if (wlist && wlist != null) {
+                                wlist.attr("title", "Available Workspaces [" + response.count + "]");
+                                dojo.empty("wlist.list");
+                                dojo.byId("wlist.list").innerHTML = wlistHTML(response.items);
+                                wlist.show();
+                            } else {
+                                wlist = new dijit.Dialog({
+                                    id: "wlist.dlg",
+                                    title: "Available Workspaces [" + response.count + "]",
+                                    style: "width:60%"
+                                });
+                                var contDiv = dojo.create("div", {"class": "dlg-cont"});
+                                var browDiv = dojo.create("div", {"class": "brow-top"}, contDiv);
+                                if (isSA) {
+                                    var newBtn = dojo.create("button", {id: "wlist.new.btn", onclick: "createWorkspace()", dojotype: "dijit.form.Button"}, browDiv);
+                                    newBtn.appendChild(document.createTextNode("New "));
+                                    dojo.create("img", {src: '/res/img/document-new.png', border: 0}, newBtn);
+                                }
+                                var rldBtn = dojo.create("button", {id: "wlist.rld.btn", onclick: "showWorkspaces()", dojotype: "dijit.form.Button"}, browDiv);
+                                rldBtn.appendChild(document.createTextNode("Refresh List "));
+                                dojo.create("img", {src: "/res/img/view-refresh.png", border: 0}, rldBtn);
+                                dojo.create("div", {id: "wlist.list", innerHTML: wlistHTML(response.items)}, contDiv);
+                                wlist.attr("content", contDiv);
+                                var handle = dojo.connect(wlist, "onCancel", function(e) {dojo.disconnect(handle); wlist.destroyRecursive(false); wlist = null;});
+                                wlist.show();
+                            }
+                        }
+                        return response;
+                    }
+                });
+            }
+
+            function wlistHTML(list) {
+                if (list.length > 0) {
                     var html = "<table class=\"list\"><thead><tr><th>Name</th><th>Active</th></tr></thead><tbody>";
-                    for (var i = 0; i < wlist.length; i++) {
-                        var w = wlist[i];
+                    for (var i = 0; i < list.length; i++) {
+                        var w = list[i];
                         var active = w.active == "true";
                         html += "<tr class=\"" + ((active) ? "on" : "off") + "\" id=\"wr" + i + "\"><td>";
@@ -1290 +1288 @@
                     return html;
                 } else {
-                    return "<div class=\"info\">No publications for the selected file. Please ask the workspace administrator to create publications for this file.</p></div>";
+                    return "<div class=\"info\"><p>No publications for the selected file.<br/>Please ask the workspace administrator to create publications for this file.</p></div>";
                 }
             }
@@ -1297 +1295 @@
                 var fname = new String(selectedFile).replace(noPathRE, "");
                 dojo.xhrGet({
-                    url: "/workspaces/${wksp}/publications?file=" + selectedFile,
-                    headers: {Accept: "application/json"},
+                    url: "/workspaces/${wksp}/publications.json?file=" + selectedFile,
+                    preventCache: true,
                     handleAs: "json",
-                    load: function(response, ioArgs) {
-                        var plist = response.publications;
-                        var dlg = dijit.byId("plist");
-                        dlg.attr("title", "Publications [" + response.count + "] for " + fname);
-                        dojo.byId("plist.list").innerHTML = plistHTML(plist);
-                        dlg.attr("content", dojo.byId("plist.container"));
-                        dojo.connect(dlg, "onCancel", function(e) { dojo.empty("plist.list"); });
-                        dlg.show();
-                        return response;
-                    },
-                    error: function(response, ioArgs) {
-                        errorDialog("Cannot Retrieve Publications for '" + fname + "'", response);
-                        console.warn(response, ioArgs);
+                    handle: function(response, ioArgs) {
+                        if (ioArgs.xhr.status != 200) {
+                            errorDialog("Cannot Retrieve Publications for '" + fname + "'", response);
+                            console.warn(response, ioArgs);
+                        } else {
+                            if (plist && plist != null) {
+                                plist.attr("title", "Publications [" + response.count + "] for " + fname);
+                                dojo.empty("plist.list");
+                                dojo.byId("plist.list").innerHTML = plistHTML(response.publications);
+                                plist.show();
+                            } else {
+                                plist = new dijit.Dialog({
+                                    id: "plist.dlg",
+                                    title: "Publications [" + response.count + "] for " + fname,
+                                    style: "width:60%"
+                                });
+                                var contDiv = dojo.create("div", {"class": "dlg-cont"});
+                                var browDiv = dojo.create("div", {"class": "brow-top"}, contDiv);
+                                if (isSA || isWA) {
+                                    var newBtn = dojo.create("button", {id: "plist.new.btn", onclick: "createPub()", dojotype: "dijit.form.Button"}, browDiv);
+                                    newBtn.appendChild(document.createTextNode("New "));
+                                    dojo.create("img", {src: '/res/img/document-new.png', border: 0}, newBtn);
+                                }
+                                var rldBtn = dojo.create("button", {id: "plist.rld.btn", onclick: "showPubs()", dojotype: "dijit.form.Button"}, browDiv);
+                                rldBtn.appendChild(document.createTextNode("Refresh List "));
+                                dojo.create("img", {src: '/res/img/view-refresh.png', border: 0}, rldBtn);
+                                dojo.create("div", {id: 'plist.list', innerHTML: plistHTML(response.publications)}, contDiv);
+                                plist.attr("content", contDiv);
+                                var handle = dojo.connect(plist, "onCancel", function(e) {dojo.disconnect(handle); plist.destroyRecursive(false); plist = null;});
+                                plist.show();
+                            }
+                        }
                         return response;
                     }
@@ -1352 +1369 @@
                     url: "/workspaces/${wksp}/pubsqueue",
                     form: dojo.byId("pnewf"),
-                    handleAs: "text",
                     handle: function(response, ioArgs) {
                         if (ioArgs.xhr.status != 202) {
@@ -1371 +1387 @@
                         url: "/workspaces/${wksp}/publications",
                         form: dojo.byId("pnewf"),
-                        handleAs: "text",
                         handle: function(response, ioArgs) {
                             if (ioArgs.xhr.status != 201) {
@@ -1390 +1405 @@
 
             function createPub() {
-                dijit.byId("plist").hide();
+                dijit.byId("plist.dlg").hide();
                 var nform = dojo.byId("pnewf");
                 nform.reset();
@@ -1397 +1412 @@
                 var dlg = dijit.byId("pnew");
                 dlg.attr("title", "Create Publication for " + selectedFile);
-                dojo.connect(dlg, "onCancel", function(e) {dijit.byId("plist").show();});
+                dojo.connect(dlg, "onCancel", function(e) {dijit.byId("plist.dlg").show();});
                 dlg.show();
             }
 
             function editPub(/* int */index) {
-                dijit.byId("plist").hide(); // Hide pubs list dialog (in dojo 1.4 it should be possible to have a dialog pop another one up, so this should be reviewed)
+                dijit.byId("plist.dlg").hide(); // Hide pubs list dialog (in dojo 1.4 it should be possible to have a dialog pop another one up, so this should be reviewed)
                 var eform = dojo.byId("peditf")
                 eform.reset();
@@ -1437 +1452 @@
                 var peDlg = dijit.byId("pedit");
                 peDlg.attr("title", "Modify Publication Parameters for " + p.name);
-                dojo.connect(peDlg, "onCancel", function(e) {dijit.byId("plist").show();}); // See comment above about 1.4 and multipopups
+                dojo.connect(peDlg, "onCancel", function(e) {dijit.byId("plist.dlg").show();}); // See comment above about 1.4 and multipopups
                 peDlg.show();
                 oname.focus();
@@ -1447 +1462 @@
                     url: "/workspaces/${wksp}/publications/" + dojo.byId("pename").value,
                     form: eform,
-                    handleAs: "text",
-                    load: function(response, ioArgs) {
+                    handle: function(response, ioArgs) {
+                        if (ioArgs.xhr.status != 200) {
+                            console.error(response, ioArgs);
+                            errorDialog("Error Modifying Publication", response);
+                        }
                         eform.reset();
-                        console.info(response, ioArgs);
-                        return response;
-                    },
-                    error: function(response, ioArgs) {
-                        eform.reset();
-                        console.error(response, ioArgs);
                         return response;
                     }
@@ -1464 +1476 @@
 
             function showRevLog() {
+                var fname = new String(selectedFile).replace(noPathRE, "");
                 dojo.xhrGet({
                     url: selectedFile + "/revhistory",
@@ -1469 +1482 @@
                     handle: function(response, ioArgs) {
                         if (ioArgs.xhr.status != 200) {
-                            errorDialog("Error Retrieving Revhistory", response);
+                            errorDialog("Cannot Retrieve Revhistory for '" + fname + "'", response);
+                            console.warn(response, ioArgs);
                         } else {
-                            var fname = new String(selectedFile).replace(noPathRE, "");
-                            var rlist = response.revisions;
-                            var dlg = dijit.byId("revlog");
-                            dlg.attr("title", "Revisions [" + response.count + "] history for " + fname);
-                            dojo.byId("revlog.list").innerHTML = rlistHTML(rlist);
-                            dlg.attr("content", dojo.byId("revlog.container"));
-                            dojo.connect(dlg, "onCancel", function(e) { dojo.empty("revlog.list"); });
-                            dlg.show();
+                            if (revlog && revlog != null) {
+                                revlog.attr("title", "Revisions [" + response.count + "] history for " + fname);
+                                dojo.empty("revlog.list");
+                                dojo.byId("revlog.list").innerHTML = rlistHTML(response.revisions);
+                                revlog.show();
+                            } else {
+                                revlog = new dijit.Dialog({
+                                    id: "revlog.dlg",
+                                    title: "Revisions [" + response.count + "] history for " + fname,
+                                    style: "width:60%"
+                                });
+                                var contDiv = dojo.create("div", {"class" : "dlg-cont"});
+                                var browDiv = dojo.create("div", {"class": "brow-top"}, contDiv);
+                                var rldBtn = dojo.create("button", {id: "revlog.rld.btn", onclick: "showRevLog()", dojotype: "dijit.form.Button"}, browDiv);
+                                rldBtn.appendChild(document.createTextNode("Refresh "));
+                                dojo.create("img", {src: "/res/img/view-refresh.png", border: 0}, rldBtn);
+                                dojo.create("div", {id: "revlog.list", innerHTML: rlistHTML(response.revisions)}, contDiv);
+                                revlog.attr("content", contDiv);
+                                var handle = dojo.connect(revlog, "onCancel", function(e) {dojo.disconnect(handle); revlog.destroyRecursive(false); revlog = null;});
+                                revlog.show();
+                            }
                         }
                         return response;
@@ -1889 +1916 @@
                     headers: {Accept: "application/json"},
                     handleAs: "json",
+                    preventCache: true,
                     load: function(response, ioArgs) {
                         var node = dojo.byId("lock");
@@ -1895 +1923 @@
                             if (locker == "${user.email}" || isWA || isSA) {
                                 var span = dojo.create("span", {"class": "button"}, node);
-                                dojo.create("a", {onclick: "unLock('" + href + "')", innerHTML: "Unlock"}, span);
+                                dojo.create("a", {href: "javascript:unLock('" + href + "')", innerHTML: "Unlock"}, span);
                             }
                             dojo.create("img", {src: "/res/img/lock.png", alt: "[lock]", style: "padding-left: 5px; vertical-align: middle;" }, node);
@@ -1904 +1932 @@
                         else {
                             var span = dojo.create("span", {"class": "button"}, node);
-                            dojo.create("a", {onclick: "lock('" + href + "')", innerHTML: "Lock"}, span);
+                            dojo.create("a", {href: "javascript:lock('" + href + "')", innerHTML: "Lock"}, span);
                         }
                         return response;

trunk/src/com/calenco/staticres/workspaces-html.ftl

@@ -29 +29 @@
         <style type="text/css">
             #preloader, body, html {width:100%;height:100%;margin:0;padding:0;}
-            /*#preloader {background:#fff url("http://o.aolcdn.com/dojo/1.3.2/dojox/image/resources/images/loading.gif") no-repeat center center;position:absolute;z-index:999;}*/
-            #preloader {background:#fff url("/res/img/cco-loading.gif") no-repeat center center;position:absolute;z-index:999;}
+            #preloader {background:#fff url("http://o.aolcdn.com/dojo/1.3.2/dojox/image/resources/images/loading.gif") no-repeat center center;position:absolute;z-index:999;}
+            /*#preloader {background:#fff url("/res/img/cco-loading.gif") no-repeat center center;position:absolute;z-index:999;}*/
         </style>
         <script type="text/javascript">djConfig = {parseOnLoad:false,isDebug:true,dojoBlankHtmlUrl:'/res/html/blank.html',baseUrl:'/res'};</script>
@@ -44 +44 @@
             dojo.require("dijit.Dialog");
             dojo.require("dijit.form.Button");
-            dojo.require("dojo.io.iframe");
             dojo.require("dijit.form.TextBox");
+            dojo.require("dijit.form.ValidationTextBox");
             dojo.require("dijit.form.FilteringSelect");
             dojo.require("dijit.form.CheckBox");
+            dojo.require("dijit.form.Form");
+            dojo.require("dojo.io.iframe");
             dojo.require("dojo.data.ItemFileReadStore");
 
@@ -61 +63 @@
                 if (evt.keyCode == dojo.keys.ENTER) {
                     evt.preventDefault();
-                }
+                    return false;
+                }
+                return true;
             }
 
@@ -117 +121 @@
                         showUsers();
                     });
+                }
+
+                /* Wire blockEnter to workspace creation text input */
+                if (isSA) {
+                    dojo.connect(dijit.byId("wdescription").textbox, "onkeypress", function(e) { blockEnter(e); });
                 }
             }
@@ -165 +174 @@
         <!--[if IE]>
         <script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
+        <script type='text/javascript'>firebug.env.height = 150</script>
         <![endif]-->
         <#-- Page title -->
@@ -205 +215 @@
                 <div dojoType="dijit.Tooltip" connectId="ueditp.button">Change user <strong>${user.name}</strong> properties</div>
                 <#if user.isSA == true>
-                <button id="create.button" dojoType="dijit.form.Button" type="button" style="padding-top:4px;">
-                    Create
-                    <script type="dojo/method" event="onClick" args="evt">
-                        dijit.byId("create").show();
-                    </script>
-                </button>
-                <div id="create" title="Create Workspace" dojoType="dijit.Dialog">
+                <button id="create.button" dojoType="dijit.form.Button" onclick="createWorkspace()" type="button" style="padding-top:4px;">Create</button>
+                <div id="wnew" title="Create Workspace" dojotype="dijit.Dialog" style="width:40%;">
+                    <form id="wnewf" name="wnewf" enctype="application/x-www-form-urlencoded" method="post" action="/workspaces" dojotype="dijit.form.Form">
+                        <div class="frow">
+                            <span style="width:37%;">
+                                <label for="wdescription">Workspace Name: </label>
+                            </span>
+                            <span style="width:51%;">
+                                <input id="wdescription" name="description" type="text" dojotype="dijit.form.ValidationTextBox" trim="true" required="true" invalidmessage="Workspace name is required" />
+                            </span>
+                        </div>
+                        <div class="brow"br>
+                            <button onclick="doCreateWorkspace()" dojotype="dijit.form.Button">Create</button>
+                        </div>
+                    </form>
+                </div>
+                <#-- <div id="create" title="Create Workspace" dojoType="dijit.Dialog">
                     <div id="create.container">
                         <form id="createf" name="createf" enctype="application/x-www-form-urlencoded">
@@ -220 +240 @@
                         </form>
                     </div>
-                </div>
+                </div> -->
                 </#if>
             </div> <#-- /Toolbar -->
@@ -514 +534 @@
                 });
             }
-            
+
             function createWorkspace() {
-                dojo.xhrPost({
-                    url: "/workspaces",
-                    form: dojo.byId("createf"),
-                    handle: function(response, ioArgs) {
-                        if (ioArgs.xhr.status != 201) {
-                            errorDialog("Error creating workspace", response);
-                        } else {
-                            updateWorkspaceList();
-                        }
-                        return response;
-                    }
-                });
-                dijit.byId("create").hide();
-                dojo.byId("createf").reset();
+                var nform = dojo.byId("wnewf");
+                nform.reset();
+                var dlg = dijit.byId("wnew");
+                dlg.show();
+            }
+
+            function doCreateWorkspace() {
+                var nform = dijit.byId("wnewf");
+                if (nform.validate()) {
+                    dojo.xhrPost({
+                        url: "/workspaces",
+                        form: dojo.byId("wnewf"),
+                        handle: function(response, ioArgs) {
+                            if (ioArgs.xhr.status != 201) {
+                                errorDialog("Cannot Create Workspace", response);
+                                console.warn(response, ioArgs);
+                            } else {
+                                updateWorkspaceList();
+                            }
+                            return response;
+                        }
+                    });
+                    nform.reset();
+                    dijit.byId("wnew").hide();
+                } else {
+                    console.warn("Form not valid!", nform);
+                }
             }