Merge branch 'brooksbecton-attachments-improvements' into devel

This commit is contained in:
Lauri Ojansivu 2017-10-31 06:20:02 +02:00
commit 29a08e5568
6 changed files with 28 additions and 7 deletions

View file

@ -79,3 +79,4 @@ shell-server@0.2.3
simple:rest-accounts-password simple:rest-accounts-password
useraccounts:core useraccounts:core
email@1.2.3 email@1.2.3
horka:swipebox

View file

@ -58,6 +58,7 @@ es5-shim@4.6.15
fastclick@1.0.13 fastclick@1.0.13
fortawesome:fontawesome@4.7.0 fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10 geojson-utils@1.0.10
horka:swipebox@1.0.2
hot-code-push@1.0.4 hot-code-push@1.0.4
html-tools@1.0.11 html-tools@1.0.11
htmljs@1.0.11 htmljs@1.0.11

View file

@ -2,9 +2,10 @@
This release adds the following new features: This release adds the following new features:
* [Permit editing WIP limit](https://github.com/wekan/wekan/pull/1312). * [Permit editing WIP limit](https://github.com/wekan/wekan/pull/1312);
* [Image attachment resize on smaller screens and swipebox](https://github.com/wekan/wekan/pull/1315).
Thanks to GitHub users nztqa and ocdtrekkie for their contributions. Thanks to GitHub users brooksbecton, nztqa and ocdtrekkie for their contributions.
# v0.51 2017-10-25 Wekan release # v0.51 2017-10-25 Wekan release

View file

@ -21,11 +21,11 @@ template(name="attachmentDeletePopup")
template(name="attachmentsGalery") template(name="attachmentsGalery")
.attachments-galery .attachments-galery
each attachments each attachments
a.attachment-item.js-open-viewer(title="{{_ 'added'}} {{ moment uploadedAt }}") a.attachment-item.swipebox(href="{{url}}" title="{{name}}")
.attachment-thumbnail .attachment-thumbnail
if isUploaded if isUploaded
if isImage if isImage
img.attachment-thumbnail-img.js-preview-image(src="{{url}}") img.attachment-thumbnail-img(src="{{url}}")
else else
span.attachment-thumbnail-ext= extension span.attachment-thumbnail-ext= extension
else else

View file

@ -11,9 +11,6 @@ Template.attachmentsGalery.events({
'click .js-download'(event) { 'click .js-download'(event) {
event.stopPropagation(); event.stopPropagation();
}, },
'click .js-open-viewer'() {
// XXX Not implemented!
},
'click .js-add-cover'() { 'click .js-add-cover'() {
Cards.findOne(this.cardId).setCover(this._id); Cards.findOne(this.cardId).setCover(this._id);
}, },

View file

@ -58,7 +58,28 @@
.preview-clipboard-image .preview-clipboard-image
width: 280px width: 280px
max-width: 100%;
height: 200px height: 200px
display: block display: block
border: 1px solid black border: 1px solid black
box-shadow: 0 1px 2px rgba(0,0,0,.2) box-shadow: 0 1px 2px rgba(0,0,0,.2)
@media screen and (max-width: 800px)
.attachments-galery
flex-direction
row
.attachment-item
width: 50% - 2%
.attachment-thumbnail
height: 130px
.attachment-details
font-size: 1.1em
@media screen and (max-width: 360px)
.attachments-galery
.attachment-item
width: 100%
.attachment-thumbnail
height: 200px