Fixed table presentations with new bootstrap, added HTML::abbr(), added public access to Database::config(), enabled DB compression to be disabled in database.php

This commit is contained in:
Deon George
2016-05-03 11:01:28 +10:00
parent 113597f9eb
commit 8f659c50c6
13 changed files with 126 additions and 226 deletions

View File

@@ -1,26 +1,28 @@
<div class="pager pagination-centered">
<ul>
<li class="<?php echo $x=($page->first_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->first_page())) ?>" rel="first"><?php echo __('First') ?></a>
</li>
<li class="<?php echo $x=($page->previous_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->previous_page())) ?>" rel="prev"><?php echo __('Previous') ?></a>
</li>
<?php for ($i = 1; $i <= $page->total_pages(); $i++): ?>
<li class="<?php echo $x=($page->current_page() == $i) ? 'active disabled' : '' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($i)) ?>"><?php echo $i ?></a>
</li>
<?php endfor ?>
<li class="<?php echo $x=($page->next_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->next_page())) ?>" rel="next"><?php echo __('Next') ?></a>
</li>
<li class="<?php echo $x=($page->last_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->last_page())) ?>" rel="last"><?php echo __('Last') ?></a>
</li>
</ul>
</div>
<nav>
<div class="text-center">
<ul class="pagination">
<li class="<?php echo $x=($page->first_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->first_page())) ?>" rel="first"><?php echo __('First') ?></a>
</li>
<li class="<?php echo $x=($page->previous_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->previous_page())) ?>" rel="prev"><?php echo __('Previous') ?></a>
</li>
<?php for ($i = 1; $i <= $page->total_pages(); $i++): ?>
<li class="<?php echo $x=($page->current_page() == $i) ? 'active disabled' : '' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($i)) ?>"><?php echo $i ?></a>
</li>
<?php endfor ?>
<li class="<?php echo $x=($page->next_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->next_page())) ?>" rel="next"><?php echo __('Next') ?></a>
</li>
<li class="<?php echo $x=($page->last_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->last_page())) ?>" rel="last"><?php echo __('Last') ?></a>
</li>
</ul>
</div>
</nav>

View File

@@ -48,29 +48,31 @@ if ($use_n6)
for ($i = $n7; $i <= $n8; $i++)
$links[$i] = $i;
?>
<div class="pagination pagination-centered">
<ul>
<li class="<?php echo $x=($page->first_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->first_page())) ?>" rel="first"><?php echo __('First') ?></a>
</li>
<li class="<?php echo $x=($page->previous_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->previous_page())) ?>" rel="prev"><?php echo __('Previous') ?></a>
</li>
<?php foreach ($links as $number => $content): ?>
<li class="<?php echo $x=($page->current_page() == $number) ? 'active disabled' : '' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($number)) ?>"><?php echo $content ?></a>
</li>
<?php endforeach ?>
<li class="<?php echo $x=($page->next_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->next_page())) ?>" rel="next"><?php echo __('Next') ?></a>
</li>
<li class="<?php echo $x=($page->last_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->last_page())) ?>" rel="last"><?php echo __('Last') ?></a>
</li>
</ul>
</div>
<nav>
<div class="text-center">
<ul class="pagination">
<li class="<?php echo $x=($page->first_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->first_page())) ?>" rel="first"><?php echo __('First') ?></a>
</li>
<li class="<?php echo $x=($page->previous_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' :HTML::chars($page->url($page->previous_page())) ?>" rel="prev"><?php echo __('Previous') ?></a>
</li>
<?php foreach ($links as $number => $content): ?>
<li class="<?php echo $x=($page->current_page() == $number) ? 'active disabled' : '' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($number)) ?>"><?php echo $content ?></a>
</li>
<?php endforeach ?>
<li class="<?php echo $x=($page->next_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->next_page())) ?>" rel="next"><?php echo __('Next') ?></a>
</li>
<li class="<?php echo $x=($page->last_page() !== FALSE) ? '' : 'disabled' ?>">
<a href="<?php echo $x ? '#' : HTML::chars($page->url($page->last_page())) ?>" rel="last"><?php echo __('Last') ?></a>
</li>
</ul>
</div>
</nav>

View File

@@ -1,11 +1,15 @@
<table class="table table-striped table-condensed table-hover" id="list-table<?php echo $jssort ? '-'.$jssort : ''; ?>">
<thead><tr><th><?php echo implode('</th><th>',$th); ?></th></tr></thead>
<tbody>
<?php foreach ($td as $details) : ?>
<tr><td><?php echo implode('</td><td>',$details['val']); ?></td></tr>
<?php endforeach ?>
<?php if ($other) : ?>
<tr><td>Other</td><td colspan="<?php #echo count($data)-1; ?>"><?php #printf('(%s) %s',$count,$other); ?></td></tr>
<?php if ($td) : ?>
<?php foreach ($td as $details) : ?>
<tr><td><?php echo implode('</td><td>',$details['val']); ?></td></tr>
<?php endforeach ?>
<?php if ($other) : ?>
<tr><td>Other</td><td colspan="<?php #echo count($data)-1; ?>"><?php #printf('(%s) %s',$count,$other); ?></td></tr>
<?php endif ?>
<?php else : ?>
<tr><td colspan="<?php echo count($th); ?>">NO records.</td></tr>
<?php endif ?>
</tbody>
</table>

View File

@@ -2,7 +2,7 @@
<html>
<head>
<title><?php echo Site::Appname(); ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />
@@ -51,6 +51,7 @@
<div class="navbar-search-addon form-group">
<i class="fa fa-search"></i>
<input type="text" autocomplete="off" name="search-query" class="form-control input-sm search-query" placeholder="Search" data-provide="typeahead">
<i class="fa fa-spinner fa-spin hidden" name="searching"></i>
</div>
</form>
<?php endif ?>

View File

@@ -2,7 +2,7 @@
<html>
<head>
<title><?php echo Site::Appname(); ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />