upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-05 00:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Add filepicker toggle

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-10-23 10:38:00 +02:00
parent c039bd2bd1
commit 26ca7a0e2f
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
5 changed files with 72 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files/appinfo/routes.php
View file

@ -66,6 +66,11 @@ $application->registerRoutes(
'url' => '/api/v1/showgridview',
'verb' => 'POST'
],
[
'name' => 'API#getGridView',
'url' => '/api/v1/showgridview',
'verb' => 'GET'
],
[
'name' => 'view#index',
'url' => '/',

11
apps/files/lib/Controller/ApiController.php
View file

@ -38,6 +38,7 @@ use OCP\Files\NotFoundException;
use OCP\IConfig;
use OCP\IRequest;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\Response;
use OCA\Files\Service\TagService;
@ -279,6 +280,16 @@ class ApiController extends Controller {
return new Response();
}
/**
* Get default settings for the grid view
*
* @NoAdminRequired
*/
public function getGridView() {
$status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '1') === '1';
return new JSONResponse(['gridview' => $status]);
}
/**
* Toggle default for showing/hiding xxx folder
*

24
core/css/styles.scss
View file

@ -698,10 +698,14 @@ code {
/* ---- DIALOGS ---- */
#oc-dialog-filepicker-content {
position: relative;
.dirtree {
width: 96%;
width: 100%;
flex-wrap: wrap;
padding-left: 12px;
padding-right: 44px;
box-sizing: border-box;
div:first-child a {
background-image: url('../img/places/home.svg?v=1');
@ -721,6 +725,24 @@ code {
}
}
}
/* Grid view toggle */
#picker-view-toggle {
position: absolute;
background-color: transparent;
border: none;
margin: 0;
padding: 22px;
opacity: .5;
right: 0;
top: 0;
&:hover,
&:focus {
opacity: 1;
}
}
.filelist-container {
box-sizing: border-box;
display: inline-block;

31
core/js/oc-dialogs.js
View file

@ -208,6 +208,7 @@ var OCdialogs = {
this.filepicker.loading = true;
this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false;
var dialogName = 'oc-dialog-filepicker-content';
@ -237,6 +238,11 @@ var OCdialogs = {
$('body').append(self.$filePicker);
self.$showGridView = $('input#picker-showgridview');
self.$showGridView.on('change', _.bind(self._onGridviewChange, self));
self._getGridSettings();
self.$filePicker.ready(function() {
self.$filelist = self.$filePicker.find('.filelist tbody');
self.$dirTree = self.$filePicker.find('.dirtree');
@ -779,6 +785,31 @@ var OCdialogs = {
//}
return dialogDeferred.promise();
},
// get the gridview setting and set the input accordingly
_getGridSettings: function() {
var self = this;
$.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function(response) {
self.$showGridView.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')
$('.list-container').toggleClass('view-grid', response.gridview);
});
},
_onGridviewChange: function() {
var show = this.$showGridView.is(':checked');
// only save state if user is logged in
if (OC.currentUser) {
$.post(OC.generateUrl('/apps/files/api/v1/showgridview'), {
show: show
});
}
this.$showGridView.next('#picker-view-toggle')
.removeClass('icon-toggle-filelist icon-toggle-pictures')
.addClass(show ? 'icon-toggle-filelist' : 'icon-toggle-pictures')
$('.list-container').toggleClass('view-grid', show);
},
_getFilePickerTemplate: function() {
var defer = $.Deferred();
if(!this.$filePickerTemplate) {

2
core/templates/filepicker.html
View file

@ -1,5 +1,7 @@
<div id="{dialog_name}" title="{title}">
<span class="dirtree breadcrumb"></span>
<input type="checkbox" class="hidden" id="picker-showgridview" checked="checked" />
<label id="picker-view-toggle" for="picker-showgridview" class="button icon-toggle-filelist" tabindex="0"></label>
<div class="filelist-container">
<div class="emptycontent">
<div class="icon-folder"></div>