Update settings page

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.3 - 2018-03-27
+
+*	Updated settings page to group link types.
+*	Enabling link types is now done with lightswitches instead of checkboxes
+
 ## 1.0.2 - 2018-03-27
 
-Updated icon and license
+*	Updated icon and license.
 
 
 ## 1.0.0 - 2018-03-27

composer.json

@@ -2,7 +2,7 @@
 	"name": "fruitstudios/linkit",
 	"description": "One link field to rule them all.",
 	"type": "craft-plugin",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"keywords": [
 		"craft",
 		"cms",
@@ -43,7 +43,7 @@
 	"extra": {
 		"name": "Linkit",
 		"handle": "linkit",
-		"schemaVersion": "1.0.2",
+		"schemaVersion": "1.0.3",
 		"hasCpSettings": false,
 		"hasCpSection": false,
 		"changelogUrl":

src/base/ElementLink.php

@@ -16,6 +16,11 @@ abstract class ElementLink extends Link
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Element');
+    }
+
     public static function elementType()
     {
         return Element::class;

src/base/Link.php

@@ -12,6 +12,16 @@ abstract class Link extends SavableComponent implements LinkInterface
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Basic');
+    }
+
+    public static function groupTitle(): string
+    {
+        return static::group().' '.Craft::t('linkit', 'Links');
+    }
+
     public static function defaultLabel(): string
     {
         $classNameParts = explode('\\', static::class);

src/base/LinkInterface.php

@@ -11,6 +11,8 @@ interface LinkInterface extends SavableComponentInterface
     // Static
     // =========================================================================
 
+    public static function group(): string;
+    public static function groupTitle(): string;
     public static function defaultLabel(): string;
     public static function defaultPlaceholder(): string;
     public static function settingsTemplatePath(): string;

src/models/Facebook.php

@@ -16,6 +16,11 @@ class Facebook extends Link
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Social');
+    }
+
     public static function defaultLabel(): string
     {
         return Craft::t('linkit', 'Facebook');

src/models/Instagram.php

@@ -16,6 +16,11 @@ class Instagram extends Link
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Social');
+    }
+
     public static function defaultLabel(): string
     {
         return Craft::t('linkit', 'Instagram');

src/models/LinkedIn.php

@@ -16,6 +16,11 @@ class LinkedIn extends Link
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Social');
+    }
+
     public static function defaultLabel(): string
     {
         return Craft::t('linkit', 'Linked In');

src/models/Twitter.php

@@ -16,6 +16,11 @@ class Twitter extends Link
     // Static
     // =========================================================================
 
+    public static function group(): string
+    {
+        return Craft::t('linkit', 'Social');
+    }
+
     public static function defaultLabel(): string
     {
         return Craft::t('linkit', 'Twitter');

src/templates/fields/_settings.twig

@@ -13,40 +13,50 @@
 	}) }} #}
 
 	{{ forms.field({
-		label: "Link Types"|t('linkit'),
-		instructions: "Select and configure the link types you would like to make available"|t('linkit'),
 		errors: field.getErrors('enabledLinkTypes'),
+		first: true
 	}) }}
 
-	{% for linkType in field.availableLinkTypes %}
+	{% set availableLinkFieldsByGroup = field.availableLinkTypes|group('groupTitle')  %}
 
-		{% set name = 'types['~linkType.type~']' %}
-		{% set isEnabled = field.types[linkType.type].enabled ?? false %}
+	{% for groupTitle, linksTypesInGroup in availableLinkFieldsByGroup %}
 
-		{{ forms.checkboxField({
-			id: linkType.type|id,
-			name: name~'[enabled]',
-			label: linkType.defaultLabel(),
-			value: true,
-			toggle: linkType.hasSettings ? '#' ~ linkType.type|id ~ '-settings' : null,
-			checked: isEnabled,
+		{{ forms.field({
+			label: groupTitle,
+			instructions: "Select and configure the {groupTitle} you would like to make available."|t('linkit', {groupTitle: groupTitle|lower}),
+			first: true
 		}) }}
 
-		{% if linkType.hasSettings %}
-			<div id="{{ linkType.type|id }}-settings" class="{{ not isEnabled ? 'hidden' }}">
-				{% namespace name %}
-					{{ linkType.getSettingsHtml()|raw }}
-				{% endnamespace %}
-			</div>
-		{% endif %}
+		{% for linkType in linksTypesInGroup %}
 
-	{% endfor %}
+			{% set name = 'types['~linkType.type~']' %}
+			{% set isEnabled = field.types[linkType.type].enabled ?? false %}
+
+			{{ forms.lightSwitchField({
+				id: linkType.type|id,
+				name: name~'[enabled]',
+				label: linkType.defaultLabel(),
+				toggle: linkType.hasSettings ? '#' ~ linkType.type|id ~ '-settings' : null,
+				on: isEnabled,
+			}) }}
+
+			{% if linkType.hasSettings %}
+				<div id="{{ linkType.type|id }}-settings" class="{{ not isEnabled ? 'hidden' }}">
+					{% namespace name %}
+						{{ linkType.getSettingsHtml()|raw }}
+					{% endnamespace %}
+				</div>
+			{% endif %}
 
-	<hr>
+		{% endfor %}
+
+		<hr>
+
+	{% endfor %}
 
 	{{ forms.textField({
 		label: "Default Link Text"|t('linkit'),
-		instructions: "Set a default text value for this link, can be overridden if custom link text option is selected."|t('linkit'),
+		instructions: "Set a default text value for this link, can be overridden if 'Allow custom link text' is selected."|t('linkit'),
 		name: 'defaultText',
 		value: field.defaultText,
 		errors: field.getErrors('defaultText'),