diff --git a/bootstrap/templates/__shared/index.phtml b/bootstrap/templates/__shared/index.phtml index a334c5d..090f5d7 100644 --- a/bootstrap/templates/__shared/index.phtml +++ b/bootstrap/templates/__shared/index.phtml @@ -28,7 +28,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/classes/Controller.php b/classes/Controller.php index c6847e1..ee81913 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -260,7 +260,7 @@ class Controller extends Object $display = new $display_class(); // Assigns the template / template variables - $display->setTemplateVariables($module->template, $template_basename, $css_class, $js_basename); + $display->setTemplateVariables($module->template, $template_basename, $css_class, $js_basename, $module->fluid); // Checks the templates $template_exists = $display->templateExists(); diff --git a/classes/Display/Common.php b/classes/Display/Common.php index 4095658..ca1942e 100644 --- a/classes/Display/Common.php +++ b/classes/Display/Common.php @@ -139,14 +139,16 @@ abstract class Display_Common extends Object * @param string $child_template child (sub) template * @param string $css_class name of the CSS class for the module * @param string $js_basename basename for the javascript file for the module + * @param boolean $fluid whether or not use a fluid layout */ - public function setTemplateVariables($parent_template, $child_template, $css_class, $js_basename) + public function setTemplateVariables($parent_template, $child_template, $css_class, $js_basename, $fluid) { $this->setTemplate($parent_template, 'parent'); $this->setTemplate($child_template, 'child'); $this->css_class = $css_class; $this->js_basename = $js_basename; + $this->fluid = $fluid; } /** diff --git a/classes/Display/PHP.php b/classes/Display/PHP.php index 614a717..c113a10 100644 --- a/classes/Display/PHP.php +++ b/classes/Display/PHP.php @@ -68,6 +68,7 @@ class Display_PHP extends Display_Common $__module = $this->module_return; $__css_class = $this->css_class; $__js_file = $this->js_basename; + $__fluid = $this->fluid; // Creates (possibly overwritten) objects $form_class = (class_exists('CustomForm') ? 'CustomForm' : 'Form'); diff --git a/classes/Module.php b/classes/Module.php index 9a21f83..cd65d52 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -43,6 +43,14 @@ class Module extends Object */ protected $db = null; + /** + * Fluid or Fixed? + * + * @access protected + * @var boolean + */ + protected $fluid = false; + /** * Page Title * diff --git a/jar.php b/jar.php index 47dba25..e35993c 100755 --- a/jar.php +++ b/jar.php @@ -1207,7 +1207,7 @@ class Controller extends Object $display = new $display_class(); // Assigns the template / template variables - $display->setTemplateVariables($module->template, $template_basename, $css_class, $js_basename); + $display->setTemplateVariables($module->template, $template_basename, $css_class, $js_basename, $module->fluid); // Checks the templates $template_exists = $display->templateExists(); @@ -2482,14 +2482,16 @@ abstract class Display_Common extends Object * @param string $child_template child (sub) template * @param string $css_class name of the CSS class for the module * @param string $js_basename basename for the javascript file for the module + * @param boolean $fluid whether or not use a fluid layout */ - public function setTemplateVariables($parent_template, $child_template, $css_class, $js_basename) + public function setTemplateVariables($parent_template, $child_template, $css_class, $js_basename, $fluid) { $this->setTemplate($parent_template, 'parent'); $this->setTemplate($child_template, 'child'); $this->css_class = $css_class; $this->js_basename = $js_basename; + $this->fluid = $fluid; } /** @@ -2636,6 +2638,7 @@ class Display_PHP extends Display_Common $__module = $this->module_return; $__css_class = $this->css_class; $__js_file = $this->js_basename; + $__fluid = $this->fluid; // Creates (possibly overwritten) objects $form_class = (class_exists('CustomForm') ? 'CustomForm' : 'Form'); @@ -5434,6 +5437,14 @@ class Module extends Object */ protected $db = null; + /** + * Fluid or Fixed? + * + * @access protected + * @var boolean + */ + protected $fluid = false; + /** * Page Title *