From 6e972913cd34372ed167d22aaa6e7eccbd5dc196 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 11 Dec 2017 21:28:45 +0100
Subject: [PATCH] statistics: improve tabs
---
modules/statistics/templates/statistics.twig | 12 +++++++++++-
modules/statistics/www/javascript.js | 13 -------------
modules/statistics/www/showstats.php | 2 +-
3 files changed, 12 insertions(+), 15 deletions(-)
delete mode 100644 modules/statistics/www/javascript.js
diff --git a/modules/statistics/templates/statistics.twig b/modules/statistics/templates/statistics.twig
index 7e5d1510f..00da9ca2d 100644
--- a/modules/statistics/templates/statistics.twig
+++ b/modules/statistics/templates/statistics.twig
@@ -4,8 +4,18 @@
{% block preload %}
<link href="{{ baseurlpath }}style.css" rel="stylesheet" />
{% endblock %}
+
{% block postload %}
- <script src="{{ baseurlpath }}javascript.js"></script>
+<script type="text/javascript">
+ $(document).ready(function() {
+ $("#tabdiv").tabs();
+ $('ul.tabset_tabs li').click(
+ function() {
+ $("html, body").animate({ scrollTop: 0 }, "slow");
+ }
+ )
+ });
+</script>
{% endblock %}
{% block content %}
diff --git a/modules/statistics/www/javascript.js b/modules/statistics/www/javascript.js
deleted file mode 100644
index 77ef1b1a5..000000000
--- a/modules/statistics/www/javascript.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(document).ready(function() {
- $('ul.tabset_tabs li').click(
- function() {
- var tab_id = $(this).attr('data-tab');
- $('ul.tabset_tabs li').removeClass('current');
- $('.tabset_content').removeClass('current');
-
- $(this).addClass('current');
- $("#"+tab_id).addClass('current');
- $("html, body").animate({ scrollTop: 0 }, "slow");
- }
- )
-})
diff --git a/modules/statistics/www/showstats.php b/modules/statistics/www/showstats.php
index 1828a1072..559d35afb 100644
--- a/modules/statistics/www/showstats.php
+++ b/modules/statistics/www/showstats.php
@@ -130,7 +130,7 @@ $t->data['post_time'] = getBaseURL($t, 'post', 'time');
$t->data['get_times_prev'] = getBaseURL($t, 'get', 'time', $t->data['available_times_prev']);
$t->data['get_times_next'] = getBaseURL($t, 'get', 'time', $t->data['available_times_next']);
-//$t->data['jquery'] = array('ui' => true, 'core' => true);
+$t->data['jquery'] = array('core' => false, 'ui' => true, 'css' => true);
$t->show();
--
GitLab