浏览代码

Merge branch 'feature/font-linux'

# Conflicts:
#	conf/default.php
#	conf/metadata.php
Giuseppe Di Terlizzi 7 年之前
父节点
当前提交
566576f35a
共有 5 个文件被更改,包括 43 次插入5 次删除
  1. 4 0
      action.php
  2. 8 2
      conf/default.php
  3. 8 2
      conf/metadata.php
  4. 22 0
      syntax/fl.php
  5. 1 1
      syntax/icon.php

+ 4 - 0
action.php

@@ -43,6 +43,10 @@ class action_plugin_icons extends DokuWiki_Action_Plugin {
       $font_icons[] = $this->getConf('typiconsURL');
     }
 
+    if ($this->getConf('loadFontlinux')) {
+      $font_icons[] = $this->getConf('fontlinuxURL');
+    }
+
     foreach ($font_icons as $font_icon) {
       $event->data['link'][] = array(
         'type'    => 'text/css',

+ 8 - 2
conf/default.php

@@ -7,11 +7,17 @@
 
 $conf['defaultSize']     = '16';
 $conf['defaultPack']     = 'fa';
+
 $conf['fontAwesomeURL']  = '//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css';
 $conf['loadFontAwesome'] = 1;
+
 $conf['typiconsURL']     = '//cdn.rawgit.com/stephenhutchings/typicons.font/master/src/font/typicons.min.css';
 $conf['loadTypicons']    = 1;
+
+$conf['fontlinuxURL']    = '//cdn.rawgit.com/Lukas-W/font-linux/v0.9/assets/font-linux.css';
+$conf['loadFontlinux']   = 1;
+
 $conf['fugueURL']        = '//raw.githubusercontent.com/yusukekamiyamane/fugue-icons/master';
 $conf['oxygenURL']       = '//raw.githubusercontent.com/pasnox/oxygen-icons-png/master/oxygen';
-$conf['silkURL']         = '//icons.iconarchive.com/icons/famfamfam/silk/16';
-$conf['flagURL']         = '//icons.iconarchive.com/icons/famfamfam/flag/16';
+$conf['silkURL']         = 'http://icons.iconarchive.com/icons/famfamfam/silk/16';
+$conf['flagURL']         = 'http://icons.iconarchive.com/icons/famfamfam/flag/16';

+ 8 - 2
conf/metadata.php

@@ -7,12 +7,18 @@
 
 
 $meta['defaultSize']     = array('string');
-$meta['defaultPack']     = array('multichoice','_choices' => array('fa', 'glyphicon', 'fugue', 'oxygen'));
+$meta['defaultPack']     = array('multichoice','_choices' => array('fa', 'glyphicon', 'fugue', 'oxygen', 'fl'));
+
 $meta['loadFontAwesome'] = array('onoff');
 $meta['fontAwesomeURL']  = array('string');
+
 $meta['loadTypicons']    = array('onoff');
 $meta['typiconsURL']     = array('string');
+
+$meta['loadFontlinux']   = array('onoff');
+$meta['fontlinuxURL']    = array('string');
+
 $meta['fugueURL']        = array('string');
 $meta['oxygenURL']       = array('string');
 $meta['silkURL']         = array('string');
-$meta['flagURL']         = array('string');
+$meta['flagURL']         = array('string');

+ 22 - 0
syntax/fl.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Plugin Icons: Glyphicons helper
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+ * @copyright  (C) 2015-2016, Giuseppe Di Terlizzi
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+require_once(dirname(__FILE__).'/icon.php');
+
+class syntax_plugin_icons_fl extends syntax_plugin_icons_icon {
+
+  const IS_ICON      = false;
+  const IS_FONT_ICON = true;
+
+  protected $pattern = '{{fl>.+?}}';
+
+}

+ 1 - 1
syntax/icon.php

@@ -270,7 +270,7 @@ class syntax_plugin_icons_icon extends DokuWiki_Syntax_Plugin {
         case 'border':
 
           $this->flags[$flag] = true;
-        
+
           if ($this->flags['pack'] == 'fa') {
             $this->classes[] = 'fa-border';
           } else {