Changes in captions.

Author: tauceti2

www/graphs.php

@@ -6,7 +6,7 @@
  */
 
 ?>
-<h2>All logins</h2>
+<h2>Number of logins</h2>
 <div>
     <script type="text/javascript">
         google.charts.load('current', {'packages':['corechart', 'controls']});
@@ -33,7 +33,7 @@ function drawChart() {
                 'chartType' : 'LineChart',
                 'containerId' : 'line_div',
                 'options':{
-                    'title' :'Login count per Day',
+                    'title' :'Number of logins per day',
                     'legend' : 'none'
                 }
             });
@@ -51,7 +51,7 @@ function drawChart() {
 
 </div>
 
-<h2>Logins per IdP</h2>
+<h2>Identity providers</h2>
 <div>
     <script type="text/javascript">
         google.charts.load('current', {'packages':['corechart']});
@@ -65,7 +65,8 @@ function drawChart() {
             ]);
 
             var options = {
-                title: 'Login per IdP'
+                title: 'Overall logins per identity provider',
+		pieSliceText: 'value'
             };
 
             var chart = new google.visualization.PieChart(document.getElementById('piechart'));
@@ -77,7 +78,7 @@ function drawChart() {
     <div id="piechart" style="width: 900px; height: 500px;"></div>
 </div>
 
-<h2>Access to the services</h2>
+<h2>Service providers</h2>
 <div>
     <script type="text/javascript">
         google.charts.load('current', {'packages':['corechart']});
@@ -91,7 +92,8 @@ function drawChart() {
             ]);
 
             var options = {
-                title: 'Access to services'
+                title: 'Overall logins to service providers',
+		pieSliceText: 'value'
             };
 
             var chart = new google.visualization.PieChart(document.getElementById('piechart2'));

www/summary.php

@@ -17,10 +17,10 @@ function drawTable() {
             data.addColumn('string', 'Name');
             data.addColumn('number', 'Count');
             data.addRows([
-                ['Total number of logins ', <?php DatabaseCommand::getCountOfAllLogins()?> ],
-                ['Number of logins for today’', <?php DatabaseCommand::getCountOfAllLoginsForToday()?>],
-                ['Number of accessed Services', <?php DatabaseCommand::getCountOfAccesedServices()?>],
-                ['Number of used Idp', <?php DatabaseCommand::getCountOfUsedIdp()?>]
+                ['Overall number of logins', <?php DatabaseCommand::getCountOfAllLogins()?> ],
+                ['Total number of accessed service providers', <?php DatabaseCommand::getCountOfAccesedServices()?>],
+                ['Total number of used identity providers', <?php DatabaseCommand::getCountOfUsedIdp()?>],
+                ['Number of logins for today', <?php DatabaseCommand::getCountOfAllLoginsForToday()?>]
                 ]);
 
             var table = new google.visualization.Table(document.getElementById('summaryTable'));

www/tables.php

@@ -5,7 +5,7 @@
  */
 ?>
 <link rel="stylesheet"  media="screen" type="text/css" href="<?php SimpleSAML_Module::getModuleUrl('proxystatistics/statisticsproxy.css')?>" />
-<h2>All login</h2>
+<h2>Number of logins per month</h2>
 <div id="tableOfAllLogin">
     <script type="text/javascript">
         google.charts.load('current', {'packages':['table']});
@@ -31,16 +31,16 @@ function drawTable() {
 
 
 
-<h2>All login per IdP</h2>
+<h2>Overall logins per identity provider</h2>
 <div>
     <script type="text/javascript">
         google.charts.load('current', {'packages':['table']});
         google.charts.setOnLoadCallback(drawTable);
 
         function drawTable() {
             var data = new google.visualization.DataTable();
-            data.addColumn('date', 'Date');
-            data.addColumn('string', 'SourceIdp');
+            data.addColumn('date', 'Month');
+            data.addColumn('string', 'Identity provider');
             data.addColumn('number', 'Count');
             data.addRows([<?php DatabaseCommand::getLoginCountPerDeyPerService()?>]);
 
@@ -56,16 +56,16 @@ function drawTable() {
     <div id="tablePerIdP"></div>
 </div>
 
-<h2> All access to the services</h2>
+<h2>Overall logins to service providers</h2>
 <div>
     <script type="text/javascript">
         google.charts.load('current', {'packages':['table']});
         google.charts.setOnLoadCallback(drawTable);
 
         function drawTable() {
             var data = new google.visualization.DataTable();
-            data.addColumn('date', 'Date');
-            data.addColumn('string', 'Service');
+            data.addColumn('date', 'Month');
+            data.addColumn('string', 'Service provider');
             data.addColumn('number', 'Count');
             data.addRows([<?php DatabaseCommand::getAccessToServicesPerMonth()?>]);