mirror of
https://github.com/ShaYmez/FreeSTAR-Status-Engine.git
synced 2026-06-01 21:54:48 -04:00
Merge branch 'master' into subscription2_dev
Fix Subscriber CSS issue
This commit is contained in:
Thomas Nilsen
+57
-69
@@ -1,7 +1,6 @@
|
||||
<?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") );
|
||||
$classes = array("danger", "warning", "primary", "success" );
|
||||
$icons = array("fa fa-times", "fa fa-exclamation", "fa fa-info", "fa fa-check" );
|
||||
@@ -21,39 +20,36 @@ class Template{
|
||||
public static function render_header($page_name, $admin = false){
|
||||
if (!$admin)
|
||||
{
|
||||
// Create subscriber menu sections for later inclusion
|
||||
// Check if we are on admin menu, if so do not display
|
||||
$arr_url = explode("/", $_SERVER['PHP_SELF']);
|
||||
$str_url = strtolower($arr_url[count($arr_url)-2]);
|
||||
if ( 'admin' == $str_url ) {
|
||||
$strSubsMenu = '';
|
||||
} else {
|
||||
// Subscriber menu is to be shown...
|
||||
$strSubsMenu = '<ul class="nav navbar-nav mr-auto">';
|
||||
// If subscriber is not logged on, display subscriber menus
|
||||
if ( (!isset($_SESSION['subscriber_valid'])) || false == $_SESSION['subscriber_valid'] ) {
|
||||
$strSubsMenu .= '<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" href="#"><span class="glyphicon glyphicon-th"></span> '. _('Subscribe').'</a>
|
||||
<ul class="dropdown-menu ">';
|
||||
|
||||
if ( SUBSCRIBE_EMAIL ) {
|
||||
$strSubsMenu .= '<li><a href="?do=email_subscription&new=1"><span class="glyphicon glyphicon-envelope"></span> '._('Subscribe via email').'</a></li>';
|
||||
}
|
||||
if ( SUBSCRIBE_TELEGRAM ) {
|
||||
$strSubsMenu .= '<li><a href="#"><script async src="https://telegram.org/js/telegram-widget.js?4" data-telegram-login="'.TG_BOT_USERNAME.'" data-size="small" data-userpic="false" data-auth-url="'.WEB_URL.'/telegram_check.php" data-request-access="write"></script></a></li>';
|
||||
}
|
||||
$strSubsMenu .= '</ul>';
|
||||
}
|
||||
// If subscriber is logged on, display unsub and logoff menu points
|
||||
if ( (isset($_SESSION['subscriber_valid'])) && $_SESSION['subscriber_valid'] ) {
|
||||
$strSubsMenu .= '<li><a href="?do=subscriptions">'._('Subscriptions').'</a></li>';
|
||||
$strSubsMenu .= '<li><a href="'.WEB_URL.'/index.php?subscriber_logout=1">'._('Logout').'</a></li>';
|
||||
}
|
||||
$strSubsMenu .= '</ul>';
|
||||
}
|
||||
// Create subscriber menu sections for later inclusion
|
||||
// Check if we are on admin menu, if so do not display
|
||||
$arr_url = explode("/", $_SERVER['PHP_SELF']);
|
||||
$str_url = strtolower($arr_url[count($arr_url)-2]);
|
||||
if ( 'admin' == $str_url ) {
|
||||
$strSubsMenu = '';
|
||||
} else {
|
||||
// Subscriber menu is to be shown...
|
||||
$strSubsMenu = '<ul class="nav navbar-nav mr-auto">';
|
||||
// If subscriber is not logged on, display subscriber menus
|
||||
if ( (!isset($_SESSION['subscriber_valid'])) || false == $_SESSION['subscriber_valid'] ) {
|
||||
$strSubsMenu .= '<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" role="button" href="#"><span class="glyphicon glyphicon-th"></span> '. _('Subscribe').'</a>
|
||||
<ul class="dropdown-menu ">';
|
||||
|
||||
|
||||
|
||||
if ( SUBSCRIBE_EMAIL ) {
|
||||
$strSubsMenu .= '<li><a href="?do=email_subscription&new=1"><span class="glyphicon glyphicon-envelope"></span> '._('Subscribe via email').'</a></li>';
|
||||
}
|
||||
if ( SUBSCRIBE_TELEGRAM ) {
|
||||
$strSubsMenu .= '<li><a href="#"><script async src="https://telegram.org/js/telegram-widget.js?4" data-telegram-login="'.TG_BOT_USERNAME.'" data-size="small" data-userpic="false" data-auth-url="'.WEB_URL.'/telegram_check.php" data-request-access="write"></script></a></li>';
|
||||
}
|
||||
$strSubsMenu .= '</ul>';
|
||||
}
|
||||
// If subscriber is logged on, display unsub and logoff menu points
|
||||
if ( (isset($_SESSION['subscriber_valid'])) && $_SESSION['subscriber_valid'] ) {
|
||||
$strSubsMenu .= '<li><a href="?do=subscriptions">'._('Subscriptions').'</a></li>';
|
||||
$strSubsMenu .= '<li><a href="'.WEB_URL.'/index.php?subscriber_logout=1">'._('Logout').'</a></li>';
|
||||
}
|
||||
$strSubsMenu .= '</ul>';
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
@@ -86,31 +82,30 @@ class Template{
|
||||
<link href="https://use.fontawesome.com/releases/v5.0.4/css/all.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<div class="navbar navbar-default" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only"><?php echo _("Toggle navigation");?></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<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>
|
||||
</div>
|
||||
<div class="navbar-left hidden-xs">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="<?php echo WEB_URL;?>/"><h1><?php echo _((defined('TITLE')?TITLE:"Service Status"));?></h1></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse navbar-right navbar-admin">
|
||||
<?php echo $strSubsMenu; ?>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="wrapper" class="center admin">
|
||||
<div class="navbar navbar-default" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only"><?php echo _("Toggle navigation");?></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<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">
|
||||
<li><a href="<?php echo WEB_URL;?>/"><h1><?php echo _((defined('TITLE')?TITLE:"Service Status"));?></h1></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse navbar-right navbar-admin">
|
||||
<?php echo $strSubsMenu; ?>
|
||||
</div><!--/.nav-collapse -->
|
||||
|
||||
<?php
|
||||
</div>
|
||||
</div>
|
||||
<div id="wrapper" class="center">
|
||||
<?php
|
||||
}else{
|
||||
global $user;
|
||||
?>
|
||||
@@ -152,12 +147,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>
|
||||
</div>
|
||||
<div class="navbar-left hidden-xs">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="<?php echo WEB_URL;?>/"><h1><?php echo _((defined('TITLE')?TITLE:"Service Status"));?></h1></a></li>
|
||||
</ul>
|
||||
<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">
|
||||
@@ -170,7 +160,7 @@ class Template{
|
||||
</div>
|
||||
</div>
|
||||
<div id="wrapper" class="center admin">
|
||||
<?php
|
||||
<?php
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,7 +177,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/contributors" 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>
|
||||
@@ -196,7 +186,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>';
|
||||
}
|
||||
@@ -220,9 +210,7 @@ class Template{
|
||||
<?php }?>
|
||||
<script src="<?php echo WEB_URL;?>/js/vendor/bootstrap.min.js"></script>
|
||||
<script src="<?php echo WEB_URL;?>/js/main.js"></script>
|
||||
<?php if ( GOOGLE_RECAPTCHA ) { ?>
|
||||
<script src='https://www.google.com/recaptcha/api.js'></script>
|
||||
<?php }?>
|
||||
<?php if ( GOOGLE_RECAPTCHA ) { ?><script src='https://www.google.com/recaptcha/api.js'></script><?php }?>
|
||||
</body>
|
||||
</html>
|
||||
<?php
|
||||
|
||||
Reference in New Issue
Block a user