From 45bf7bd2dedb886c84dfca31741dacf7a201b2dc Mon Sep 17 00:00:00 2001
From: Brian Weaver <weaver.299@osu.edu>
Date: Wed, 16 Jun 2021 02:25:26 -0400
Subject: [PATCH] De-composerfy and update views_fieldsets to 8.x-3.x dev
version
---
composer.json | 1 -
composer.lock | 54 +--
vendor/composer/InstalledVersions.php | 13 +-
vendor/composer/installed.json | 58 ---
vendor/composer/installed.php | 13 +-
web/modules/views_fieldsets/LICENSE.txt | 339 ------------------
web/modules/views_fieldsets/README.md | 78 ++++
.../src/Plugin/views/field/Fieldset.php | 27 +-
.../views_fieldsets/src/RowFieldset.php | 35 +-
.../views-fieldsets-details.html.twig | 2 +-
.../views-fieldsets-div.html.twig | 2 +-
.../views-fieldsets-fieldset.html.twig | 2 +-
.../views_fieldsets/views_fieldsets.info.yml | 10 +-
.../views_fieldsets/views_fieldsets.module | 33 +-
14 files changed, 147 insertions(+), 520 deletions(-)
delete mode 100644 web/modules/views_fieldsets/LICENSE.txt
create mode 100644 web/modules/views_fieldsets/README.md
diff --git a/composer.json b/composer.json
index 3601f93123..9d5c8841de 100644
--- a/composer.json
+++ b/composer.json
@@ -172,7 +172,6 @@
"drupal/views_autocomplete_filters": "1.3",
"drupal/views_bootstrap": "3.6",
"drupal/views_bulk_operations": "3.13",
- "drupal/views_fieldsets": "3.3",
"drupal/views_infinite_scroll": "1.8",
"drupal/webform": "^6",
"drush-ops/behat-drush-endpoint": "0.0.5",
diff --git a/composer.lock b/composer.lock
index 541983b296..35a0c059b1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "aaceda75f4dd47b59cc62a5c2930f95e",
+ "content-hash": "ae568968193bc676854d544c33aeda74",
"packages": [
{
"name": "alchemy/zippy",
@@ -8062,58 +8062,6 @@
"docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo"
}
},
- {
- "name": "drupal/views_fieldsets",
- "version": "3.3.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/views_fieldsets.git",
- "reference": "8.x-3.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_fieldsets-8.x-3.3.zip",
- "reference": "8.x-3.3",
- "shasum": "2bcfa3bb920ec79bee016ca7d255dcf0c8bcbff1"
- },
- "require": {
- "drupal/core": "~8.0"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "8.x-3.3",
- "datestamp": "1519199885",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "pifagor",
- "homepage": "https://www.drupal.org/user/2375692"
- },
- {
- "name": "ron_s",
- "homepage": "https://www.drupal.org/user/184990"
- },
- {
- "name": "rudiedirkx",
- "homepage": "https://www.drupal.org/user/890274"
- }
- ],
- "description": "Adds fieldsets to Views.",
- "homepage": "https://www.drupal.org/project/views_fieldsets",
- "support": {
- "source": "https://git.drupalcode.org/project/views_fieldsets"
- }
- },
{
"name": "drupal/views_infinite_scroll",
"version": "1.8.0",
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 579a8498c5..c3c3c771f1 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -32,7 +32,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => '635e50bcd628568d572d4333e30ea47f6fdf10d8',
+ 'reference' => 'a55f46589328d6dd365ebde1289d7c4f0a5fe789',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -1966,15 +1966,6 @@ class InstalledVersions
),
'reference' => '8.x-3.13',
),
- 'drupal/views_fieldsets' =>
- array (
- 'pretty_version' => '3.3.0',
- 'version' => '3.3.0.0',
- 'aliases' =>
- array (
- ),
- 'reference' => '8.x-3.3',
- ),
'drupal/views_infinite_scroll' =>
array (
'pretty_version' => '1.8.0',
@@ -2271,7 +2262,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => '635e50bcd628568d572d4333e30ea47f6fdf10d8',
+ 'reference' => 'a55f46589328d6dd365ebde1289d7c4f0a5fe789',
),
'pantheon-systems/quicksilver-pushback' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ed5725b448..a5410d252d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -8353,64 +8353,6 @@
},
"install-path": "../../web/modules/views_bulk_operations"
},
- {
- "name": "drupal/views_fieldsets",
- "version": "3.3.0",
- "version_normalized": "3.3.0.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/views_fieldsets.git",
- "reference": "8.x-3.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_fieldsets-8.x-3.3.zip",
- "reference": "8.x-3.3",
- "shasum": "2bcfa3bb920ec79bee016ca7d255dcf0c8bcbff1"
- },
- "require": {
- "drupal/core": "~8.0"
- },
- "type": "drupal-module",
- "extra": {
- "branch-alias": {
- "dev-3.x": "3.x-dev"
- },
- "drupal": {
- "version": "8.x-3.3",
- "datestamp": "1519199885",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "installation-source": "dist",
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "pifagor",
- "homepage": "https://www.drupal.org/user/2375692"
- },
- {
- "name": "ron_s",
- "homepage": "https://www.drupal.org/user/184990"
- },
- {
- "name": "rudiedirkx",
- "homepage": "https://www.drupal.org/user/890274"
- }
- ],
- "description": "Adds fieldsets to Views.",
- "homepage": "https://www.drupal.org/project/views_fieldsets",
- "support": {
- "source": "http://cgit.drupalcode.org/views_fieldsets"
- },
- "install-path": "../../web/modules/views_fieldsets"
- },
{
"name": "drupal/views_infinite_scroll",
"version": "1.8.0",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index bb5fc7e825..eaa5558c39 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => '635e50bcd628568d572d4333e30ea47f6fdf10d8',
+ 'reference' => 'a55f46589328d6dd365ebde1289d7c4f0a5fe789',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -1940,15 +1940,6 @@
),
'reference' => '8.x-3.13',
),
- 'drupal/views_fieldsets' =>
- array (
- 'pretty_version' => '3.3.0',
- 'version' => '3.3.0.0',
- 'aliases' =>
- array (
- ),
- 'reference' => '8.x-3.3',
- ),
'drupal/views_infinite_scroll' =>
array (
'pretty_version' => '1.8.0',
@@ -2245,7 +2236,7 @@
'aliases' =>
array (
),
- 'reference' => '635e50bcd628568d572d4333e30ea47f6fdf10d8',
+ 'reference' => 'a55f46589328d6dd365ebde1289d7c4f0a5fe789',
),
'pantheon-systems/quicksilver-pushback' =>
array (
diff --git a/web/modules/views_fieldsets/LICENSE.txt b/web/modules/views_fieldsets/LICENSE.txt
deleted file mode 100644
index d159169d10..0000000000
--- a/web/modules/views_fieldsets/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/web/modules/views_fieldsets/README.md b/web/modules/views_fieldsets/README.md
new file mode 100644
index 0000000000..0cce491479
--- /dev/null
+++ b/web/modules/views_fieldsets/README.md
@@ -0,0 +1,78 @@
+CONTENTS OF THIS FILE
+---------------------
+
+ * Introduction
+ * Requirements
+ * Installation
+ * Configuration
+ * Maintainers
+
+
+INTRODUCTION
+------------
+
+Creates fieldset (and details and div) in Views fields output, to group fields,
+by adding a new field: "Global: Fieldset" and a few preprocessors. Also
+introduces a new template: views-fieldsets-fieldset.tpl.php where you can
+customize your fieldset output.
+
+ * For a full description of the module, visit the project page:
+ https://www.drupal.org/project/views_fieldsets
+
+ * To submit bug reports and feature suggestions, or to track changes:
+ https://www.drupal.org/project/issues/views_fieldsets
+
+
+REQUIREMENTS
+------------
+
+This module requires no modules outside of Drupal core.
+
+
+INSTALLATION
+------------
+
+ * Install the Views fieldsets module as you would normally install a
+ contributed Drupal module. Visit
+ https://www.drupal.org/node/1897420 for further information.
+
+
+CONFIGURATION
+-------------
+
+ 1. Navigate to Administration > Extend and enable the module.
+ 2. Navigate to Administration > Structure > views and open existing view or
+ a create a new view.
+ 3. Add some fields.
+ 4. Add field "Global: Fieldset" and customize settings (html tag,
+ collapsible, tokens etc)
+ 5. Rearrange fields to drag normal fields under Fieldset fields. You can
+ nest fieldsets. The result will be visible in Preview.
+
+Theming:
+There are several new templates. You can specify the filename the Views way. See
+Theme: Information for theme hook suggestion specifics. Available:
+
+ * views-fieldsets-fieldset.tpl.php
+ * views-fieldsets-fieldset--events.tpl.php
+ * views-fieldsets-fieldset--default.tpl.php (all tags)
+ * views-fieldsets-fieldset--default.tpl.php (per tag)
+ * views-fieldsets-fieldset--page.tpl.php
+ * views-fieldsets-fieldset--events--page.tpl.php
+
+And of course the related preprocessors:
+
+```
+template_preprocess_views_fieldsets_fieldset(),
+template_preprocess_views_fieldsets_fieldset__events() etc.
+```
+
+
+MAINTAINERS
+-----------
+
+ * rudiedirkx - https://www.drupal.org/u/rudiedirkx
+
+Supporting organizations:
+
+ * GOLEMS GABB - https://www.drupal.org/golems-gabb
diff --git a/web/modules/views_fieldsets/src/Plugin/views/field/Fieldset.php b/web/modules/views_fieldsets/src/Plugin/views/field/Fieldset.php
index 292544c6ad..923a02be85 100644
--- a/web/modules/views_fieldsets/src/Plugin/views/field/Fieldset.php
+++ b/web/modules/views_fieldsets/src/Plugin/views/field/Fieldset.php
@@ -10,6 +10,8 @@
use Drupal\views_fieldsets\RowFieldset;
/**
+ * {@inheritdoc}
+ *
* @ingroup views_field_handlers.
*
* @ViewsField("fieldset").
@@ -19,7 +21,7 @@ class Fieldset extends FieldPluginBase {
/**
* {@inheritdoc}
*/
- static public function getUIFieldParents(array $fields, $field_name) {
+ public static function getUiFieldParents(array $fields, $field_name) {
$parents = [];
$current_field = $field_name;
while ($parent = self::getUIFieldParent($fields, $current_field)) {
@@ -32,14 +34,14 @@ static public function getUIFieldParents(array $fields, $field_name) {
/**
* {@inheritdoc}
*/
- static public function getUIFieldParent(array $fields, $field_name) {
+ public static function getUiFieldParent(array $fields, $field_name) {
return $fields[$field_name];
}
/**
* {@inheritdoc}
*/
- static public function getFieldParents(ViewExecutable $view, $field_name) {
+ public static function getFieldParents(ViewExecutable $view, $field_name) {
$parents = [];
$current_field = $field_name;
while ($parent = self::getFieldParent($view, $current_field)) {
@@ -52,7 +54,7 @@ static public function getFieldParents(ViewExecutable $view, $field_name) {
/**
* {@inheritdoc}
*/
- static public function getFieldParent(ViewExecutable $view, $field_name) {
+ public static function getFieldParent(ViewExecutable $view, $field_name) {
$fieldsets = self::getAllFieldsets($view);
foreach ($fieldsets as $fieldset_name => $fieldset) {
if (in_array($field_name, $fieldset->getChildren())) {
@@ -65,7 +67,7 @@ static public function getFieldParent(ViewExecutable $view, $field_name) {
/**
* {@inheritdoc}
*/
- static public function getWrapperTypes() {
+ public static function getWrapperTypes() {
$types = &drupal_static(__METHOD__);
if (!$types) {
// @todo Get from hook_theme() definitions?
@@ -81,7 +83,7 @@ static public function getWrapperTypes() {
/**
* {@inheritdoc}
*/
- static public function isFieldsetView(ViewExecutable $view) {
+ public static function isFieldsetView(ViewExecutable $view) {
foreach ($view->field as $field) {
if ($field instanceof self) {
return TRUE;
@@ -93,7 +95,7 @@ static public function isFieldsetView(ViewExecutable $view) {
/**
* {@inheritdoc}
*/
- static public function getAllFieldsets(ViewExecutable $view) {
+ public static function getAllFieldsets(ViewExecutable $view) {
return array_filter($view->field, function ($field) {
return $field instanceof self;
});
@@ -102,7 +104,7 @@ static public function getAllFieldsets(ViewExecutable $view) {
/**
* {@inheritdoc}
*/
- static public function replaceFieldsetHandlers(ViewExecutable $view, array &$fields, ResultRow $row) {
+ public static function replaceFieldsetHandlers(ViewExecutable $view, array &$fields, ResultRow $row) {
$fieldsets = self::getAllFieldsets($view);
// Replace Fieldsets.
foreach ($fields as $name => $field) {
@@ -187,7 +189,9 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#title' => $this->t('Collapsed'),
'#default_value' => $this->options['collapsed'],
];
- // Available tokens list. Not as pretty as FieldPluginBase, because it doesn't have a reusable method.
+ /* Available tokens list. Not as pretty as FieldPluginBase,
+ * because it doesn't have a reusable method.
+ */
$form['tokens'] = [
'#theme' => 'item_list',
'#title' => $this->t('Replacement patterns'),
@@ -201,7 +205,10 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function render(ResultRow $values) {
- // This will be overridden in RowFieldset::render(), which is called by magic through $field->content.
+ /*
+ * This will be overridden in RowFieldset::render(),
+ * which is called by magic through $field->content.
+ */
return '[' . implode('|', $this->getChildren()) . ']';
}
diff --git a/web/modules/views_fieldsets/src/RowFieldset.php b/web/modules/views_fieldsets/src/RowFieldset.php
index 29c157dfb7..8dad316811 100644
--- a/web/modules/views_fieldsets/src/RowFieldset.php
+++ b/web/modules/views_fieldsets/src/RowFieldset.php
@@ -3,10 +3,14 @@
namespace Drupal\views_fieldsets;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Unicode;
use Drupal\Core\Render\Markup;
use Drupal\views\ResultRow;
use Drupal\views_fieldsets\Plugin\views\field\Fieldset;
+/**
+ * {@inheritdoc}
+ */
class RowFieldset {
public $row;
@@ -40,7 +44,8 @@ public function __isset($name) {
* Method's name.
*/
public function __get($name) {
- if (is_callable($method = [$this, "get_$name"])) {
+ $method_name = 'get' . Unicode::ucwords($name);
+ if (is_callable($method = [$this, $method_name])) {
return call_user_func($method);
}
if (!empty($name) && !empty($this->properties[$name])) {
@@ -50,23 +55,23 @@ public function __get($name) {
}
/**
- * Object get_content().
+ * Object getcontent().
*/
- public function get_content() {
+ public function getContent() {
return $this->render();
}
/**
- * Object get_wrapper_element().
+ * Object getwrapperelement().
*/
- public function get_wrapper_element() {
+ public function getWrapperelement() {
return '';
}
/**
- * Object get_element_type().
+ * Object getelementtype().
*/
- public function get_element_type() {
+ public function getElementtype() {
return '';
}
@@ -80,9 +85,14 @@ public function render() {
'#fields' => $this->children,
'#legend' => Markup::create($this->getLegend()),
'#collapsible' => (bool) $this->handler->options['collapsible'],
- '#collapsed' => (bool) $this->handler->options['collapsed'],
- '#classes' => $this->getClasses(),
+ '#attributes' => [
+ 'class' => $this->getClasses(),
+ ],
];
+ if ($this->handler->options['collapsed'] && $this->getWrapperType() != 'div') {
+ $element['#attributes']['class'][] = 'collapsed';
+ }
+
return render($element);
}
@@ -115,7 +125,8 @@ protected function getClasses() {
$classes = array_map(function ($class) {
return Html::getClass($this->tokenize($class));
}, $classes);
- return implode(' ', $classes);
+
+ return $classes;
}
/**
@@ -133,8 +144,8 @@ protected function tokenize($string) {
*
* @param array $fields
* Fields.
- * @param array $field_name
- * Fields name.
+ * @param string $field_name
+ * Field name.
*/
public function addChild(array $fields, $field_name) {
$this->children[$field_name] = $fields[$field_name];
diff --git a/web/modules/views_fieldsets/views-fieldsets-details.html.twig b/web/modules/views_fieldsets/views-fieldsets-details.html.twig
index abba152eb3..5024fd7759 100644
--- a/web/modules/views_fieldsets/views-fieldsets-details.html.twig
+++ b/web/modules/views_fieldsets/views-fieldsets-details.html.twig
@@ -1,4 +1,4 @@
-<details class="{{ classes }}" {% if not collapsed %}open{% endif %}>
+<details {{ attributes }}>
{% if legend %}
<summary>{{ legend }}</summary>
{% endif %}
diff --git a/web/modules/views_fieldsets/views-fieldsets-div.html.twig b/web/modules/views_fieldsets/views-fieldsets-div.html.twig
index 04033634d7..62f8a45f1c 100644
--- a/web/modules/views_fieldsets/views-fieldsets-div.html.twig
+++ b/web/modules/views_fieldsets/views-fieldsets-div.html.twig
@@ -1,3 +1,3 @@
-<div class="{{ classes }}">
+<div {{ attributes }}>
{% include 'views-view-fields.html.twig' %}
</div>
diff --git a/web/modules/views_fieldsets/views-fieldsets-fieldset.html.twig b/web/modules/views_fieldsets/views-fieldsets-fieldset.html.twig
index 0b18d8d30d..173e861b48 100644
--- a/web/modules/views_fieldsets/views-fieldsets-fieldset.html.twig
+++ b/web/modules/views_fieldsets/views-fieldsets-fieldset.html.twig
@@ -1,4 +1,4 @@
-<fieldset class="{{ classes }} {% if collapsed %}collapsed{% endif %}">
+<fieldset {{ attributes }}>
{% if legend %}
<legend>{{ legend }}</legend>
{% endif %}
diff --git a/web/modules/views_fieldsets/views_fieldsets.info.yml b/web/modules/views_fieldsets/views_fieldsets.info.yml
index eb9f9b7c05..154de2df78 100644
--- a/web/modules/views_fieldsets/views_fieldsets.info.yml
+++ b/web/modules/views_fieldsets/views_fieldsets.info.yml
@@ -1,11 +1,5 @@
-name: Views fieldsets
+name: Views Fieldsets
type: module
description: Adds fieldsets to Views.
package: Views
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2018-02-21
-version: '8.x-3.3'
-core: '8.x'
-project: 'views_fieldsets'
-datestamp: 1519199887
+core_version_requirement: ^8 || ^9
diff --git a/web/modules/views_fieldsets/views_fieldsets.module b/web/modules/views_fieldsets/views_fieldsets.module
index af518a6fa7..4ad8fa2f42 100644
--- a/web/modules/views_fieldsets/views_fieldsets.module
+++ b/web/modules/views_fieldsets/views_fieldsets.module
@@ -14,14 +14,14 @@
* Implements hook_theme().
*/
function views_fieldsets_theme() {
- $vars = ['fields' => [], 'classes' => ''];
+ $vars = ['fields' => [], 'attributes' => []];
$path = drupal_get_path('module', 'views_fieldsets');
$hooks['views_fieldsets_fieldset'] = [
'variables' => $vars + [
- 'legend' => '',
- 'collapsible' => TRUE,
- 'collapsed' => FALSE,
- ],
+ 'legend' => '',
+ 'collapsible' => TRUE,
+ 'collapsed' => FALSE,
+ ],
'template' => 'views-fieldsets-fieldset',
'path' => $path,
];
@@ -65,6 +65,8 @@ function views_fieldsets_preprocess_views_view_fields(&$vars) {
*/
function views_fieldsets_views_ui_display_tab_alter(&$build, ViewUI $ui_view, $display_id) {
$view = $ui_view->getExecutable();
+ // Re-init handlers.
+ $view->inited = FALSE;
$view->build($display_id);
$ui_view->set('executable', $view);
if (Fieldset::isFieldsetView($view)) {
@@ -124,15 +126,15 @@ function views_fieldsets_form_views_ui_rearrange_form_alter(&$form, &$form_state
'#attributes' => ['class' => ['field-name']],
],
'hierarchy' => $debug_tabledrag + [
- '#type' => 'hidden',
- '#default_value' => Fieldset::getFieldParent($view, $field_name),
- '#attributes' => ['class' => ['hierarchy']],
- ],
+ '#type' => 'hidden',
+ '#default_value' => Fieldset::getFieldParent($view, $field_name),
+ '#attributes' => ['class' => ['hierarchy']],
+ ],
'depth' => $debug_tabledrag + [
- '#type' => 'hidden',
- '#default_value' => $depth,
- '#attributes' => ['class' => ['depth']],
- ],
+ '#type' => 'hidden',
+ '#default_value' => $depth,
+ '#attributes' => ['class' => ['depth']],
+ ],
];
unset($row);
}
@@ -156,6 +158,7 @@ function views_fieldsets_form_views_ui_rearrange_form_alter(&$form, &$form_state
'relationship' => 'sibling',
'group' => 'weight',
];
+
$form['actions']['submit']['#submit'][] = 'views_fieldsets_views_ui_rearrange_form_submit';
}
@@ -167,6 +170,8 @@ function views_fieldsets_views_ui_rearrange_form_submit($form, $form_state) {
$display_id = $form_state->get('display_id');
$view = $ui_view->getExecutable();
$view->setDisplay($display_id);
+ // Re-init handlers.
+ $view->inited = FALSE;
$view->build($display_id);
$fieldsets = Fieldset::getAllFieldsets($view);
// Sort 1-dimensionally (wrong overall, but right per level).
@@ -180,7 +185,7 @@ function views_fieldsets_views_ui_rearrange_form_submit($form, $form_state) {
// Sort overall: level by level, n-dimensionally following the tree down.
$input_fields_weights = [];
foreach ($input_fields as $field_name => $fieldset) {
- $parents = Fieldset::getUIFieldParents($input_fields, $field_name);
+ $parents = Fieldset::getUiFieldParents($input_fields, $field_name);
$id = array_reverse(array_merge([$field_name], $parents));
$id = array_map(function ($field) use ($fields_order) {
return array_search($field, $fields_order);
--
GitLab