Disable all the things, for new fields. Bump to 2.2.0

vaersaagod · May 27, 2022 · 14d3e8f · 14d3e8f
1 parent cec49b6
commit 14d3e8f
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 30 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,12 @@
 # Release Notes for LinkMate
 
+## 2.2.0 - 2022-05-27
+### Changed  
+- Changed default link type to "Entry"
+- All link types are now disabled by default, for new fields
+- Moved the "Enable all" toggle to the bottom of the link type settings list  
+- Tightened up the styles for the field settings a little bit  
+
 ## 2.1.0 - 2022-05-27  
 ### Added
 - Added the "Show site menu" setting to the element link type, making it possible to link across sites to non-propagated elements (excepting users).  

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vaersaagod/linkmate",
     "description": "Let's hook you up, mate!",
     "type": "craft-plugin",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/fields/LinkField.php b/src/fields/LinkField.php
@@ -46,7 +46,7 @@ class LinkField extends Field
     /**
      * @var string|array
      */
-    public string|array $allowedLinkNames = '*';
+    public string|array $allowedLinkNames = [];
 
     /**
      * @var bool

diff --git a/src/resources/LinkFieldAdmin.css b/src/resources/LinkFieldAdmin.css
@@ -22,7 +22,7 @@
 
 .linkFieldAdmin--tabsGroup {
   margin-right: -1px;
-  padding: 20px 10px 0 10px;
+  padding: 10px 10px 0 10px;
 
   background: #f1f5f8;
   border-right: 1px solid #e3e5e8;
@@ -32,6 +32,10 @@
   font-weight: bold;
 }
 
+.linkFieldAdmin--tabsGroup:first-child {
+  padding-top: 5px;
+}
+
 .linkFieldAdmin--tabsRow {
   position: relative;
   margin-right: -1px;
@@ -44,8 +48,14 @@
   line-height: 40px;
 }
 
+.linkFieldAdmin--tabsRow.all {
+  border-bottom: none;
+  margin-top: 20px;
+  padding-bottom: 2px;
+}
+
 .linkFieldAdmin--tabsRow:last-child {
-  margin-bottom: 20px;
+
 }
 
 .linkFieldAdmin--tabsRow.selected {

diff --git a/src/templates/_settings-element.twig b/src/templates/_settings-element.twig
@@ -19,6 +19,7 @@
 }) }}
 
 {% if elementName|lower != 'user' %}
+
   {{ forms.checkboxField({
     fieldset: true,
     label: 'Show the site menu'|t('app'),

diff --git a/src/templates/_settings-general.twig b/src/templates/_settings-general.twig
@@ -22,7 +22,7 @@
   checked: settings.allowCustomText
 }) }}
 
-&nbsp;
+<hr/>
 
 {{ forms.checkboxField({
   label: 'Allow links to open in new window'|t('linkmate'),
@@ -36,7 +36,7 @@
   checked: settings.autoNoReferrer
 }) }}
 
-&nbsp;
+<hr/>
 
 {{ forms.checkboxField({
   label: 'Enable aria label support'|t('linkmate'),

diff --git a/src/templates/_settings.twig b/src/templates/_settings.twig
@@ -5,41 +5,47 @@
 
 <div class="linkFieldAdmin" id="{{ name }}">
     <div class="linkFieldAdmin--tabs">
+
         <div class="linkFieldAdmin--tabsRow selected" data-name="_general">
             <button class="linkFieldAdmin--tabsTab">{{ 'General settings'|t('linkmate') }}</button>
         </div>
 
-        <div class="linkFieldAdmin--tabsRow all">
-            <div class="linkFieldAdmin--tabsLightswitch">
-                {{- forms.lightswitch({
-                    name: 'allowedLinkNames[]',
-                    on: allTypesAllowed,
-                    value: '*',
-                }) -}}
-            </div>
-            {{ 'Enable all'|t('linkmate') }}
-        </div>
+        <div>
 
-        {%- for linkType in linkTypes -%}
-            {%- if linkType.group != group -%}
-                {%- set group = linkType.group -%}
-                <div class="linkFieldAdmin--tabsGroup">{{ group }}</div>
-            {%- endif -%}
+            {%- for linkType in linkTypes -%}
+                {%- if linkType.group != group -%}
+                    {%- set group = linkType.group -%}
+                    <div class="linkFieldAdmin--tabsGroup">{{ group }}</div>
+                {%- endif -%}
+
+                <div class="linkFieldAdmin--tabsRow" data-name="{{ linkType.name }}">
+                    <div class="linkFieldAdmin--tabsLightswitch{% if allTypesAllowed %} hidden{% endif %}">
+                        {{- forms.lightswitch({
+                            name: 'allowedLinkNames[]',
+                            on: linkType.enabled,
+                            value: linkType.name,
+                        }) -}}
+                    </div>
+
+                    <button class="linkFieldAdmin--tabsTab">
+                        {{- linkType.displayName -}}
+                    </button>
+                </div>
+            {%- endfor -%}
 
-            <div class="linkFieldAdmin--tabsRow" data-name="{{ linkType.name }}">
-                <div class="linkFieldAdmin--tabsLightswitch{% if allTypesAllowed %} hidden{% endif %}">
+            <div class="linkFieldAdmin--tabsRow all">
+                <div class="linkFieldAdmin--tabsLightswitch">
                     {{- forms.lightswitch({
                         name: 'allowedLinkNames[]',
-                        on: linkType.enabled,
-                        value: linkType.name,
+                        on: allTypesAllowed,
+                        value: '*',
                     }) -}}
                 </div>
-
-                <button class="linkFieldAdmin--tabsTab">
-                    {{- linkType.displayName -}}
-                </button>
+                {{ 'Enable all'|t('linkmate') }}
             </div>
-        {%- endfor -%}
+
+        </div>
+
     </div>
     <div class="linkFieldAdmin--body">
         <div class="linkFieldAdmin--bodyContent selected" data-name="_general">