From a93a2037775bb2f50ae28f6d9d25ffb08766276f Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 10:37:02 +0000 Subject: [PATCH 01/10] Update filebrowser.theme.inc Added fix for disappearing icons. --- filebrowser.theme.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filebrowser.theme.inc b/filebrowser.theme.inc index b8ca665..ea16a6c 100644 --- a/filebrowser.theme.inc +++ b/filebrowser.theme.inc @@ -127,7 +127,7 @@ function theme_dir_listing_list_view($node) { $visible_columns[$column_name] = TRUE; $unsorted_rows[$file_name][FILEBROWSER_DATA_NAME_ICON] = array( 'data' => _filebrowser_thumbnails_generate($node, $data), - 'style' => 'width:1%;' + 'style' => 'width:1%;min-width:18px;' ); break; From c12c8fff033b342758ad272ce471d5ab4c06ac73 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 10:56:49 +0000 Subject: [PATCH 02/10] Create filebrowser_style.css --- filebrowser_style.css | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 filebrowser_style.css diff --git a/filebrowser_style.css b/filebrowser_style.css new file mode 100644 index 0000000..a4b0326 --- /dev/null +++ b/filebrowser_style.css @@ -0,0 +1,8 @@ +#filebrowser-form-actions img { + max-width:none; +} + +#filebrowser-form-actions th.select-all { + width:1%; + max-width: 18px; +} From e5dacfd257e791b6809b4fdf059bd74ce0ef7d66 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 11:59:31 +0000 Subject: [PATCH 03/10] Create filebrowser_style.css --- css/filebrowser_style.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 css/filebrowser_style.css diff --git a/css/filebrowser_style.css b/css/filebrowser_style.css new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/css/filebrowser_style.css @@ -0,0 +1 @@ + From 7b3d66d6c61149352819f8a48c4becdbb467be67 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 12:00:18 +0000 Subject: [PATCH 04/10] Update filebrowser_style.css --- css/filebrowser_style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/css/filebrowser_style.css b/css/filebrowser_style.css index 8b13789..a4b0326 100644 --- a/css/filebrowser_style.css +++ b/css/filebrowser_style.css @@ -1 +1,8 @@ +#filebrowser-form-actions img { + max-width:none; +} +#filebrowser-form-actions th.select-all { + width:1%; + max-width: 18px; +} From 176846f318fc89bcec5039ca0e1f10ffba6bd1d1 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 12:00:30 +0000 Subject: [PATCH 05/10] Delete filebrowser_style.css --- filebrowser_style.css | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 filebrowser_style.css diff --git a/filebrowser_style.css b/filebrowser_style.css deleted file mode 100644 index a4b0326..0000000 --- a/filebrowser_style.css +++ /dev/null @@ -1,8 +0,0 @@ -#filebrowser-form-actions img { - max-width:none; -} - -#filebrowser-form-actions th.select-all { - width:1%; - max-width: 18px; -} From 59884da309ea2dfc385ec96a7598867c7b37e211 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 20:44:39 +0000 Subject: [PATCH 06/10] Update filebrowser.info --- filebrowser.info | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/filebrowser.info b/filebrowser.info index 448732d..5aa24ae 100644 --- a/filebrowser.info +++ b/filebrowser.info @@ -1,7 +1,8 @@ name = Filebrowser description = Provides FTP-like browsing capabilities. -version = 1.x-3.1 +version = 1.x-3.5 backdrop = 1.x type = module +stylesheets[all][] = css/filebrowser_style.css package = FileBrowser -project = "filebrowser" \ No newline at end of file +project = "filebrowser" From 30aeef31101bc79d5e995e0ef908d14f238047eb Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 21:19:04 +0000 Subject: [PATCH 07/10] Update filebrowser.module --- filebrowser.module | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/filebrowser.module b/filebrowser.module index 898edd0..b263040 100644 --- a/filebrowser.module +++ b/filebrowser.module @@ -393,7 +393,9 @@ function filebrowser_insert($node) { function filebrowser_update($node) { _filebrowser_prepare_record($node, FALSE); backdrop_write_record("node_dir_listing", $node, 'nid'); - _filebrowser_node_content_delete($node); + // From Drupal Filebrowser Issue #2760957: listing edit resets fids + // No need to reset the fids on node edit. + // _filebrowser_node_content_delete($node); } /** From 909f577b637f4832f0bf58a1888260e770d23be4 Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 21:30:53 +0000 Subject: [PATCH 08/10] Update filebrowser.module --- filebrowser.module | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/filebrowser.module b/filebrowser.module index b263040..b5f5a8b 100644 --- a/filebrowser.module +++ b/filebrowser.module @@ -474,7 +474,8 @@ function filebrowser_view($node, $view_mode) { $path_elements = explode('/', rtrim($node->file_listing['.']['relative-path'], "/")); for ($i = 0; $i < count($path_elements); $i++) { $child_dir = $path_elements[$i] == '' ? '/' : $path_elements[$i]; - $breadcrumb_path .= $child_dir; + // From Drupal Filebrowser Issue #2511546: Add a slash from the third breadcrumb. + $breadcrumb_path = ($i < 2) ? $breadcrumb_path . $child_dir : $breadcrumb_path . '/' . $child_dir; $fid = db_query("SELECT fid FROM {node_dir_listing_content} WHERE path = :path", array(':path' => $breadcrumb_path)) ->fetchField(); if ($child_dir == '/') { From b4068ca641cfa8c9d8511ccafc73a8d6bf24f4dd Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Sun, 25 Oct 2020 22:10:30 +0000 Subject: [PATCH 09/10] Update filebrowser.module --- filebrowser.module | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/filebrowser.module b/filebrowser.module index b5f5a8b..8e9d36a 100644 --- a/filebrowser.module +++ b/filebrowser.module @@ -533,7 +533,9 @@ function filebrowser_view($node, $view_mode) { // Insert filebrowser links $node-> content['links']['filebrowser'] = array('#theme' => 'links__node__blog', '#links' => _filebrowser_links($node), - '#attributes' => array('class' => array('links', 'inline')),); + '#attributes' => array('class' => array('links', 'inline')), + ); + return $node; } @@ -654,7 +656,7 @@ function filebrowser_form_upload_validate($form, &$form_state) { } /** - * uploads submition. + * uploads submission. */ function filebrowser_form_upload_submit($form, &$form_state) { $i = 1; // Later we can have multi-upload @@ -807,7 +809,7 @@ function filebrowser_form_actions_submit($form, $form_state) { if ($value) { $fids[] = $form['table']['#options'][$key]['fid']; } - } + } $result = module_invoke_all('filebrowser_action_process', $form['#node'], $form_state['values']['action'], $fids); if ($result) { return $result; From e0c976a2cd1c1e16d1659e491a82ba6ba8258f5e Mon Sep 17 00:00:00 2001 From: and-e-h <55768408+and-e-h@users.noreply.github.com> Date: Tue, 27 Oct 2020 02:14:12 +0000 Subject: [PATCH 10/10] Update filebrowser.info --- filebrowser.info | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/filebrowser.info b/filebrowser.info index 5aa24ae..f09f7a8 100644 --- a/filebrowser.info +++ b/filebrowser.info @@ -1,8 +1,6 @@ +type = module name = Filebrowser description = Provides FTP-like browsing capabilities. version = 1.x-3.5 backdrop = 1.x -type = module stylesheets[all][] = css/filebrowser_style.css -package = FileBrowser -project = "filebrowser"