Skip to content
Browse files

Remove smarty postfilter-includmiscfiles (not sure when it was last u…

…sed), change basetemplate to abstract class, ensure we include tables.css in custom AND default reports [#568]
  • Loading branch information...
1 parent 4959b69 commit 2049c4a85eee360bb5246ebd9aa09a3b3faefd5c @dleffler dleffler committed
View
2 framework/core/subsystems/expTemplate.php
@@ -153,7 +153,7 @@ public static function getFormTemplates($type) { //FIXME Not Used???
* @return array
* @node Subsystems:Template
*/
- public static function listModuleViews($module) { //FIXME only used by 1) containermodule edit action
+ public static function listModuleViews($module) { //FIXME only used by 1) containermodule edit action for OS modules
return expCore::buildNameList("modules", $module, "tpl", "[!_]*");
}
View
6 framework/core/subsystems/forms/basetemplate.php
@@ -18,12 +18,12 @@
/** @define "BASE" "../../../.." */
/**
- * Base Template
+ * Base Template class
*
* @package Subsystems-Forms
* @subpackage Template
*/
-class basetemplate {
+abstract class basetemplate {
// Smarty template object.
var $tpl;
@@ -63,7 +63,7 @@ function __construct($item_type, $item_dir, $view = "Default") {
$this->tpl->setPluginsDir(array(SMARTY_PATH.'plugins',BASE.'framework/plugins'));
//autoload filters
- $this->tpl->autoload_filters = array('post' => array('includemiscfiles'));
+// $this->tpl->autoload_filters = array('post' => array('includemiscfiles'));
$this->viewfile = expTemplate::getViewFile($item_type, $item_dir, $view);
$this->viewdir = realpath(dirname($this->viewfile));
View
2 framework/core/subsystems/forms/controllertemplate.php
@@ -44,7 +44,7 @@ function __construct($controller, $viewfile) {
$this->tpl->setPluginsDir(array(SMARTY_PATH.'plugins',BASE.'framework/plugins'));
//autoload filters
- $this->tpl->autoload_filters = array('post' => array('includemiscfiles'));
+// $this->tpl->autoload_filters = array('post' => array('includemiscfiles'));
$this->viewfile = $viewfile;
$this->viewdir = realpath(dirname($this->viewfile));
View
2 framework/core/subsystems/forms/template.php
@@ -18,7 +18,7 @@
/** @define "BASE" "../../.." */
/**
- * Wraps the template system in use, to provide a uniform and consistent
+ * Wraps the OS modules template system in use, to provide a uniform and consistent
* interface to templates.
*
* @package Subsystems-Forms
View
1 framework/modules-1/formbuilder/actions/view_record.php
@@ -62,6 +62,7 @@
// $template->assign('backlink',expHistory::getLastNotEditable());
$template->assign('backlink',expHistory::getLast('editable'));
$template->assign('is_email',0);
+ $template->assign("css",file_get_contents(BASE."framework/core/assets/css/tables.css"));
$template->output();
} else {
echo SITE_403_HTML;
View
10 framework/modules-1/formbuilder/views/_custom_report.tpl
@@ -13,9 +13,15 @@
*
*}
-{css unique="custom-report-buttons" corecss="button"}
+{if $is_email == 1}
+<style type="text/css" media="screen">
+ {$css}
+</style>
+{else}
+ {css unique="custom-report" corecss="tables,button"}
-{/css}
+ {/css}
+{/if}
{eval var=$template}
View
2 framework/modules-1/formbuilder/views/_default_report.tpl
@@ -20,7 +20,7 @@
{else}
{css unique="default-report" corecss="tables,button"}
- {/css}
+ {/css}
{/if}
<table border="0" cellspacing="0" cellpadding="0" class="exp-skin-table">

0 comments on commit 2049c4a

Please sign in to comment.
Something went wrong with that request. Please try again.