From 3ccc7fe407059291118ca436e1a3ee826b5a4383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iskender=20TOTO=C4=9ELU?= Date: Tue, 18 Apr 2017 15:55:42 +0300 Subject: [PATCH 1/2] Fixed, language support check --- InputfieldPageTableExtended.module | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 InputfieldPageTableExtended.module diff --git a/InputfieldPageTableExtended.module b/InputfieldPageTableExtended.module old mode 100644 new mode 100755 index 04d80e5..374bf7a --- a/InputfieldPageTableExtended.module +++ b/InputfieldPageTableExtended.module @@ -43,10 +43,9 @@ class InputfieldPageTableExtended extends InputfieldPageTable { $pagesToRender = $this->attr('value'); // pages $layout = ""; //get the right language label - $lang = wire('user')->language; $label = 'label'; - if (wire('user')->language->title != 'default'){ - $label = "label{$lang}"; + if ($this->wire('modules')->isInstalled('LanguageSupport') && $this->wire('user')->language->name != 'default'){ + $label = "label{$this->wire('user')->language}"; } // $this->wire("config")->paths->templates .= "views/bocks/"; // echo $this->wire("config")->paths->templates; From 053ce16544c15cab71164a31c1fe8ed4cab42cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iskender=20TOTO=C4=9ELU?= Date: Tue, 9 May 2017 15:18:22 +0300 Subject: [PATCH 2/2] Support for pathToTemplates Example : {siteModules}myModule/templates/index.php {templates} => site template path, {adminTemplates} => admin templates path, {modules} => admin module path, {siteModules} => site module path, {cache} => site cache path --- FieldtypePageTableExtended.module | 3 ++- InputfieldPageTableExtended.css | 0 InputfieldPageTableExtended.js | 0 InputfieldPageTableExtended.module | 16 +++++++++------- README.md | 0 resetAdminCSS.css | 0 6 files changed, 11 insertions(+), 8 deletions(-) mode change 100644 => 100755 FieldtypePageTableExtended.module mode change 100644 => 100755 InputfieldPageTableExtended.css mode change 100644 => 100755 InputfieldPageTableExtended.js mode change 100644 => 100755 README.md mode change 100644 => 100755 resetAdminCSS.css diff --git a/FieldtypePageTableExtended.module b/FieldtypePageTableExtended.module old mode 100644 new mode 100755 index 0ba8a26..200a1b7 --- a/FieldtypePageTableExtended.module +++ b/FieldtypePageTableExtended.module @@ -1,4 +1,5 @@ -pathToTemplates); if($this->renderLayout) { + $files = $this->wire('files'); $pagesToRender = $this->attr('value'); // pages $layout = ""; //get the right language label @@ -53,12 +54,13 @@ class InputfieldPageTableExtended extends InputfieldPageTable { $layoutTitle = $p->template->$label ? $p->template->$label : $p->template->name; $ext = "." . $this->config->templateExtension; $template_name = $p->template->altFilename ? basename($p->template->altFilename, $ext) : $p->template->name; - $templateFilename = $this->config->paths->templates . $this->pathToTemplates . $template_name . $ext; + if(is_dir($this->pathToTemplates)) $templateFilename = $this->config->paths->templates . $this->pathToTemplates . $template_name . $ext; + else $templateFilename = $this->pathToTemplates; + if(preg_match('/\{(.*?)\}/', $templateFilename, $_match) && $this->config->paths->{$_match[1]}) { + $templateFilename = $this->config->paths->{$_match[1]} . str_replace($_match[0], '', $this->pathToTemplates); + } + $parsedTemplate = $files->render($templateFilename, array('page' => $p, 'isAdmin' => 1, 'pageTableExtended' => true)); - $parsedTemplate = new TemplateFile($templateFilename); - $parsedTemplate->set("page", $p); - $parsedTemplate->set("isAdmin", 1); - $parsedTemplate->options = array('pageTableExtended' => true); $p->of(true); $iconClass = "fa-angle-down"; @@ -81,7 +83,7 @@ class InputfieldPageTableExtended extends InputfieldPageTable { '.$layoutTitle.' -
'.$parsedTemplate->render().'
+
' . $parsedTemplate . '
diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/resetAdminCSS.css b/resetAdminCSS.css old mode 100644 new mode 100755