X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=views%2Fsidebar.phtml;h=2c16424c3f311ec5c55b1659fb3fb2dbad53bd80;hb=2701d8c46a3047adbfc10d5e70dbdc490eae7245;hp=4ecce30d2af920594baec58a5a66197fc6189bee;hpb=c5efaeee1075614b4f8cc1ce373df1adcc4ee9fb;p=mdref%2Fmdref

diff --git a/views/sidebar.phtml b/views/sidebar.phtml
index 4ecce30..2c16424 100644
--- a/views/sidebar.phtml
+++ b/views/sidebar.phtml
@@ -1,58 +1,115 @@
+
 <div class="sidebar">
-	<?php 
+	<?php if (isset($entry)) : ?>
+
+	<div class="edit">
+		<a href="<?= $entry->getEditUrl() ?>">Edit</a>
+	</div>
+	<?php endif; ?>
+
+	<?php
 		if (isset($baseUrl) || !isset($entry)) {
-			$up = "";
+			$up = "./";
 		} else {
 			$up = str_repeat("../", count($entry->getParents()));
 		}
 	?>
+
 	<ul>
 		<li>&lsh; <a href="<?= $up ?>">Home</a>
 			<?php if (isset($entry)) : /* @var \mdref\Entry $entry */ ?>
+
 			<ul>
 				<li>
-					<?php foreach ($entry->getParents() as $parent) if ($parent->isFile()) : ?>
-					&uarr; 
-						<a href="<?= $up.$view->esc($parent->getName()) ?>">
-							<?= $view->esc($entry->getRepo()->getEntry($parent)) ?>
+					<?php foreach ($entry->getParents() as $parent) : ?>
+						<?php if ($parent->isFile()) : ?>
+
+					&uarr; <a href="<?= $up.$esc($parent->getName()) ?>">
+							<?= $esc($entry->getRepo()->getEntry($parent)) ?>
+
 						</a>
 						<ul>
 							<li>
-					<?php endif; ?>
-							&circlearrowright; <a href="<?= $up.$view->esc($entry->getName()) ?>"
-							><?= $view->esc($entry) ?></a>
+						<?php endif; ?>
+					<?php endforeach; ?>
+
+							&circlearrowright; <strong><a href="<?= $up.$esc($entry->getName()) ?>"
+							><?= $esc($entry) ?></a></strong>
+
+							<?php if ($entry->hasIterator()): ?>
+
 							<ul>
 								<?php foreach ($entry as $sub) : /* @var \mdref\Entry $sub */ ?>
+
 								<li>
-									&rdsh; <a href="<?= $up.$view->esc($sub->getName()) ?>"
-									><?= $view->esc($sub) ?></a>
+									&rdsh; <a href="<?= $up.$esc($sub->getName()) ?>"
+									><?= $esc($sub) ?></a>
 								</li>
 								<?php endforeach; ?>
+
 							</ul>
-					<?php foreach ($entry->getParents() as $parent) if ($parent->isFile()) : ?>
+							<?php endif; ?>
+
+							<?php if (isset($parent)) : ?>
+								<?php
+								while ($parent && !$parent->isFile()) {
+									$parent = $parent->getParent();
+								}
+								?>
+								<?php if ($parent && $parent->hasIterator()) : ?>
+									<?php
+									$parent_closed = true;
+									?>
+
+						</ul>
+									<?php foreach ($parent as $sub) : ?>
+										<?php
+										if ($sub->getName() === $entry->getName()) {
+											continue;
+										}
+										?>
+
+						<li>&ldsh; <a href="<?= $up.$esc($sub->getName()) ?>"><?= $esc($sub) ?></a></li>
+									<?php endforeach; ?>
+								<?php endif; ?>
+							<?php endif; ?>
+						<?php foreach ($entry->getParents() as $parent) : ?>
+							<?php if (!empty($parent_closed)) : ?>
+								<?php
+								$parent_closed = false;
+								?>
+							<?php elseif ($parent->isFile()) : ?>
+								<?php if (isset($parent_closed)) : ?>
+									<?php
+									unset($parent_closed);
+									?>
+								<?php else : ?>
+
 						</li>
+								<?php endif; ?>
+
 					</ul>
-					<?php endif; ?>
+							<?php endif; ?>
+						<?php endforeach; ?>
+
 				</li>
 			</ul>
 			<?php elseif (isset($refs)) : ?>
+
 			<ul>
 				<?php foreach ($refs as $repo) : /* @var \mdref\Repo $repo */ ?>
 					<?php foreach ($repo as $sub) : /* @var \mdref\Entry $entry */ ?>
+
 						<li>
-							&rdsh; <a href="<?= $view->esc($sub->getName()) ?>"
-							><?= $view->esc($sub->getTitle()) ?></a>
+							&rdsh; <a href="<?= $esc($sub->getName()) ?>"
+							><?= $esc($sub->getTitle()) ?></a>
 						</li>
 					<?php endforeach; ?>
 				<?php endforeach; ?>
+
 			</ul>
 			<?php endif; ?>
+
 		</li>
 	</ul>
-	<?php if (isset($entry)) : ?>
-	<div class="edit">
-		<a href="<?= $entry->getEditUrl() ?>">Edit</a>
-	</div>
-	<?php endif; ?>
 </div>
-