Skip to content

Merge changes I made #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmazingDreams wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Merge changes I made #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d179de4
Update classes/breadcrumbs.php
Girt Oct 29, 2012
f345181
PSR-0 support
Girt Feb 10, 2013
09b94f7
Added params to factory to simplify adding breadcrumb
AmazingDreams Apr 21, 2013
d46f925
Improved compatability of layout.php
AmazingDreams Apr 21, 2013
147a9a5
Merge pull request #1 from AmazingDreams/3.3/master
Apr 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions classes/breadcrumb.php → classes/Breadcrumb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ class Breadcrumb
/**
* Breadcrumb Factory
*/
public static function factory()
public static function factory($title = '', $url = '')
{
return new Breadcrumb;
$crumb = new Breadcrumb();
$crumb->set_title($title);
$crumb->set_url($url);

return $crumb;
}

/**
Expand Down
0 classes/breadcrumb/exception.php → classes/Breadcrumb/Exception.php
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion classes/breadcrumbs.php → classes/Breadcrumbs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ public static function add(Breadcrumb $crumb)
*/
public static function render($template = "breadcrumbs/layout")
{
echo View::factory($template)->set('breadcrumbs', self::$breadcrumbs)->render();
return View::factory($template)->set('breadcrumbs', self::$breadcrumbs)->render();
}
}
18 changes: 9 additions & 9 deletions views/breadcrumbs/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
* @author Kieran Graham
*/
?>
<? if (count($breadcrumbs) > 0) : ?>
<?php if (count($breadcrumbs) > 0) : ?>
<ul id="breadcrumbs">
<? foreach ($breadcrumbs as $crumb) : ?>
<? if ($crumb->get_url() !== NULL) : ?>
<li><a href="<?=$crumb->get_url()?>"><?=$crumb->get_title()?></a></li>
<? else : ?>
<li><?=$crumb->get_title()?></li>
<? endif; ?>
<? endforeach; ?>
<?php foreach ($breadcrumbs as $crumb) : ?>
<?php if ($crumb->get_url() !== NULL) : ?>
<li><?php echo HTML::anchor($crumb->get_url(), $crumb->get_title()); ?></li>
<?php else : ?>
<li><?php echo $crumb->get_title()?></li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<? endif; ?>
<?php endif; ?>