Merge pull request #117 from yigitkeremoktay/patch-4
Some Graphical Improvements
This commit is contained in:
Vojtěch Sajdl
GitHub
commit
f3aca0c172
|
|
@ -34,6 +34,12 @@ define("WHO_WE_ARE","##who_we_are##");
|
|||
define("POLICY_URL","##policy_url##");
|
||||
define("INSTALL_OVERRIDE", false);
|
||||
define("DEFAULT_LANGUAGE", "en_GB");
|
||||
define("CUSTOM_LOGO_URL",""); // This will use the default logo if left empty
|
||||
define("COPYRIGHT_TEXT",""); // Leave this empty if you don't want your copyright displayed
|
||||
// Without COPYRIGHT_TEXT Set
|
||||
// 2020 Server Status Project Contributors
|
||||
// With COPYRIGHT_TEXT Set
|
||||
// 2020 Server Status Project Contributors and COPYRIGHT_TEXT
|
||||
//Stop editing
|
||||
require("classes/locale-negotiator.php");
|
||||
|
||||
|
|
|
|||
74
css/main.css
74
css/main.css
|
|
@ -1,39 +1,40 @@
|
|||
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese');
|
||||
@import url('https://fonts.googleapis.com/css?family=Fira+Sans:400,700&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese');
|
||||
|
||||
body {
|
||||
background: #ffffff;
|
||||
margin: 0;
|
||||
height: 100%;
|
||||
line-height: 24px;
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
body {
|
||||
background: #ffffff;
|
||||
margin: 0;
|
||||
margin-top: 80px;
|
||||
height: 100%;
|
||||
line-height: 24px;
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
}
|
||||
|
||||
img {
|
||||
height: auto;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
a {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
text-decoration: none;
|
||||
a {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:hover,
|
||||
a:focus {
|
||||
text-decoration: none;
|
||||
color:#3566a8;
|
||||
color:#f5f4f4;
|
||||
}
|
||||
|
||||
.centered {
|
||||
text-align: center
|
||||
text-align: center
|
||||
}
|
||||
|
||||
|
||||
.navbar {
|
||||
padding-top: 5px;
|
||||
margin-bottom: 0px;
|
||||
padding-top: 5px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
|
|
@ -42,28 +43,32 @@ a:focus {
|
|||
|
||||
|
||||
.navbar-default .navbar-nav > li > a {
|
||||
color: #f5f4f4;
|
||||
font-size: 1em;
|
||||
color: #f5f4f4;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > li > a:hover {
|
||||
color: #a7a7a7;
|
||||
color: #a7a7a7;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
|
||||
color: #ffffff;
|
||||
background-color: transparent;
|
||||
color: #f5f4f4;
|
||||
background-color: transparent;
|
||||
}
|
||||
.navbar-collapse
|
||||
{
|
||||
background: #2f60a3;
|
||||
background: #2f60a3;
|
||||
}
|
||||
.navbar-default {
|
||||
z-index: 200;
|
||||
background-color: #2f60a3;
|
||||
background-color: gray;
|
||||
border-color: transparent;
|
||||
border-radius: 0px;
|
||||
border-radius: 0px 0px 30px 30px;
|
||||
height: 77px;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -160,7 +165,7 @@ body a h1{
|
|||
|
||||
.navbar-header .btn
|
||||
{
|
||||
margin-top: 15px;
|
||||
margin-top: 15px;
|
||||
margin-right: 10px
|
||||
}
|
||||
|
||||
|
|
@ -243,11 +248,11 @@ body a h1{
|
|||
border-left-color: transparent;
|
||||
}
|
||||
|
||||
.timeline .panel .panel-heading.icon * {
|
||||
.timeline .panel .panel-heading.icon * {
|
||||
/*This shouldn't be relative in size...*/
|
||||
font-size: 20px;
|
||||
vertical-align: middle;
|
||||
line-height: 40px;
|
||||
font-size: 20px;
|
||||
vertical-align: middle;
|
||||
line-height: 40px;
|
||||
}
|
||||
.timeline .panel .panel-heading.icon {
|
||||
position: absolute;
|
||||
|
|
@ -296,10 +301,11 @@ body a h1{
|
|||
|
||||
/* Footer */
|
||||
#footerwrap {
|
||||
border-radius: 30px 30px 0px 0px;
|
||||
min-height: 60px;
|
||||
padding-top: 15px;
|
||||
padding-bottom: 10px;
|
||||
background: #2f60a3;
|
||||
background: gray;
|
||||
}
|
||||
|
||||
#footerwrap a{
|
||||
|
|
@ -564,7 +570,7 @@ i.danger{
|
|||
}
|
||||
|
||||
#footerwrap .dropdown-menu{
|
||||
background: #337ab7
|
||||
background: gray;
|
||||
}
|
||||
|
||||
#footerwrap .dropdown-menu a{
|
||||
|
|
@ -573,7 +579,7 @@ i.danger{
|
|||
padding: 2px 5px;
|
||||
display: block;
|
||||
transition: 125ms ease-in-out background-color;
|
||||
background-color: #337ab7
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
#footerwrap .dropdown-menu a:hover{
|
||||
|
|
@ -616,7 +622,3 @@ label.form-name
|
|||
{
|
||||
line-height: 20px
|
||||
}
|
||||
.panel .panel-footer .label
|
||||
{
|
||||
display: inline-block;
|
||||
}
|
||||
|
|
|
|||
14
template.php
14
template.php
|
|
@ -1,4 +1,4 @@
|
|||
<?php
|
||||
<?php
|
||||
//This should later be translatable, maybe find a better solution?
|
||||
//This is here for better generation of POT files :)
|
||||
$statuses = array(_("Major outage"), _("Minor outage"), _("Planned maintenance"), _("Operational") );
|
||||
|
|
@ -55,7 +55,7 @@ class Template{
|
|||
<div class="navbar navbar-default" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<a class="navbar-brand" href="<?php echo WEB_URL;?>"><img src="<?php echo WEB_URL;?>/img/logo_white.png" alt="logo" class="menu-logo" width="50" height="50"></a>
|
||||
<a class="navbar-brand" href="<?php echo WEB_URL;?>"><a class="navbar-brand" href="<?php echo WEB_URL;?>/admin"><img src="<?php if(strlen(CUSTOM_LOGO_URL)>1){ echo CUSTOM_LOGO_URL; } else { echo WEB_URL."/img/logo_white.png"; } ?>" alt="logo" class="menu-logo" style="height:50px;"></a>
|
||||
</div>
|
||||
<div class="navbar-left hidden-xs">
|
||||
<ul class="nav navbar-nav">
|
||||
|
|
@ -66,7 +66,7 @@ class Template{
|
|||
</div>
|
||||
</div>
|
||||
<div id="wrapper" class="center">
|
||||
<?php
|
||||
<?php
|
||||
}else{
|
||||
global $user;
|
||||
?>
|
||||
|
|
@ -108,7 +108,7 @@ class Template{
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="<?php echo WEB_URL;?>/admin"><img src="<?php echo WEB_URL;?>/img/logo_white.png" alt="logo" class="menu-logo" width="50" height="50"></a>
|
||||
<a class="navbar-brand" href="<?php echo WEB_URL;?>/admin"><img src="<?php if(strlen(CUSTOM_LOGO_URL)>1){ echo CUSTOM_LOGO_URL; } else { echo WEB_URL."/img/logo_white.png"; } ?>" alt="logo" class="menu-logo" width="50" height="50"></a>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse navbar-right navbar-admin">
|
||||
<ul class="nav navbar-nav">
|
||||
|
|
@ -121,7 +121,7 @@ class Template{
|
|||
</div>
|
||||
</div>
|
||||
<div id="wrapper" class="center admin">
|
||||
<?php
|
||||
<?php
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ class Template{
|
|||
<div id="footerwrap">
|
||||
<div class="container">
|
||||
<div class="row centered">
|
||||
<div class="col-md-4 text-left"><a href="https://github.com/Pryx/server-status/" target="_blank"><i class="fab fa-github" aria-hidden="true"></i> </a>Copyright © <?php echo date("Y");?> Vojtěch Sajdl</div>
|
||||
<div class="col-md-4 text-left"><a href="https://github.com/Pryx/server-status/graphs/contributions" target="_blank">Copyright © <?php echo date("Y");?> Server Status Project Contributors </a><?php if(strlen(COPYRIGHT_TEXT)>1){ echo " and ".COPYRIGHT_TEXT; } ?></div>
|
||||
<div class="col-md-4 text-center">
|
||||
<div class="btn-group dropup">
|
||||
<button type="button" class="btn btn-primary"><?php echo '<img src="'.WEB_URL.'/locale/'.$_SESSION['locale'].'/flag.png" alt="'.$lang_names[$_SESSION['locale']].'">'.$lang_names[$_SESSION['locale']];?></button>
|
||||
|
|
@ -147,7 +147,7 @@ class Template{
|
|||
<span class="sr-only"><?php echo _("Toggle Dropdown");?></span>
|
||||
</button>
|
||||
<div class="dropdown-menu">
|
||||
<?php
|
||||
<?php
|
||||
foreach ($lang_names as $key => $value) {
|
||||
echo '<a href="?lang='.$key.'"><img src="'.WEB_URL.'/locale/'.$key.'/flag.png" alt="'.$value.'">'.$value.'</a>';
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue