Merge branch 'cc-4661-listener-statistics' into devel

Conflicts:
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2012-11-07 17:20:12 -05:00
commit 7300b608cf
52 changed files with 22519 additions and 14 deletions

View file

@ -0,0 +1,7 @@
<div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
Listener Count Over Time<br>
<div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div>
<div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div>
<?php echo $this->date_form; ?>
</div>