Skip to content

Commit

Permalink
fixing misnamed class
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisFrench committed Sep 1, 2015
1 parent c420af3 commit 6bf5c14
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Admin/Views/Nav/left.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

$selected = ($current == $item->route)
|| (!empty($item->base) && strpos($current, $item->base.'/') !== false)
|| (\Dsc\String::inStrings(\DscArrayHelper::getColumn($item->getDescendants(), 'route'), $current ))
|| (\Dsc\String::inStrings(\Dsc\ArrayHelper::getColumn($item->getDescendants(), 'route'), $current ))
;

if ($selected || $current == str_replace( './', '/', $item->route )) {
Expand Down
4 changes: 2 additions & 2 deletions src/Admin/Views/common/nav-primary.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</li>

<?php if ($items) { foreach ($items as $item) { ?>
<li <?php if (!empty($item->id)) {echo 'id="'.$item->id.'"';}?> class="<?php if ($current == $item->route || (!empty($item->base) && strpos($current, $item->base) !== false) || \Dsc\String::inStrings(\DscArrayHelper::getColumn($item->children, 'route'), $current ) ) { echo 'active'; } ?> <?php echo !empty($item->children) ? 'dropdown' : null; ?> ">
<li <?php if (!empty($item->id)) {echo 'id="'.$item->id.'"';}?> class="<?php if ($current == $item->route || (!empty($item->base) && strpos($current, $item->base) !== false) || \Dsc\String::inStrings(\Dsc\ArrayHelper::getColumn($item->children, 'route'), $current ) ) { echo 'active'; } ?> <?php echo !empty($item->children) ? 'dropdown' : null; ?> ">
<a href="<?php echo !empty($item->children) ? 'javascript:;' : '.' . $item->route; ?>">
<?php if (!empty($item->icon)) { ?><i class="<?php echo $item->icon; ?>"></i><?php } ?>
<?php if (!empty($item->title)) { ?><span class="title"><?php echo $item->title; ?></span> <?php } ?>
Expand All @@ -23,7 +23,7 @@
</a>
<?php if (!empty($item->children)) { ?>
<ul class="sub-nav">
<?php foreach ($item->children as $child_array) { $child = \DscArrayHelper::toObject($child_array); ?>
<?php foreach ($item->children as $child_array) { $child = \Dsc\ArrayHelper::toObject($child_array); ?>
<?php if (empty($child->hidden)) { ?>
<li class="<?php if (strpos($current, $child->route) !== false && !$active_has_been_found && substr_count($current, '/') == substr_count($child->route, '/')) { echo 'active'; $active_has_been_found = true; } ?>">
<a href=".<?php echo $child->route; ?>">
Expand Down

0 comments on commit 6bf5c14

Please sign in to comment.