Skip to content

Commit

Permalink
Fixing userguide to work with "un-clean" URLs (ie those with index.ph…
Browse files Browse the repository at this point in the history
…p in them)
  • Loading branch information
kiall committed Jan 16, 2011
1 parent b97c54e commit 90d1695
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion classes/kohana/kodoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static function link_class_member($matches)
}
}

return HTML::anchor(Route::get('docs/api')->uri(array('class' => $class)).$member, $link);
return HTML::anchor(Route::get('docs/api')->uri(array('class' => $class)).$member, $link, NULL, NULL, TRUE);
}

public static function factory($class)
Expand Down
2 changes: 1 addition & 1 deletion views/userguide/api/class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?php echo $doc->modifiers, $doc->class->name ?>
<?php $parent = $doc->class; ?>
<?php while ($parent = $parent->getParentClass()): ?>
<br/><small>extends <?php echo HTML::anchor($route->uri(array('class' => $parent->name)), $parent->name) ?></small>
<br/><small>extends <?php echo HTML::anchor($route->uri(array('class' => $parent->name)), $parent->name, NULL, NULL, TRUE) ?></small>
<?php endwhile ?>
</h1>

Expand Down
2 changes: 1 addition & 1 deletion views/userguide/api/method.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<?php $declares = $doc->method->getDeclaringClass(); ?>
<h3 id="<?php echo $doc->method->name ?>">
<?php echo $doc->modifiers, $doc->method->name ?>( <?php echo $doc->params ? $doc->params_short() : '' ?>)
<small>(defined in <?php echo html::anchor($route->uri(array('class' => $declares->name)), $declares->name) ?>)</small>
<small>(defined in <?php echo html::anchor($route->uri(array('class' => $declares->name)), $declares->name, NULL, NULL, TRUE) ?>)</small>
</h3>

<div class="description">
Expand Down
4 changes: 2 additions & 2 deletions views/userguide/api/toc.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@

<?php foreach ($classes as $class => $methods): $link = $route->uri(array('class' => $class)) ?>
<div class="class <?php echo Text::alternate('left', 'right') ?>">
<h2><?php echo HTML::anchor($link, $class) ?></h2>
<h2><?php echo HTML::anchor($link, $class, NULL, NULL, TRUE) ?></h2>
<ul class="methods">
<?php foreach ($methods as $method): ?>
<li><?php echo HTML::anchor("{$link}#{$method}", "{$class}::{$method}") ?></li>
<li><?php echo HTML::anchor("{$link}#{$method}", "{$class}::{$method}", NULL, NULL, TRUE) ?></li>
<?php endforeach ?>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/userguide/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<?php foreach($modules as $url => $options): ?>

<p>
<strong><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name']) ?></strong> -
<strong><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></strong> -
<?php echo $options['description'] ?>
</p>

Expand Down
2 changes: 1 addition & 1 deletion views/userguide/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ul>
<?php foreach($modules as $url => $options): ?>

<li><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name']) ?></li>
<li><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></li>

<?php endforeach; ?>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion views/userguide/page-toc.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<?php if ($item['level'] > 1): ?>
<?php echo str_repeat('&nbsp;', ($item['level'] - 1) * 4) ?>
<?php endif ?>
<?php echo HTML::anchor('#'.$item['id'],$item['name']); ?><br />
<?php echo HTML::anchor('#'.$item['id'],$item['name'], NULL, NULL, TRUE); ?><br />
<?php endforeach; ?>
</div>
<?php endif ?>
2 changes: 1 addition & 1 deletion views/userguide/template.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<ul id="breadcrumb">
<?php foreach ($breadcrumb as $link => $title): ?>
<?php if (is_string($link)): ?>
<li><?php echo HTML::anchor($link, $title) ?></li>
<li><?php echo HTML::anchor($link, $title, NULL, NULL, TRUE) ?></li>
<?php else: ?>
<li class="last"><?php echo $title ?></li>
<?php endif ?>
Expand Down

0 comments on commit 90d1695

Please sign in to comment.