ShaYmez/FreeSTAR-Status-Engine
1
0
Fork 0
mirror of https://github.com/ShaYmez/FreeSTAR-Status-Engine.git synced 2025-02-03 09:44:13 -05:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Vojtěch Sajdl 2017-12-12 14:17:10 +01:00
parent 3e973ad9de
commit f2600d0c56
No known key found for this signature in database
GPG Key ID: 5D4EB1361A272390
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/dashboard.php
View File

@ -73,7 +73,7 @@ render_header("Dashboard", true);
<div class="panel-body"> <div class="panel-body">
<textarea name="text" placeholder="Here goes your text..." required><?php echo htmlspecialchars($_POST['text']); ?></textarea> <textarea name="text" placeholder="Here goes your text..." required><?php echo htmlspecialchars($_POST['text']); ?></textarea>
</div> </div>
<div class="panel-footer"> <div class="panel-footer clearfix">
<small>Posted by: <?php echo $user->get_username();?> <span class="pull-right" id="end_time_wrapper">Ending:&nbsp;<input id="end_time" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="end_time" class="pull-right" placeholder="End time" value="<?php echo htmlspecialchars($_POST['end_time']); ?>"></span></small> <small>Posted by: <?php echo $user->get_username();?> <span class="pull-right" id="end_time_wrapper">Ending:&nbsp;<input id="end_time" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="end_time" class="pull-right" placeholder="End time" value="<?php echo htmlspecialchars($_POST['end_time']); ?>"></span></small>
</div> </div>
</article> </article>

2
classes/incident.php
View File

@ -139,7 +139,7 @@ class Incident
<div class="panel-body"> <div class="panel-body">
<?php echo $this->text; ?> <?php echo $this->text; ?>
</div> </div>
<div class="panel-footer"> <div class="panel-footer clearfix">
<small>Posted by: <?php echo $this->username; <small>Posted by: <?php echo $this->username;
if (isset($this->end_date)){?> if (isset($this->end_date)){?>
<span class="pull-right"><?php echo strtotime($this->end_date)>time()?"Ending:":"Ended:";?>&nbsp;<time class="pull-right timeago" datetime="<?php echo $this->end_date; ?>"><?php echo $this->end_date; ?></time></span> <span class="pull-right"><?php echo strtotime($this->end_date)>time()?"Ending:":"Ended:";?>&nbsp;<time class="pull-right timeago" datetime="<?php echo $this->end_date; ?>"><?php echo $this->end_date; ?></time></span>

15
css/main.css
View File

@ -54,7 +54,10 @@ a:focus {
color: #ffffff; color: #ffffff;
background-color: transparent; background-color: transparent;
} }
.navbar-collapse
{
background: #2f60a3;
}
.navbar-default { .navbar-default {
z-index: 200; z-index: 200;
background-color: #2f60a3; background-color: #2f60a3;
@ -113,8 +116,9 @@ div.center {
.service{ .service{
float: left; float: left;
width:70%; box-sizing: border-box;
min-width: 250px; width:60%;
min-width: 200px;
padding: 15px 35px; padding: 15px 35px;
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
@ -129,8 +133,9 @@ a h1{
.status{ .status{
float: left; float: left;
width:30%; box-sizing: border-box;
min-width: 100px; width:40%;
min-width: 150px;
padding: 15px 35px; padding: 15px 35px;
text-align: right; text-align: right;
font-size: 14px; font-size: 14px;

4
js/main.js
View File

@ -9,6 +9,10 @@ function timeago()
(function(){ (function(){
timeago(); timeago();
$("body").on("click", ".navbar-toggle", function(){
$($(this).data("target")).toggleClass("collapse");
});
var incidents = $('.timeline'); var incidents = $('.timeline');
$("body").on("click", "#loadmore", function(e){ $("body").on("click", "#loadmore", function(e){