summaryrefslogtreecommitdiffstats
path: root/non-puppet/qtmetrics2
diff options
context:
space:
mode:
authorJuha Sippola <juhasippola@outlook.com>2015-09-29 14:15:13 +0300
committerTony Sarajärvi <tony.sarajarvi@theqtcompany.com>2015-09-29 11:24:11 +0000
commitd7a9cd0162b76386e9558d82855dcdd35aeec926 (patch)
treee1b63cf9d913808c3eafe615a0ea1d41508ca592 /non-puppet/qtmetrics2
parent85a83b8e06b817e6655a6ee1d5db5a65c1c8e7f1 (diff)
Qt Metrics 2: Lib structure change
Changed Bootstrap and SlimViews lib directory structure to match with that in Github (those are used as git submodules). Change-Id: I157baf4d2a3b992d6f4b35fd636ba1eec6686252 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
Diffstat (limited to 'non-puppet/qtmetrics2')
-rw-r--r--non-puppet/qtmetrics2/index.php4
-rw-r--r--non-puppet/qtmetrics2/templates/about.html4
-rw-r--r--non-puppet/qtmetrics2/templates/footer.html4
-rw-r--r--non-puppet/qtmetrics2/templates/header.html4
4 files changed, 8 insertions, 8 deletions
diff --git a/non-puppet/qtmetrics2/index.php b/non-puppet/qtmetrics2/index.php
index f570db6..0413112 100644
--- a/non-puppet/qtmetrics2/index.php
+++ b/non-puppet/qtmetrics2/index.php
@@ -34,14 +34,14 @@
/**
* Qt Metrics API
- * @since 28-09-2015
+ * @since 29-09-2015
* @author Juha Sippola
*/
require_once 'lib/Slim/Slim/Slim.php';
require_once 'lib/Slim/Slim/View.php';
require_once 'lib/Slim/Slim/Middleware.php';
-require_once 'lib/Slim/Slim/Views/Twig.php';
+require_once 'lib/SlimViews/Twig.php';
require_once 'lib/Twig/lib/Twig/Autoloader.php';
require_once 'src/Factory.php';
require_once 'src/HttpBasicAuth.php';
diff --git a/non-puppet/qtmetrics2/templates/about.html b/non-puppet/qtmetrics2/templates/about.html
index ce05cee..a4d3f45 100644
--- a/non-puppet/qtmetrics2/templates/about.html
+++ b/non-puppet/qtmetrics2/templates/about.html
@@ -34,7 +34,7 @@
/**
* About window content
- * @since 28-09-2015
+ * @since 29-09-2015
* @author Juha Sippola
*/
@@ -52,4 +52,4 @@ and the global Qt developer community are the target audience. For detailed desc
<p>See the <strong><a href="https://wiki.qt.io/Qt_Metrics_2_Backlog" target="_blank">backlog</a></strong>
for development items currently identified or in progress.</p>
-<p><small>Version 0.37 (28-Sep-2015)</small></p>
+<p><small>Version 0.38 (29-Sep-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/footer.html b/non-puppet/qtmetrics2/templates/footer.html
index d8720e6..3ae56d4 100644
--- a/non-puppet/qtmetrics2/templates/footer.html
+++ b/non-puppet/qtmetrics2/templates/footer.html
@@ -34,7 +34,7 @@
/**
* Footer section of html page including the scripts
- * @since 15-09-2015
+ * @since 29-09-2015
* @author Juha Sippola
*/
@@ -56,7 +56,7 @@
{# jQuery and Bootstrap #}
<script src="lib/jQuery/jquery-1.11.3.min.js"></script>
<script src="lib/jQuery-UI/jquery-ui.min.js"></script>
-<script src="lib/Bootstrap/js/bootstrap.min.js"></script>
+<script src="lib/Bootstrap/dist/js/bootstrap.min.js"></script>
{# IE10 viewport hack for Surface/desktop Windows 8 bug #}
<script src="scripts/ie10-viewport-bug-workaround.js"></script>
diff --git a/non-puppet/qtmetrics2/templates/header.html b/non-puppet/qtmetrics2/templates/header.html
index 79e6611..ad4663c 100644
--- a/non-puppet/qtmetrics2/templates/header.html
+++ b/non-puppet/qtmetrics2/templates/header.html
@@ -34,7 +34,7 @@
/**
* Header section of html page including the meta data and style sheets
- * @since 27-09-2015
+ * @since 29-09-2015
* @author Juha Sippola
*/
@@ -60,7 +60,7 @@
<link rel="stylesheet" href="lib/jQuery-UI-themes/themes/smoothness/jquery-ui.min.css">
{# Bootstrap core CSS #}
-<link rel="stylesheet" href="lib/Bootstrap/css/bootstrap.min.css">
+<link rel="stylesheet" href="lib/Bootstrap/dist/css/bootstrap.min.css">
{# Custom styles for the Bootstrap templates used #}
<link rel="stylesheet" href="styles/bootstrap_custom.css">