Skip to content

Commit 2ae1c05

Browse files
carlbennettcarlbennett
committed
Convert news viewer to bootstrap
1 parent 2a8325e commit 2ae1c05

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

‎src/templates/News.phtml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,36 @@ if (is_null($news_posts) || empty($news_posts)) { ?>
4040
if (!isset($users[$user_id])) $users[$user_id] = new User($user_id);
4141
$avatar = $users[$user_id]->getAvatarURI(22); ?>
4242
<div class="container mb-3">
43-
<span class="float-right">
44-
<? if ($edit_visible) { ?>
45-
<a class="btn btn-sm btn-secondary" href="<?=$edit_url?>" title="Edit">📝</a>
46-
<? } if ($delete_visible) { ?>
47-
<a class="btn btn-sm btn-danger" href="<?=$delete_url?>" title="Delete">❌</a>
48-
<? } ?>
49-
<a class="btn btn-sm btn-primary" href="https://facebook.com/sharer/sharer.php?u=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-facebook-24px.png')?>"/></a>
50-
<a class="btn btn-sm btn-primary" href="https://twitter.com/share?text=<?=urlencode($news_post_title)?>&amp;url=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-twitter-24px.png')?>"/></a>
51-
</span>
52-
<h1><a href="<?=$url?>"><?=filter_var($news_post_title, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?></a></h1>
53-
<? if (!($news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)) { ?>
54-
<section class="red"><p><strong>Warning:</strong> This news post is not yet published. You can view this because you are allowed to create, modify, or delete news posts.</p></section>
55-
<? } ?>
56-
<section class="news"><img class="category" alt="<? echo $news_post->getCategory()->getLabel(); ?>" title="<? echo $news_post->getCategory()->getLabel(); ?>" src="<? echo Common::relativeUrlToAbsolute("/a/news_categories/" . $news_post->getCategory()->getFilename()); ?>"/><? echo $news_post->getContent(true); ?></section>
57-
<div class="card"><div class="card-body">
58-
<span class="float-right text-muted">
59-
<time datetime="<?=$created_dt->format('c')?>"><?=$created_dt->format('l, F j, Y')?></time>
43+
<div class="row"><div class="col">
44+
<span class="float-right">
45+
<? if ($edit_visible) { ?>
46+
<a class="btn btn-sm btn-secondary" href="<?=$edit_url?>" title="Edit">📝</a>
47+
<? } if ($delete_visible) { ?>
48+
<a class="btn btn-sm btn-danger" href="<?=$delete_url?>" title="Delete">❌</a>
49+
<? } ?>
50+
<a class="btn btn-sm btn-primary" href="https://facebook.com/sharer/sharer.php?u=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-facebook-24px.png')?>"/></a>
51+
<a class="btn btn-sm btn-primary" href="https://twitter.com/share?text=<?=urlencode($title)?>&amp;url=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-twitter-24px.png')?>"/></a>
52+
</span>
53+
<h1 class="display-4"><a href="<?=$url?>"><?=filter_var($news_post_title, FILTER_SANITIZE_STRING)?></a></h1>
54+
<? if (!($news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)) { ?>
55+
<section class="red"><p><strong>Warning:</strong> This news post is not yet published. You can view this because you are allowed to create, modify, or delete news posts.</p></section>
56+
<? } ?>
57+
<div style="background-color:rgba(0,0,0,0.45);" class="font-weight-bold float-left mb-2 mr-2 p-2 rounded small shadow text-center"><img alt="<?=$news_post->getCategory()->getLabel()?>" title="<?=$news_post->getCategory()->getLabel()?>" src="<?=Common::relativeUrlToAbsolute('/a/news_categories/' . $news_post->getCategory()->getFilename())?>"/><br/><?=$news_post->getCategory()->getLabel()?></div><?=$news_post->getContent(true)?>
58+
</div></div>
59+
<div class="row"><div class="col">
60+
<div class="card"><div class="card-body">
61+
<span class="float-right text-muted">
62+
<time datetime="<?=$created_dt->format('c')?>"><?=$created_dt->format('l, F j, Y')?></time>
6063
<? if ($edited_dt) { ?>
61-
| <strong>Edited:</strong> <time datetime="<?=$edited_dt->format('c')?>"><?=$edited_dt->format('l, F j, Y'); ?></time>
64+
| <strong>Edited:</strong> <time datetime="<?=$edited_dt->format('c')?>"><?=$edited_dt->format('l, F j, Y'); ?></time>
6265
<? } ?>
63-
</span>
66+
</span>
6467
<? echo ($users[$user_id] ?
6568
sprintf('<a href="%s"><img class="img-fluid rounded mr-2" src="%s"/>%s</a>',
6669
$users[$user_id]->getURI(), $users[$user_id]->getAvatarURI(40), filter_var($users[$user_id]->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS)
6770
) : 'Anonymous'
6871
); ?>
72+
</div></div>
6973
</div></div>
7074
</div>
7175
<? }

‎src/templates/News/View.phtml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,32 +52,36 @@ require('./header.inc.phtml'); ?>
5252
<? if ($draft) { ?>
5353
<div class="alert alert-warning">This news post is marked as <strong>draft</strong>. Edit the news post to <strong>publish</strong> it.</div>
5454
<? } ?>
55-
<span class="float-right">
56-
<? if ($edit_visible) { ?>
57-
<a class="btn btn-sm btn-secondary" href="<?=$edit_url?>" title="Edit">📝</a>
58-
<? } if ($delete_visible) { ?>
59-
<a class="btn btn-sm btn-danger" href="<?=$delete_url?>" title="Delete">❌</a>
60-
<? } ?>
61-
<a class="btn btn-sm btn-primary" href="https://facebook.com/sharer/sharer.php?u=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-facebook-24px.png')?>"/></a>
62-
<a class="btn btn-sm btn-primary" href="https://twitter.com/share?text=<?=urlencode($title)?>&amp;url=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-twitter-24px.png')?>"/></a>
63-
</span>
64-
<h1 class="display-4"><a href="<? echo $url; ?>"><? echo filter_var($title, FILTER_SANITIZE_STRING); ?></a></h1>
65-
<? if (!($object->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)) { ?>
66-
<section class="red"><p><strong>Warning:</strong> This news post is not yet published. You can view this because you are allowed to create, modify, or delete news posts.</p></section>
67-
<? } ?>
68-
<section class="news"><img class="category" alt="<? echo $object->getCategory()->getLabel(); ?>" title="<? echo $object->getCategory()->getLabel(); ?>" src="<? echo Common::relativeUrlToAbsolute("/a/news_categories/" . $object->getCategory()->getFilename()); ?>"/><? echo $object->getContent(true); ?></section>
69-
<div class="card"><div class="card-body">
70-
<span class="float-right text-muted">
71-
<time datetime="<?=$created_dt->format('c')?>"><?=$created_dt->format('l, F j, Y')?></time>
55+
<div class="row"><div class="col">
56+
<span class="float-right">
57+
<? if ($edit_visible) { ?>
58+
<a class="btn btn-sm btn-secondary" href="<?=$edit_url?>" title="Edit">📝</a>
59+
<? } if ($delete_visible) { ?>
60+
<a class="btn btn-sm btn-danger" href="<?=$delete_url?>" title="Delete">❌</a>
61+
<? } ?>
62+
<a class="btn btn-sm btn-primary" href="https://facebook.com/sharer/sharer.php?u=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-facebook-24px.png')?>"/></a>
63+
<a class="btn btn-sm btn-primary" href="https://twitter.com/share?text=<?=urlencode($title)?>&amp;url=<?=urlencode($url)?>" rel="external" data-popup="1"><img class="img-fluid" src="<?=Common::relativeUrlToAbsolute('/a/social-twitter-24px.png')?>"/></a>
64+
</span>
65+
<h1 class="display-4"><a href="<?=$url?>"><?=filter_var($title, FILTER_SANITIZE_STRING)?></a></h1>
66+
<? if (!($object->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)) { ?>
67+
<section class="red"><p><strong>Warning:</strong> This news post is not yet published. You can view this because you are allowed to create, modify, or delete news posts.</p></section>
68+
<? } ?>
69+
<div style="background-color:rgba(0,0,0,0.45);" class="font-weight-bold float-left mb-2 mr-2 p-2 rounded small shadow text-center"><img alt="<?=$object->getCategory()->getLabel()?>" title="<?=$object->getCategory()->getLabel()?>" src="<?=Common::relativeUrlToAbsolute('/a/news_categories/' . $object->getCategory()->getFilename())?>"/><br/><?=$object->getCategory()->getLabel()?></div><?=$object->getContent(true)?>
70+
</div></div>
71+
<div class="row"><div class="col">
72+
<div class="card"><div class="card-body">
73+
<span class="float-right text-muted">
74+
<time datetime="<?=$created_dt->format('c')?>"><?=$created_dt->format('l, F j, Y')?></time>
7275
<? if ($edited_dt) { ?>
73-
| <strong>Edited:</strong> <time datetime="<?=$edited_dt->format('c')?>"><?=$edited_dt->format('l, F j, Y'); ?></time>
76+
| <strong>Edited:</strong> <time datetime="<?=$edited_dt->format('c')?>"><?=$edited_dt->format('l, F j, Y'); ?></time>
7477
<? } ?>
75-
</span>
78+
</span>
7679
<? echo ($user ?
7780
sprintf('<a href="%s"><img class="img-fluid rounded mr-2" src="%s"/>%s</a>',
7881
$user->getURI(), $user->getAvatarURI(40), filter_var($user->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS)
7982
) : 'Anonymous'
8083
); ?>
84+
</div></div>
8185
</div></div>
8286
</div>
8387
<div class="container mb-3">

0 commit comments

Comments
 (0)