use jquery; use a common set of node actions

fcrepo · Jun 20, 2013 · ad7c0c3 · ad7c0c3
1 parent 27e992c
commit ad7c0c3
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 73 deletions.
diff --git a/fcrepo-http-api/src/main/resources/views/bootstrap.min.css b/fcrepo-http-api/src/main/resources/views/bootstrap.min.css
diff --git a/fcrepo-http-api/src/main/resources/views/bootstrap.min.js b/fcrepo-http-api/src/main/resources/views/bootstrap.min.js
diff --git a/fcrepo-http-api/src/main/resources/views/common-breadcrumb.vsl b/fcrepo-http-api/src/main/resources/views/common-breadcrumb.vsl
@@ -4,10 +4,10 @@
 <ul class="breadcrumb">
     <li><a href="$uriInfo.getBaseUri()">Home</a> <span class="divider">/</span></li>
     #foreach($entry in $breadcrumbs.entrySet())
-        #if ($entry.getValue() == $uriInfo.getAbsolutePath().toString())
-            <li class="active">$entry.getKey()</li>
+        #if ($entry.getKey() == $uriInfo.getAbsolutePath().toString())
+            <li class="active">$entry.getValue()</li>
         #else
-            <li ><a href="$entry.getValue()">$entry.getKey()</a> <span class="divider">/</span></li>
+            <li ><a href="$entry.getKey()">$entry.getValue()</a> <span class="divider">/</span></li>
         #end
     #end
 </ul>
diff --git a/fcrepo-http-api/src/main/resources/views/common-head.vsl b/fcrepo-http-api/src/main/resources/views/common-head.vsl
@@ -1,9 +1,7 @@
-<script type="text/javascript">
-   #include("views/bootstrap.min.js")
-</script>
-<style type="text/css">
-   #include("views/bootstrap.min.css")
-</style>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
+
+<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
 <script type="text/javascript">
    #include("views/common.js")
 </script>

diff --git a/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl b/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl
@@ -0,0 +1,21 @@
+
+<form id="action_create">
+    <h3>Create New Node</h3>
+    <label>
+        Type
+    <select id="new_mixin">
+        <option value="">folder</option>
+        <option value="fedora:object">object</option>
+        <option value="fedora:datastream">datastream</option>
+    </select>
+    </label>
+    <label>
+        Identifier
+    <input type="text" id="new_id" placeholder="identifier"/>
+    </label>
+    <button type="submit" class="btn btn-primary">Add</button>
+</form>
+<hr />
+<form id="action_delete" action="javascript:deleteItem()">
+    <button type="submit" class="btn btn-danger">Delete</button>
+</form>
diff --git a/fcrepo-http-api/src/main/resources/views/common.css b/fcrepo-http-api/src/main/resources/views/common.css
@@ -1 +1,10 @@
 body { padding-top: 40px; }
+
+.mode_root #action_delete {
+    display: none;
+}
+
+
+.nt_file #action_create, .nt_resource #action_create {
+    display: none;
+}
diff --git a/fcrepo-http-api/src/main/resources/views/common.js b/fcrepo-http-api/src/main/resources/views/common.js
@@ -1,24 +1,34 @@
 
 function addChild()
 {
-    var id = document.getElementById("new_id").value;
-    var mixin = document.getElementById("new_mixin").value;
-    var newURI = window.location + "/" + id;
+    var id = $("#new_id").val().trim();
+
+    if ( id == "") {
+        id = "fcr:new";
+    }
+
+    var mixin = $("#new_mixin").val();
+
+    var newURI = $('#main').attr('resource') + "/" + id;
+
     if ( mixin != '' ) {
         var postURI = newURI + "?mixin=" + mixin;
     } else {
         var postURI = newURI;
     }
 
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            window.location = newURI;
-        }
-    }
-    xhr.open('POST',postURI,true);
-    xhr.send(null);
+    $.post(postURI, function(data, textStatus, request) {
+        window.location = request.getResponseHeader('Location');
+    });
+
+    return false;
 }
+
+$(function() {
+$('#action_create').submit(addChild);
+
+});
+
 function deleteItem()
 {
     var uri = window.location;

diff --git a/fcrepo-http-api/src/main/resources/views/mode-root.vsl b/fcrepo-http-api/src/main/resources/views/mode-root.vsl
@@ -7,8 +7,8 @@
 </head>
 
 
-<body>
-<div class="container" resource="$topic.getURI()">
+<body class="mode_root">
+<div id="main" class="container" resource="$topic.getURI()">
 
     #parse("views/common-node-header.vsl")
 
@@ -41,19 +41,8 @@
         <div class="span3">
         ## output actions
     <div class="actions">
-      <form action="javascript:addChild()">
-        <select id="new_mixin">
-          <option value="">folder</option>
-          <option value="fedora:object">object</option>
-          <option value="fedora:datastream">datastream</option>
-        </select>
-        <input type="text" id="new_id" value="new_id"/>
-        <input type="submit" value="add">
-      </form>
-      <form action="javascript:deleteItem()">
-        <input type="submit" value="delete this folder"/>
-
-      </form>
+        #parse("views/common-node-actions.vsl")
+
     </div>
 
           </div>

diff --git a/fcrepo-http-api/src/main/resources/views/nt-file.vsl b/fcrepo-http-api/src/main/resources/views/nt-file.vsl
@@ -7,8 +7,8 @@
 </head>
 
 
-<body>
-<div class="container" resource="$topic.getURI()">
+<body class="nt_file">
+<div  id="main" class="container" resource="$topic.getURI()">
     #parse("views/common-node-header.vsl")
 
     <div class="row">
@@ -40,13 +40,11 @@
         ## output actions
     ## output actions
     <div class="actions">
+        #parse("views/common-node-actions.vsl")
       <form action="javascript:updateFile()">
           <input type="file" id="update_file"/>
           <input type="submit" value="update content">
       </form>
-      <form action="javascript:deleteItem()">
-          <input type="submit" value="delete this datastream"/>
-      </form>
     </div>
         </div>
 

diff --git a/fcrepo-http-api/src/main/resources/views/nt-folder.vsl b/fcrepo-http-api/src/main/resources/views/nt-folder.vsl
@@ -7,8 +7,8 @@
 </head>
 
 
-<body>
-<div class="container" resource="$topic.getURI()">
+<body  class="nt_folder">
+<div  id="main" class="container" resource="$topic.getURI()">
     #parse("views/common-node-header.vsl")
 
 
@@ -42,19 +42,7 @@
         <div class="span3">
         ## output actions
             <div class="actions">
-                <form action="javascript:addChild()">
-                    <select id="new_mixin">
-                        <option value="">folder</option>
-                        <option value="fedora:object">object</option>
-                        <option value="fedora:datastream">datastream</option>
-                    </select>
-                    <input type="text" id="new_id" value="new_id"/>
-                    <input type="submit" value="add">
-                </form>
-                <form action="javascript:deleteItem()">
-                    <input type="submit" value="delete this folder"/>
-
-                </form>
+                #parse("views/common-node-actions.vsl")
             </div>
         </div>
 

diff --git a/fcrepo-http-api/src/main/resources/views/nt-resource.vsl b/fcrepo-http-api/src/main/resources/views/nt-resource.vsl
@@ -7,8 +7,8 @@
 </head>
 
 
-<body>
-<div class="container" resource="$topic.getURI()">
+<body class="nt_resource">
+<div  id="main" class="container" resource="$topic.getURI()">
     #parse("views/common-node-header.vsl")
 
 
@@ -40,6 +40,7 @@
 
         <div class="span3">
         ## output actions
+        #parse("views/common-node-actions.vsl")
         </div>
 
     </div>

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ViewHelpers.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/ViewHelpers.java
@@ -106,7 +106,7 @@ public Map<String, String> getNodeBreadcrumbs(final UriInfo uriInfo, final Node
            LOGGER.trace("Adding breadcrumb for path segment {} => {}", path, uri);
 
 
-           builder.put(path, uri);
+           builder.put(uri, path);
 
            cumulativePath.append("/");