joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added fluid variable to the Module class

Browse source 
As a developer you still need to code for it (it's shown at work in the bootstrap) but you can use the variable to toggle fluid and fixed right from the module itself
This commit is contained in:
Josh Sherman 2012-10-14 17:53:23 -04:00
parent b05a1691f2
commit 3c2c936cee
6 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bootstrap/templates/__shared/index.phtml
View file

@ -28,7 +28,7 @@
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<div class="container<?php $__module->fluid ? '-fluid' : ''; ?>">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -49,7 +49,7 @@
</div>
</div>
<div class="container">
<div class="container<?php $__module->fluid ? '-fluid' : ''; ?>">
<div class="content <?php echo $__css_class; ?>">
<?php require $__template; ?>
</div>

2
classes/Controller.php
View file

@ -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();

4
classes/Display/Common.php
View file

@ -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;
}
/**

1
classes/Display/PHP.php
View file

@ -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');

8
classes/Module.php
View file

@ -43,6 +43,14 @@ class Module extends Object
*/
protected $db = null;
/**
* Fluid or Fixed?
*
* @access protected
* @var boolean
*/
protected $fluid = false;
/**
* Page Title
*

15
jar.php
View file

@ -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
*