M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using Bootstrap pull right class + code format

This commit is contained in:
Wruczek 2016-10-31 03:18:46 +01:00
parent 3f3baab957
commit f68c29cc04
14 changed files with 129 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bans.php
View File

@ -5,7 +5,6 @@ require_once __DIR__ . "/include/tsutils.php";
require_once __DIR__ . "/lib/phpfastcache/autoload.php";
use phpFastCache\Util;
use phpFastCache\CacheManager;
@ -20,8 +19,6 @@ if (is_null($banlist)) {
$banlist = array(getBanlist(), date('d-m-Y H:i:s'));
$cache->set('banlist', $banlist, 600);
}
?>
<div class="panel panel-default">

10
css/style.css
View File

@ -23,11 +23,7 @@ a {
text-align: right;
}
.pullright {
float: right !important;
}
.pullright .fa {
.pull-right .fa {
margin-right: 0px
}
@ -44,7 +40,6 @@ p, a {
hyphens: auto;
}
/* ****** */
/* STATUS */
/* ****** */
@ -61,7 +56,6 @@ p, a {
float: right
}
/* ********* */
/* ADMINLIST */
/* ********* */
@ -93,7 +87,6 @@ p, a {
margin-left: 19px
}
/* ****** */
/* NAVBAR */
/* ****** */
@ -123,7 +116,6 @@ body {
width: auto;
}
/* ****** */
/* FOOTER */
/* ****** */

3
css/theme.css
View File

@ -167,6 +167,7 @@ fieldset[disabled] .btn-link:focus {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #00343f;
}
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
@ -184,6 +185,7 @@ fieldset[disabled] .btn-link:focus {
.nav-tabs-justified > li > a {
border-bottom: 1px solid #00343f;
}
.nav-tabs-justified > .active > a,
.nav-tabs-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus {
@ -211,6 +213,7 @@ fieldset[disabled] .btn-link:focus {
.navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
background-color: #004449
}
.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {

5
include/adminlist.php
View File

@ -3,7 +3,6 @@ require_once __DIR__ . "/tsutils.php";
require_once __DIR__ . "/../lib/phpfastcache/autoload.php";
use phpFastCache\Util;
use phpFastCache\CacheManager;
@ -68,11 +67,11 @@ function getAdminList() {
$user = getClientByDbid($tsAdmin, $userInfo['cldbid']);
if (!$user) {
$output .= '<p><span class="label label-primary iconspacer">' . $userInfo['client_nickname'] . '</span><span class="label label-danger pullright">' . translate($lang["adminlist"]["status"]["offline"]) . '</span></p>';
$output .= '<p><span class="label label-primary iconspacer">' . $userInfo['client_nickname'] . '</span><span class="label label-danger pull-right">' . translate($lang["adminlist"]["status"]["offline"]) . '</span></p>';
continue;
}
$output .= '<p><img src="lib/ts3phpframework/images/viewer/' . $user->getIcon() . '.png" alt="Status użytkownika">' . '<span class="label label-primary">' . $user . '</span>' . ($user['client_away'] ? '<span class="label label-warning pullright">' . translate($lang["adminlist"]["status"]["away"]) . '</span>' : '<span class="label label-success pullright">' . translate($lang["adminlist"]["status"]["online"]) . '</span>') . '</p>';
$output .= '<p><img src="lib/ts3phpframework/images/viewer/' . $user->getIcon() . '.png" alt="Status użytkownika">' . '<span class="label label-primary">' . $user . '</span>' . ($user['client_away'] ? '<span class="label label-warning pull-right">' . translate($lang["adminlist"]["status"]["away"]) . '</span>' : '<span class="label label-success pull-right">' . translate($lang["adminlist"]["status"]["online"]) . '</span>') . '</p>';
}
}

4
include/header.php
View File

@ -131,7 +131,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-shield" aria-hidden="true"></i> <?php tl($lang["adminlist"]["title"]); ?> <span class="pullright"><i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["adminlist"]["lastupdate"], [$adminlist[1]]); ?>"></i></span></div>
<div class="panel-heading"><i class="fa fa-shield" aria-hidden="true"></i> <?php tl($lang["adminlist"]["title"]); ?> <span class="pull-right"><i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="<?php tl($lang["adminlist"]["lastupdate"], [$adminlist[1]]); ?>"></i></span></div>
<div class="panel-body adminlist">
<?php echo $adminlist[0]; ?>
</div>
@ -146,7 +146,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
$name = $item[0];
$linkdesc = $item[1];
$link = $item[2];
echo '<li>' . $name . ' <span class="pullright"><a href="' . $link . '">' . $linkdesc . '</a></span></li>';
echo '<li>' . $name . ' <span class="pull-right"><a href="' . $link . '">' . $linkdesc . '</a></span></li>';
} ?>
</ul>
</div>