From 3370e108022c896886e06a2c42aea7f8c8364c08 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Wed, 6 Jan 2021 10:55:30 -0500
Subject: [PATCH] Updates to make AdminThemeUikit easier to extend with an
 AdminThemeUikit descending module

---
 wire/core/AdminTheme.php                      | 52 +++++++++++++++++--
 wire/core/AdminThemeFramework.php             | 15 ++++--
 wire/core/Config.php                          |  1 +
 wire/core/admin.php                           | 15 +++++-
 .../AdminThemeUikit/AdminThemeUikit.module    | 32 ++++++++++--
 .../AdminTheme/AdminThemeUikit/_head.php      | 24 +++++----
 .../AdminTheme/AdminThemeUikit/_main.php      |  4 +-
 .../AdminTheme/AdminThemeUikit/_offcanvas.php |  2 +-
 .../AdminThemeUikit/_sidenav-init.php         |  7 +--
 .../AdminThemeUikit/_sidenav-side.php         |  2 +-
 .../AdminThemeUikit/_sidenav-tree.php         |  2 +-
 .../AdminTheme/AdminThemeUikit/controller.php |  2 +-
 .../AdminTheme/AdminThemeUikit/default.php    |  8 +--
 .../AdminTheme/AdminThemeUikit/init.php       |  2 +-
 .../AdminThemeUikit/scripts/main.js           |  6 +--
 .../AdminThemeUikit/scripts/main.min.js       |  2 +-
 .../Fieldtype/FieldtypeFile/config.php        |  3 +-
 17 files changed, 136 insertions(+), 43 deletions(-)

diff --git a/wire/core/AdminTheme.php b/wire/core/AdminTheme.php
index 004b829e..27acef24 100644
--- a/wire/core/AdminTheme.php
+++ b/wire/core/AdminTheme.php
@@ -10,10 +10,12 @@
  * This file is licensed under the MIT license. 
  * https://processwire.com/about/license/mit/
  * 
- * ProcessWire 3.x, Copyright 2018 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
  * https://processwire.com
  * 
  * @property int|string $version Current admin theme version
+ * @property string $url URL to admin theme
+ * @property string $path Disk path to admin theme
  * 
  * @method void install()
  * @method void uninstall()
@@ -156,14 +158,55 @@ abstract class AdminTheme extends WireData implements Module {
 
 		if($session->get('hidpi')) $this->addBodyClass('hidpi-device');
 		if($session->get('touch')) $this->addBodyClass('touch-device'); 
-		
+
 		$this->addBodyClass($this->className());
 	}
 
+	/**
+	 * Get property
+	 * 
+	 * @param string $key
+	 * @return int|mixed|null|string
+	 * 
+	 */
 	public function get($key) {
-		if($key == 'version') return $this->version;
+		if($key === 'version') return $this->version;
+		if($key === 'url') return $this->url();
+		if($key === 'path') return $this->path();
 		return parent::get($key); 
 	}
+	
+	/**
+	 * Get URL to this admin theme
+	 *
+	 * @return string
+	 * @since 3.0.171
+	 *
+	 */
+	public function url() {
+		return $this->wire()->config->urls($this->className());
+	}
+
+	/**
+	 * Get disk path to this admin theme
+	 * 
+	 * @return string
+	 * @since 3.0.171
+	 * 
+	 */
+	public function path() {
+		$config = $this->wire()->config;
+		$path = $config->paths($this->className());
+		if(empty($path)) {
+			$class = $this->className();
+			$path = $config->paths->modules . "AdminTheme/$class/";
+			if(!is_dir($path)) {
+				$path = $config->paths->siteModules . "$class/";
+				if(!is_dir($path)) $path = __DIR__;
+			}
+		}
+		return $path;
+	}
 
 	/**
 	 * Get predefined translated label by key for labels shared among admin themes
@@ -189,7 +232,8 @@ abstract class AdminTheme extends WireData implements Module {
 	 *
 	 */
 	public function isCurrent() {
-		return $this->wire('adminTheme') === $this; 
+		$adminTheme = $this->wire()->adminTheme;
+		return $adminTheme && $adminTheme->className() === $this->className();
 	}
 
 	/**
diff --git a/wire/core/AdminThemeFramework.php b/wire/core/AdminThemeFramework.php
index 027bab78..7006ccbc 100644
--- a/wire/core/AdminThemeFramework.php
+++ b/wire/core/AdminThemeFramework.php
@@ -4,7 +4,13 @@
  * AdminTheme Framework
  * 
  * The methods in this class may eventually be merged to AdminTheme.php, 
- * but are isolated to this class during development. 
+ * but are isolated to this class during development.
+ * 
+ * This file is licensed under the MIT license.
+ * https://processwire.com/about/license/mit/
+ * 
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
+ * https://processwire.com
  *
  * @property bool $isSuperuser
  * @property bool $isEditor
@@ -65,6 +71,8 @@ abstract class AdminThemeFramework extends AdminTheme {
 	
 	public function wired() {
 		$this->sanitizer = $this->wire('sanitizer');
+		$user = $this->wire()->user;
+		$this->isLoggedIn = $user && $user->isLoggedin();
 		parent::wired();
 	}
 
@@ -95,13 +103,12 @@ abstract class AdminThemeFramework extends AdminTheme {
 	public function init() {
 		
 		$user = $this->wire('user');
-		if(!$user->isLoggedin() && $this->useAsLogin) $this->setCurrent();
+		if(!$this->isLoggedIn && $this->useAsLogin) $this->setCurrent();
 		parent::init();
 		
 		// if this is not the current admin theme, exit now so no hooks are attached
 		if(!$this->isCurrent()) return;
 
-		$this->isLoggedIn = $user->isLoggedin();
 		$this->isSuperuser = $this->isLoggedIn && $user->isSuperuser();
 		$this->isEditor = $this->isLoggedIn && ($this->isSuperuser || $user->hasPermission('page-edit'));
 		$this->includeInitFile();
@@ -119,7 +126,7 @@ abstract class AdminThemeFramework extends AdminTheme {
 	 */
 	public function includeInitFile() {
 		$config = $this->wire('config');
-		$initFile = $config->paths->adminTemplates . 'init.php';
+		$initFile = $this->path() . 'init.php';
 		if(file_exists($initFile)) {
 			if(strpos($initFile, $config->paths->site) === 0) {
 				// admin themes in /site/modules/ may be compiled
diff --git a/wire/core/Config.php b/wire/core/Config.php
index f401f0df..88ddc51a 100644
--- a/wire/core/Config.php
+++ b/wire/core/Config.php
@@ -163,6 +163,7 @@
  * @property string|null $pagerHeadTags Populated at runtime to contain `<link rel=prev|next />` tags for document head, after pagination has been rendered by MarkupPagerNav module. #pw-group-runtime 
  * @property array $statusFiles File inclusions for ProcessWire’s runtime statuses/states. #pw-group-system @since 3.0.142
  * @property int $status Value of current system status/state corresponding to ProcessWire::status* constants. #pw-internal
+ * @property null|bool $disableUnknownMethodException Disable the “Method does not exist or is not callable in this context” exception. (default=null) #pw-internal
  * 
  * @property int $rootPageID Page ID of homepage (usually 1) #pw-group-system-IDs
  * @property int $adminRootPageID Page ID of admin root page #pw-group-system-IDs
diff --git a/wire/core/admin.php b/wire/core/admin.php
index 7253bd37..350b4582 100644
--- a/wire/core/admin.php
+++ b/wire/core/admin.php
@@ -6,7 +6,7 @@
  * This file is designed for inclusion by /site/templates/admin.php template and all the variables 
  * it references are from your template namespace. 
  *
- * Copyright 2018 by Ryan Cramer
+ * Copyright 2021 by Ryan Cramer
  * 
  * @var Config $config
  * @var User $user
@@ -18,6 +18,7 @@
  * @var Sanitizer $sanitizer
  * @var Session $session
  * @var Notices $notices
+ * @var AdminTheme $adminTheme
  * 
  *
  */
@@ -99,6 +100,12 @@ function _checkForMaxInputVars(WireInput $input) {
 	}
 }
 
+// fallback theme if one not already present
+if(empty($adminTheme)) {
+	$adminTheme = $modules->get($config->defaultAdminTheme ? $config->defaultAdminTheme : 'AdminThemeUikit');
+	if(empty($adminTheme)) $adminTheme = $modules->get('AdminThemeUikit');
+	if($adminTheme) $wire->wire('adminTheme', $adminTheme);
+}
 
 // notify superuser if there is an http host error
 if($user->isSuperuser()) _checkForHttpHostError($config); 
@@ -214,7 +221,11 @@ if($controller && $controller->isAjax()) {
 	echo $content; 
 } else {
 	if(!strlen($content)) $content = '<p>' . __('The process returned no content.') . '</p>';
-	$adminThemeFile = $config->paths->adminTemplates . 'default.php';
+	if($adminTheme) {
+		$adminThemeFile = $adminTheme->path() . 'default.php';
+	} else {
+		$adminThemeFile = $config->paths->adminTemplates . 'default.php';
+	}
 	if(strpos($adminThemeFile, $config->paths->site) === 0) {
 		// @todo determine if compilation needed
 		$adminThemeFile = $wire->files->compile($adminThemeFile);
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module
index bbaa4dcf..d121a3c5 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module
+++ b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module
@@ -153,6 +153,10 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl
 			$this->addClass('body', 'AdminThemeUikitNoGrid'); 
 		}
 		
+		if($this->className() !== 'AdminThemeUikit') {
+			$this->addBodyClass('AdminThemeUikit');
+		}
+		
 		$session->removeFor('Page', 'appendEditUrl');
 		/** @var JqueryUI $jqueryUI */
 		$jqueryUI = $modules->get('JqueryUI');
@@ -990,7 +994,7 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl
 		
 		if(empty($logoURL) || $options['getNative'] || strpos($logoURL, '//') !== false) {
 			$native = true;
-			$logoURL = $config->urls($this->className()) . self::logo;
+			$logoURL = $this->url() . self::logo;
 		} else {
 			$logoURL = $config->urls->root . ltrim($logoURL, '/');
 			$logoURL = $sanitizer->entities($logoURL);
@@ -1021,6 +1025,28 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl
 	public function getLogoURL() {
 		return $this->getLogo(array('getURL' => true));
 	}
+	
+	/**
+	 * Get URL to this admin theme
+	 *
+	 * @return string
+	 * @since 3.0.171
+	 *
+	 */
+	public function url() {
+		return $this->wire()->config->urls->modules . 'AdminTheme/AdminThemeUikit/';
+	}
+	
+	/**
+	 * Get disk path to this admin theme
+	 *
+	 * @return string
+	 * @since 3.0.171
+	 *
+	 */
+	public function path() {
+		return __DIR__ . '/';
+	}
 
 	/**
 	 * Get the primary Uikit CSS file to use
@@ -1037,9 +1063,9 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl
 			if(strpos($cssURL, '//') === false) $cssURL = $config->urls->root . ltrim($cssURL, '/');
 			return $this->wire('sanitizer')->entities($cssURL);
 		} else if(self::dev && strpos(__FILE__, '/wire/modules/') === false) {
-			return $config->urls->adminTemplates . 'uikit/custom/pw.css?v=' . $version;
+			return $this->url() . 'uikit/custom/pw.css?v=' . $version;
 		} else {
-			return $config->urls->adminTemplates . 'uikit/dist/css/uikit.pw.min.css?v=' . $version;
+			return $this->url() . 'uikit/dist/css/uikit.pw.min.css?v=' . $version;
 		}
 	}
 	
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_head.php b/wire/modules/AdminTheme/AdminThemeUikit/_head.php
index 02a06d0c..444100ac 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_head.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_head.php
@@ -15,17 +15,21 @@ if(!defined("PROCESSWIRE")) die();
 /** @var string $layout */
 
 $version = $adminTheme->version . 'e';
+$rootUrl = $config->urls->root;
+$themeUrl = $adminTheme->url();
+$styles = $config->styles;
+$scripts = $config->scripts;
 
-$config->styles->prepend($config->urls->root . "wire/templates-admin/styles/AdminTheme.css?v=$version");
-$config->styles->prepend($adminTheme->getUikitCSS());
-$config->styles->append($config->urls->root . "wire/templates-admin/styles/font-awesome/css/font-awesome.min.css?v=$version");
+$styles->prepend($rootUrl . "wire/templates-admin/styles/AdminTheme.css?v=$version");
+$styles->prepend($adminTheme->getUikitCSS());
+$styles->append($rootUrl . "wire/templates-admin/styles/font-awesome/css/font-awesome.min.css?v=$version");
 
 $ext = $config->debug ? "js" : "min.js";
-$config->scripts->append($config->urls->root . "wire/templates-admin/scripts/inputfields.$ext?v=$version");
-$config->scripts->append($config->urls->root . "wire/templates-admin/scripts/main.$ext?v=$version");
-$config->scripts->append($config->urls->adminTemplates . "uikit/dist/js/uikit.min.js?v=$version");
-$config->scripts->append($config->urls->adminTemplates . "uikit/dist/js/uikit-icons.min.js?v=$version");
-$config->scripts->append($config->urls->adminTemplates . "scripts/main.js?v=$version");
+$scripts->append($rootUrl . "wire/templates-admin/scripts/inputfields.$ext?v=$version");
+$scripts->append($rootUrl . "wire/templates-admin/scripts/main.$ext?v=$version");
+$scripts->append($themeUrl . "uikit/dist/js/uikit.min.js?v=$version");
+$scripts->append($themeUrl . "uikit/dist/js/uikit-icons.min.js?v=$version");
+$scripts->append($themeUrl . "scripts/main.js?v=$version");
 
 ?>
 
@@ -42,13 +46,13 @@ $config->scripts->append($config->urls->adminTemplates . "scripts/main.js?v=$ver
 	</script>
 
 	<?php
-	foreach($config->styles as $file) {
+	foreach($styles as $file) {
 		echo "\n\t<link type='text/css' href='$file' rel='stylesheet' />";
 	}
 	if($adminTheme->maxWidth && strpos($layout, 'sidenav') === false) {
 		echo "\n\t<style type='text/css'>.pw-container { max-width: {$adminTheme->maxWidth}px; }</style>";
 	}
-	foreach($config->scripts as $file) {
+	foreach($scripts as $file) {
 		echo "\n\t<script type='text/javascript' src='$file'></script>";
 	}
 	?>
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_main.php b/wire/modules/AdminTheme/AdminThemeUikit/_main.php
index 89e81fb4..89dc7fab 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_main.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_main.php
@@ -13,7 +13,7 @@
 /** @var Modules $modules */
 /** @var Notices $notices */
 /** @var Page $page */
-/** @var Process $process */
+/** @var Process $proc;ess */
 /** @var Sanitizer $sanitizer */
 /** @var WireInput $input */
 /** @var Paths $urls */
@@ -29,7 +29,7 @@ if(!isset($content)) $content = '';
 	/* this intentionally on a separate line */ ?>">
 <head>
 	<?php 
-	include($config->paths->adminTemplates . '_head.php');
+	include(__DIR__ . '/_head.php');
 	echo $adminTheme->renderExtraMarkup('head'); 
 	?>
 </head>
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_offcanvas.php b/wire/modules/AdminTheme/AdminThemeUikit/_offcanvas.php
index c802bd13..06f7a50b 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_offcanvas.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_offcanvas.php
@@ -20,7 +20,7 @@ if(!defined("PROCESSWIRE")) die();
 			<a id="offcanvas-nav-close" href='#offcanvas-nav' class='uk-text-muted' onclick='return false;' data-uk-toggle>
 				<i class='fa fa-times uk-float-right uk-margin-small-top'></i>
 			</a>
-			<img class='pw-logo' width='200' style='margin-left:-5px' src='<?php echo $config->urls($adminTheme->className()); ?>uikit/custom/images/logo.png' />
+			<img class='pw-logo' width='200' style='margin-left:-5px' src='<?php echo $adminTheme->url(); ?>uikit/custom/images/logo.png' />
 		</p>	
 		<?php include(__DIR__ . '/_search-form.php'); ?>
 		<ul class='pw-sidebar-nav uk-nav uk-nav-parent-icon uk-margin-small-top' data-uk-nav='animation: false; multiple: true;'>
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-init.php b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-init.php
index 16036af7..7879f753 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-init.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-init.php
@@ -25,6 +25,7 @@ if(strpos($mainURL, 'layout=')) {
 	$mainURL .= (strpos($mainURL, '?') ? '&' : '?') . 'layout=sidenav-main';
 }
 $mainURL = $sanitizer->entities($mainURL);
+$themeURL = $adminTheme->url();
 
 // pane definition iframes
 $panes = array(
@@ -49,7 +50,7 @@ $panes = array(
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	
-	<link rel="stylesheet" href="<?php echo $config->urls->adminTemplates; ?>layout/source/stable/layout-default.css">
+	<link rel="stylesheet" href="<?php echo $themeURL; ?>layout/source/stable/layout-default.css">
 	
 	<?php require(__DIR__ . '/_head.php'); ?>
 	
@@ -76,8 +77,8 @@ $panes = array(
 		}
 	</style>
 	
-	<script src="<?php echo $config->urls->adminTemplates; ?>layout/source/stable/jquery.layout.js"></script>
-	<script src="<?php echo $config->urls->adminTemplates; ?>layout/source/stable/plugins/jquery.layout.state.js"></script>
+	<script src="<?php echo $themeURL; ?>layout/source/stable/jquery.layout.js"></script>
+	<script src="<?php echo $themeURL; ?>layout/source/stable/plugins/jquery.layout.state.js"></script>
 </head>
 <body class='pw-layout-sidenav-init'>	
 
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-side.php b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-side.php
index e23898e2..9e732954 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-side.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-side.php
@@ -24,7 +24,7 @@ if(!defined("PROCESSWIRE")) die();
 <html class="pw pw-sidebar-frame" lang="<?php echo $adminTheme->_('en');
 	/* this intentionally on a separate line */ ?>">
 <head>
-	<?php include($config->paths->adminTemplates . '_head.php'); ?>
+	<?php include(__DIR__ . '/_head.php'); ?>
 	<style type='text/css'>
 		#pw-sidenav-bar .pw-search-form .uk-inline, 
 		#pw-sidenav-bar .pw-search-input {
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-tree.php b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-tree.php
index 4328a203..8baaa437 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-tree.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/_sidenav-tree.php
@@ -17,7 +17,7 @@ if(!isset($content)) $content = '';
 <html class="pw pw-sidebar-frame" lang="<?php echo $adminTheme->_('en');
 	/* this intentionally on a separate line */ ?>">
 <head>
-	<?php include($config->paths->adminTemplates . '_head.php'); ?>
+	<?php include(__DIR__ . '/_head.php'); ?>
 	<script>
 		var pageListRefresh = {
 			refreshPage: function(id) {
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/controller.php b/wire/modules/AdminTheme/AdminThemeUikit/controller.php
index 86ba460d..1d3d3467 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/controller.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/controller.php
@@ -11,5 +11,5 @@ if(!defined("PROCESSWIRE")) die();
  * This file need not be present in new admin themes, and will eventually be removed from this theme.
  *
  */ 
-
+/** @var Config $config */
 require($config->paths->core . "admin.php"); 
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/default.php b/wire/modules/AdminTheme/AdminThemeUikit/default.php
index 93b945a6..1e0ca8a7 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/default.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/default.php
@@ -30,17 +30,17 @@ if($adminTheme->isModal) {
 
 if($layout === 'sidenav-init' || $layout === 'sidenav-tree-init') {
 	// sidenav main loader
-	include($config->paths->adminTemplates . "_sidenav-init.php");
+	include(__DIR__ . "/_sidenav-init.php");
 	
 } else if($layout === 'sidenav-side') {
 	// sidenav sidebar pane
 	$adminTheme->addBodyClass("pw-layout-sidenav-side");
-	include($config->paths->adminTemplates . "_sidenav-side.php");
+	include(__DIR__ . "/_sidenav-side.php");
 
 } else if($layout === 'sidenav-tree') {
 	// sidenav tree pane
 	$adminTheme->addBodyClass("pw-layout-sidenav-tree");
-	include($config->paths->adminTemplates . "_sidenav-tree.php");
+	include(__DIR__ . "/_sidenav-tree.php");
 	
 } else {
 	// main markup file
@@ -50,6 +50,6 @@ if($layout === 'sidenav-init' || $layout === 'sidenav-tree-init') {
 	} else if($layout != 'modal') {
 		$layout = '';
 	}
-	include($config->paths->adminTemplates . "_main.php");
+	include(__DIR__ . "/_main.php");
 }
 
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/init.php b/wire/modules/AdminTheme/AdminThemeUikit/init.php
index 6b426cf6..f0e4d3a6 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/init.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/init.php
@@ -139,7 +139,7 @@ $config->set('SystemNotifications', array(
  */
 
 $classes = InputfieldWrapper::getClasses();
-$classes['form'] = 'InputfieldFormNoWidths InputfieldFormVertical uk-form-vertical';
+$classes['form'] = 'InputfieldFormVertical uk-form-vertical' . ($adminTheme->ukGrid ? ' InputfieldFormNoWidths' : '');
 $classes['list'] = 'Inputfields uk-grid uk-grid-collapse uk-grid-match';
 $classes['list_clearfix'] = 'uk-clearfix';
 $classes['item_column_width_first'] = 'InputfieldColumnWidthFirst uk-first-column';
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js b/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js
index b2633fe4..411f21fe 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js
+++ b/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js
@@ -437,17 +437,17 @@ var ProcessWireAdminTheme = {
 				var $li = $("<li></li>").addClass('pw-nav-dup').append($a2);
 				$ul.append($li);
 				if(data.add) {
-					var $li = $(
+					var $li2 = $(
 						"<li class='pw-nav-add'>" +
 						"<a href='" + data.url + data.add.url + "'>" +
 						"<i class='fa fa-fw fa-" + data.add.icon + " pw-nav-icon'></i>" +
 						data.add.label + "</a>" +
 						"</li>"
 					);
-					$ul.append($li);
+					$ul.append($li2);
 				}
 				// populate the retrieved items
-				$.each(data.list, function(n) {
+				$.each(data.list, function(i) {
 					if(this.label.indexOf('<span') > -1) {
 						// Uikit beta 34 does not like span elements in the label for some reason
 						this.label = this.label.replace(/<\/?span[^>]*>/g, '');
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js b/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js
index 1af6da94..c86b3657 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js
+++ b/wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js
@@ -1 +1 @@
-var ProcessWireAdminTheme={init:function(){this.setupInputfields();this.setupTooltips();this.checkLayout()},ready:function(){this.setupCloneButton();ProcessWireAdmin.init();this.setupSearch();this.setupSideNav();var $body=$("body");$(document).on("wiretabclick opened",function(e){$("body").addClass("pw-fake-resize");$(window).resize();setTimeout(function(){$("body").removeClass("pw-fake-resize")},100)});$("a.notice-remove","#notices").click(function(){$("#notices").slideUp("fast",function(){$(this).remove()});return false});$("a.pw-logo-link").click(this.logoClickEvent);$("#_ProcessPageEditView").click(function(e){e.stopPropagation()});var resizeTimer=null;$(window).resize(function(){if(resizeTimer)return;resizeTimer=setTimeout(function(){ProcessWireAdminTheme.windowResized();resizeTimer=null},250)});this.setupMasthead();this.setupWireTabs();$body.removeClass("pw-init").addClass("pw-ready")},setupWireTabs:function(){var $tabs=$(".WireTabs");if($tabs.length){$(document).on("wiretabclick",function(event,$newTabContent){ProcessWireAdminTheme.wireTabClick($newTabContent)});setTimeout(function(){var $activeTab=$tabs.children(".uk-active");if($activeTab.length){var href=$activeTab.find("a").attr("href");if(href.indexOf("#")===0){var $activeContent=$(href);if($activeContent.length)ProcessWireAdminTheme.wireTabClick($activeContent)}}},500)}},wireTabClick:function($newTabContent){if(!$newTabContent.length)return;var $header=null;var $inputfield=null;if($newTabContent.hasClass("InputfieldWrapper")){$inputfield=$newTabContent.children(".Inputfields").children(".Inputfield:eq(0)");$header=$inputfield.children(".InputfieldHeader")}else if($newTabContent.hasClass("Inputfield")){$inputfield=$newTabContent;$header=$newTabContent.children(".InputfieldHeader")}if(!$header||!$header.length)return;var skip=false;var skipClasses=["InputfieldIsPrimary","InputfieldIsWarning","InputfieldIsError","InputfieldIsHighlight","InputfieldIsSuccess"];for(var n=0;n<skipClasses.length;n++){if($inputfield.hasClass(skipClasses[n])){skip=true;break}}if(skip)return;var hbc=$header.css("background-color").replace(/ /g,"");if(hbc==="rgb(255,255,255)"||hbc==="rgba(0,0,0,0)")return;var $tab=$("#_"+$newTabContent.attr("id")).parent();if(!$tab.length)return;if($tab.css("background-color").replace(/ /g,"")!=hbc)$tab.addClass("pw-tab-muted")},checkLayout:function(){if($("body").attr("class").indexOf("pw-layout-sidenav")==-1)return;if($("body").hasClass("pw-layout-sidenav-init"))return;if(typeof parent=="undefined"||typeof parent.isPresent=="undefined"){var href=window.location.href;if(href.indexOf("layout=")>-1){href=href.replace(/([?&]layout)=[-_a-zA-Z0-9]+/,"$1=sidenav-init")}else{href+=(href.indexOf("?")>0?"&":"?")+"layout=sidenav-init"}window.location.href=href}},windowResized:function(){if($("body").hasClass("pw-fake-resize"))return;this.setupMasthead()},setupMasthead:function(){var $masthead=$("#pw-masthead");var $mastheadMobile=$("#pw-masthead-mobile");var width=$(window).width();var height=0;var maxHeight=0;if(width>767){maxHeight=parseInt($masthead.data("pw-height"));height=$masthead.children(".pw-container").height()}else{height=999}if($masthead.hasClass("uk-hidden"))$masthead.removeClass("uk-hidden");if(height>maxHeight){if(!$masthead.hasClass("pw-masthead-hidden")){$masthead.addClass("pw-masthead-hidden").css({position:"absolute",top:"-9999px"});$mastheadMobile.removeClass("uk-hidden");$("#offcanvas-toggle").removeClass("uk-hidden")}}else{if($masthead.hasClass("pw-masthead-hidden")){$mastheadMobile.addClass("uk-hidden");$masthead.removeClass("pw-masthead-hidden").css({position:"relative",top:0});$("#offcanvas-toggle").addClass("uk-hidden")}}},setupCloneButton:function(){if($("body").is(".modal"))return;var $buttons=$("button.pw-head-button, button.head_button_clone");if($buttons.length==0)return;var $head=$("#pw-content-head-buttons");var $lastToggle=null;var $lastButton=null;var toggles={};$buttons.each(function(){var $t=$(this);var $a=$t.parent("a");var $button;if($a.length>0){$button=$t.parent("a").clone(true);$head.prepend($button)}else if($t.hasClass("pw-head-button")||$t.hasClass("head_button_clone")){$button=$t.clone(true);$button.attr("data-from_id",$t.attr("id")).attr("id",$t.attr("id")+"_copy").addClass("pw-head-button");$button.click(function(){$("#"+$(this).attr("data-from_id")).click();return false});if($button.hasClass("pw-button-dropdown-toggle")){var id=$button.attr("id").replace("pw-dropdown-toggle-","");toggles[id]=$button}else if($button.hasClass("pw-button-dropdown-main")){var $wrap=$("<span></span>").addClass("pw-button-dropdown-wrap");$wrap.append($button).addClass("uk-float-right");$head.prepend($wrap)}else{$button.addClass("uk-float-right");$head.prepend($button)}}});for(var id in toggles){var $toggle=toggles[id];var $button=$("#"+id);$button.after($toggle)}},setupSearch:function(){$.widget("custom.adminsearchautocomplete",$.ui.autocomplete,{_renderMenu:function(ul,items){var that=this;var currentType="";ul.addClass("pw-dropdown-menu-shorter uk-nav uk-nav-default");ul.css("z-index",9999);$.each(items,function(index,item){if(item.type!=currentType){if(currentType.length){$("<li class='uk-nav-divider'></li>").appendTo(ul)}$("<li>"+item.type+"</li>").addClass("uk-nav-header").appendTo(ul);currentType=item.type}that._renderItemData(ul,item)})},_renderItem:function(ul,item){if(item.label==item.template)item.template="";var $label=$("<span></span>").text(item.label).css("margin-right","3px");if(item.unpublished)$label.css("text-decoration","line-through");if(item.hidden)$label.addClass("ui-priority-secondary");if(item.icon.length){var $icon=$("<i></i>").addClass("fa fa-fw fa-"+item.icon).css("margin-right","2px");$label.prepend($icon)}var $a=$("<a></a>").attr("href",item.edit_url).attr("title",item.tip).append($label).append($("<small class='uk-text-muted'></small>").text(item.template));if(item.edit_url=="#"||!item.edit_url.length){$a.removeAttr("href")}return $("<li></li>").append($a).appendTo(ul)}});$(".pw-search-form").each(function(){var $form=$(this);var $input=$form.find(".pw-search-input");var position={my:"right top",at:"right bottom"};if($form.closest(".uk-offcanvas-bar").length){position.my="left top";position.at="left bottom"}$input.click(function(event){event.stopPropagation()});$input.adminsearchautocomplete({minLength:2,position:position,search:function(event,ui){$form.find(".pw-search-icon").addClass("uk-hidden");$form.find(".pw-spinner-icon").removeClass("uk-hidden")},open:function(event,ui){},close:function(event,ui){},source:function(request,response){if(request.term===$input.attr("data-help-term"))request.term="help";var url=$input.parents("form").attr("data-action")+"?q="+request.term;$.getJSON(url,function(data){var len=data.matches.length;if(len<data.total){}else{}$form.find(".pw-search-icon").removeClass("uk-hidden");$form.find(".pw-spinner-icon").addClass("uk-hidden");response($.map(data.matches,function(item){return{label:item.title,value:item.title,page_id:item.id,template:item.template_label?item.template_label:"",edit_url:item.editUrl,type:item.type,tip:item.tip,unpublished:typeof item.unpublished!="undefined"?item.unpublished:false,hidden:typeof item.hidden!="undefined"?item.hidden:false,locked:typeof item.locked!="undefined"?item.locked:false,icon:typeof item.icon!="undefined"?item.icon:""}}))})},select:function(event,ui){$(this).val("");if(typeof event.key!=="undefined"){event.preventDefault();if(ui.item.edit_url==="#"||ui.item.edit_url.length<1)return false;if(typeof parent.isPresent=="undefined"){window.location=ui.item.edit_url}else{parent.jQuery("#pw-admin-main")[0].contentWindow.document.location.href=ui.item.edit_url}}}}).focus(function(){setTimeout(function(){$input.attr("placeholder",$input.attr("data-help-note"))},1250)}).blur(function(){$input.attr("placeholder","")})})},setupSideNav:function(){$(".pw-sidebar-nav").on("click","a",function(event){var $a=$(this);if(!$a.hasClass("pw-has-ajax-items")){event.stopPropagation();return}var $ul=$a.closest("li").find("ul");var url=$(this).attr("data-json");if($ul.hasClass("navJSON"))return false;var $spinner=$("<li class='pw-nav-spinner'><i class='fa fa-spin fa-spinner'></i></li>");$ul.append($spinner);$.getJSON(url,function(data){var $a2=$a.clone();var $icon2=$a2.find("i");if(!$icon2.length){$icon2=$("<i></i>");$a2.prepend($icon2)}$icon2.attr("class","fa fa-fw fa-arrow-circle-right pw-nav-icon");$a2.removeAttr("data-json").removeAttr("class");$a2.find("small").remove();var $li=$("<li></li>").addClass("pw-nav-dup").append($a2);$ul.append($li);if(data.add){var $li=$("<li class='pw-nav-add'>"+"<a href='"+data.url+data.add.url+"'>"+"<i class='fa fa-fw fa-"+data.add.icon+" pw-nav-icon'></i>"+data.add.label+"</a>"+"</li>");$ul.append($li)}$.each(data.list,function(n){if(this.label.indexOf("<span")>-1){this.label=this.label.replace(/<\/?span[^>]*>/g,"")}var icon="";var $label=$("<div>"+this.label+"</div>");var label=$label.text();if(label.length>30){var $small=$label.find("small");if($small.length)$small.remove();label=$label.text();label=label.substring(0,30);var n=label.lastIndexOf(" ");if(n>3)label=label.substring(0,n)+"… ";$label.html(label);if($small.length)$label.append($small)}label=$label.html().replace("&nbsp;"," ");if(this.icon)icon="<i class='fa fa-fw fa-"+this.icon+" pw-nav-icon'></i>";var url=this.url.indexOf("/")===0?this.url:data.url+this.url;var $a=$("<a href='"+url+"'>"+icon+label+"</a>");var $li=$("<li></li>").append($a);if(this.navJSON!="undefined"&&this.navJSON){$a.addClass("pw-has-items pw-has-ajax-items").attr("data-json",this.navJSON);var $ul2=$("<ul class='uk-nav-sub uk-nav-parent-icon'></ul>");$li.addClass("uk-parent").append($ul2);UIkit.nav($ul2,{multiple:true})}if(typeof this.className!="undefined"&&this.className&&this.className.length){$li.addClass(this.className)}if($li.hasClass("pw-nav-add")||$li.hasClass("pw-pagelist-show-all")){$ul.children(".pw-nav-dup").after($li.removeClass("separator").addClass("pw-nav-add"))}else{$ul.append($li)}});$spinner.remove();$ul.addClass("navJSON").addClass("length"+parseInt(data.list.length)).hide();if($ul.children().length)$ul.css("opacity",1).fadeIn("fast")});return false})},setupInputfields:function(){var noGrid=$("body").hasClass("AdminThemeUikitNoGrid");function initFormMarkup($target){$("form.uk-form-horizontal").each(function(){$(this).find(".InputfieldContent > .Inputfields").each(function(){var $content=$(this);$content.addClass("uk-form-vertical");$content.find(".uk-form-label").removeClass("uk-form-label");$content.find(".uk-form-controls").removeClass("uk-form-controls")});$(this).find(".InputfieldSubmit, .InputfieldButton").each(function(){$(this).find(".InputfieldContent").before("<div class='uk-form-label'>&nbsp;</div>")})});$(".InputfieldNoBorder.uk-card").removeClass("uk-card uk-card-default");$(".InputfieldIsOffset.InputfieldColumnWidthFirst").each(function(){var $t=$(this);var $f;do{$f=$t.next(".InputfieldColumnWidth");if(!$f.length||$f.hasClass("InputfieldColumnWidthFirst"))break;$f.addClass("InputfieldIsOffset");$t=$f}while(true)});$(".Inputfields").each(function(){identifyFirstLastRows($(this))});$(".ui-widget.Inputfield, .ui-widget-header.InputfieldHeader, .ui-widget-content.InputfieldContent").removeClass("ui-widget ui-widget-header ui-widget-content");$(".MarkupPagerNav:not(.uk-pagination)").each(function(){$(this).addClass("uk-pagination")});if(typeof $target=="undefined")$target=$(".InputfieldForm");var $selects=$("select:not([multiple]):not(.uk-select)",$target);$selects.addClass("uk-select")}function identifyFirstLastRows($inputfields){$(".InputfieldRowFirst",$inputfields).removeClass("InputfieldRowFirst");$(".InputfieldRowLast",$inputfields).removeClass("InputfieldRowLast");var $in=$inputfields.children(".Inputfield:not(.InputfieldStateHidden):eq(0)");if(!$in.length)return;do{$in.addClass("InputfieldRowFirst");$in=$in.next(".Inputfield:not(.InputfieldStateHidden)")}while($in.hasClass("InputfieldColumnWidth")&&!$in.hasClass("InputfieldColumnWidthFirst"));$in=$inputfields.children(".Inputfield:last-child");while($in.length&&$in.hasClass("InputfieldStateHidden")){$in=$in.prev(".Inputfield")}do{$in.addClass("InputfieldRowLast");if(!$in.hasClass("InputfieldColumnWidth")||$in.hasClass("InputfieldColumnWidthFirst"))break;$in=$in.prev(".Inputfield:not(.InputfieldStateHidden)")}while($in.hasClass("InputfieldColumnWidth"))}var ukGridClassCache=[];function ukGridClass(width,$in){if(noGrid&&typeof $in!="undefined"){if(typeof width=="string"){$in.addClass(width)}else{$in.css("width",width+"%")}return""}var ukGridClassDefault="uk-width-1-1";var ukGridClass=ukGridClassDefault;var widthIsClass=false;if(typeof width=="string"&&typeof $in!="undefined"){ukGridClass=width;widthIsClass=true}else if(!width||width>=100){ukGridClass=ukGridClassDefault}else if(typeof ukGridClassCache[width]!="undefined"){ukGridClass="uk-width-"+ukGridClassCache[width]}else{for(var pct in ProcessWire.config.ukGridWidths){var cn=ProcessWire.config.ukGridWidths[pct];pct=parseInt(pct);if(width>=pct){ukGridClass=cn;break}}if(ukGridClass.length){ukGridClassCache[width]=ukGridClass;ukGridClass="uk-width-"+ukGridClass}}if(!widthIsClass&&ukGridClass&&ukGridClass!=ukGridClassDefault){ukGridClass+="@m"}if(typeof $in!="undefined"){if(ukGridClass&&$in.hasClass(ukGridClass)){}else{removeUkGridClass($in);if(ukGridClass)$in.addClass(ukGridClass)}}return ukGridClass}function removeUkGridClass(str){var $in=null;if(typeof str!="string"){$in=str;str=$in.attr("class")}if(str.indexOf("uk-width-")>-1){var cls=str.replace(/uk-width-(\d-\d|expand)[@smxl]*\s*/g,"");if($in!==null)$in.attr("class",cls)}return str}function updateInputfieldRow($inputfield){if(!$inputfield)return;var $inputfields=$inputfield.parent().children(".Inputfield");var $lastInputfield=null;var width=0;var widthHidden=0;var w=0;var lastW=0;var debug=false;function consoleLog(msg,$in){if(!debug)return;if(typeof $in=="undefined")$in=$inputfield;var id=$in.attr("id");id=id.replace("wrap_Inputfield_","");console.log(id+" (combined width="+width+", w="+w+"): "+msg)}function expandLastInputfield($in){if(typeof $in=="undefined")$in=$lastInputfield;if($in){if(noGrid){$in.addClass("InputfieldColumnWidthLast")}else{ukGridClass("InputfieldColumnWidthLast uk-width-expand",$in)}}}function applyHiddenInputfield(){if(debug)consoleLog("A: hidden",$inputfield);lastW+=w;width+=w;if($lastInputfield&&width>=95){if(debug)consoleLog("Updating last visible Inputfield to width="+lastW,$lastInputfield);ukGridClass(lastW,$lastInputfield);width=0;lastW=0;widthHidden=0;$lastInputfield=null}else{widthHidden+=w}}function applyFullWidthInputfield(){if(debug)consoleLog("Skipping because full-width",$inputfield);if(width<100&&$lastInputfield)expandLastInputfield($lastInputfield);$lastInputfield=null;widthHidden=0;lastW=0;width=0}$inputfields.each(function(){$inputfield=$(this);var isLastColumn=false;var isFirstColumn=false;var hasWidth=$inputfield.hasClass("InputfieldColumnWidth");var isNewRow=!hasWidth||$inputfield.hasClass("InputfieldColumnWidthFirst");if(isNewRow&&$lastInputfield&&width<100){expandLastInputfield($lastInputfield)}w=hasWidth?parseInt($inputfield.attr("data-colwidth")):0;if(!w||w>=95){applyFullWidthInputfield();return}if($inputfield.hasClass("InputfieldStateHidden")){applyHiddenInputfield();return}if(!width||width>=100){width=0;isFirstColumn=true;isLastColumn=false;if(debug)consoleLog("B: starting new row",$inputfield)}else if(width+w>100){if($lastInputfield)expandLastInputfield($lastInputfield);width=0;isFirstColumn=true;if(debug)consoleLog("C: start new row because width would exceed 100%",$inputfield)}else if(width+w==100){isLastColumn=true;if(debug)consoleLog("D: width is exactly 100%, so this is the last column",$inputfield)}else if(width+w>=95){isLastColumn=true;w=100-width;if(debug)consoleLog("D2: width is close enough to 100%, so this is the last column",$inputfield)}else{if(debug)consoleLog("E: not first or last column",$inputfield)}if(isLastColumn){$inputfield.addClass("InputfieldColumnWidthLast")}else{$inputfield.removeClass("InputfieldColumnWidthLast")}if(isFirstColumn){$inputfield.addClass("InputfieldColumnWidthFirst");widthHidden=0}else{$inputfield.removeClass("InputfieldColumnWidthFirst")}if(isLastColumn){$lastInputfield=null;width=0;lastW=0;if(widthHidden)w+=widthHidden;widthHidden=0}else{$lastInputfield=$inputfield;width+=w;lastW=w}ukGridClass(w,$inputfield)});if(width<100&&$lastInputfield)expandLastInputfield($lastInputfield)}var showHideInputfieldTimer=null;var showHideInputfield=function(event,inputfield){var $inputfield=$(inputfield);if(event.type=="showInputfield"){$inputfield.removeClass("uk-hidden")}else{$inputfield.show();$inputfield.addClass("uk-hidden")}updateInputfieldRow($inputfield);if(showHideInputfieldTimer)return;showHideInputfieldTimer=setTimeout(function(){identifyFirstLastRows($inputfield.closest(".Inputfields"));var $inputfields=$inputfield.find(".Inputfields");if($inputfields.length){$inputfields.each(function(){identifyFirstLastRows($(this))})}showHideInputfieldTimer=null},100)};$(document).on("reloaded",function(){initFormMarkup($(this))});$(document).on("hideInputfield",showHideInputfield);$(document).on("showInputfield",showHideInputfield);$(document).on("columnWidth",".Inputfield",function(e,width){ukGridClass(width,$(this));return false});$("body").addClass("InputfieldColumnWidthsInit");initFormMarkup()},setupTooltips:function(){$(".tooltip, .pw-tooltip").each(function(){$(this).removeClass("tooltip pw-tooltip");UIkit.tooltip($(this))})},linkTargetMainMouseoverEvent:function(){var $a=$(this);var href=$a.attr("href");if(href.length<2)return;if($a.attr("target"))return;if($a.parent("li").hasClass("PageListActionView")){$a.attr("target","_top")}else{$a.attr("target","main")}},logoClickEvent:function(){if($("body").hasClass("pw-layout-sidenav-init")){if($("#pw-admin-side").length){toggleSidebarPane()}else{UIkit.toggle("#offcanvas-nav").toggle()}}else if(ProcessWire.config.adminTheme.logoAction==1){UIkit.toggle("#offcanvas-nav").toggle()}else{return true}return false}};$(document).ready(function(){ProcessWireAdminTheme.ready()});
\ No newline at end of file
+var ProcessWireAdminTheme={init:function(){this.setupInputfields();this.setupTooltips();this.checkLayout()},ready:function(){this.setupCloneButton();ProcessWireAdmin.init();this.setupSearch();this.setupSideNav();var $body=$("body");$(document).on("wiretabclick opened",function(e){$("body").addClass("pw-fake-resize");$(window).resize();setTimeout(function(){$("body").removeClass("pw-fake-resize")},100)});$("a.notice-remove","#notices").click(function(){$("#notices").slideUp("fast",function(){$(this).remove()});return false});$("a.pw-logo-link").click(this.logoClickEvent);$("#_ProcessPageEditView").click(function(e){e.stopPropagation()});var resizeTimer=null;$(window).resize(function(){if(resizeTimer)return;resizeTimer=setTimeout(function(){ProcessWireAdminTheme.windowResized();resizeTimer=null},250)});this.setupMasthead();this.setupWireTabs();$body.removeClass("pw-init").addClass("pw-ready")},setupWireTabs:function(){var $tabs=$(".WireTabs");if($tabs.length){$(document).on("wiretabclick",function(event,$newTabContent){ProcessWireAdminTheme.wireTabClick($newTabContent)});setTimeout(function(){var $activeTab=$tabs.children(".uk-active");if($activeTab.length){var href=$activeTab.find("a").attr("href");if(href.indexOf("#")===0){var $activeContent=$(href);if($activeContent.length)ProcessWireAdminTheme.wireTabClick($activeContent)}}},500)}},wireTabClick:function($newTabContent){if(!$newTabContent.length)return;var $header=null;var $inputfield=null;if($newTabContent.hasClass("InputfieldWrapper")){$inputfield=$newTabContent.children(".Inputfields").children(".Inputfield:eq(0)");$header=$inputfield.children(".InputfieldHeader")}else if($newTabContent.hasClass("Inputfield")){$inputfield=$newTabContent;$header=$newTabContent.children(".InputfieldHeader")}if(!$header||!$header.length)return;var skip=false;var skipClasses=["InputfieldIsPrimary","InputfieldIsWarning","InputfieldIsError","InputfieldIsHighlight","InputfieldIsSuccess"];for(var n=0;n<skipClasses.length;n++){if($inputfield.hasClass(skipClasses[n])){skip=true;break}}if(skip)return;var hbc=$header.css("background-color").replace(/ /g,"");if(hbc==="rgb(255,255,255)"||hbc==="rgba(0,0,0,0)")return;var $tab=$("#_"+$newTabContent.attr("id")).parent();if(!$tab.length)return;if($tab.css("background-color").replace(/ /g,"")!=hbc)$tab.addClass("pw-tab-muted")},checkLayout:function(){if($("body").attr("class").indexOf("pw-layout-sidenav")==-1)return;if($("body").hasClass("pw-layout-sidenav-init"))return;if(typeof parent=="undefined"||typeof parent.isPresent=="undefined"){var href=window.location.href;if(href.indexOf("layout=")>-1){href=href.replace(/([?&]layout)=[-_a-zA-Z0-9]+/,"$1=sidenav-init")}else{href+=(href.indexOf("?")>0?"&":"?")+"layout=sidenav-init"}window.location.href=href}},windowResized:function(){if($("body").hasClass("pw-fake-resize"))return;this.setupMasthead()},setupMasthead:function(){var $masthead=$("#pw-masthead");var $mastheadMobile=$("#pw-masthead-mobile");var width=$(window).width();var height=0;var maxHeight=0;if(width>767){maxHeight=parseInt($masthead.data("pw-height"));height=$masthead.children(".pw-container").height()}else{height=999}if($masthead.hasClass("uk-hidden"))$masthead.removeClass("uk-hidden");if(height>maxHeight){if(!$masthead.hasClass("pw-masthead-hidden")){$masthead.addClass("pw-masthead-hidden").css({position:"absolute",top:"-9999px"});$mastheadMobile.removeClass("uk-hidden");$("#offcanvas-toggle").removeClass("uk-hidden")}}else{if($masthead.hasClass("pw-masthead-hidden")){$mastheadMobile.addClass("uk-hidden");$masthead.removeClass("pw-masthead-hidden").css({position:"relative",top:0});$("#offcanvas-toggle").addClass("uk-hidden")}}},setupCloneButton:function(){if($("body").is(".modal"))return;var $buttons=$("button.pw-head-button, button.head_button_clone");if($buttons.length==0)return;var $head=$("#pw-content-head-buttons");var $lastToggle=null;var $lastButton=null;var toggles={};$buttons.each(function(){var $t=$(this);var $a=$t.parent("a");var $button;if($a.length>0){$button=$t.parent("a").clone(true);$head.prepend($button)}else if($t.hasClass("pw-head-button")||$t.hasClass("head_button_clone")){$button=$t.clone(true);$button.attr("data-from_id",$t.attr("id")).attr("id",$t.attr("id")+"_copy").addClass("pw-head-button");$button.click(function(){$("#"+$(this).attr("data-from_id")).click();return false});if($button.hasClass("pw-button-dropdown-toggle")){var id=$button.attr("id").replace("pw-dropdown-toggle-","");toggles[id]=$button}else if($button.hasClass("pw-button-dropdown-main")){var $wrap=$("<span></span>").addClass("pw-button-dropdown-wrap");$wrap.append($button).addClass("uk-float-right");$head.prepend($wrap)}else{$button.addClass("uk-float-right");$head.prepend($button)}}});for(var id in toggles){var $toggle=toggles[id];var $button=$("#"+id);$button.after($toggle)}},setupSearch:function(){$.widget("custom.adminsearchautocomplete",$.ui.autocomplete,{_renderMenu:function(ul,items){var that=this;var currentType="";ul.addClass("pw-dropdown-menu-shorter uk-nav uk-nav-default");ul.css("z-index",9999);$.each(items,function(index,item){if(item.type!=currentType){if(currentType.length){$("<li class='uk-nav-divider'></li>").appendTo(ul)}$("<li>"+item.type+"</li>").addClass("uk-nav-header").appendTo(ul);currentType=item.type}that._renderItemData(ul,item)})},_renderItem:function(ul,item){if(item.label==item.template)item.template="";var $label=$("<span></span>").text(item.label).css("margin-right","3px");if(item.unpublished)$label.css("text-decoration","line-through");if(item.hidden)$label.addClass("ui-priority-secondary");if(item.icon.length){var $icon=$("<i></i>").addClass("fa fa-fw fa-"+item.icon).css("margin-right","2px");$label.prepend($icon)}var $a=$("<a></a>").attr("href",item.edit_url).attr("title",item.tip).append($label).append($("<small class='uk-text-muted'></small>").text(item.template));if(item.edit_url=="#"||!item.edit_url.length){$a.removeAttr("href")}return $("<li></li>").append($a).appendTo(ul)}});$(".pw-search-form").each(function(){var $form=$(this);var $input=$form.find(".pw-search-input");var position={my:"right top",at:"right bottom"};if($form.closest(".uk-offcanvas-bar").length){position.my="left top";position.at="left bottom"}$input.click(function(event){event.stopPropagation()});$input.adminsearchautocomplete({minLength:2,position:position,search:function(event,ui){$form.find(".pw-search-icon").addClass("uk-hidden");$form.find(".pw-spinner-icon").removeClass("uk-hidden")},open:function(event,ui){},close:function(event,ui){},source:function(request,response){if(request.term===$input.attr("data-help-term"))request.term="help";var url=$input.parents("form").attr("data-action")+"?q="+request.term;$.getJSON(url,function(data){var len=data.matches.length;if(len<data.total){}else{}$form.find(".pw-search-icon").removeClass("uk-hidden");$form.find(".pw-spinner-icon").addClass("uk-hidden");response($.map(data.matches,function(item){return{label:item.title,value:item.title,page_id:item.id,template:item.template_label?item.template_label:"",edit_url:item.editUrl,type:item.type,tip:item.tip,unpublished:typeof item.unpublished!="undefined"?item.unpublished:false,hidden:typeof item.hidden!="undefined"?item.hidden:false,locked:typeof item.locked!="undefined"?item.locked:false,icon:typeof item.icon!="undefined"?item.icon:""}}))})},select:function(event,ui){$(this).val("");if(typeof event.key!=="undefined"){event.preventDefault();if(ui.item.edit_url==="#"||ui.item.edit_url.length<1)return false;if(typeof parent.isPresent=="undefined"){window.location=ui.item.edit_url}else{parent.jQuery("#pw-admin-main")[0].contentWindow.document.location.href=ui.item.edit_url}}}}).focus(function(){setTimeout(function(){$input.attr("placeholder",$input.attr("data-help-note"))},1250)}).blur(function(){$input.attr("placeholder","")})})},setupSideNav:function(){$(".pw-sidebar-nav").on("click","a",function(event){var $a=$(this);if(!$a.hasClass("pw-has-ajax-items")){event.stopPropagation();return}var $ul=$a.closest("li").find("ul");var url=$(this).attr("data-json");if($ul.hasClass("navJSON"))return false;var $spinner=$("<li class='pw-nav-spinner'><i class='fa fa-spin fa-spinner'></i></li>");$ul.append($spinner);$.getJSON(url,function(data){var $a2=$a.clone();var $icon2=$a2.find("i");if(!$icon2.length){$icon2=$("<i></i>");$a2.prepend($icon2)}$icon2.attr("class","fa fa-fw fa-arrow-circle-right pw-nav-icon");$a2.removeAttr("data-json").removeAttr("class");$a2.find("small").remove();var $li=$("<li></li>").addClass("pw-nav-dup").append($a2);$ul.append($li);if(data.add){var $li2=$("<li class='pw-nav-add'>"+"<a href='"+data.url+data.add.url+"'>"+"<i class='fa fa-fw fa-"+data.add.icon+" pw-nav-icon'></i>"+data.add.label+"</a>"+"</li>");$ul.append($li2)}$.each(data.list,function(i){if(this.label.indexOf("<span")>-1){this.label=this.label.replace(/<\/?span[^>]*>/g,"")}var icon="";var $label=$("<div>"+this.label+"</div>");var label=$label.text();if(label.length>30){var $small=$label.find("small");if($small.length)$small.remove();label=$label.text();label=label.substring(0,30);var n=label.lastIndexOf(" ");if(n>3)label=label.substring(0,n)+"… ";$label.html(label);if($small.length)$label.append($small)}label=$label.html().replace("&nbsp;"," ");if(this.icon)icon="<i class='fa fa-fw fa-"+this.icon+" pw-nav-icon'></i>";var url=this.url.indexOf("/")===0?this.url:data.url+this.url;var $a=$("<a href='"+url+"'>"+icon+label+"</a>");var $li=$("<li></li>").append($a);if(this.navJSON!="undefined"&&this.navJSON){$a.addClass("pw-has-items pw-has-ajax-items").attr("data-json",this.navJSON);var $ul2=$("<ul class='uk-nav-sub uk-nav-parent-icon'></ul>");$li.addClass("uk-parent").append($ul2);UIkit.nav($ul2,{multiple:true})}if(typeof this.className!="undefined"&&this.className&&this.className.length){$li.addClass(this.className)}if($li.hasClass("pw-nav-add")||$li.hasClass("pw-pagelist-show-all")){$ul.children(".pw-nav-dup").after($li.removeClass("separator").addClass("pw-nav-add"))}else{$ul.append($li)}});$spinner.remove();$ul.addClass("navJSON").addClass("length"+parseInt(data.list.length)).hide();if($ul.children().length)$ul.css("opacity",1).fadeIn("fast")});return false})},setupInputfields:function(){var noGrid=$("body").hasClass("AdminThemeUikitNoGrid");function initFormMarkup($target){$("form.uk-form-horizontal").each(function(){$(this).find(".InputfieldContent > .Inputfields").each(function(){var $content=$(this);$content.addClass("uk-form-vertical");$content.find(".uk-form-label").removeClass("uk-form-label");$content.find(".uk-form-controls").removeClass("uk-form-controls")});$(this).find(".InputfieldSubmit, .InputfieldButton").each(function(){$(this).find(".InputfieldContent").before("<div class='uk-form-label'>&nbsp;</div>")})});$(".InputfieldNoBorder.uk-card").removeClass("uk-card uk-card-default");$(".InputfieldIsOffset.InputfieldColumnWidthFirst").each(function(){var $t=$(this);var $f;do{$f=$t.next(".InputfieldColumnWidth");if(!$f.length||$f.hasClass("InputfieldColumnWidthFirst"))break;$f.addClass("InputfieldIsOffset");$t=$f}while(true)});$(".Inputfields").each(function(){identifyFirstLastRows($(this))});$(".ui-widget.Inputfield, .ui-widget-header.InputfieldHeader, .ui-widget-content.InputfieldContent").removeClass("ui-widget ui-widget-header ui-widget-content");$(".MarkupPagerNav:not(.uk-pagination)").each(function(){$(this).addClass("uk-pagination")});if(typeof $target=="undefined")$target=$(".InputfieldForm");var $selects=$("select:not([multiple]):not(.uk-select)",$target);$selects.addClass("uk-select")}function identifyFirstLastRows($inputfields){$(".InputfieldRowFirst",$inputfields).removeClass("InputfieldRowFirst");$(".InputfieldRowLast",$inputfields).removeClass("InputfieldRowLast");var $in=$inputfields.children(".Inputfield:not(.InputfieldStateHidden):eq(0)");if(!$in.length)return;do{$in.addClass("InputfieldRowFirst");$in=$in.next(".Inputfield:not(.InputfieldStateHidden)")}while($in.hasClass("InputfieldColumnWidth")&&!$in.hasClass("InputfieldColumnWidthFirst"));$in=$inputfields.children(".Inputfield:last-child");while($in.length&&$in.hasClass("InputfieldStateHidden")){$in=$in.prev(".Inputfield")}do{$in.addClass("InputfieldRowLast");if(!$in.hasClass("InputfieldColumnWidth")||$in.hasClass("InputfieldColumnWidthFirst"))break;$in=$in.prev(".Inputfield:not(.InputfieldStateHidden)")}while($in.hasClass("InputfieldColumnWidth"))}var ukGridClassCache=[];function ukGridClass(width,$in){if(noGrid&&typeof $in!="undefined"){if(typeof width=="string"){$in.addClass(width)}else{$in.css("width",width+"%")}return""}var ukGridClassDefault="uk-width-1-1";var ukGridClass=ukGridClassDefault;var widthIsClass=false;if(typeof width=="string"&&typeof $in!="undefined"){ukGridClass=width;widthIsClass=true}else if(!width||width>=100){ukGridClass=ukGridClassDefault}else if(typeof ukGridClassCache[width]!="undefined"){ukGridClass="uk-width-"+ukGridClassCache[width]}else{for(var pct in ProcessWire.config.ukGridWidths){var cn=ProcessWire.config.ukGridWidths[pct];pct=parseInt(pct);if(width>=pct){ukGridClass=cn;break}}if(ukGridClass.length){ukGridClassCache[width]=ukGridClass;ukGridClass="uk-width-"+ukGridClass}}if(!widthIsClass&&ukGridClass&&ukGridClass!=ukGridClassDefault){ukGridClass+="@m"}if(typeof $in!="undefined"){if(ukGridClass&&$in.hasClass(ukGridClass)){}else{removeUkGridClass($in);if(ukGridClass)$in.addClass(ukGridClass)}}return ukGridClass}function removeUkGridClass(str){var $in=null;if(typeof str!="string"){$in=str;str=$in.attr("class")}if(str.indexOf("uk-width-")>-1){var cls=str.replace(/uk-width-(\d-\d|expand)[@smxl]*\s*/g,"");if($in!==null)$in.attr("class",cls)}return str}function updateInputfieldRow($inputfield){if(!$inputfield)return;var $inputfields=$inputfield.parent().children(".Inputfield");var $lastInputfield=null;var width=0;var widthHidden=0;var w=0;var lastW=0;var debug=false;function consoleLog(msg,$in){if(!debug)return;if(typeof $in=="undefined")$in=$inputfield;var id=$in.attr("id");id=id.replace("wrap_Inputfield_","");console.log(id+" (combined width="+width+", w="+w+"): "+msg)}function expandLastInputfield($in){if(typeof $in=="undefined")$in=$lastInputfield;if($in){if(noGrid){$in.addClass("InputfieldColumnWidthLast")}else{ukGridClass("InputfieldColumnWidthLast uk-width-expand",$in)}}}function applyHiddenInputfield(){if(debug)consoleLog("A: hidden",$inputfield);lastW+=w;width+=w;if($lastInputfield&&width>=95){if(debug)consoleLog("Updating last visible Inputfield to width="+lastW,$lastInputfield);ukGridClass(lastW,$lastInputfield);width=0;lastW=0;widthHidden=0;$lastInputfield=null}else{widthHidden+=w}}function applyFullWidthInputfield(){if(debug)consoleLog("Skipping because full-width",$inputfield);if(width<100&&$lastInputfield)expandLastInputfield($lastInputfield);$lastInputfield=null;widthHidden=0;lastW=0;width=0}$inputfields.each(function(){$inputfield=$(this);var isLastColumn=false;var isFirstColumn=false;var hasWidth=$inputfield.hasClass("InputfieldColumnWidth");var isNewRow=!hasWidth||$inputfield.hasClass("InputfieldColumnWidthFirst");if(isNewRow&&$lastInputfield&&width<100){expandLastInputfield($lastInputfield)}w=hasWidth?parseInt($inputfield.attr("data-colwidth")):0;if(!w||w>=95){applyFullWidthInputfield();return}if($inputfield.hasClass("InputfieldStateHidden")){applyHiddenInputfield();return}if(!width||width>=100){width=0;isFirstColumn=true;isLastColumn=false;if(debug)consoleLog("B: starting new row",$inputfield)}else if(width+w>100){if($lastInputfield)expandLastInputfield($lastInputfield);width=0;isFirstColumn=true;if(debug)consoleLog("C: start new row because width would exceed 100%",$inputfield)}else if(width+w==100){isLastColumn=true;if(debug)consoleLog("D: width is exactly 100%, so this is the last column",$inputfield)}else if(width+w>=95){isLastColumn=true;w=100-width;if(debug)consoleLog("D2: width is close enough to 100%, so this is the last column",$inputfield)}else{if(debug)consoleLog("E: not first or last column",$inputfield)}if(isLastColumn){$inputfield.addClass("InputfieldColumnWidthLast")}else{$inputfield.removeClass("InputfieldColumnWidthLast")}if(isFirstColumn){$inputfield.addClass("InputfieldColumnWidthFirst");widthHidden=0}else{$inputfield.removeClass("InputfieldColumnWidthFirst")}if(isLastColumn){$lastInputfield=null;width=0;lastW=0;if(widthHidden)w+=widthHidden;widthHidden=0}else{$lastInputfield=$inputfield;width+=w;lastW=w}ukGridClass(w,$inputfield)});if(width<100&&$lastInputfield)expandLastInputfield($lastInputfield)}var showHideInputfieldTimer=null;var showHideInputfield=function(event,inputfield){var $inputfield=$(inputfield);if(event.type=="showInputfield"){$inputfield.removeClass("uk-hidden")}else{$inputfield.show();$inputfield.addClass("uk-hidden")}updateInputfieldRow($inputfield);if(showHideInputfieldTimer)return;showHideInputfieldTimer=setTimeout(function(){identifyFirstLastRows($inputfield.closest(".Inputfields"));var $inputfields=$inputfield.find(".Inputfields");if($inputfields.length){$inputfields.each(function(){identifyFirstLastRows($(this))})}showHideInputfieldTimer=null},100)};$(document).on("reloaded",function(){initFormMarkup($(this))});$(document).on("hideInputfield",showHideInputfield);$(document).on("showInputfield",showHideInputfield);$(document).on("columnWidth",".Inputfield",function(e,width){ukGridClass(width,$(this));return false});$("body").addClass("InputfieldColumnWidthsInit");initFormMarkup()},setupTooltips:function(){$(".tooltip, .pw-tooltip").each(function(){$(this).removeClass("tooltip pw-tooltip");UIkit.tooltip($(this))})},linkTargetMainMouseoverEvent:function(){var $a=$(this);var href=$a.attr("href");if(href.length<2)return;if($a.attr("target"))return;if($a.parent("li").hasClass("PageListActionView")){$a.attr("target","_top")}else{$a.attr("target","main")}},logoClickEvent:function(){if($("body").hasClass("pw-layout-sidenav-init")){if($("#pw-admin-side").length){toggleSidebarPane()}else{UIkit.toggle("#offcanvas-nav").toggle()}}else if(ProcessWire.config.adminTheme.logoAction==1){UIkit.toggle("#offcanvas-nav").toggle()}else{return true}return false}};$(document).ready(function(){ProcessWireAdminTheme.ready()});
\ No newline at end of file
diff --git a/wire/modules/Fieldtype/FieldtypeFile/config.php b/wire/modules/Fieldtype/FieldtypeFile/config.php
index 14fb3f93..940e986f 100644
--- a/wire/modules/Fieldtype/FieldtypeFile/config.php
+++ b/wire/modules/Fieldtype/FieldtypeFile/config.php
@@ -32,7 +32,6 @@ class FieldtypeFileConfiguration extends Wire {
 	 *
 	 * @param Field $field
 	 * @param InputfieldWrapper $inputfields
-	 *
 	 * @return InputfieldWrapper
 	 *
 	 */
@@ -57,7 +56,7 @@ class FieldtypeFileConfiguration extends Wire {
 		$f = $modules->get('InputfieldTextarea');
 		$f->attr('name', 'extensions');
 		$value = $field->get('extensions');
-		if(!$value) $value = $fieldtype->get('defaultFileExtensions');
+		if(!$value) $value = $this->fieldtype->get('defaultFileExtensions');
 		$f->attr('value', $value);
 		$f->attr('rows', 3);
 		$f->label = $this->_('Allowed file extensions');