Skip to content

Commit 9552e0c

Browse files
carlbennettcarlbennett
committed
Second pass at bootstrap convert
1 parent a990983 commit 9552e0c

File tree

3 files changed

+82
-91
lines changed

3 files changed

+82
-91
lines changed

‎etc/config.sample.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
"BNETDocs has to take a brief moment to do some system maintenance. We'll be back shortly."
2020
],
2121
"navigation": {
22-
"front_page": "/welcome",
23-
"hide_search_documents": false,
24-
"hide_search_packets": false,
25-
"hide_popular_documents": false,
26-
"hide_popular_packets": false
22+
"front_page": "/welcome"
2723
},
2824
"privacy": {
2925
"contact": {

‎src/templates/Document/Index.phtml‎

Lines changed: 72 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,82 @@
1-
<?php
2-
1+
<?php /* vim: set colorcolumn=: */
32
namespace BNETDocs\Templates\Document;
4-
53
use \BNETDocs\Libraries\Document;
64
use \BNETDocs\Libraries\User;
75
use \CarlBennett\MVC\Libraries\Common;
86
use \CarlBennett\MVC\Libraries\Pair;
9-
10-
$title = 'Document Index';
11-
$description = 'The index for documents on BNETDocs';
7+
$title = 'All Documents';
8+
$description = 'This page is an index for all of the document pages on BNETDocs';
129
$this->opengraph->attach(new Pair('url', '/document/index'));
13-
1410
$order = $this->getContext()->order;
15-
16-
require('./header.inc.phtml');
17-
?>
18-
<article>
19-
<header>Document Index</header>
20-
<section>
21-
<form method="GET">
22-
<label for="order">Order by:</label>
23-
<select name="order" id="order" onchange="form.submit();"
24-
style="display:inline-block;width:200px;">
25-
<option value="created-asc"<?php
26-
if ($order === 'created-asc') { echo ' selected="selected"';
27-
} ?>>Created (Ascending)</option>
28-
<option value="created-desc"<?php
29-
if ($order === 'created-desc') { echo ' selected="selected"';
30-
} ?>>Created (Descending)</option>
31-
<option value="id-asc"<?php
32-
if ($order === 'id-asc') { echo ' selected="selected"';
33-
} ?>>Id (Ascending)</option>
34-
<option value="id-desc"<?php
35-
if ($order === 'id-desc') { echo ' selected="selected"';
36-
} ?>>Id (Descending)</option>
37-
<option value="title-asc"<?php
38-
if ($order === 'title-asc') { echo ' selected="selected"';
39-
} ?>>Title (Ascending)</option>
40-
<option value="title-desc"<?php
41-
if ($order === 'title-desc') { echo ' selected="selected"';
42-
} ?>>Title (Descending)</option>
43-
<option value="updated-asc"<?php
44-
if ($order === 'updated-asc') { echo ' selected="selected"';
45-
} ?>>Updated (Ascending)</option>
46-
<option value="updated-desc"<?php
47-
if ($order === 'updated-desc') { echo ' selected="selected"';
48-
} ?>>Updated (Descending)</option>
49-
<option value="user-id-asc"<?php
50-
if ($order === 'user-id-asc') { echo ' selected="selected"';
51-
} ?>>User Id (Ascending)</option>
52-
<option value="user-id-desc"<?php
53-
if ($order === 'user-id-desc') { echo ' selected="selected"';
54-
} ?>>User Id (Descending)</option>
55-
</select>
56-
<input type="submit" value="Reorder"/>
57-
</form>
58-
<table>
59-
<thead>
60-
<tr>
61-
<th class="left">Found <?php echo number_format($this->getContext()->sum_documents); ?> document<?php echo ($this->getContext()->sum_documents != 1 ? "s" : ""); ?></th>
62-
<th class="left">Author</th>
63-
</tr>
64-
</thead><tbody>
11+
require('./header.inc.phtml'); ?>
12+
<div class="container mb-3">
13+
<h2><?=$title?></h2>
14+
<p><?=$description?></p>
15+
<form method="GET" class="m-2" id="order_by_form">
16+
<label for="order">Order by:</label>
17+
<select class="form-control form-control-sm" name="order" id="order" onchange="form.submit();"
18+
style="display:inline-block;width:200px;">
19+
<option value="created-asc"<?php
20+
if ($order === 'created-asc') { echo ' selected="selected"';
21+
} ?>>Created (Ascending)</option>
22+
<option value="created-desc"<?php
23+
if ($order === 'created-desc') { echo ' selected="selected"';
24+
} ?>>Created (Descending)</option>
25+
<option value="id-asc"<?php
26+
if ($order === 'id-asc') { echo ' selected="selected"';
27+
} ?>>Id (Ascending)</option>
28+
<option value="id-desc"<?php
29+
if ($order === 'id-desc') { echo ' selected="selected"';
30+
} ?>>Id (Descending)</option>
31+
<option value="title-asc"<?php
32+
if ($order === 'title-asc') { echo ' selected="selected"';
33+
} ?>>Title (Ascending)</option>
34+
<option value="title-desc"<?php
35+
if ($order === 'title-desc') { echo ' selected="selected"';
36+
} ?>>Title (Descending)</option>
37+
<option value="updated-asc"<?php
38+
if ($order === 'updated-asc') { echo ' selected="selected"';
39+
} ?>>Updated (Ascending)</option>
40+
<option value="updated-desc"<?php
41+
if ($order === 'updated-desc') { echo ' selected="selected"';
42+
} ?>>Updated (Descending)</option>
43+
<option value="user-id-asc"<?php
44+
if ($order === 'user-id-asc') { echo ' selected="selected"';
45+
} ?>>User Id (Ascending)</option>
46+
<option value="user-id-desc"<?php
47+
if ($order === 'user-id-desc') { echo ' selected="selected"';
48+
} ?>>User Id (Descending)</option>
49+
</select>
50+
<input class="btn btn-sm btn-secondary" type="submit" value="Reorder"/>
51+
</form>
52+
<table class="table table-hover table-striped" id="docs_tbl">
53+
<thead>
54+
<tr>
55+
<th class="left">Found <?php echo number_format($this->getContext()->sum_documents); ?> document<?php echo ($this->getContext()->sum_documents != 1 ? "s" : ""); ?></th>
56+
<th class="left">Author</th>
57+
</tr>
58+
</thead><tbody>
6559
<?php foreach ($this->getContext()->documents as $document) {
66-
$user = $document->getUser();
67-
if ($user) {
68-
$user_url = $user->getURI();
69-
$avatar_url = $user->getAvatarURI(22);
70-
}
60+
$user = $document->getUser();
61+
if ($user) {
62+
$user_url = $user->getURI();
63+
$avatar_url = $user->getAvatarURI(22);
64+
}
7165
?>
72-
<tr>
73-
<td><strong><a href="<?php echo $document->getURI(); ?>"><?php echo filter_var($document->getTitle(), FILTER_SANITIZE_STRING); ?></a></strong><br/><span style="color:#aaa;"><?php echo rtrim(Common::stripUpTo(Common::stripUpTo(trim(filter_var($document->getContent(true), FILTER_SANITIZE_STRING)), "\n", 90), ". ", 90), "."); ?></span></td>
74-
<td><?php if ($user) { ?><a href="<?php echo $user_url; ?>"><img class="avatar" src="<?php echo $avatar_url; ?>"/>&nbsp;<?php echo filter_var($user->getName(), FILTER_SANITIZE_STRING); ?></a><?php } else { ?>Anonymous<?php } ?></td>
75-
</tr>
66+
<tr>
67+
<td><strong><a href="<?php echo $document->getURI(); ?>"><?php echo filter_var($document->getTitle(), FILTER_SANITIZE_STRING); ?></a></strong><br/><span style="color:#aaa;"><?php echo rtrim(Common::stripUpTo(Common::stripUpTo(trim(filter_var($document->getContent(true), FILTER_SANITIZE_STRING)), "\n", 90), ". ", 90), "."); ?></span></td>
68+
<td><?php if ($user) { ?><a href="<?php echo $user_url; ?>"><img class="avatar" src="<?php echo $avatar_url; ?>"/>&nbsp;<?php echo filter_var($user->getName(), FILTER_SANITIZE_STRING); ?></a><?php } else { ?>Anonymous<?php } ?></td>
69+
</tr>
7670
<?php } ?>
77-
</tbody></table>
78-
</section>
79-
</article>
71+
</tbody></table>
72+
</div>
73+
<?php ob_start(); ?>
74+
<script type="text/javascript">
75+
$(document).ready(function(){
76+
$('#order_by_form').hide();
77+
$('#docs_tbl').DataTable({
78+
"responsive": true
79+
});
80+
});
81+
</script>
82+
<? $_footer_script = ob_get_clean(); require('./footer.inc.phtml'); ?>

‎src/templates/header.inc.phtml‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ $_campaign_vultr = (
124124
<li class="nav-item<?=_header_active('/document/', false)?> dropdown">
125125
<a class="nav-link dropdown-toggle" href="#" id="navbarObjectsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documents</a>
126126
<div class="dropdown-menu" aria-labelledby="navbarObjectsDropdown">
127-
<? if ($_header_staff) { ?>
127+
<a class="dropdown-item<?=_header_active('/document/index', false)?> text-info" href="<?=Common::relativeUrlToAbsolute('/document/index')?>">All Documents<?=_header_active('/document/index', true)?></a>
128+
<? if ($_header_staff) { ?>
129+
<div class="dropdown-divider"></div>
128130
<a class="dropdown-item<?=_header_active('/document/create', false)?> text-success" href="<?=Common::relativeUrlToAbsolute('/document/create')?>">Create Document<?=_header_active('/document/create', true)?></a>
129131
<div class="dropdown-divider"></div>
130132
<? }
@@ -134,12 +136,15 @@ $_campaign_vultr = (
134136
</div>
135137
</li>
136138
</ul>
137-
<a class="btn btn-sm btn-outline-success my-2 my-sm-0" tabindex="-1" href="<?=Common::relativeUrlToAbsolute('/user/login?return=' . rawurlencode(getenv('REQUEST_URI')))?>">Log in</a>
139+
<? if (!$_header_user) { ?>
140+
<a class="btn btn-sm btn-outline-success my-2 my-sm-0" tabindex="-1" href="<?=Common::relativeUrlToAbsolute('/user/login?return=' . rawurlencode((getenv('REQUEST_URI') == '/user/logout' ? '/tools' : getenv('REQUEST_URI'))))?>">Log in</a>
141+
<? } else { ?>
142+
<span class="nav-item navbar-text mx-3"><a href="<?=$_header_user->getURI()?>"><?=$_header_user->getName()?></a><?=($_header_user->isDisabled() ? ' <span class="font-weight-bold text-danger">(Disabled)</span>' : '')?></span>
143+
<a class="btn btn-sm btn-outline my-2 my-sm-0" tabindex="-1" href="<?=Common::relativeUrlToAbsolute('/user/logout')?>">Log out</a>
144+
<? } ?>
138145
</div>
139146
</nav>
140147
<!--
141-
<a>Info Hub</a>
142-
<a href="<?=Common::relativeUrlToAbsolute('/welcome')?>">Welcome</a>
143148
<a href="<?=Common::relativeUrlToAbsolute('/credits')?>">Contributors</a>
144149
<?php if (Common::$config->discord->enabled) { ?>
145150
<a href="<?=Common::relativeUrlToAbsolute('/discord')?>">Discord</a>
@@ -161,20 +166,7 @@ $_campaign_vultr = (
161166
<?php } ?>
162167
<?php } ?>
163168
<a>The Docs</a>
164-
<a href="<?=Common::relativeUrlToAbsolute('/document/index')?>">Document Index</a>
165-
<?php if (!$_header_navigation_config->hide_search_documents) { ?>
166-
<a href="<?=Common::relativeUrlToAbsolute('/document/search')?>">Search Documents</a>
167-
<?php } ?>
168-
<?php if (!$_header_navigation_config->hide_popular_documents) { ?>
169-
<a href="<?=Common::relativeUrlToAbsolute('/document/popular')?>">Popular Documents</a>
170-
<?php } ?>
171169
<a href="<?=Common::relativeUrlToAbsolute('/packet/index')?>">Packet Index</a>
172-
<?php if (!$_header_navigation_config->hide_search_packets) { ?>
173-
<a href="<?=Common::relativeUrlToAbsolute('/packet/search')?>">Search Packets</a>
174-
<?php } ?>
175-
<?php if (!$_header_navigation_config->hide_popular_packets) { ?>
176-
<a href="<?=Common::relativeUrlToAbsolute('/packet/popular')?>">Popular Packets</a>
177-
<?php } ?>
178170
<a>Other Pages</a>
179171
<a href="<?=Common::relativeUrlToAbsolute('//files.bnetdocs.org/')?>">File Archive</a>
180172
<a href="<?=Common::relativeUrlToAbsolute('/privacy')?>">Privacy Notice</a>

0 commit comments

Comments
 (0)