a better html structure...

Signed-off-by: Banana <mail@bananas-playground.net>

diff --git a/webroot/view/entry/entry.html b/webroot/view/entry/entry.html
index 23a3c0df1da8dd8b119328f544d743a69aff6027..e9c992a288f30fc4536e8286035d6f4c1c2c32a8 100644 (file)
--- a/webroot/view/entry/entry.html
+++ b/webroot/view/entry/entry.html
@@ -1,15 +1,18 @@
+<p><a href="<?php echo PATH_WEBROOT; ?>/"><?php echo $i18n->t('text.home'); ?></a> | <a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a></p>
 <p>
-    <a href="<?php echo PATH_WEBROOT; ?>"><?php echo $i18n->t('text.home'); ?></a>
-    <?php if(!empty($TemplateData['data'])) {
-    echo ' | ';
+<?php if(!empty($TemplateData['data'])) {
     $_link = '';
+    $crumbs = count($TemplateData['data']['breadcrumb']);
+    $i = 0;
     foreach($TemplateData['data']['breadcrumb'] as $be) {
         $_link .= '/'.$be;
-        echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a> | ';
+        echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a>';
+        if(++$i !== $crumbs) {
+            echo ' | ';
+        }
     }
     ?>
-    <a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a>
-    <?php } ?>
+<?php } ?>
 </p>
 <?php if(!empty($TemplateData['data'])) { ?>
 <p>Created: <?php echo $TemplateData['data']['created'] ?? ''; ?>, Updated: <?php echo $TemplateData['data']['modified'] ?? ''; ?></p>

diff --git a/webroot/view/list/list.html b/webroot/view/list/list.html
index 1e5517e09408ed8ded7a36f1a9c8d342016d1187..b04147beea1e00c6e2661924f1fe7873b8752424 100644 (file)
--- a/webroot/view/list/list.html
+++ b/webroot/view/list/list.html
@@ -3,23 +3,27 @@
     <input type="submit" name="submitForm" value="<?php echo $i18n->t('form.button.search'); ?>">
 </form>
 <?php if(!empty($TemplateData['entries'])) { ?>
-<p>
-    <a href="<?php echo PATH_WEBROOT; ?>/"><?php echo $i18n->t('text.home'); ?></a> |
+<p><a href="<?php echo PATH_WEBROOT; ?>/"><?php echo $i18n->t('text.home'); ?></a> | <a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a></p>
 <?php
     foreach($TemplateData['entries'] as $k=>$v) {
+        echo '<p>';
         $_link = '';
+        $crumbs = count($v['breadcrumb']);
+        $i = 0;
         foreach($v['breadcrumb'] as $be) {
             $_link .= '/'.$be;
-            echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a> | ';
+            echo '<a href="'.PATH_WEBROOT.$_link.'">'.$be.'</a>';
+            if(++$i !== $crumbs) {
+                echo ' | ';
+            }
         }
+        echo '</p>';
 ?>
-    <a href="<?php echo PATH_WEBROOT; ?>/new"><?php echo $i18n->t('text.new'); ?></a>
-<p>
-<ul>
-    <?php foreach($v['e'] as $e) { ?>
-    <li><a href="<?php echo PATH_WEBROOT; ?>/<?php echo $e['link']; ?>"><?php echo $e['ident']; ?></a> <?php echo $e['date']; ?> <?php echo htmlspecialchars($e['body'],ENT_HTML5); ?></li>
-    <?php } ?>
-</ul>
+        <ul>
+            <?php foreach($v['e'] as $e) { ?>
+            <li><a href="<?php echo PATH_WEBROOT; ?>/<?php echo $e['link']; ?>"><?php echo $e['ident']; ?></a> <?php echo $e['date']; ?> <?php echo htmlspecialchars($e['body'],ENT_HTML5); ?></li>
+            <?php } ?>
+        </ul>
 <?php
     }
 } else { ?>