diff --git a/CHANGELOG.md b/CHANGELOG.md index 13d638678..eaea25bbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ script to fix this. - Files were not properly reindexed when the Move button was used to move a file into or out of a folder in a dataset. - When adding a file to a dataset by URL, prioritize the URL `content-type` header over the file content type established by looking at the file name extension. +- Wrap words across lines to stay within interface elements. [#160](https://github.com/clowder-framework/clowder/issues/160) ## 1.14.0 - 2021-01-07 diff --git a/app/views/collectionofdatasets.scala.html b/app/views/collectionofdatasets.scala.html index dcb4e88a5..a5cdcfa82 100644 --- a/app/views/collectionofdatasets.scala.html +++ b/app/views/collectionofdatasets.scala.html @@ -89,7 +89,7 @@
-

@Html(collection.name)

+

@Html(collection.name)

@if(!collection.trash && Permission.checkPermission(Permission.EditCollection, ResourceRef(ResourceRef.collection, collection.id))) {

diff --git a/app/views/datasets/listitem.scala.html b/app/views/datasets/listitem.scala.html index b0453f078..cc4709c91 100644 --- a/app/views/datasets/listitem.scala.html +++ b/app/views/datasets/listitem.scala.html @@ -29,7 +29,7 @@
diff --git a/app/views/file.scala.html b/app/views/file.scala.html index 3fc665bfe..1e3804727 100644 --- a/app/views/file.scala.html +++ b/app/views/file.scala.html @@ -257,7 +257,7 @@
-

@Html(file.filename)

+

@Html(file.filename)

@if(Permission.checkPermission(Permission.EditFile, ResourceRef(ResourceRef.file, file.id))) {
diff --git a/app/views/files/linkDownload.scala.html b/app/views/files/linkDownload.scala.html index e218ed243..697eaa586 100644 --- a/app/views/files/linkDownload.scala.html +++ b/app/views/files/linkDownload.scala.html @@ -3,7 +3,7 @@ @main("Download File") {
-

@Html(file.filename)

+

@Html(file.filename)

diff --git a/app/views/files/listitem.scala.html b/app/views/files/listitem.scala.html index a4319413b..83cbb53f4 100644 --- a/app/views/files/listitem.scala.html +++ b/app/views/files/listitem.scala.html @@ -23,7 +23,7 @@
-

@file.filename

+

@file.filename

    diff --git a/app/views/files/share.scala.html b/app/views/files/share.scala.html index e4dfedadd..f99678ede 100644 --- a/app/views/files/share.scala.html +++ b/app/views/files/share.scala.html @@ -3,7 +3,7 @@ @main("Share") {
    -

    @Html(file.filename)

    +

    @Html(file.filename)

    diff --git a/app/views/spaces/spaceAllocation.scala.html b/app/views/spaces/spaceAllocation.scala.html index dbefc12ce..f68def0ef 100644 --- a/app/views/spaces/spaceAllocation.scala.html +++ b/app/views/spaces/spaceAllocation.scala.html @@ -37,7 +37,7 @@

    @Messages("a.contains.b", Messages("spaces.title"), Messages("dataset.title"

    @if(resourceType == ResourceRef.dataset) { diff --git a/conf/messages b/conf/messages index d142f5a26..862ebbfb3 100644 --- a/conf/messages +++ b/conf/messages @@ -12,7 +12,7 @@ trial.title = Trial {0} owner.label=Owner owner.title = {0}''s {1} owner.in.resource.title={0}''s {1} in {2} {4} -resource.in.title= {0} in {1} {3} +resource.in.title= {0} in {1} {3} list.title= {0} # Basic terms diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 583aacef5..d86877488 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -579,6 +579,10 @@ p.error, span.error { border-bottom: 1px solid #E1E1E8; } +.space-title { + word-wrap: break-word; +} + .space-col-right { padding-left: 50px; }