Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

Browse source 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
This commit is contained in:
Albert Santoni 2014-03-27 16:38:03 -04:00
commit 1c5e2d6205
59 changed files with 1851 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/application/views/scripts/plupload/index.phtml
View file

@ -9,3 +9,19 @@
<div id="plupload_error">
<table></table>
</div>
<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow alpha-block">
<div id="recent_uploads" class="padded">
<div id="recent_uploads_filter">
<form>
<input type="radio" name="upload_status" id="upload_status_all" checked></input><label for="upload_status_all">All</label>
<input type="radio" name="upload_status" id="upload_status_failed"></input><label for="upload_status_failed">Failed</label>
<input type="radio" name="upload_status" id="upload_status_pending"></input><label for="upload_status_pending">Pending</label>
</form>
</div>
<H2>Recent Uploads</H2>
<table id="recent_uploads_table" class="lib-content ui-widget ui-widget-content block-shadow alpha-block "></table>
</div>
<div style="clear: both;"></div>
</div>