Commit 354cd97d authored by Naomi Guyer's avatar Naomi Guyer Committed by Robert Lyon

Graph tidy-up/bootstraping (BUG 1465107)

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