Merge pull request #5 from Dolphiq/development

Development
Dolphiq · Dec 14, 2017 · efadc13 · efadc13
2 parents 3d65de8 + d826535
commit efadc13
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Changelog
+## 1.0.4 - 2017-12-14
+
+### Changed
+- Changed the plugin icon
+- Made compatible with Craft RC2
+- Use css for the font-asset style set and not scss (sass) to support more environments
 
 ## 1.0.3 - 2017-10-06
 

diff --git a/README.md b/README.md
@@ -46,6 +46,30 @@ You can easily use ionicons or font awesome icons
 
 ## Usage sample in twig template
 
+### Quick example code
+        {% do view.registerAssetBundle("plugins\\dolphiq\\iconpicker\\assets\\sharedAsset") %}
+        <html style="padding: 0; margin: 0;">
+        <head>
+            <title></title>
+
+            {{ head() }}
+
+        </head>
+
+        <body>
+
+        {{ beginBody() }}
+
+        {% if entry.iconPickerField.icon %}
+            Hex: {{ entry.iconPickerField.icon }}<br>
+            {{ entry.iconPickerField.iconSpan|raw }}
+        {% endif %}
+
+        {{ endBody() }}
+
+        </body>
+        </html>
+
 Display an icon with a custom class:
 
     <span class='{{ entry.iconClass }} myCustomClass'>{{ entry.iconChar }}</span>
@@ -75,17 +99,16 @@ Display an icon with a custom class:
 6. Get the icon font class 
 
        {{ entry.fieldName.iconClass }}
-
-7. Get the icon name 
-
-       {{ entry.fieldName.iconName }}
 
-8. Conditional example of showing icon only when it is set
+7. Conditional example of showing icon only when it is set
 
        {% if entry.fieldName.icon %}
             {{ entry.fieldName.iconSpan|raw }}
        {% endif %}
 
+## Iconpicker Roadmap
+- Select and upload the fonts in the UI
+- Enable (name) search while picking an icon
 
 ### Contributors & Developers
 Lucas Weijers - Original developer

diff --git a/composer.json b/composer.json
@@ -1,20 +1,21 @@
 {
   "name": "dolphiq/iconpicker",
-  "description": "Craft Iconpicker plugin provides a new field type that offers users an easy way to pick an icon from a .woff or .ttf font file.",
-  "version": "1.0.3",
+  "description": "Craft Iconpicker field type that offers end-users an easy way to pick an icon/symbol from a .woff or .ttf font file.",
+  "version": "1.0.4",
   "keywords": [
     "craft",
     "cms",
     "craftcms",
     "craft-plugin",
     "icon",
+    "symbol",
     "iconpicker",
     "craft3"
   ],
   "type": "craft-plugin",
   "license": "MIT",
   "require": {
-    "craftcms/cms": "^3.0.0-beta.20",
+    "craftcms/cms": "^3.0.0-RC2",
     "phenx/php-font-lib": "^0.5.0"
   },
   "autoload": {
@@ -32,7 +33,7 @@
   "extra": {
     "handle": "dolphiq-iconpicker",
     "name": "Iconpicker",
-    "description": "Craft Iconpicker plugin provides a new field type that offers users an easy way to pick an icon from a .woff or .ttf font file.",
+    "description": "Craft Iconpicker field type that offers end-users an easy way to pick an icon/symbol from a .woff or .ttf font file.",
     "schemaVersion": "1.0.0",
     "developer": "Dolphiq",
     "developerUrl": "https://dolphiq.nl/",

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: lucasweijers
- * Date: 19-05-17
- * Time: 15:23
+ * Craft3 Forms plugin
+ *
+ * @author    Lucas Weijers
+ * @copyright Copyright (c) 2017 Dolphiq
+ * @link      https://dolphiq.nl/
  */
 
-
 namespace plugins\dolphiq\iconpicker;
 
 use Craft;

diff --git a/src/assets/appAsset.php b/src/assets/appAsset.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: lucasweijers
- * Date: 16-08-17
- * Time: 14:58
+ * Created by Dolphiq
+ * Lucas Weijers
+ * Date: 2017-10-16
+ *
  *
  * This asset will publish all css and js needed voor the backend application
  */

diff --git a/src/assets/sharedAsset.php b/src/assets/sharedAsset.php
@@ -19,11 +19,18 @@ public function init()
         // define the path that your publishable resources live
         $this->sourcePath = '@vendor/dolphiq/iconpicker/src/resources-shared';
 
-        // The css file is autogenerated in field/iconpicker.php, with the fonts that are available in the resources-shared folder
-        $this->css = [
-            'css/fonts.scss',
-        ];
-
+        // try to find the file, if scss exists,
+        if(file_exists(__DIR__. '/../resources-shared/css/fonts.css')) {
+            // The css file is autogenerated in field/iconpicker.php, with the fonts that are available in the resources-shared folder
+            $this->css = [
+                'css/fonts.css',
+            ];
+        } elseif(file_exists(__DIR__ . '/../resources-shared/css/fonts.scss')) {
+            // The css file is autogenerated in field/iconpicker.php, with the fonts that are available in the resources-shared folder
+            $this->css = [
+                'css/fonts.scss',
+            ];
+        }
         parent::init();
     }
 }
diff --git a/src/fields/Iconpicker.php b/src/fields/Iconpicker.php
@@ -293,7 +293,7 @@ public function getFontCss()
             }
         }
 
-        file_put_contents(Craft::getAlias($sharedAsset->sourcePath . '/css/fonts.scss'), $scss);
+        file_put_contents(Craft::getAlias($sharedAsset->sourcePath . '/css/fonts.css'), $scss);
 
         // Register the assetbundle that loads the generated css
         Craft::$app->view->registerAssetBundle(sharedAsset::className());

diff --git a/src/icon.svg b/src/icon.svg
diff --git a/src/templates/fieldSettings.twig b/src/templates/fieldSettings.twig
@@ -7,9 +7,11 @@
     id: 'dolphiq-iconpicker-font',
     name: 'iconFont',
     options: fonts,
+    instructions: 'To select an other font, upload more font files (.ttf or .woff) in the plugins font directory. (src/resources-shared/fonts)',
     value: field.iconFont,
 }) }}
 
+
 {% else %}
 
     <p class="warning">You need to put at least one font (.ttf or .woff) in the plugins font directory. (src/resources-shared/fonts)</p>