Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
mkonecny 2011-02-01 20:29:03 -05:00
commit 4f055788d4
14 changed files with 111 additions and 483 deletions

View file

@ -1,23 +0,0 @@
<ul>
<li><a href="#simpleSearch">Search</a></li>
<li><a href="#advancedSearch">Advanced Search</a></li>
</ul>
<div id="simpleSearch">
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
<thead>
<tr>
<th>Id</th>
<th>Title</th>
<th>Creator</th>
<th>Album</th>
<th>Track</th>
<th>Length</th>
<th>Type</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
<div id="advancedSearch">
Some Text
</div>

View file

@ -0,0 +1,23 @@
<ul>
<li><a href="#simpleSearch">Search</a></li>
<li><a href="#advancedSearch">Advanced Search</a></li>
</ul>
<div id="simpleSearch">
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
<thead>
<tr>
<th>Id</th>
<th>Title</th>
<th>Creator</th>
<th>Album</th>
<th>Track</th>
<th>Length</th>
<th>Type</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
<div id="advancedSearch">
Some Text
</div>

View file

@ -1,8 +1 @@
<div id='schedule_calendar' class="ui-widget-content block-shadow padded"></div>
<ul id="schedule_event_default_menu" class="contextMenu">
<?php echo $this->partialLoop('library/contextMenuPartial.phtml', $this->eventDefaultMenu) ?>
</ul>
<ul id="schedule_event_host_menu" class="contextMenu">
<?php echo $this->partialLoop('library/contextMenuPartial.phtml', $this->eventHostMenu) ?>
</ul>