diff options
author | Thomas Lange <code@nerdmind.de> | 2017-09-14 23:51:36 +0200 |
---|---|---|
committer | Thomas Lange <code@nerdmind.de> | 2017-09-14 23:51:36 +0200 |
commit | 3180d399f20d6e7bec41cf986cfbf8e1aafa3587 (patch) | |
tree | 24ddabcc6f140a6d006e940edcbf56b5814829f3 | |
parent | a2556505e5f2d528a6c93958a8c7c9beaf4e002a (diff) | |
download | blog-3180d399f20d6e7bec41cf986cfbf8e1aafa3587.tar.gz blog-3180d399f20d6e7bec41cf986cfbf8e1aafa3587.tar.xz blog-3180d399f20d6e7bec41cf986cfbf8e1aafa3587.zip |
Some markup optimizations has been made to both templates (the HTML5 <article> element is more correct for the purpose of an item list, because real lists should only be used if the order of the items would change the meaning. This is not the case, because each item is a self-contained area which has nothing to do with the other items).
-rw-r--r-- | template/admin/html/home.php | 12 | ||||
-rw-r--r-- | template/admin/html/page/index.php | 4 | ||||
-rw-r--r-- | template/admin/html/page/item.php | 4 | ||||
-rw-r--r-- | template/admin/html/post/index.php | 4 | ||||
-rw-r--r-- | template/admin/html/post/item.php | 4 | ||||
-rw-r--r-- | template/admin/html/user/index.php | 4 | ||||
-rw-r--r-- | template/admin/html/user/item.php | 4 | ||||
-rw-r--r-- | template/admin/rsrc/main.css | 35 | ||||
-rw-r--r-- | template/standard/html/home.php | 10 | ||||
-rw-r--r-- | template/standard/html/page/item.php | 4 | ||||
-rw-r--r-- | template/standard/html/page/list.php | 4 | ||||
-rw-r--r-- | template/standard/html/post/item.php | 4 | ||||
-rw-r--r-- | template/standard/html/post/list.php | 4 | ||||
-rw-r--r-- | template/standard/html/search/result.php | 4 | ||||
-rw-r--r-- | template/standard/html/user/item.php | 4 | ||||
-rw-r--r-- | template/standard/html/user/list.php | 4 | ||||
-rw-r--r-- | template/standard/rsrc/main.css | 33 |
17 files changed, 63 insertions, 79 deletions
diff --git a/template/admin/html/home.php b/template/admin/html/home.php index 6ade82d..f8a45c5 100644 --- a/template/admin/html/home.php +++ b/template/admin/html/home.php @@ -4,9 +4,9 @@ <h2><i class="fa fa-newspaper-o"></i><?=$Language->text('last_post')?></h2> <p><strong><?=$Language->text('posts')?>:</strong> <?=$COUNT['POST']?> | <a href="<?=Application::getAdminURL('post/')?>"><?=$Language->text('post_overview')?></a> | <a href="<?=Application::getAdminURL('post/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['POST'])): ?> - <ul class="item-list"> + <div class="item-container post"> <?=$LAST['POST']?> - </ul> + </div> <?php else: ?> <p><em><?=$Language->text('home_no_posts')?></em></p> <?php endif; ?> @@ -15,9 +15,9 @@ <p><strong><?=$Language->text('pages')?>:</strong> <?=$COUNT['PAGE']?> | <a href="<?=Application::getAdminURL('page/')?>"><?=$Language->text('page_overview')?></a> | <a href="<?=Application::getAdminURL('page/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['PAGE'])): ?> - <ul class="item-list"> + <div class="item-container page"> <?=$LAST['PAGE']?> - </ul> + </div> <?php else: ?> <p><em><?=$Language->text('home_no_pages')?></em></p> <?php endif; ?> @@ -26,9 +26,9 @@ <p><strong><?=$Language->text('users')?>:</strong> <?=$COUNT['USER']?> | <a href="<?=Application::getAdminURL('user/')?>"><?=$Language->text('user_overview')?></a> | <a href="<?=Application::getAdminURL('user/insert.php')?>"><?=$Language->text('insert')?></a></p> <?php if(!empty($LAST['USER'])): ?> - <ul class="item-list"> + <div class="item-container user"> <?=$LAST['USER']?> - </ul> + </div> <?php else: ?> <p><em><?=$Language->text('home_no_users')?></em></p> <?php endif; ?> diff --git a/template/admin/html/page/index.php b/template/admin/html/page/index.php index 0989796..dbd5144 100644 --- a/template/admin/html/page/index.php +++ b/template/admin/html/page/index.php @@ -1,10 +1,10 @@ <h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><a class="brackets" href="<?=Application::getAdminURL("page/insert.php")?>"><?=$Language->text('insert')?></a></h1> <p><?=$Language->text('overview_page_desc')?></p> -<ul class="item-list page"> +<div class="item-container page"> <?php foreach($LIST['PAGES'] as $page): ?> <?php echo $page; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/admin/html/page/item.php b/template/admin/html/page/item.php index 4f0f884..156824b 100644 --- a/template/admin/html/page/item.php +++ b/template/admin/html/page/item.php @@ -1,4 +1,4 @@ -<li class="item-list-li page"> +<article class="item"> <header> <h2><i class="fa fa-file-text-o"></i><?=escapeHTML($PAGE['ATTR']['NAME'])?><span>#<?=$PAGE['ATTR']['ID']?></span></h2> <div> @@ -25,4 +25,4 @@ <li><a href="<?=Application::getAdminURL("page/delete.php?id={$PAGE['ATTR']['ID']}")?>" title="<?=$Language->text('delete_page')?>"><i class="fa fa-trash-o"></i></a></li> </ul> </footer> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/admin/html/post/index.php b/template/admin/html/post/index.php index 124d39b..a78076e 100644 --- a/template/admin/html/post/index.php +++ b/template/admin/html/post/index.php @@ -1,10 +1,10 @@ <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><a class="brackets" href="<?=Application::getAdminURL("post/insert.php")?>"><?=$Language->text('insert')?></a></h1> <p><?=$Language->text('overview_post_desc')?></p> -<ul class="item-list post"> +<div class="item-container post"> <?php foreach($LIST['POSTS'] as $post): ?> <?php echo $post; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/admin/html/post/item.php b/template/admin/html/post/item.php index 19b81c1..6707e81 100644 --- a/template/admin/html/post/item.php +++ b/template/admin/html/post/item.php @@ -1,4 +1,4 @@ -<li class="item-list-li post"> +<article class="item"> <header> <h2><i class="fa fa-newspaper-o"></i><?=escapeHTML($POST['ATTR']['NAME'])?><span>#<?=$POST['ATTR']['ID']?></span></h2> <div> @@ -25,4 +25,4 @@ <li><a href="<?=Application::getAdminURL("post/delete.php?id={$POST['ATTR']['ID']}")?>" title="<?=$Language->text('delete_post')?>"><i class="fa fa-trash-o"></i></a></li> </ul> </footer> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/admin/html/user/index.php b/template/admin/html/user/index.php index bc34402..b1b4463 100644 --- a/template/admin/html/user/index.php +++ b/template/admin/html/user/index.php @@ -1,10 +1,10 @@ <h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?><a class="brackets" href="<?=Application::getAdminURL("user/insert.php")?>"><?=$Language->text('insert')?></a></h1> <p><?=$Language->text('overview_user_desc')?></p> -<ul class="item-list user"> +<div class="item-container user"> <?php foreach($LIST['USERS'] as $user): ?> <?php echo $user; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/admin/html/user/item.php b/template/admin/html/user/item.php index 6cb9e7a..1575bf7 100644 --- a/template/admin/html/user/item.php +++ b/template/admin/html/user/item.php @@ -1,4 +1,4 @@ -<li class="item-list-li user"> +<article class="item"> <header> <h2><i class="fa fa-user"></i><?=escapeHTML($USER['ATTR']['FULLNAME'])?><span>#<?=$USER['ATTR']['ID']?></span></h2> <div> @@ -24,4 +24,4 @@ <li><a href="<?=Application::getAdminURL("user/delete.php?id={$USER['ATTR']['ID']}")?>" title="<?=$Language->text('delete_user')?>"><i class="fa fa-trash-o"></i></a></li> </ul> </footer> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/admin/rsrc/main.css b/template/admin/rsrc/main.css index 7eca69c..5c07926 100644 --- a/template/admin/rsrc/main.css +++ b/template/admin/rsrc/main.css @@ -123,26 +123,21 @@ table,td{padding:0.5rem;border:0.05rem solid #AAA;} a.brackets:before,a.brackets:after{color:#222;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -/* Item List <ul> -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.item-list{list-style:none;margin:0;padding:0;} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -/* Item List <li> -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.item-list-li{display:block;border:0.05rem solid #AAA;margin-bottom:1rem;clear:both;} -.item-list-li > header, -.item-list-li > footer{background:#EEE;overflow:hidden;} -.item-list-li > blockquote{margin:0;padding:0.75rem;font-family:inherit;} -.item-list-li > header{padding:0.5rem 0.75rem;border-bottom:0.05rem solid #AAA;position:sticky;top:0;} -.item-list-li > footer{border-top:0.05rem solid #AAA;} -.item-list-li > footer > ul{margin:0;padding:0;list-style:none;} -.item-list-li > footer > ul > li{display:inline-block;float:left;} -.item-list-li > footer > ul > li:last-child{float:right;} -.item-list-li > footer > ul > li > a{color:inherit;display:inline-block;padding:0.25rem 2rem;} -.item-list-li > footer > ul > li > a:hover, -.item-list-li > footer > ul > li > a:active{background:#DDD;} -.item-list-li h2 > span{float:right;} +/* Item Element +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +.item{display:block;border:0.05rem solid #AAA;margin-bottom:1rem;clear:both;} +.item > header, +.item > footer{background:#EEE;overflow:hidden;} +.item > blockquote{margin:0;padding:0.75rem;font-family:inherit;} +.item > header{padding:0.5rem 0.75rem;border-bottom:0.05rem solid #AAA;position:sticky;top:0;} +.item > footer{border-top:0.05rem solid #AAA;} +.item > footer > ul{margin:0;padding:0;list-style:none;} +.item > footer > ul > li{display:inline-block;float:left;} +.item > footer > ul > li:last-child{float:right;} +.item > footer > ul > li > a{color:inherit;display:inline-block;padding:0.25rem 2rem;} +.item > footer > ul > li > a:hover, +.item > footer > ul > li > a:active{background:#DDD;} +.item h2 > span{float:right;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /* Argument list diff --git a/template/standard/html/home.php b/template/standard/html/home.php index e516204..f2aa20e 100644 --- a/template/standard/html/home.php +++ b/template/standard/html/home.php @@ -10,10 +10,10 @@ <h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_name_items', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> <p><?=$Language->text('home_heading_desc', Application::get('POST.LIST_SIZE'))?></p> -<ul class="item-list post"> -<?php foreach($LIST['POSTS'] as $post): ?> - <?php echo $post; ?> -<?php endforeach; ?> -</ul> +<div class="item-container post"> + <?php foreach($LIST['POSTS'] as $post): ?> + <?php echo $post; ?> + <?php endforeach; ?> +</div> <?=$PAGINATION['HTML']?> diff --git a/template/standard/html/page/item.php b/template/standard/html/page/item.php index 81f6c8c..f2803fa 100644 --- a/template/standard/html/page/item.php +++ b/template/standard/html/page/item.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<li class="item-list-li page"> +<article class="item"> <header> <h2> <a title="<?=$Language->text('select_page')?>: »<?=escapeHTML($PAGE['ATTR']['NAME'])?>«" href="<?=$PAGE['URL']?>"><?=escapeHTML($PAGE['ATTR']['NAME'])?></a> @@ -17,4 +17,4 @@ <blockquote cite="<?=$PAGE['URL']?>"> <p><?=excerpt($PAGE['BODY']['HTML'](), 600)?></p> </blockquote> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/standard/html/page/list.php b/template/standard/html/page/list.php index da75330..b2361bf 100644 --- a/template/standard/html/page/list.php +++ b/template/standard/html/page/list.php @@ -10,10 +10,10 @@ <h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/page/')?>" title="<?=$Language->text('feed_name_pages', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> <p><?=$Language->text('page_overview_heading_desc', $PAGINATION['THIS'])?></p> -<ul class="item-list page"> +<div class="item-container page"> <?php foreach($LIST['PAGES'] as $page): ?> <?php echo $page; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/standard/html/post/item.php b/template/standard/html/post/item.php index 7733e61..c4035cb 100644 --- a/template/standard/html/post/item.php +++ b/template/standard/html/post/item.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<li class="item-list-li post"> +<article class="item"> <header> <h2> <a title="<?=$Language->text('select_post')?>: »<?=escapeHTML($POST['ATTR']['NAME'])?>«" href="<?=$POST['URL']?>"><?=escapeHTML($POST['ATTR']['NAME'])?></a> @@ -17,4 +17,4 @@ <blockquote cite="<?=$POST['URL']?>"> <?=$POST['BODY']['HTML']()?> </blockquote> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/standard/html/post/list.php b/template/standard/html/post/list.php index adb4fd6..7622170 100644 --- a/template/standard/html/post/list.php +++ b/template/standard/html/post/list.php @@ -10,10 +10,10 @@ <h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/post/')?>" title="<?=$Language->text('feed_name_posts', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> <p><?=$Language->text('post_overview_heading_desc', $PAGINATION['THIS'])?></p> -<ul class="item-list post"> +<div class="item-container post"> <?php foreach($LIST['POSTS'] as $post): ?> <?php echo $post; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/standard/html/search/result.php b/template/standard/html/search/result.php index 1558c3c..044afe1 100644 --- a/template/standard/html/search/result.php +++ b/template/standard/html/search/result.php @@ -29,8 +29,8 @@ <input type="submit" value="<?=$Language->text('search')?>" /> </form> -<ul class="item-list post"> +<div class="item-container post"> <?php foreach($RESULT['LIST'] as $post): ?> <?php echo $post; ?> <?php endforeach; ?> -</ul>
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/template/standard/html/user/item.php b/template/standard/html/user/item.php index 04abc0f..45106af 100644 --- a/template/standard/html/user/item.php +++ b/template/standard/html/user/item.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<li class="item-list-li user"> +<article class="item"> <header> <h2> <a title="<?=$Language->text('select_user')?>: »<?=escapeHTML($USER['ATTR']['FULLNAME'])?>«" href="<?=$USER['URL']?>"><?=escapeHTML($USER['ATTR']['FULLNAME'])?></a> @@ -17,4 +17,4 @@ <blockquote cite="<?=$USER['URL']?>"> <?=$USER['BODY']['HTML']()?> </blockquote> -</li>
\ No newline at end of file +</article>
\ No newline at end of file diff --git a/template/standard/html/user/list.php b/template/standard/html/user/list.php index d95bd0c..ebc231d 100644 --- a/template/standard/html/user/list.php +++ b/template/standard/html/user/list.php @@ -10,10 +10,10 @@ <h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?></h1> <p><?=$Language->text('user_overview_heading_desc', $PAGINATION['THIS'])?></p> -<ul class="item-list user"> +<div class="item-container user"> <?php foreach($LIST['USERS'] as $user): ?> <?php echo $user; ?> <?php endforeach; ?> -</ul> +</div> <?=$PAGINATION['HTML']?>
\ No newline at end of file diff --git a/template/standard/rsrc/main.css b/template/standard/rsrc/main.css index 500ddc2..bafb39e 100644 --- a/template/standard/rsrc/main.css +++ b/template/standard/rsrc/main.css @@ -89,26 +89,15 @@ table img{border:none;border-radius:0;} a.brackets:before,a.brackets:after{color:#222;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -/* Item List <ul> +/* Item Element /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.item-list{list-style:none;padding:0;} -.item-list.page{} -.item-list.post{} -.item-list.user{} - -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -/* Item List <li> -/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.item-list-li{background:#EEE;border:0.05rem solid #AAA;overflow:hidden;margin:0.5rem 0;} -.item-list-li > header{padding:0.25rem 1rem;border-bottom:0.05rem solid #AAA;overflow:hidden;text-transform:uppercase;} -.item-list-li > header h2{font-size:0.65rem;float:left;} -.item-list-li > header .info{float:right;font-size:0.6rem;font-weight:400;} -.item-list-li > header a{color:inherit;} -.item-list-li > blockquote{margin:0;padding:0 1rem;font-family:inherit;} -.item-list-li > blockquote img{display:block;} -.item-list-li.page{} -.item-list-li.post{} -.item-list-li.user{} +.item{background:#EEE;border:0.05rem solid #AAA;overflow:hidden;margin:0.5rem 0;} +.item > header{padding:0.25rem 1rem;border-bottom:0.05rem solid #AAA;overflow:hidden;text-transform:uppercase;} +.item > header h2{font-size:0.65rem;float:left;} +.item > header .info{float:right;font-size:0.6rem;font-weight:400;} +.item > header a{color:inherit;} +.item > blockquote{margin:0;padding:0 1rem;font-family:inherit;} +.item > blockquote img{display:block;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /* Item content on main sites @@ -163,9 +152,9 @@ thead > tr > td, th > td{text-align:center;} #toogle-nav:checked + ul{display:block;} #main-navi li:last-child{float:none;} - .item-list-li > header{text-align:center;} - .item-list-li > header > h2, - .item-list-li > header > .info{float:none;display:block;} + .item > header{text-align:center;} + .item > header > h2, + .item > header > .info{float:none;display:block;} } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ |