mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-09-07 12:28:25 +02:00
Fixed server calendar needing scrollbar
This commit is contained in:
parent
dd6f2a1e30
commit
46a74d2297
@ -146,8 +146,8 @@ function onlineActivityCalendar(id, events, firstDay) {
|
|||||||
|
|
||||||
events: events,
|
events: events,
|
||||||
|
|
||||||
height: 490,
|
height: 800,
|
||||||
contentHeight: 485,
|
contentHeight: 795,
|
||||||
header: {
|
header: {
|
||||||
left: 'title',
|
left: 'title',
|
||||||
center: '',
|
center: '',
|
||||||
|
@ -352,13 +352,13 @@
|
|||||||
<div aria-labelledby="online-calendar-tab" class="tab-pane fade" id="calendar-tab"
|
<div aria-labelledby="online-calendar-tab" class="tab-pane fade" id="calendar-tab"
|
||||||
role="tabpanel">
|
role="tabpanel">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-2 col-sm" style="height: 0;"></div>
|
<div class="col-lg-1 col-sm" style="height: 0;"></div>
|
||||||
<div class="col-lg-8 col-sm-12" style="height: 550px;">
|
<div class="col-lg-10 col-sm-12" style="height: 850px;">
|
||||||
<div class="chart-area" id="calendar">
|
<div class="chart-area" id="calendar">
|
||||||
<span class="loader"></span>
|
<span class="loader"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-2 col-sm" style="height: 0;"></div>
|
<div class="col-lg-1 col-sm" style="height: 0;"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div aria-labelledby="online-punchcard-tab" class="tab-pane fade" id="punchcard-tab"
|
<div aria-labelledby="online-punchcard-tab" class="tab-pane fade" id="punchcard-tab"
|
||||||
@ -1555,14 +1555,11 @@
|
|||||||
|
|
||||||
jsonRequest("../v1/graph?type=serverCalendar&server=${serverName}", function (json, error) {
|
jsonRequest("../v1/graph?type=serverCalendar&server=${serverName}", function (json, error) {
|
||||||
if (json) {
|
if (json) {
|
||||||
var clicked = false;
|
|
||||||
$('#online-calendar-tab').click(function () {
|
|
||||||
if (!clicked) {
|
|
||||||
onlineActivityCalendar('#calendar', json.data, json.firstDay);
|
|
||||||
clicked = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
$('#calendar').text('');
|
$('#calendar').text('');
|
||||||
|
onlineActivityCalendar('#calendar', json.data, json.firstDay);
|
||||||
|
$('#online-calendar-tab').click(function () {
|
||||||
|
$('#calendar').fullCalendar('render');
|
||||||
|
});
|
||||||
} else if (error) {
|
} else if (error) {
|
||||||
$('#calendar').text("Failed to load calendar data: " + error)
|
$('#calendar').text("Failed to load calendar data: " + error)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user