vladimir's changes on the playlist builder screen so far. need some changes to cue/fade editor and css for datatables

This commit is contained in:
Naomi 2011-01-26 18:31:59 -05:00
parent de3c95bd36
commit 293575a457
62 changed files with 3076 additions and 3371 deletions

View file

@ -1,17 +1,23 @@
<div>
<table id="library_display">
<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>
<ul>
<li><a href="#simpleSearch">Search</a></li>
<li><a href="#advancedSearch">Advanced Search</a></li>
</ul>
<div id="simpleSearch">
<table id="library_display">
<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,56 +0,0 @@
<div class="paginationControl">
<p>
<?php if ($this->pageCount): ?>
<?php echo $this->firstItemNumber; ?> - <?php echo $this->lastItemNumber; ?>
of <?php echo $this->totalItemCount; ?>
</p>
<p>
<!-- First page link -->
<?php if (isset($this->previous)): ?>
<a href="<?php echo $this->url(array('page' => $this->first)); ?>">
First
</a> |
<?php else: ?>
<span class="disabled">First</span> |
<?php endif; ?>
<!-- Previous page link -->
<?php if (isset($this->previous)): ?>
<a href="<?php echo $this->url(array('page' => $this->previous)); ?>">
&lt; Previous
</a> |
<?php else: ?>
<span class="disabled">&lt; Previous</span> |
<?php endif; ?>
<!-- current pages links -->
<?php foreach ($this->pagesInRange as $page): ?>
<?php if ($this->current != $page): ?>
<a href="<?php echo $this->url(array('page' => $page));?>"><?php echo $page; ?></a>
<?php else: ?>
<?php echo $page; ?>
<?php endif; ?>
<?php endforeach; ?>
<!-- Next page link -->
<?php if (isset($this->next)): ?>
<a href="<?php echo $this->url(array('page' => $this->next)); ?>">
Next &gt;
</a> |
<?php else: ?>
<span class="disabled">Next &gt;</span> |
<?php endif; ?>
<!-- Last page link -->
<?php if (isset($this->next)): ?>
<a href="<?php echo $this->url(array('page' => $this->last)); ?>">
Last
</a>
<?php else: ?>
<span class="disabled">Last</span>
<?php endif; ?>
<?php endif; ?>
</p>
</div>

View file

@ -0,0 +1,22 @@
<ul id="nav">
<?php foreach ($this->container as $page) : ?>
<li class="top">
<?php if($page->hasPages()) : ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span class="down"><?php echo $page->getLabel(); ?></span>
</a>
<ul class="sub">
<?php foreach ($page->getPages() as $sub) : ?>
<li>
<a href="<?php echo $sub->getHref(); ?>"><?php echo $sub->getLabel(); ?></a>
</li>
<?php endforeach; ?>
</ul>
<?php else: ?>
<a class="top_link" href="<?php echo $page->getHref(); ?>">
<span><?php echo $page->getLabel(); ?></span>
</a>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>

View file

@ -1,21 +1,24 @@
<button id="spl_new">New</button>
<button id="spl_new" class="ui-button" role="button" aria-disabled="false">New</button>
<?php if (isset($this->pl)) : ?>
<button id="spl_delete">Delete</button>
<button id="spl_close">Done Editing</button>
<button id="spl_delete" class="ui-button" role="button" aria-disabled="false">Delete</button>
<button id="spl_close" class="ui-button right-floated" role="button" aria-disabled="false">Done Editing</button>
<?php endif; ?>
<?php if (isset($this->pl)) : ?>
<div id="spl_name"><?php echo $this->pl->getName(); ?></div>
<div id="spl_length"><?php echo $this->pl->getLength(); ?></div>
<h3 id="spl_name"><?php echo $this->pl->getName(); ?></h3>
<h4 id="spl_length"><?php echo $this->pl->getLength(); ?></h4>
<div class="clear"></div>
<div class="" style="clear:both; float:none; width:100%;">
<ul id="spl_sortable">
<?php if (count($this->pl->getContents())) : ?>
<?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
<?php else : ?>
<li class="spl_empty">Empty playlist</li>
<?php endif; ?>
</ul>
</div>
<ul id="spl_sortable">
<?php if (count($this->pl->getContents())) : ?>
<?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
<?php else : ?>
<li class="spl_empty">Empty playlist</li>
<?php endif; ?>
</ul>
<div id="spl_editor"></div>
<div id="spl_error" class="ui-state-error ui-corner-all" style="display: none"></div>
<?php else : ?>
<div>No open playlist</div>

View file

@ -1,31 +0,0 @@
<?php // playlistEditorTable.phtml ?>
<li class="pl_row" id="pl_<?php echo $this->partialCounter-1 ?>">
<div class="pl_fade_in">
<span>Fade in: </span><span class="pl_time"><?php echo $this->fadein ?></span>
</div>
<span class="pl_input">
<input type="checkbox" class="checkbox" name="<?php echo $this->partialCounter-1 ?>"/>
</span>
<span class="pl_title">
<?php echo $this->CcFiles['track_title'] ?>
</span>
<span class="pl_artist">
<?php echo $this->CcFiles['artist_name'] ?>
</span>
<span class="pl_length" >
<?php echo $this->CcFiles['length'] ?>
</span>
<span class="pl_cue_in pl_time">
<?php echo $this->cuein ?>
</span>
<span class="pl_cue_out pl_time">
<?php echo $this->cueout ?>
</span>
<span class="pl_playlength">
<?php echo $this->cliplength ?>
</span>
<div class="pl_fade_out">
<span>Fade out: </span><span class="pl_time"><?php echo $this->fadeout ?></span>
</div>
</li>

View file

@ -1,8 +1,6 @@
<div id="spl_cue_in_<?php echo $this->pos; ?>" class="spl_cue_in">
<span>Cue In:</span>
<span class="spl_text_input" contenteditable="true"><?php echo $this->cueIn; ?></span>
</div>
<div id="spl_cue_out_<?php echo $this->pos; ?>" class="spl_cue_out">
<span>Cue Out:</span>
<span class="spl_text_input" contenteditable="true"><?php echo $this->cueOut; ?></span>
</div>
<dl id="spl_cue_editor" class="inline-list">
<dt>Cue In:</dt>
<dd id="spl_cue_in_<?php echo $this->pos; ?>"><span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span></dd>
<dt>Cue Out:</dt>
<dd id="spl_cue_out_<?php echo $this->pos; ?>"><span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span></dd>
</dl>

View file

@ -1,8 +1,6 @@
<div id="spl_fade_out_<?php echo $this->pos; ?>" class="spl_fade_out">
<span>Fade Out:</span>
<span class="spl_text_input" contenteditable="true"><?php echo $this->fadeOut; ?></span>
</div>
<div id="spl_fade_in_<?php echo $this->pos; ?>" class="spl_fade_in">
<span>Fade In:</span>
<span class="spl_text_input" contenteditable="true"><?php echo $this->fadeIn; ?></span>
</div>
<dl id="spl_editor" class="inline-list">
<dt>Fade out:</dt>
<dd id="spl_fade_out_<?php echo $this->pos -1; ?>"><span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span></dd>
<dt>Fade in:</dt>
<dd id="spl_fade_in_<?php echo $this->pos; ?>"><span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span></dd>
</dl>

View file

@ -1,14 +1,21 @@
<?php if($this->partialCounter-1 > 0): ?>
<li id="crossfade_<?php echo $this->partialCounter-2 ?>-<?php echo $this->partialCounter-1 ?>" class="crossfade" style="display: none"></li>
<?php endif; ?>
<li class="ui-state-default" id="spl_<?php echo $this->partialCounter-1 ?>">
<div>
<span class="ui-icon ui-icon-play"></span>
</div>
<div>
<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
<a href="#" class="big_play"><span class="ui-icon ui-icon-play"></span></a>
<div class="text-row top">
<span class="spl_playlength"><?php echo $this->cliplength ?></span>
<span class="ui-icon ui-icon-close"></span>
<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
</div>
<div class="text-row">
<span class="spl_artist"><?php echo $this->CcFiles['artist_name'] ?></span>
<?php if($this->partialCounter-1 > 0): ?>
<div id="fade_<?php echo $this->partialCounter-1 ?>" class="spl_fade_control ui-state-default ui-corner-all">Fade</div>
<?php endif; ?>
<div>
</div>
<?php if($this->partialCounter-1 > 0): ?>
<div id="fade_<?php echo $this->partialCounter-1 ?>" class="spl_fade_control ui-state-default"></div>
<?php endif; ?>
<span class="ui-icon ui-icon-closethick"></span>
</li>
<li id="cues_<?php echo $this->partialCounter-1 ?>" class="crossfade" style="display: none"></li>