Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Adding mime type for geojson
- Add "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
- Show statistics of spaces (bytes, users. etc) [#119](https://github.com/clowder-framework/clowder/issues/119)

### Changed
- Space layout is now more inline with the layout of files and dataasets.

## 1.18.1 - 2021-08-16

Expand Down Expand Up @@ -69,6 +73,7 @@ If any files are returned, you should check to see if these files affected and a

### Changed
- Updated Sphinx dependencies due to security and changes in required packages.
- Updated the three.js libraries for the FBX previewer

## 1.16.0 - 2021-03-31

Expand Down Expand Up @@ -137,6 +142,7 @@ script to fix this.
## 1.14.0 - 2021-01-07

### Added
- Added a previewer for FBX files.
- Added a new `/api/reports/metrics/extractors` report for summarizing extractor usage by user. Database administrators
can use `scripts/updates/UpdateUserId.js` to assign user IDs to older extraction event records based on resource ownership
in order to improve the accuracy of the report for older data.
Expand Down
75 changes: 49 additions & 26 deletions app/views/spaces/otherActions.scala.html
Original file line number Diff line number Diff line change
@@ -1,38 +1,61 @@
@(space: ProjectSpace)(implicit user: Option[models.User])
@import api.Permission
@import play.api.i18n.Messages
<div class="row ds-section-sm space-col-right">
<ul class="list-unstyled">
@if(Permission.checkPermission(Permission.EditSpace, ResourceRef(ResourceRef.space, space.id))) {
<li><a href="@routes.Spaces.manageUsers(space.id)" class="btn btn-link btn-xs btn-margins">
<div class="row ds-section-sm">
<div class="col-md-12 col-lg-12 col-sm-12">
<h3>Space Management</h3>
</div>
@if(Permission.checkPermission(Permission.EditSpace, ResourceRef(ResourceRef.space, space.id))) {
<div class="col-md-12 col-lg-12 col-sm-12">
<a href="@routes.Spaces.manageUsers(space.id)" class="btn btn-link btn-xs btn-margins">
<span class = "glyphicon glyphicon-user" aria-hidden="true"></span> Manage Users
</a></li>
<li><a href="@routes.Spaces.updateSpace(space.id)" class="btn btn-link btn-xs btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a href="@routes.Spaces.updateSpace(space.id)" class="btn btn-link btn-xs btn-margins">
<span class = "glyphicon glyphicon-edit" aria-hidden="true"></span> Edit @Messages("space.title")
</a></li>
<li><a href="@routes.Metadata.getMetadataBySpace(space.id)" class="btn btn-link btn-xs btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a href="@routes.Metadata.getMetadataBySpace(space.id)" class="btn btn-link btn-xs btn-margins">
<span class = "glyphicon glyphicon-list" aria-hidden="true"></span> Manage Metadata Terms & Definitions
</a></li>
<li><a href="@routes.Spaces.selectExtractors(space.id)" class="btn btn-link btn-xs btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a href="@routes.Spaces.selectExtractors(space.id)" class="btn btn-link btn-xs btn-margins">
<span class = "glyphicon glyphicon-fullscreen" aria-hidden="true"></span> Extractors
</a></li>
} else {
<li><a class="btn btn-link btn-xs disabled btn-margins">
</a>
</div>
} else {
<div class="col-md-12 col-lg-12 col-sm-12">
<a class="btn btn-link btn-xs btn-margins disabled">
<span class = "glyphicon glyphicon-user" aria-hidden="true"></span> Manage Users
</a></li>
<li><a class="btn btn-link btn-xs disabled btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a class="btn btn-link btn-xs btn-margins disabled">
<span class = "glyphicon glyphicon-edit" aria-hidden="true"></span> Edit @Messages("space.title")
</a></li>
<li><a class="btn btn-link btn-xs disabled btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a class="btn btn-link btn-xs btn-margins disabled">
<span class = "glyphicon glyphicon-list" aria-hidden="true"></span> Manage Metadata Terms & Definitions
</a></li>
<li><a class="btn btn-link btn-xs disabled btn-margins">
</a>
</div>
<div class="col-md-12 col-lg-12 col-sm-12">
<a class="btn btn-link btn-xs btn-margins disabled">
<span class = "glyphicon glyphicon-fullscreen" aria-hidden="true"></span> Extractors
</a></li>
}
@if(play.api.Play.current.plugin[services.StagingAreaPlugin].isDefined && Permission.checkPermission(Permission.EditStagingArea, ResourceRef(ResourceRef.space, space.id))) {
<li><a class = "btn btn-xs btn-link btn-margins" href="@routes.Spaces.stagingArea(space.id)" title="Staging Area"><span class="glyphicon glyphicon-book"></span> Staging Area</a></li>
}
<li>@spaces.follow(space)</li>
</ul>
</a>
</div>
}
@if(play.api.Play.current.plugin[services.StagingAreaPlugin].isDefined && Permission.checkPermission(Permission.EditStagingArea, ResourceRef(ResourceRef.space, space.id))) {
<div class="col-md-12 col-lg-12 col-sm-12">
<a href="@routes.Spaces.stagingArea(space.id)" class="btn btn-link btn-xs btn-margins" title="Staging Area">
<span class="glyphicon glyphicon-book"></span> Staging Area
</a>
</div>
}
<div class="col-md-12 col-lg-12 col-sm-12">
@spaces.follow(space)
</div>
</div>
Loading