diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/oc-dialogs.js | 4 | ||||
| -rw-r--r-- | core/js/share/sharedialoglinkshareview.handlebars | 3 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 1 | ||||
| -rw-r--r-- | core/js/sharetemplates.js | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 3169dab4b88..f1fa2b41c9d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -242,7 +242,7 @@ var OCdialogs = { // No grid for IE! if (OC.Util.isIE()) { self.$filePicker.find('#picker-view-toggle').remove(); - self.$filePicker.find('#filestable').removeClass('view-grid'); + self.$filePicker.find('#picker-filestable').removeClass('view-grid'); } $('body').append(self.$filePicker); @@ -808,7 +808,7 @@ var OCdialogs = { _getGridSettings: function() { var self = this; $.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function(response) { - self.$showGridView.checked = response.gridview; + self.$showGridView.get(0).checked = response.gridview; self.$showGridView.next('#picker-view-toggle') .removeClass('icon-toggle-filelist icon-toggle-pictures') .addClass(response.gridview ? 'icon-toggle-filelist' : 'icon-toggle-pictures') diff --git a/core/js/share/sharedialoglinkshareview.handlebars b/core/js/share/sharedialoglinkshareview.handlebars index 4f58f632d1b..5889806e1ca 100644 --- a/core/js/share/sharedialoglinkshareview.handlebars +++ b/core/js/share/sharedialoglinkshareview.handlebars @@ -17,7 +17,8 @@ {{/if}} {{#each linkShares}} <li data-share-id="{{cid}}"> - <div class="avatar icon-public-white"></div><span class="username" title="{{linkShareLabel}}">{{linkShareLabel}}</span> + <div class="avatar icon-public-white"></div> + <span class="username" title="{{linkShareCreationDate}}">{{linkShareLabel}}</span> <span class="sharingOptionsGroup"> <a href="#" class="clipboard-button icon icon-clippy has-tooltip" data-clipboard-text="{{shareLinkURL}}" title="{{copyLabel}}"></a> diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 989c10c2c57..716df70c376 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -832,6 +832,7 @@ newShareTitle: t('core', 'New share link'), copyLabel: t('core', 'Copy link'), showPending: this.showPending === share.id, + linkShareCreationDate: t('core', 'Created on {time}', { time: moment(share.stime * 1000).format('LLLL') }) }) }, diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js index 049ee90aa6f..4d827bbe83f 100644 --- a/core/js/sharetemplates.js +++ b/core/js/sharetemplates.js @@ -36,8 +36,8 @@ templates['sharedialoglinkshareview'] = template({"1":function(container,depth0, return " <li data-share-id=\"" + alias4(((helper = (helper = helpers.cid || (depth0 != null ? depth0.cid : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"cid","hash":{},"data":data}) : helper))) - + "\">\n <div class=\"avatar icon-public-white\"></div><span class=\"username\" title=\"" - + alias4(((helper = (helper = helpers.linkShareLabel || (depth0 != null ? depth0.linkShareLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"linkShareLabel","hash":{},"data":data}) : helper))) + + "\">\n <div class=\"avatar icon-public-white\"></div>\n <span class=\"username\" title=\"" + + alias4(((helper = (helper = helpers.linkShareCreationDate || (depth0 != null ? depth0.linkShareCreationDate : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"linkShareCreationDate","hash":{},"data":data}) : helper))) + "\">" + alias4(((helper = (helper = helpers.linkShareLabel || (depth0 != null ? depth0.linkShareLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"linkShareLabel","hash":{},"data":data}) : helper))) + "</span>\n \n <span class=\"sharingOptionsGroup\">\n <a href=\"#\" class=\"clipboard-button icon icon-clippy has-tooltip\" data-clipboard-text=\"" |