Commit 787addce authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Graph tidy-up/bootstraping (BUG 1465107)"

parents ce45f3bc 354cd97d
...@@ -1068,7 +1068,7 @@ function fetch_graph_data(opts) { ...@@ -1068,7 +1068,7 @@ function fetch_graph_data(opts) {
if (!document.getElementById(opts.id + 'title')) { if (!document.getElementById(opts.id + 'title')) {
// We need to add in the title container // We need to add in the title container
var title = document.createElement('div'); var title = document.createElement('strong');
title.id = opts.id + 'title'; title.id = opts.id + 'title';
title.className = 'graphtitle'; title.className = 'graphtitle';
var canvas = document.getElementById(opts.id); var canvas = document.getElementById(opts.id);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
.graphtitle { .graphtitle {
font-weight: bold; display: block;
font-size: 13px;
} }
.graphlegend ul { .graphlegend ul {
list-style: none; list-style: none;
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
@import "../lib/star"; @import "../lib/star";
@import "../lib/tinymce"; @import "../lib/tinymce";
@import "../lib/draggable"; @import "../lib/draggable";
@import "../lib/chart"; @import "../lib/graph";
// Keep these files last to override all other style sheets // Keep these files last to override all other style sheets
@import "../custom"; @import "../custom";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
{else} {else}
{if $groupgraph} {if $groupgraph}
<div id="site-stats-graph" class="pull-right"> <div id="site-stats-graph" class="site-stats-graph panel-body pull-right">
<canvas class="graphcanvas" id="sitestatsgroupgraph" width="265" height="151"></canvas> <canvas class="graphcanvas" id="sitestatsgroupgraph"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
jQuery(function() { jQuery(function() {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</p> </p>
{/if} {/if}
{if $viewtypes} {if $viewtypes}
<div id="site-stats-graph"> <div id="site-stats-graph" class="site-stats-graph">
<canvas class="graphcanvas" id="sitestatsviewtypesgraph" width="300" height="200"></canvas> <canvas class="graphcanvas" id="sitestatsviewtypesgraph" width="300" height="200"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
......
{if $sitedata.weekly} {if $sitedata.weekly}
<div id="site-stats-graph" class="panel-body"> <div id="site-stats-graph" class="panel-body site-stats-graph">
<canvas class="graphcanvas" id="sitestatsgraph" width="265" height="151"></canvas> <canvas class="graphcanvas" id="sitestatsgraph"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
jQuery(function() { jQuery(function() {
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{/if} {/if}
<table class="table"> <table class="table">
<tr> <tr>
<th>{str tag=siteinstalled section=admin}</th> <th>{str tag=siteinstalled section=admin}</th>
<td>{$sitedata.installdate}</td> <td>{$sitedata.installdate}</td>
</tr> </tr>
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
{$sitedata.users} {$sitedata.users}
<small>{str tag=activeusers section=admin}: {$sitedata.usersloggedin}</small> <small>{str tag=activeusers section=admin}: {$sitedata.usersloggedin}</small>
</td> </td>
</tr> </tr>
{/if} {/if}
{if $sitedata.groups} {if $sitedata.groups}
<tr> <tr>
<th>{str tag=groups}</th> <th>{str tag=groups}</th>
<td>{$sitedata.groups} <td>{$sitedata.groups}
<small>{$sitedata.strgroupmemberaverage}</small> <small>{$sitedata.strgroupmemberaverage}</small>
</td> </td>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
{/if} {/if}
{if $sitedata.views} {if $sitedata.views}
<tr> <tr>
<th>{str tag=Views section=view}</th> <th>{str tag=Views section=view}</th>
<td> <td>
{$sitedata.views} {$sitedata.views}
<small>{$sitedata.strviewsperuser}</small> <small>{$sitedata.strviewsperuser}</small>
......
{if $institutiondata.weekly} {if $institutiondata.weekly}
<div id="site-stats-graph"> <div id="site-stats-graph" class="panel-body site-stats-graph">
<canvas class="graphcanvas" id="sitestatsgraph" width="265" height="151"></canvas> <canvas class="graphcanvas" id="sitestatsgraph"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
jQuery(function() { jQuery(function() {
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<li class="list-group-item">{$data.strmaxquotaused|safe}</li> <li class="list-group-item">{$data.strmaxquotaused|safe}</li>
</ul> </ul>
{if $data} {if $data}
<div id="site-stats-graph" class="pull-right"> <div id="site-stats-graph" class="panel-body site-stats-graph pull-right">
<canvas class="graphcanvas" id="sitestatsusersgraph" width="300" height="300"></canvas> <canvas class="graphcanvas" id="sitestatsusersgraph"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
jQuery(function() { jQuery(function() {
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
{if $blocktypecounts} {if $blocktypecounts}
<h4>{str tag=blockcountsbytype section=admin}: </h4> <h4>{str tag=blockcountsbytype section=admin}: </h4>
{if $viewtypes} {if $viewtypes}
<div id="site-stats-graph" class="pull-right"> <div id="site-stats-graph" class="panel-body site-stats-graph pull-right">
<canvas class="graphcanvas" id="sitestatsviewtypesgraph" width="300" height="200"></canvas> <canvas class="graphcanvas" id="sitestatsviewtypesgraph"></canvas>
<script type="application/javascript"> <script type="application/javascript">
{literal} {literal}
jQuery(function() { jQuery(function() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment