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

SAAS-948 - ShowBuilder redesign editors and fixes

Browse source
This commit is contained in:
Duncan Sommerville 2015-07-27 15:37:55 -04:00
parent ba90b1f1eb
commit 59d89b0b9e
16 changed files with 2048 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

37
airtime_mvc/application/views/scripts/show-builder/index.phtml
View file

@ -1,8 +1,12 @@
<style>
body {
html, body {
background: #242424;
}
div.ColVis_collectionBackground {
background-color: transparent;
}
.wrapper {
position: absolute;
background: #242424;
@ -21,13 +25,26 @@
</form>
<div id="media_type_nav">
<button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
New <span class="caret"></span>
</button>
<div class="media_type_selector selected" selection_id="1">Files</div>
<div class="media_type_selector" selection_id="2">Playlists</div>
<div class="media_type_selector" selection_id="3">Smart Blocks</div>
<div class="media_type_selector" selection_id="4">Webstreams</div>
<div class="btn-group">
<button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
New <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="new-playlist">
<a href="#"><?php echo _("Playlist") ?></a>
</li>
<li id="new-smart-block">
<a href="#"><?php echo _("Smart Block") ?></a>
</li>
<li id="new-webstream">
<a href="#"><?php echo _("Webstream") ?></a>
</li>
</ul>
</div>
<div class="media_type_selector selected" selection_id="1"><?php echo _("Files") ?></div>
<div class="media_type_selector" selection_id="2"><?php echo _("Playlists") ?></div>
<div class="media_type_selector" selection_id="3"><?php echo _("Smart Blocks") ?></div>
<div class="media_type_selector" selection_id="4"><?php echo _("Webstreams") ?></div>
</div>
<div id="library_content" class="lib-content tabs lib-test">
@ -40,4 +57,8 @@
</div>
<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
<div id="side_playlist" class="pl-content media-builder-test">
</div>
<?php echo $this->dialog ?>

6
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View file

@ -22,9 +22,9 @@
</div>
<?php if (isset($this->obj)) : ?>
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>
<input id="obj_lastMod" type="hidden" value="<?php echo "1";//$this->obj->getLastModified('U'); ?>"></input>
<input id="obj_type" type="hidden" value="webstream"></input>
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"/>
<input id="obj_lastMod" type="hidden" value="<?php echo "1";//$this->obj->getLastModified('U'); ?>"/>
<input id="obj_type" type="hidden" value="webstream"/>
<div class="status" style="display:none;"></div>
<div class="playlist_title">