Merge branch 'release/1.5.0'

CHANGELOG.md

@@ -1,5 +1,12 @@
+# v1.5.0
+## 02/09/2017
+
+2. [](#improved)
+  * Use tabs in admin panel settings for better user experience
+  * Use toggle buttons for page settings
+
 # v1.4.4
-## 11/01/2017
+## 01/11/2017
 
 3. [](#bugfix)
   * Fixed `CURLOPT_AUTOREFERER` constant

LICENSE

@@ -27,7 +27,7 @@ using Grav External Links Plugin in any way.
 MIT LICENSE
 -----------
 
-Copyright (c) 2016 Benjamin Regler, https://github.com/sommerregen/grav-plugin-external-links
+Copyright (c) 2017 Benjamin Regler, https://github.com/sommerregen/grav-plugin-external-links
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -179,7 +179,7 @@ Thanks!
 
 ## License
 
-Copyright (c) 2016 [Benjamin Regler][github]. See also the list of [contributors] who participated in this project.
+Copyright (c) 2017 [Benjamin Regler][github]. See also the list of [contributors] who participated in this project.
 
 [Dual-licensed](LICENSE) for use under the terms of the [MIT][mit-license] or [GPLv3][gpl-license] licenses.
 

blueprints.yaml

@@ -1,173 +1,178 @@
-name: External Links
-version: 1.4.4
+name: "External Links"
+version: "1.5.0"
 description: "This plugin adds small icons to external and mailto links, informing users the link will take them to a new site or open their email client."
-icon: external-link
+icon: "external-link"
 author:
-  name: Sommerregen
-  email: [email protected]
-homepage: https://github.com/sommerregen/grav-plugin-external-links
-keywords: [external, links, filter, formatter, plugin]
-docs: https://github.com/sommerregen/grav-plugin-external-links/blob/master/README.md
-bugs: https://github.com/sommerregen/grav-plugin-external-links/issues
-license: MIT/GPL
+  name: "Sommerregen"
+  email: "[email protected]"
+homepage: "https://github.com/sommerregen/grav-plugin-external-links"
+keywords: ["external", "links", "filter", "formatter", "plugin"]
+docs: "https://github.com/sommerregen/grav-plugin-external-links/blob/master/README.md"
+bugs: "https://github.com/sommerregen/grav-plugin-external-links/issues"
+license: "MIT/GPL"
 
 form:
   validation: strict
-  fields:
-    global:
-      type: section
-      title: PLUGINS.EXTERNAL_LINKS.GLOBAL_CONFIG
-      underline: 1
 
-      fields:
-        enabled:
-          type: toggle
-          label: PLUGINS.EXTERNAL_LINKS.PLUGIN_STATUS
-          highlight: 1
-          default: 0
-          options:
-            1: PLUGIN_ADMIN.ENABLED
-            0: PLUGIN_ADMIN.DISABLED
-          validate:
-            type: bool
-
-        built_in_css:
-          type: toggle
-          label: PLUGINS.EXTERNAL_LINKS.BUILTIN_CSS
-          highlight: 1
-          default: 1
-          options:
-            1: PLUGIN_ADMIN.YES
-            0: PLUGIN_ADMIN.NO
-          validate:
-            type: bool
-
-        weight:
-          type: text
-          size: x-small
-          label: PLUGINS.EXTERNAL_LINKS.WEIGHT
-          default: 0
-          validate:
-            type: int
-            min: -100
-            max: 100
-
-    default:
-      type: section
-      title: PLUGINS.EXTERNAL_LINKS.DEFAULT_CONFIG
-      underline: 1
+  fields:
+    tabs:
+      type: tabs
+      active: 1
+      class: subtle
 
       fields:
-        links:
-          type: section
-          title: PLUGINS.EXTERNAL_LINKS.LINKS.SECTION
-          text: PLUGINS.EXTERNAL_LINKS.LINKS.SECTION_HELP
+        external_links:
+          type: tab
+          title: PLUGINS.EXTERNAL_LINKS.PLUGIN_NAME
 
           fields:
-            links.www:
+            enabled:
               type: toggle
-              label: PLUGINS.EXTERNAL_LINKS.LINKS.WWW
-              help: PLUGINS.EXTERNAL_LINKS.LINKS.WWW_HELP
-              default: 0
+              label: PLUGIN_ADMIN.PLUGIN_STATUS
+              help: PLUGINS.EXTERNAL_LINKS.STATUS_HELP
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            built_in_css:
+              type: toggle
+              label: PLUGINS.EXTERNAL_LINKS.BUILTIN_CSS
+              highlight: 1
+              default: 1
               options:
                 1: PLUGIN_ADMIN.YES
                 0: PLUGIN_ADMIN.NO
               validate:
                 type: bool
 
-            links.schemes:
-              type: selectize
-              size: large
-              label: PLUGINS.EXTERNAL_LINKS.LINKS.SCHEMES
-              help: PLUGINS.EXTERNAL_LINKS.LINKS.SCHEMES_HELP
+            weight:
+              type: text
+              size: x-small
+              label: PLUGINS.EXTERNAL_LINKS.WEIGHT
+              default: 0
               validate:
-                type: commalist
+                type: int
+                min: -100
+                max: 100
 
-        exclude:
-          type: section
-          title: PLUGINS.EXTERNAL_LINKS.EXCLUDE.SECTION
-          text: PLUGINS.EXTERNAL_LINKS.EXCLUDE.SECTION_HELP
+        settings:
+          type: tab
+          title: PLUGINS.EXTERNAL_LINKS.SETTINGS
 
           fields:
-            exclude.classes:
-              type: selectize
-              size: large
-              label: PLUGINS.EXTERNAL_LINKS.EXCLUDE.CLASSES
-              help: PLUGINS.EXTERNAL_LINKS.EXCLUDE.CLASSES_HELP
+            links:
+              type: section
+              title: PLUGINS.EXTERNAL_LINKS.LINKS.SECTION
+              text: PLUGINS.EXTERNAL_LINKS.LINKS.SECTION_HELP
+
+              fields:
+                links.www:
+                  type: toggle
+                  label: PLUGINS.EXTERNAL_LINKS.LINKS.WWW
+                  help: PLUGINS.EXTERNAL_LINKS.LINKS.WWW_HELP
+                  default: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
+                links.schemes:
+                  type: selectize
+                  size: large
+                  label: PLUGINS.EXTERNAL_LINKS.LINKS.SCHEMES
+                  help: PLUGINS.EXTERNAL_LINKS.LINKS.SCHEMES_HELP
+                  validate:
+                    type: commalist
+
+            exclude:
+              type: section
+              title: PLUGINS.EXTERNAL_LINKS.EXCLUDE.SECTION
+              text: PLUGINS.EXTERNAL_LINKS.EXCLUDE.SECTION_HELP
+
+              fields:
+                exclude.classes:
+                  type: selectize
+                  size: large
+                  label: PLUGINS.EXTERNAL_LINKS.EXCLUDE.CLASSES
+                  help: PLUGINS.EXTERNAL_LINKS.EXCLUDE.CLASSES_HELP
+                  validate:
+                    type: commalist
+
+                exclude.domains:
+                  type: selectize
+                  size: large
+                  label: PLUGINS.EXTERNAL_LINKS.EXCLUDE.DOMAINS
+                  help: PLUGINS.EXTERNAL_LINKS.EXCLUDE.DOMAINS_HELP
+                  placeholder: "localhost/*, img.domain.com/*"
+                  validate:
+                    type: commalist
+
+        content:
+          type: tab
+          title: PLUGINS.EXTERNAL_LINKS.CONTENT
+
+          fields:
+            process:
+              type: toggle
+              label: PLUGINS.EXTERNAL_LINKS.PROCESS
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
               validate:
-                type: commalist
+                type: bool
 
-            exclude.domains:
-              type: selectize
-              size: large
-              label: PLUGINS.EXTERNAL_LINKS.EXCLUDE.DOMAINS
-              help: PLUGINS.EXTERNAL_LINKS.EXCLUDE.DOMAINS_HELP
-              placeholder: "localhost/*, img.domain.com/*"
+            title:
+              type: toggle
+              label: PLUGINS.EXTERNAL_LINKS.TITLE
+              default: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            no_follow:
+              type: toggle
+              label: PLUGINS.EXTERNAL_LINKS.NO_FOLLOW
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
               validate:
-                type: commalist
+                type: bool
 
-    specific:
-      type: section
-      title: PLUGINS.EXTERNAL_LINKS.SPECIFIC_CONFIG
-      underline: 1
+            target:
+              type: select
+              size: large
+              label: PLUGINS.EXTERNAL_LINKS.TARGET
+              default: _blank
+              placeholder: _blank
+              selectize:
+                create: true
+              options:
+                _blank: PLUGINS.EXTERNAL_LINKS.TARGET_BLANK
+                _self: PLUGINS.EXTERNAL_LINKS.TARGET_SELF
+                _parent: PLUGINS.EXTERNAL_LINKS.TARGET_PARENT
+                _top: PLUGINS.EXTERNAL_LINKS.TARGET_TOP
+              validate:
+                type: string
 
-      fields:
-        process:
-          type: toggle
-          label: PLUGINS.EXTERNAL_LINKS.PROCESS
-          highlight: 1
-          default: 1
-          options:
-            1: PLUGIN_ADMIN.YES
-            0: PLUGIN_ADMIN.NO
-          validate:
-            type: bool
-
-        title:
-          type: toggle
-          label: PLUGINS.EXTERNAL_LINKS.TITLE
-          default: 0
-          options:
-            1: PLUGIN_ADMIN.YES
-            0: PLUGIN_ADMIN.NO
-          validate:
-            type: bool
-
-        no_follow:
-          type: toggle
-          label: PLUGINS.EXTERNAL_LINKS.NO_FOLLOW
-          default: 1
-          options:
-            1: PLUGIN_ADMIN.YES
-            0: PLUGIN_ADMIN.NO
-          validate:
-            type: bool
-
-        target:
-          type: select
-          size: large
-          label: PLUGINS.EXTERNAL_LINKS.TARGET
-          default: _blank
-          placeholder: _blank
-          selectize:
-            create: true
-          options:
-            _blank: PLUGINS.EXTERNAL_LINKS.TARGET_BLANK
-            _self: PLUGINS.EXTERNAL_LINKS.TARGET_SELF
-            _parent: PLUGINS.EXTERNAL_LINKS.TARGET_PARENT
-            _top: PLUGINS.EXTERNAL_LINKS.TARGET_TOP
-          validate:
-            type: string
-
-        mode:
-          type: select
-          size: large
-          classes: fancy
-          label: PLUGINS.EXTERNAL_LINKS.MODE
-          help: PLUGINS.EXTERNAL_LINKS.MODE_HELP
-          default: active
-          options:
-            active: PLUGINS.EXTERNAL_LINKS.MODE_ACTIVE
-            passive: PLUGINS.EXTERNAL_LINKS.MODE_PASSIVE
-          validate:
-            type: string
+            mode:
+              type: select
+              size: large
+              classes: fancy
+              label: PLUGINS.EXTERNAL_LINKS.MODE
+              help: PLUGINS.EXTERNAL_LINKS.MODE_HELP
+              default: active
+              options:
+                active: PLUGINS.EXTERNAL_LINKS.MODE_ACTIVE
+                passive: PLUGINS.EXTERNAL_LINKS.MODE_PASSIVE
+              validate:
+                type: string