Skip to content

Commit bfb3bd7

Browse files
carlbennettcarlbennett
committed
Next pass at bootstrap conversion
1 parent ba8f14d commit bfb3bd7

File tree

3 files changed

+145
-175
lines changed

3 files changed

+145
-175
lines changed

‎src/templates/EventLog/Index.phtml‎

Lines changed: 78 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
<?php
2-
1+
<?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
32
namespace BNETDocs\Templates\EventLog;
43

54
use \BNETDocs\Libraries\Event;
65
use \BNETDocs\Libraries\Exceptions\UserNotFoundException;
76
use \CarlBennett\MVC\Libraries\Common;
87
use \CarlBennett\MVC\Libraries\Pair;
98

10-
$title = 'Event Logs';
11-
$description = 'The index for event logs on BNETDocs';
9+
$title = 'Event Logs';
10+
$description = 'All triggered event logs on BNETDocs';
1211
$this->opengraph->attach(new Pair('url', '/eventlog/index'));
1312

13+
$form_order_by = [
14+
'datetime-asc' => 'Timestamp (Ascending)',
15+
'datetime-desc' => 'Timestamp (Descending)',
16+
'id-asc' => 'Event Id (Ascending)',
17+
'id-desc' => 'Event Id (Descending)',
18+
];
19+
1420
$page = $this->getContext()->page;
1521
$pages = $this->getContext()->pages;
1622
$limit = $this->getContext()->limit;
@@ -19,90 +25,72 @@ $order = $this->getContext()->order;
1925
$no_prev = ($page <= 1);
2026
$no_next = ($page >= $pages);
2127

22-
require('./header.inc.phtml');
23-
?>
24-
<article>
25-
<?php if (!$this->getContext()->acl_allowed) { ?>
26-
<header class="red"><?php echo $title; ?></header>
27-
<section class="red">
28-
<p>You are not authorized to view this page.</p>
29-
</section>
30-
<?php } else { ?>
31-
<header><?php echo $title; ?></header>
32-
<section>
33-
<?php require('./NYI.inc.phtml'); ?><hr/>
34-
<form method="GET">
35-
<input type="hidden" name="page" value="<?php echo $page; ?>"/>
36-
<input type="hidden" name="limit" value="<?php echo $limit; ?>"/>
37-
<label for="order">Order by:</label>
38-
<select name="order" id="order" onchange="form.submit();"
39-
style="display:inline-block;width:200px;">
40-
<option value="id-asc"<?php
41-
if ($order === 'id-asc') { echo ' selected="selected"';
42-
} ?>>Event Id (Ascending)</option>
43-
<option value="id-desc"<?php
44-
if ($order === 'id-desc') { echo ' selected="selected"';
45-
} ?>>Event Id (Descending)</option>
46-
<option value="datetime-asc"<?php
47-
if ($order === 'datetime-asc') { echo ' selected="selected"';
48-
} ?>>Timestamp (Ascending)</option>
49-
<option value="datetime-desc"<?php
50-
if ($order === 'datetime-desc') { echo ' selected="selected"';
51-
} ?>>Timestamp (Descending)</option>
52-
</select>
53-
<input type="submit" value="Reorder"/>
54-
</form>
55-
<table>
56-
<thead>
57-
<tr>
58-
<th class="right" style="width:70px;">Id</th>
59-
<th class="left" style="width:220px;">Event Type</th>
60-
<th class="left" style="width:200px;">Timestamp</th>
61-
<th class="left">User Account</th>
62-
</tr>
63-
</thead><tbody>
64-
<?php foreach ($this->getContext()->events as $event) {
65-
$e_id = $event->getId();
66-
try { $e_user = $event->getUser(); }
67-
catch ( UserNotFoundException $e ) { $e_user = null; }
68-
if ( is_null( $e_user ) ) { $e_user = '<em>(null)</em>'; }
69-
else {
70-
$e_user_url = $e_user->getURI();
71-
$e_user_avatar = $e_user->getAvatarURI(22);
72-
$e_user = filter_var( $e_user->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS );
73-
$e_user = '<a href="' . $e_user_url . '"><img class="avatar" src="' . $e_user_avatar . '"/>&nbsp;' . $e_user . '</a>';
74-
}
28+
require('./header.inc.phtml'); ?>
29+
<div class="container mb-3">
30+
<? if (!$this->getContext()->acl_allowed) { ?>
31+
<div class="alert alert-danger">
32+
<h1><?=$title?></h1>
33+
<p class="mb-0">You are not authorized to view this page.</p>
34+
</div>
35+
<? } else { ?>
36+
<h1><?=$title?></h1>
37+
<p><?=$description?></p>
38+
<form method="GET" class="m-2" id="filter_form">
39+
<input type="hidden" name="page" value="<? echo $page; ?>"/>
40+
<input type="hidden" name="limit" value="<? echo $limit; ?>"/>
41+
<label for="order" class="font-weight-bold m-1">Order by:</label>
42+
<select class="form-control form-control-sm" name="order" id="order" onchange="form.submit();" style="display:inline-block;width:200px;">
43+
<? foreach ($form_order_by as $item_value => $item_label) {
44+
$item_selected = ($order === $item_value ? ' selected="selected"' : '');
45+
echo sprintf('<option value="%s"%s>%s</option>' . PHP_EOL, $item_value, $item_selected, $item_label);
46+
} ?>
47+
</select>
48+
<input class="btn btn-sm btn-secondary" type="submit" value="Reorder"/>
49+
</form>
50+
<table class="table table-hover table-sm table-striped">
51+
<thead>
52+
<tr>
53+
<th class="text-right">Id</th>
54+
<th>Event Type</th>
55+
<th>Timestamp</th>
56+
<th>User Account</th>
57+
</tr>
58+
</thead><tbody>
59+
<? foreach ($this->getContext()->events as $event) {
60+
$e_id = $event->getId();
61+
try { $e_user = $event->getUser(); }
62+
catch ( UserNotFoundException $e ) { $e_user = null; }
63+
if ( is_null( $e_user ) ) { $e_user = '<em>(null)</em>'; }
64+
else {
65+
$e_user_url = $e_user->getURI();
66+
$e_user_avatar = $e_user->getAvatarURI(22);
67+
$e_user = filter_var( $e_user->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS );
68+
$e_user = '<a href="' . $e_user_url . '"><img class="avatar" src="' . $e_user_avatar . '"/>&nbsp;' . $e_user . '</a>';
69+
}
7570
?>
76-
<tr>
77-
<td class="right"><a href="<?php echo Common::relativeUrlToAbsolute('/eventlog/view?id=' . $e_id); ?>"><?php echo $e_id; ?></a></td>
78-
<td><?php echo $event->getEventTypeName(); ?></td>
79-
<td><time datetime="<?php echo $event->getEventDateTime()->format('c'); ?>"><?php echo $event->getEventDateTime()->format('l, F j, Y'); ?></time></td>
80-
<td><?php echo $e_user; ?></td>
81-
</tr>
82-
<?php } ?>
83-
</tbody></table>
84-
</section>
85-
<section>
86-
<hr/>
87-
<span class="float-left">
88-
<?php if (!$no_prev) { ?>
89-
<a class="button" href="<?php echo Common::relativeUrlToAbsolute('/eventlog/index?page=' . ($page - 1) . '&limit=' . $limit . '&order=' . $order); ?>">Prev</a>
90-
<?php } else { ?>
91-
<button class="button button-disabled" disabled="disabled">Prev</button>
92-
<?php } ?>
93-
</span>
94-
<span class="float-right">
95-
<?php if (!$no_next) { ?>
96-
<a class="button" href="<?php echo Common::relativeUrlToAbsolute('/eventlog/index?page=' . ($page + 1) . '&limit=' . $limit . '&order=' . $order); ?>">Next</a>
97-
<?php } else { ?>
98-
<button class="button button-disabled" disabled="disabled">Next</button>
99-
<?php } ?>
100-
</span>
101-
<p class="center" style="line-height:24px;">
102-
<strong><?php echo number_format($page); ?></strong> of <?php echo number_format($pages); ?>
103-
</p>
104-
</section>
105-
</article>
106-
<?php } ?>
107-
</article>
108-
<?php require("./footer.inc.phtml"); ?>
71+
<tr>
72+
<td class="text-right"><a href="<?=Common::relativeUrlToAbsolute('/eventlog/view?id=' . $e_id)?>"><?=$e_id?></a></td>
73+
<td><?=$event->getEventTypeName()?></td>
74+
<td><time datetime="<?=$event->getEventDateTime()->format('c')?>"><?=$event->getEventDateTime()->format('l, F j, Y')?></time></td>
75+
<td><?=$e_user?></td>
76+
</tr>
77+
<? } ?>
78+
</tbody></table>
79+
<nav aria-label="User list navigation" class="d-flex justify-content-center">
80+
<ul class="pagination">
81+
<? if (!$no_prev) { ?>
82+
<li class="page-item"><a class="page-link" href="<?=Common::relativeUrlToAbsolute('/eventlog/index?page=' . ($page - 1) . '&limit=' . $limit . '&order=' . $order)?>">Previous</a></li>
83+
<? } else { ?>
84+
<li class="page-item disabled"><span class="page-link">Previous</span></li>
85+
<? } ?>
86+
<li class="page-item disabled"><span class="page-link"><?=number_format($page)?> of <?=number_format($pages)?></span></li>
87+
<? if (!$no_next) { ?>
88+
<li class="page-item"><a class="page-link" href="<?=Common::relativeUrlToAbsolute('/eventlog/index?page=' . ($page + 1) . '&limit=' . $limit . '&order=' . $order)?>">Next</a></li>
89+
<? } else { ?>
90+
<li class="page-item disabled"><span class="page-link">Next</span></li>
91+
<? } ?>
92+
</ul>
93+
</nav>
94+
</div>
95+
<? } ?>
96+
<? require("./footer.inc.phtml"); ?>

‎src/templates/EventLog/View.phtml‎

Lines changed: 66 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?php
2-
1+
<?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
32
namespace BNETDocs\Templates\EventLog;
43

54
use \BNETDocs\Libraries\Event;
@@ -8,111 +7,94 @@ use \BNETDocs\Libraries\User;
87
use \CarlBennett\MVC\Libraries\Common;
98
use \CarlBennett\MVC\Libraries\Pair;
109

11-
$title = 'Event Log Viewer';
10+
$title = 'Event Log Viewer';
1211
$description = 'The event log viewer on BNETDocs';
1312
$this->opengraph->attach( new Pair( 'url', '/eventlog/view' ));
1413

1514
$object_id = $this->getContext()->id;
16-
$object = $this->getContext()->event;
17-
$user = $this->getContext()->user;
18-
19-
$object_ip_address = (
20-
$object instanceof Event ? $object->getIPAddress() : null
21-
);
22-
23-
$object_metadata = (
24-
$object instanceof Event ? $object->getMetadata() : null
25-
);
15+
$object = $this->getContext()->event;
16+
$user = $this->getContext()->user;
2617

27-
$object_user_id = (
28-
$object instanceof Event ? $object->getUserId() : null
29-
);
18+
$object_ip_address = ($object instanceof Event ? $object->getIPAddress() : null);
19+
$object_metadata = ($object instanceof Event ? $object->getMetadata() : null);
20+
$object_user_id = ($object instanceof Event ? $object->getUserId() : null);
3021

31-
try {
32-
$object_user = (
33-
!is_null( $object_user_id ) ? new User( $object_user_id ) : null
34-
);
35-
} catch (UserNotFoundException $e) {
22+
try
23+
{
24+
$object_user = (!is_null($object_user_id) ? new User($object_user_id) : null);
25+
}
26+
catch (UserNotFoundException $e)
27+
{
3628
$object_user = null;
3729
}
3830

39-
if ( !$object instanceof Event ) {
31+
if (!$object instanceof Event)
32+
{
4033
$title = 'Event Not Found';
4134
$description = 'The event you tried to access could not be found.';
4235
}
4336

4437
$tpl_user = (
45-
is_null( $object_user ) ? '<em>(null)</em>' :
46-
'<a href="' . $object_user->getURI() . '"><img class="avatar" src="' .
47-
$object_user->getAvatarURI( 22 ) . '"/> ' . filter_var(
48-
$object_user->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS
49-
)
38+
is_null($object_user) ? '<em>(null)</em>' :
39+
'<a href="' . $object_user->getURI() . '"><img class="mr-2" src="' .
40+
$object_user->getAvatarURI(22) . '"/>' .
41+
filter_var($object_user->getName(), FILTER_SANITIZE_FULL_SPECIAL_CHARS)
5042
);
5143

52-
$tpl_metadata_j = @json_decode( $object_metadata );
44+
$tpl_metadata_j = @json_decode($object_metadata);
5345
$tpl_metadata = (
54-
is_null( $object_metadata ) ? '<em>(null)</em>' : (
55-
json_last_error() === JSON_ERROR_NONE ? (
56-
'<pre><code class="wrap">' . filter_var(
57-
json_encode( $tpl_metadata_j, JSON_PRETTY_PRINT ),
58-
FILTER_SANITIZE_FULL_SPECIAL_CHARS
59-
) .
60-
'</code></pre>'
61-
) : (
62-
'<textarea rows="10" readonly="readonly">' . filter_var(
63-
$object_metadata, FILTER_SANITIZE_FULL_SPECIAL_CHARS
64-
) . '</textarea>'
65-
)
46+
is_null($object_metadata) ? '<em>(null)</em>' :
47+
(
48+
'<pre><code style="white-space:pre-wrap;" class="language-' . (
49+
json_last_error() === JSON_ERROR_NONE ? 'json' : 'plaintext'
50+
) . '">' . str_replace("\n", "<br/>\n", filter_var(
51+
json_encode($tpl_metadata_j, JSON_PRETTY_PRINT), FILTER_SANITIZE_FULL_SPECIAL_CHARS)
52+
) . '</code></pre>'
6653
)
6754
);
6855

69-
$tpl_referer = getenv( 'HTTP_REFERER' );
70-
if ( !empty( $tpl_referer )) {
71-
$tpl_referer = '<a href="' . filter_var(
72-
$tpl_referer, FILTER_SANITIZE_FULL_SPECIAL_CHARS
73-
) . '">&lt;&lt; Back to Previous</a>';
56+
$tpl_referer = getenv('HTTP_REFERER');
57+
if (!empty($tpl_referer))
58+
{
59+
$tpl_referer = '<a href="' . filter_var($tpl_referer, FILTER_SANITIZE_FULL_SPECIAL_CHARS) . '">&lt;&lt; Back to Previous</a>';
7460
}
75-
if ( stripos( $tpl_referer, getenv( 'HTTP_HOST' ) ) === false ) {
61+
if (stripos($tpl_referer, getenv('HTTP_HOST')) === false)
62+
{
7663
$tpl_referer = '';
7764
}
78-
if ( stripos( $tpl_referer, '/eventlog/view?id=' . $object_id ) !== false ) {
65+
if (stripos($tpl_referer, '/eventlog/view?id=' . $object_id) !== false)
66+
{
7967
$tpl_referer = '';
8068
}
8169

82-
require('./header.inc.phtml');
83-
?>
84-
<article>
85-
<?php if ( !$this->getContext()->acl_allowed ) { ?>
86-
<header class="red"><?php echo $title; ?></header>
87-
<section class="red">
88-
<p>You are not authorized to view this page.</p>
89-
</section>
90-
<?php } else if ( is_null( $object )) { $title = 'Event Not Found' ?>
91-
<header class="red"><?php echo $title; ?></header>
92-
<section class="red">
93-
<p><?php echo $description; ?></p>
94-
<?php if ( !empty( $tpl_referer )) { ?>
95-
<p><?php echo $tpl_referer; ?></p>
96-
<?php } ?>
97-
</section>
98-
<?php } else { ?>
99-
<header><?php echo $title; ?></header>
100-
<section>
101-
<table class="info">
102-
<thead></thead><tbody>
103-
<tr><th class="right" style="width:100px;">Id</th><td><a href="<?php echo Common::relativeUrlToAbsolute('/eventlog/view?id=' . $object_id); ?>"><?php echo $object_id; ?></a></td></tr>
104-
<tr><th class="right">Event Type</th><td><?php echo $object->getEventTypeName(); ?></td></tr>
105-
<tr><th class="right">Timestamp</th><td><time datetime='<?php echo $object->getEventDateTime()->format('c'); ?>'><?php echo $object->getEventDateTime()->format('l, F j, Y'); ?></time></td></tr>
106-
<tr><th class="right">IP Address</th><td><?php echo ( $object_ip_address ? $object_ip_address : '<em>(null)</em>' ); ?></td></tr>
107-
<tr><th class="right">User Account</th><td><?php echo $tpl_user; ?></td></tr>
108-
<tr><th class="right" style="vertical-align:top;">Metadata</th><td><?php echo $tpl_metadata; ?></td></tr>
109-
</tbody>
110-
</table>
111-
<?php if ( !empty( $tpl_referer )) { ?>
112-
<hr/><p><?php echo $tpl_referer; ?></p>
113-
<?php } ?>
114-
</section>
115-
</article>
116-
<?php } ?>
117-
</article>
118-
<?php require("./footer.inc.phtml"); ?>
70+
require('./header.inc.phtml'); ?>
71+
<div class="container mb-3">
72+
<? if (!$this->getContext()->acl_allowed) { ?>
73+
<div class="alert alert-danger">
74+
<h1><?=$title?></h1>
75+
<p class="mb-0">You are not authorized to view this page.</p>
76+
</div>
77+
<? } else if (is_null($object)) { ?>
78+
<div class="alert alert-danger">
79+
<h1><?=$title?></h1>
80+
<p><?=$description?></p>
81+
<?=(!empty($tpl_referer) ? ' <p>' . $tpl_referer . '</p>' : '')?>
82+
</div>
83+
<? } else { ?>
84+
<h1><?=$title?></h1>
85+
<table class="table table-hover table-striped">
86+
<thead></thead><tbody>
87+
<tr><th scope="row" class="text-right">Id</th><td><code><a href="<?=Common::relativeUrlToAbsolute('/eventlog/view?id=' . $object_id)?>"><?=$object_id?></a></code></td></tr>
88+
<tr><th scope="row" class="text-right">Event Type</th><td><?=$object->getEventTypeName()?></td></tr>
89+
<tr><th scope="row" class="text-right">Timestamp</th><td><time datetime='<?=$object->getEventDateTime()->format('c')?>'><?=$object->getEventDateTime()->format('l, F j, Y')?></time></td></tr>
90+
<tr><th scope="row" class="text-right">IP Address</th><td><?=($object_ip_address ? '<code>' . $object_ip_address . '</code>' : '<em>(null)</em>')?></td></tr>
91+
<tr><th scope="row" class="text-right">User Account</th><td><?=$tpl_user?></td></tr>
92+
</tbody>
93+
</table>
94+
<?=$tpl_metadata?>
95+
<? if (!empty($tpl_referer)) { ?>
96+
<hr/><p><?=$tpl_referer?></p>
97+
<? } ?>
98+
<? } ?>
99+
</div>
100+
<? require("./footer.inc.phtml"); ?>

‎src/templates/User/Index.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ require('./header.inc.phtml'); ?>
6262
<li class="page-item disabled"><span class="page-link">Next</span></li>
6363
<? } ?>
6464
</ul>
65-
</div>
65+
</nav>
6666
</div>
6767
<? require("./footer.inc.phtml"); ?>

0 commit comments

Comments
 (0)