framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Roots_Sidebar

Browse Source
This commit is contained in:
Scott Walkinshaw
2012-10-02 15:36:51 -04:00
parent 85596e11d0
commit 7f5eea8c69
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/config.php
View File

@@ -16,9 +16,9 @@ add_theme_support('bootstrap-top-navbar'); // Enable Bootstrap's fixed navbar
* See lib/sidebar.php for more details
*/
function roots_display_sidebar() {
$exclude = new Roots_Sidebar(
$sidebar_config = new Roots_Sidebar(
/**
* Conditionals tag checks (http://codex.wordpress.org/Conditional_Tags)
* Conditional tag checks (http://codex.wordpress.org/Conditional_Tags)
* Any of these conditional tags that return true won't show the sidebar
*/
array(
@@ -34,7 +34,7 @@ function roots_display_sidebar() {
)
);
return $exclude->display;
return $sidebar_config->display;
}
// #main CSS classes

14
lib/sidebar.php
View File

@@ -13,22 +13,18 @@
class Roots_Sidebar {
private $conditionals;
private $templates;
public $display = true;
function __construct($conditionals = array(), $templates = array()) {
$this->conditionals = $conditionals;
$this->templates = $templates;
foreach($this->conditionals as $conditional_tag) {
if ($this->check_conditional_tag($conditional_tag)) {
$this->display = false;
}
}
$conditionals = array_map($this->check_conditional_tag, $this->conditionals);
$templates = array_map($this->check_page_template, $this->templates);
foreach($this->templates as $page_template) {
if ($this->check_page_template($page_template)) {
$this->display = false;
}
if (in_array(true, $conditionals) || in_array(true, $templates)) {
$this->display = false;
}
}