Merge pull request #63 from melanger/chartjsFromComposer

Chartjs from composer

Author: vyskocilpavel

CHANGELOG.md

@@ -35,6 +35,7 @@ All notable changes to this project will be documented in this file.
 - Added modes into PerunAttribute process filter
     - MODE_FULL - Rewrite all attributes specified in config
     - MODE_PARTIAL - Rewrite only unset attributes
+- Chart.bundle.js is now loaded from SSP module instead of directly from internet
 
 #### Fixed
 - Fixed the problem that IDP filter on WAYF didn't work correctly

composer.json

@@ -23,6 +23,7 @@
         "simplesamlphp/simplesamlphp": "~1.17",
         "simplesamlphp/composer-module-installer": "~1.0",
         "cesnet/simplesamlphp-module-perunauthorize": "~2.0",
+        "cesnet/simplesamlphp-module-chartjs": "~2.8.0",
         "ext-curl": "*",
         "ext-json": "*"
     }

templates/listOfSps-tpl.php

@@ -212,6 +212,6 @@ function getClass($attribute)
 
 ?>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.3/Chart.bundle.js"></script>
+<script src="<?php echo htmlspecialchars(\SimpleSAML\Module::getModuleURL('chartjs/Chart.bundle.min.js'));?>"></script>
 
 <script src="<?php echo htmlspecialchars(\SimpleSAML\Module::getModuleURL('perun/listOfSps.js'));?>"></script>

www/res/css/listOfSps.css

@@ -75,3 +75,24 @@ h3 {
         word-wrap: break-word;
     }
 }
+
+.row, .col-md-6 {
+    box-sizing: border-box;
+}
+.row {
+    margin-left: -15px;
+    margin-right: -15px;
+}
+.col-md-6 {
+    position: relative;
+    min-height: 1px;
+    padding-left: 15px;
+    padding-right: 15px;
+
+}
+@media (min-width: 992px) {
+    .col-md-6 {
+        width: 50%;
+        float: left;
+    }
+}