From 8223441ca90e43557f82da58f3917d0011c6c212 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Wed, 11 Dec 2019 13:53:36 +0900 Subject: [PATCH] Add Front folder for web fonts The font folder is set in the layout folder for frontend and holds web fonts. There is a new symlink folder in the libs directory to match the FONT folder name for backend fonts --- www/configs/config.master.php | 2 ++ www/lib/CoreLibs/Template/SmartyExtend.php | 3 +++ www/lib/font | 1 + 3 files changed, 6 insertions(+) create mode 120000 www/lib/font diff --git a/www/configs/config.master.php b/www/configs/config.master.php index 5b751ebb..7c828e8f 100644 --- a/www/configs/config.master.php +++ b/www/configs/config.master.php @@ -54,6 +54,8 @@ DEFINE('PDFS', 'documents'.DS); DEFINE('CSV', 'csv'.DS); // css DEFINE('CSS', 'css'.DS); +// font (web) +DEFINE('FONT', 'font'.DS); // js DEFINE('JS', 'javascript'.DS); // table arrays diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index 0cd96926..e3900642 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -81,6 +81,7 @@ class SmartyExtend extends SmartyBC public $INCLUDES; public $JAVASCRIPT; public $CSS; + public $FONT; public $PICTURES; public $CACHE_PICTURES; public $CACHE_PICTURES_ROOT; @@ -175,6 +176,7 @@ class SmartyExtend extends SmartyBC $this->setTemplateDir($this->TEMPLATE_PATH); $this->JAVASCRIPT = LAYOUT.JS; $this->CSS = LAYOUT.CSS; + $this->FONT = LAYOUT.FONT; $this->PICTURES = LAYOUT.IMAGES; $this->CACHE_PICTURES = LAYOUT.CACHE; $this->CACHE_PICTURES_ROOT = ROOT.$this->CACHE_PICTURES; @@ -334,6 +336,7 @@ class SmartyExtend extends SmartyBC // default CMS settings // define all needed smarty stuff for the general HTML/page building $this->HEADER['CSS'] = CSS; + $this->HEADER['FONT'] = FONT; $this->HEADER['JS'] = JS; $this->HEADER['ENCODING'] = $this->encoding; $this->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING; diff --git a/www/lib/font b/www/lib/font new file mode 120000 index 00000000..4d3f59e6 --- /dev/null +++ b/www/lib/font @@ -0,0 +1 @@ +Fonts/ \ No newline at end of file