From 57bdc3b19e58f879121032d8eeb8ea249d6d0307 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 31 Aug 2024 19:38:56 -0500 Subject: [PATCH] More license updates, make sure everyone can dedent. --- themes/V3/Blank/snippets.js | 249 +++++++++--------- themes/V3/Blank/snippets/license.gen.js | 3 +- .../V3/Blank/snippets/licenseDTRPGCC.gen.js | 1 + 3 files changed, 126 insertions(+), 127 deletions(-) diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js index 7eb7795f7..c66d56f62 100644 --- a/themes/V3/Blank/snippets.js +++ b/themes/V3/Blank/snippets.js @@ -143,12 +143,12 @@ module.exports = [ subsnippets : [ { name : 'Title Page Declaration', - icon : 'fas fa-text', + icon : 'fas fa-sticky-note', gen : LicenseGenAelf.aelfTitleNotice }, { name : 'Legal Declaration', - icon : 'fas fa-text', + icon : 'fas fa-sticky-note', gen : LicenseGenAelf.aelfLegalNotice }, { @@ -278,129 +278,6 @@ module.exports = [ }, ] }, - - { - name : 'GNU', - icon : 'fas fa-w', - subsnippets : [ - - { - name : 'GNU Free Documentation License', - icon : 'fas fa-w', - gen : LicenseGenGNU.gfdl, - }, - - { - name : 'GNU FDL Title Page', - icon : 'fas fa-w', - gen : LicenseGenGNU.gfdltitle, - }, - - { - name : 'GNU FDL Title Page w/alterations', - icon : 'fas fa-w', - gen : LicenseGenGNU.gfdltitleinvariant, - }, - - { - name : 'GNU General Public License v3', - icon : 'fas fa-w', - gen : LicenseGenGNU.gpl3, - }, - - { - name : 'GNU GPLv3 Title Page', - icon : 'fas fa-w', - gen : LicenseGenGNU.gpl3title, - }, - ] - }, - - { - name : 'MIT License', - icon : 'fas fa-mit', - gen : LicenseGen.mit, - }, - - { - name : 'ORC Notice', - icon : 'fas fa-Paizo', - gen : LicenseGen.orc1, - }, - - { - name : 'Old School Essentials', - icon : 'fas fa-ose', - subsnippets : [ - { - name : 'OSE Logo - Black', - icon : 'fas fab-ose', - gen : LicenseGen.oseBlack, - }, - - { - name : 'OSE Logo - White', - icon : 'fas fa-ose', - gen : LicenseGen.oseWhite, - }, - - { - name : 'OSE Legal Text', - icon : 'fas fa-alt', - gen : LicenseGen.oseNotice, - } - ] - }, - - { - name : 'Shadowdark', - icon : 'fab fa-shadowdark', - subsnippets : [ - { - name : 'Icons', - icon : 'fas fa-image', - subsnippets : [ - { - name : 'Compatibility Logo - Black', - icon : 'fas fa-image', - gen : LicenseGen.shadowDarkBlack - }, - { - name : 'Compatibility Logo - White', - icon : 'fas fa-image', - gen : LicenseGen.shadowDarkWhite - } - ] - }, - { - name : 'License Statement', - icon : 'fas fa-alt', - gen : LicenseGen.shadowDarkNotice - } - - ] - - }, - - { - name : 'Wizards of the Coast', - icon : 'fab fa-wizards-of-the-coast', - subsnippets : [ - - { - name : 'OGL 1.0 A', - icon : 'fab fa-wizards-of-the-coast', - gen : LicenseGenWotC.ogl1a, - }, - - { - name : 'WoTC Fan Content Policy', - icon : 'fas fa-w', - gen : LicenseGenWotC.fcp, - }, - ] - }, - { name : 'DTRPG Community Content', incon : 'fab fa-dtrpg', @@ -761,8 +638,128 @@ module.exports = [ }, ] - } + }, + { + name : 'GNU', + icon : 'fas fa-w', + subsnippets : [ + { + name : 'GNU Free Documentation License', + icon : 'fas fa-w', + gen : LicenseGenGNU.gfdl, + }, + + { + name : 'GNU FDL Title Page', + icon : 'fas fa-w', + gen : LicenseGenGNU.gfdltitle, + }, + + { + name : 'GNU FDL Title Page w/alterations', + icon : 'fas fa-w', + gen : LicenseGenGNU.gfdltitleinvariant, + }, + + { + name : 'GNU General Public License v3', + icon : 'fas fa-w', + gen : LicenseGenGNU.gpl3, + }, + + { + name : 'GNU GPLv3 Title Page', + icon : 'fas fa-w', + gen : LicenseGenGNU.gpl3title, + }, + ] + }, + + { + name : 'MIT License', + icon : 'fas fa-mit', + gen : LicenseGen.mit, + }, + + { + name : 'ORC Notice', + icon : 'fas fa-Paizo', + gen : LicenseGen.orc1, + }, + + { + name : 'Old School Essentials', + icon : 'fas fa-ose', + subsnippets : [ + { + name : 'OSE Logo - Black', + icon : 'fas fab-ose', + gen : LicenseGen.oseBlack, + }, + + { + name : 'OSE Logo - White', + icon : 'fas fa-ose', + gen : LicenseGen.oseWhite, + }, + + { + name : 'OSE Legal Text', + icon : 'fas fa-alt', + gen : LicenseGen.oseNotice, + } + ] + }, + + { + name : 'Shadowdark', + icon : 'fab fa-shadowdark', + subsnippets : [ + { + name : 'Icons', + icon : 'fas fa-image', + subsnippets : [ + { + name : 'Compatibility Logo - Black', + icon : 'fas fa-image', + gen : LicenseGen.shadowDarkBlack + }, + { + name : 'Compatibility Logo - White', + icon : 'fas fa-image', + gen : LicenseGen.shadowDarkWhite + } + ] + }, + { + name : 'License Statement', + icon : 'fas fa-alt', + gen : LicenseGen.shadowDarkNotice + } + + ] + + }, + + { + name : 'Wizards of the Coast', + icon : 'fab fa-wizards-of-the-coast', + subsnippets : [ + + { + name : 'OGL 1.0 A', + icon : 'fab fa-wizards-of-the-coast', + gen : LicenseGenWotC.ogl1a, + }, + + { + name : 'WoTC Fan Content Policy', + icon : 'fas fa-w', + gen : LicenseGenWotC.fcp, + }, + ] + }, ] }, { diff --git a/themes/V3/Blank/snippets/license.gen.js b/themes/V3/Blank/snippets/license.gen.js index a2fea926a..41a552853 100644 --- a/themes/V3/Blank/snippets/license.gen.js +++ b/themes/V3/Blank/snippets/license.gen.js @@ -1,5 +1,6 @@ /* eslint-disable max-lines */ const _ = require('lodash'); +const dedent = require('dedent'); // Small and one-off licenses // Licenses in this file consist of one or two functions at most. If something is larger, @@ -10,7 +11,7 @@ module.exports = { mit : function () { return dedent` {{license,wide - Copyright \\ \\ + Copyright \ \ : Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: : diff --git a/themes/V3/Blank/snippets/licenseDTRPGCC.gen.js b/themes/V3/Blank/snippets/licenseDTRPGCC.gen.js index 4b95f58d1..fdc1d33bb 100644 --- a/themes/V3/Blank/snippets/licenseDTRPGCC.gen.js +++ b/themes/V3/Blank/snippets/licenseDTRPGCC.gen.js @@ -1,5 +1,6 @@ /* eslint-disable max-lines */ const _ = require('lodash'); +const dedent = require('dedent'); // DriveThruRPG/OneBookShelf Community Content Programs