Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds tooltip to make people aware of API JSON format #129

Merged
merged 2 commits into from
Oct 26, 2018
Merged

Adds tooltip to make people aware of API JSON format #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c568d
Add a simple tooltip to make people aware of the JSON format
patschi Sep 4, 2018
c097275
Just a very simple variable naming fix that was bugging me
patschi Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
swapUsageLine,
cpuLoadChart,
cpuLoadLine,
activeusersChart,
activeUsersChart,
sharesChart;

$(document).ready(function () {
Expand All @@ -41,6 +41,7 @@
setHumanReadableSizeToElement("phpUploadMaxSize");
setHumanReadableSizeToElement("systemDiskFreeSpace");

$('#ocsEndPoint span.icon-info').tooltip({placement: 'top'});
initMonitoringLinkToClipboard();
$("#monitoring-endpoint-url").on('click', function() {
$(this).select();
Expand Down Expand Up @@ -198,10 +199,10 @@
stepSize = 1;
}

if (typeof activeusersChart === 'undefined') {
if (typeof activeUsersChart === 'undefined') {
var ctx = document.getElementById("activeuserscanvas");

activeusersChart = new Chart(ctx, {
activeUsersChart = new Chart(ctx, {
type: 'line',
data: {
labels: [
Expand Down
3 changes: 2 additions & 1 deletion templates/settings-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,6 @@
<div>
<input type="text" readonly="readonly" id="monitoring-endpoint-url" value="<?php echo p($_['ocs']); ?>" />
<a class="clipboardButton icon icon-clippy" data-clipboard-target="#monitoring-endpoint-url"></a>
</div>
<span class="icon-info svg" title="" data-original-title="<?php p($l->t('Did you know?')); ?> <?php p($l->t('Appending "?format=json" at the end of the URL gives you the result in JSON format!')); ?>"></span>
</div>
</div>