diff --git a/test_data/sample/describo.json b/test_data/sample/describo.json index b81527bb172e052c9e8172fac579437c7787981d..7d357d8aa3e0c1422d7cfa4bb999a2434725ea54 100644 --- a/test_data/sample/describo.json +++ b/test_data/sample/describo.json @@ -32,38 +32,46 @@ "value": "0" } ] - }, - "id": "0" + } }, - "1": { + "2": { "properties": { - "type": [ + "name": [ { - "value": "Person" + "value": "Place(2)" } ], - "name": [ + "description": [ { - "value": "Person(1)" + "value": "" } ], - "affiliation": [ + "URL": [ { - "id": "" + "value": "" } ], - "email": [ + "geo": [ { - "value": " " + "value": "" } ], - "URL": [ + "Address": [ + { + "value": "" + } + ], + "type": [ + { + "value": "Place" + } + ], + "id": [ { - "value": " " + "value": "2" } ] - }, - "show": true + } }, "http://uts.edu.au": { "properties": { @@ -92,8 +100,56 @@ "value": "http://uts.edu.au" } ] - }, - "id": "http://uts.edu.au" + } + }, + "./": { + "properties": { + "name": [ + { + "value": "This is my sample" + } + ], + "description": [ + { + "value": "" + } + ], + "contactPoint": [], + "creator": [ + { + "id": "0" + } + ], + "contributor": [], + "URL": [ + { + "value": "" + } + ], + "hasPart": [ + { + "id": "pics" + }, + { + "id": "lots_of_little_files" + } + ], + "type": [ + { + "value": "Dataset" + } + ], + "id": [ + { + "value": "./" + } + ], + "path": [ + { + "value": "./" + } + ] + } }, "pics": { "properties": { @@ -128,8 +184,7 @@ "value": "pics" } ] - }, - "id": "pics" + } }, "lots_of_little_files": { "properties": { @@ -154,8 +209,7 @@ "value": "lots_of_little_files" } ] - }, - "id": "lots_of_little_files" + } }, "pics/2017-06-11 12.56.14.jpg": { "properties": { @@ -192,8 +246,7 @@ "value": "pics/2017-06-11 12.56.14.jpg" } ] - }, - "id": "pics/2017-06-11 12.56.14.jpg" + } }, "pics/sepia_fence.jpg": { "properties": { @@ -225,8 +278,7 @@ "value": "pics/sepia_fence.jpg" } ] - }, - "id": "pics/sepia_fence.jpg" + } }, "pics/thumbs/2017-06-11 12.56.14.png": { "properties": { @@ -258,8 +310,7 @@ "value": "pics/thumbs/2017-06-11 12.56.14.png" } ] - }, - "id": "pics/thumbs/2017-06-11 12.56.14.png" + } }, "pics/thumbs": { "properties": { @@ -299,8 +350,7 @@ "value": "pics/thumbs" } ] - }, - "id": "pics/thumbs" + } }, "pics/thumbs/sepia_fence.png": { "properties": { @@ -332,64 +382,8 @@ "value": "pics/thumbs/sepia_fence.png" } ] - }, - "id": "pics/thumbs/sepia_fence.png" - }, - "/Users/124411/working/describo/test_data/sample": { - "properties": { - "name": [ - { - "value": "This is my sample" - } - ], - "description": [ - { - "value": "" - } - ], - "contactPoint": [], - "creator": [ - { - "id": "0" - }, - { - "value": "", - "id": "1", - "new_type": "Person" - } - ], - "contributor": [], - "URL": [ - { - "value": "" - } - ], - "hasPart": [ - { - "id": "pics" - }, - { - "id": "lots_of_little_files" - } - ], - "type": [ - { - "value": "Dataset" - } - ], - "id": [ - { - "value": "./" - } - ], - "path": [ - { - "value": "./" - } - ] - }, - "id": "/Users/124411/working/describo/test_data/sample" + } } }, - "root": "/Users/124411/working/describo/test_data/sample" + "root": "./" } \ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index 5e2ca3da5f74771895c3c53e347fd8b5a75866ca..c8df04669633eb7ade33016f0d5c7837248a1b16 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -34,9 +34,8 @@ Package a dataset here </template> </a> - <a class="nav-link" v-else="" - data-toggle="modal" data-target="#addPathModal" - >Add a Path</a> + <a class="nav-link cursor" v-else="" + data-toggle="modal" data-target="#addPathModal">Start with a folder</a> </div> <div class="navbar-item mr-auto"> <a @@ -60,7 +59,7 @@ </a> <a class="nav-link cursor" v-else>No dataset path</a> </div> - <template v-if="context"> + <template v-if="context && dataset_path && display_path"> <div class="navbar-item mr-auto"> <div class="btn-group"> <a class="nav-link dropdown-toggle cursor" id="dropdownMenuButton" @@ -262,7 +261,7 @@ <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> - <h5 class="modal-title">Start with a Path</h5> + <h5 class="modal-title">Start with a folder</h5> <button type="button" class="close" data-dismiss="modal" aria-label="Close"> <span aria-hidden="true">×</span> </button> @@ -272,7 +271,7 @@ <div class="form-group"> <label for="addAPathInput">Path</label> <input type="text" class="form-control" name="addAPathInput" aria-describedby="path" placeholder="path"> - <small id="path" class="form-text text-muted">Input path</small> + <small id="path" class="form-text text-muted">Select a location for Describo!</small> </div> <button type="submit" class="btn btn-primary">Go</button> </form>