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

CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 

-implemented css changes
-formatted playlist_builder.css
This commit is contained in:
denise 2012-09-17 15:41:22 -04:00
parent 3329c36d0c
commit 43c336eb6d
3 changed files with 347 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
airtime_mvc/application/views/scripts/playlist/update.phtml
View File

@ -35,9 +35,15 @@ if ($item['type'] == 2) {
<span class="spl_cue ui-state-default"></span> <span class="spl_cue ui-state-default"></span>
<?php } else if ($item['type'] == 2) { <?php } else if ($item['type'] == 2) {
if ($staticBlock) {?> if ($staticBlock) {?>
<span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">Static Block Expand</span> <span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">
<span class="ui-icon ui-icon-triangle-2-n-s"></span>
Expand Static Block
</span>
<?php } else { ?> <?php } else { ?>
<span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">Dynamic Block</span> <span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">
<span class="ui-icon ui-icon-triangle-2-n-s"></span>
Expand Dynamic Block
</span>
<?php } <?php }
} ?> } ?>
<span class="spl_title"><?php echo $item['track_title'] ?></span> <span class="spl_title"><?php echo $item['track_title'] ?></span>
@ -79,7 +85,7 @@ if ($item['type'] == 2) {
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php if ($item['type'] == 2) {?> <?php if ($item['type'] == 2) {?>
<div id="block_<?php echo $item["id"]?>_info"></div> <ul style='display:none' id="block_<?php echo $item["id"]?>_info" class="smart-block-info"></ul>
<?php } ?> <?php } ?>
</li> </li>
<?php $i = $i+1; ?> <?php $i = $i+1; ?>

126
airtime_mvc/public/css/playlist_builder.css
View File

@ -4,23 +4,15 @@
overflow: auto; overflow: auto;
} }
#side_playlist, #side_playlist,#side_playlist ul,#side_playlist li {
#side_playlist ul,
#side_playlist li {
float: left; float: left;
} }
#spl_sortable, #spl_sortable,#spl_sortable>li,#side_playlist>div,#spl_editor,.spl_artist,.spl_cue_in,.spl_fade_in,.spl_cue_out,.spl_fade_out
#spl_sortable > li, {
#side_playlist > div,
#spl_editor,
.spl_artist,
.spl_cue_in,
.spl_fade_in,
.spl_cue_out,
.spl_fade_out {
clear: left; clear: left;
} }
#spl_sortable>li { #spl_sortable>li {
width: 100%; width: 100%;
margin-bottom: -1px; margin-bottom: -1px;
@ -29,15 +21,14 @@
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
/*#side_playlist button { /*#side_playlist button {
float: left; float: left;
font-size: 12px; font-size: 12px;
height: 28px; height: 28px;
margin: 0 7px 20px 0; margin: 0 7px 20px 0;
}*/ }*/
#side_playlist input,#side_playlist textarea {
#side_playlist input,
#side_playlist textarea {
width: 200px; width: 200px;
} }
@ -55,7 +46,8 @@
margin-bottom: 0; margin-bottom: 0;
} }
#side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active { #side_playlist li div.list-item-container,#side_playlist li div.list-item-container.ui-state-active
{
height: 56px; height: 56px;
border: none; border: none;
} }
@ -97,11 +89,13 @@
text-shadow: none; text-shadow: none;
opacity: 1; opacity: 1;
} }
.spl_block_expand:hover,.spl_block_expand.close:hover { .spl_block_expand:hover,.spl_block_expand.close:hover {
color: #FF611F; color: #FF611F;
text-shadow: none; text-shadow: none;
opacity: 1; opacity: 1;
} }
.spl_block_expand .ui-icon { .spl_block_expand .ui-icon {
float: left; float: left;
} }
@ -117,18 +111,17 @@
padding: 0 5px 0 0; padding: 0 5px 0 0;
color: #D5D5D5; color: #D5D5D5;
} }
.ui-state-active .spl_artist,.ui-state-active .spl_offset { .ui-state-active .spl_artist,.ui-state-active .spl_offset {
color: #606060 !important; color: #606060 !important;
} }
#spl_editor > div > span { #spl_editor>div>span { /* display: inline-block;
/* display: inline-block;
width: 150px;*/ width: 150px;*/
} }
.ui-icon-closethick, .ui-icon-closethick,.spl_fade_control,.spl_text_input {
.spl_fade_control,
.spl_text_input {
cursor: pointer; cursor: pointer;
} }
@ -152,6 +145,7 @@
clear: both; clear: both;
float: left; float: left;
} }
#side_playlist h4 { #side_playlist h4 {
font-size: 15px; font-size: 15px;
margin: 8px 0 10px 0; margin: 8px 0 10px 0;
@ -161,9 +155,11 @@
clear: both; clear: both;
float: left; float: left;
} }
#side_playlist h3+h4 { #side_playlist h3+h4 {
margin: 0 0 11px 0; margin: 0 0 11px 0;
} }
#spl_sortable div.big_play { #spl_sortable div.big_play {
display: block; display: block;
width: 20px; width: 20px;
@ -174,8 +170,10 @@
float: left; float: left;
background-color: #707070; background-color: #707070;
background: -moz-linear-gradient(top, #707070 0, #666666 100%); background: -moz-linear-gradient(top, #707070 0, #666666 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #707070), color-stop(100%, #666666)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #707070),
color-stop(100%, #666666) );
} }
#spl_sortable div.big_play_disabled { #spl_sortable div.big_play_disabled {
display: block; display: block;
width: 20px; width: 20px;
@ -186,34 +184,43 @@
float: left; float: left;
background-color: #707070; background-color: #707070;
background: -moz-linear-gradient(top, #707070 0, #666666 100%); background: -moz-linear-gradient(top, #707070 0, #666666 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #707070), color-stop(100%, #666666)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #707070),
color-stop(100%, #666666) );
} }
#spl_sortable div.big_play:hover { #spl_sortable div.big_play:hover {
border: 1px solid #282828; border: 1px solid #282828;
background-color: #3b3b3b; background-color: #3b3b3b;
background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b),
color-stop(100%, #292929) );
cursor: pointer; cursor: pointer;
} }
#spl_sortable div.big_play .ui-icon { #spl_sortable div.big_play .ui-icon {
margin: 17px 0 0 1px; margin: 17px 0 0 1px;
} }
#spl_sortable div.big_play_disabled .ui-icon { #spl_sortable div.big_play_disabled .ui-icon {
margin: 17px 0 0 1px; margin: 17px 0 0 1px;
} }
#spl_sortable div.big_play:hover .ui-icon-play, #spl_sortable div.big_play:hover .ui-icon-pause { #spl_sortable div.big_play:hover .ui-icon-play,#spl_sortable div.big_play:hover .ui-icon-pause
{
background-image: url(redmond/images/ui-icons_ff5d1a_256x240.png); background-image: url(redmond/images/ui-icons_ff5d1a_256x240.png);
} }
#spl_sortable .ui-icon-closethick { #spl_sortable .ui-icon-closethick {
position: absolute; position: absolute;
top: 3px; top: 3px;
right: 6px; right: 6px;
z-index: 3; z-index: 3;
} }
#spl_sortable .ui-icon-closethick:hover { #spl_sortable .ui-icon-closethick:hover {
background-image: url(redmond/images/ui-icons_ff5d1a_256x240.png) background-image: url(redmond/images/ui-icons_ff5d1a_256x240.png)
} }
#spl_sortable .spl_fade_control { #spl_sortable .spl_fade_control {
position: absolute; position: absolute;
right: 35px; right: 35px;
@ -227,6 +234,7 @@
#spl_sortable li .container { #spl_sortable li .container {
} }
#spl_sortable .text-row { #spl_sortable .text-row {
height: 20px; height: 20px;
line-height: 19px; line-height: 19px;
@ -236,31 +244,38 @@
margin: -1px 0 0 0; margin: -1px 0 0 0;
float: none; float: none;
} }
#spl_sortable .top { #spl_sortable .top {
padding-top: 9px; padding-top: 9px;
} }
#spl_sortable li .spl_fade_control.ui-state-default { #spl_sortable li .spl_fade_control.ui-state-default {
background: transparent url(images/crossfade_playlist.png) no-repeat 0 0; background: transparent url(images/crossfade_playlist.png) no-repeat 0 0;
border: none; border: none;
} }
#spl_sortable li .spl_fade_control.ui-state-active { #spl_sortable li .spl_fade_control.ui-state-active {
background: transparent url(images/crossfade_playlist.png) no-repeat 0 -30px; background: transparent url(images/crossfade_playlist.png) no-repeat 0
-30px;
border: none; border: none;
} }
#spl_sortable li .crossfade,#spl_sortable li .cue-edit { #spl_sortable li .crossfade,#spl_sortable li .cue-edit {
background: #debc9e url(images/crossfade_bg.png) repeat-x 0 0 !important; background: #debc9e url(images/crossfade_bg.png) repeat-x 0 0 !important;
border: 1px solid #5d5d5d; border: 1px solid #5d5d5d;
border-width: 1px 0 0 0; border-width: 1px 0 0 0;
min-height: 35px; min-height: 35px;
} }
#spl_sortable li .cue-edit { #spl_sortable li .cue-edit {
background:#b6d1d5 url(images/cue-editor_bg.png) repeat-x 0 0 !important; background: #b6d1d5 url(images/cue-editor_bg.png) repeat-x 0 0
!important;
} }
#spl_sortable dl.inline-list { #spl_sortable dl.inline-list {
margin: 10px 0 0 37px; margin: 10px 0 0 37px;
} }
#spl_sortable li .spl_fade_start,#spl_sortable li .spl_fade_end { #spl_sortable li .spl_fade_start,#spl_sortable li .spl_fade_end {
background-color: transparent; background-color: transparent;
float: right; float: right;
@ -270,10 +285,12 @@
width: 33px; width: 33px;
margin-top: 2px; margin-top: 2px;
} }
#spl_sortable li .spl_fade_start.ui-state-default { #spl_sortable li .spl_fade_start.ui-state-default {
background: transparent url(images/fade_in.png) no-repeat 0 0; background: transparent url(images/fade_in.png) no-repeat 0 0;
border: none; border: none;
} }
#spl_sortable li .spl_fade_start.ui-state-active { #spl_sortable li .spl_fade_start.ui-state-active {
background: transparent url(images/fade_in.png) no-repeat 0 -30px; background: transparent url(images/fade_in.png) no-repeat 0 -30px;
border: none; border: none;
@ -283,26 +300,30 @@
background: transparent url(images/fade_out.png) no-repeat 0 0; background: transparent url(images/fade_out.png) no-repeat 0 0;
border: none; border: none;
} }
#spl_sortable li .spl_fade_end.ui-state-active { #spl_sortable li .spl_fade_end.ui-state-active {
background: transparent url(images/fade_out.png) no-repeat 0 -30px; background: transparent url(images/fade_out.png) no-repeat 0 -30px;
border: none; border: none;
} }
.crossfade dl.inline-list, .cue-edit dl.inline-list, .crossfade-main dl.inline-list {
.crossfade dl.inline-list,.cue-edit dl.inline-list,.crossfade-main dl.inline-list
{
padding-bottom: 5px; padding-bottom: 5px;
clear: left; clear: left;
} }
.crossfade dl.inline-list dt, .cue-edit dl.inline-list dt, .crossfade-main dl.inline-list dt {
.crossfade dl.inline-list dt,.cue-edit dl.inline-list dt,.crossfade-main dl.inline-list dt
{
min-width: 90px; min-width: 90px;
} }
.crossfade dl.inline-list dd, .cue-edit dl.inline-list dd, .crossfade-main dl.inline-list dd {
.crossfade dl.inline-list dd,.cue-edit dl.inline-list dd,.crossfade-main dl.inline-list dd
{
float: left; float: left;
font-size: 12px; font-size: 12px;
margin: 0; margin: 0;
} }
.edit-error { .edit-error {
color: #b80000; color: #b80000;
margin: 0; margin: 0;
@ -317,6 +338,7 @@
.spl_text_input { .spl_text_input {
color: #fff; color: #fff;
} }
.crossfade-main { .crossfade-main {
background: #debc9e; background: #debc9e;
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;
@ -333,6 +355,7 @@
.crossfade-main .edit-error:last-child { .crossfade-main .edit-error:last-child {
padding-bottom: 2px; padding-bottom: 2px;
} }
.crossfade-main .ui-icon-closethick { .crossfade-main .ui-icon-closethick {
position: absolute; position: absolute;
right: 6px; right: 6px;
@ -350,34 +373,40 @@
margin-top: 2px; margin-top: 2px;
cursor: pointer; cursor: pointer;
} }
#spl_sortable li .spl_cue.ui-state-default { #spl_sortable li .spl_cue.ui-state-default {
background: transparent url(images/cue_playlist.png) no-repeat 0 0; background: transparent url(images/cue_playlist.png) no-repeat 0 0;
border: none; border: none;
} }
#spl_sortable li .spl_cue.ui-state-default:hover { #spl_sortable li .spl_cue.ui-state-default:hover {
background: transparent url(images/cue_playlist.png) no-repeat 0 -15px; background: transparent url(images/cue_playlist.png) no-repeat 0 -15px;
border: none; border: none;
} }
#spl_sortable li .spl_cue.ui-state-active, #spl_sortable li .spl_cue.ui-state-active:hover {
#spl_sortable li .spl_cue.ui-state-active,#spl_sortable li .spl_cue.ui-state-active:hover
{
background: transparent url(images/cue_playlist.png) no-repeat 0 -30px; background: transparent url(images/cue_playlist.png) no-repeat 0 -30px;
border: none; border: none;
} }
/*--/////////////// Changes 16.05.2011 ////////////--*/ /*--/////////////// Changes 16.05.2011 ////////////--*/
.playlist_title { .playlist_title {
margin: 16px 0 10px 0; margin: 16px 0 10px 0;
height: 26px; height: 26px;
clear: both; clear: both;
} }
#side_playlist .playlist_title h3,#side_playlist .playlist_title h4 { #side_playlist .playlist_title h3,#side_playlist .playlist_title h4 {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#side_playlist .playlist_title h3 { #side_playlist .playlist_title h3 {
float: left; float: left;
width: 84%; width: 84%;
} }
#side_playlist .playlist_title h4 { #side_playlist .playlist_title h4 {
float: right; float: right;
clear: none; clear: none;
@ -389,14 +418,16 @@
padding: 0 22px 0 2px; padding: 0 22px 0 2px;
background: url(images/icon_edit_l.png) no-repeat right center; background: url(images/icon_edit_l.png) no-repeat right center;
text-decoration: none; text-decoration: none;
} }
#side_playlist .playlist_title h3 a:hover { #side_playlist .playlist_title h3 a:hover {
background-color: #D8D8D8; background-color: #D8D8D8;
} }
.element_hidden { .element_hidden {
display: none; display: none;
} }
#side_playlist .playlist_title h3 input[type="text"] { #side_playlist .playlist_title h3 input[type="text"] {
background-color: #dddddd; background-color: #dddddd;
border: 1px solid #8F8F8F; border: 1px solid #8F8F8F;
@ -417,6 +448,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#side_playlist .zend_form dt,#side_playlist .zend_form dd { #side_playlist .zend_form dt,#side_playlist .zend_form dd {
display: block; display: block;
float: none; float: none;
@ -424,10 +456,12 @@
padding: 0; padding: 0;
width: 100%; width: 100%;
} }
#side_playlist .zend_form dd.buttons { #side_playlist .zend_form dd.buttons {
margin-top: 8px; margin-top: 8px;
text-align: right; text-align: right;
} }
#side_playlist .zend_form dd.buttons .ui-button { #side_playlist .zend_form dd.buttons .ui-button {
margin: 0 0 0 10px; margin: 0 0 0 10px;
} }
@ -461,26 +495,32 @@
margin: 0 0 8px 0; margin: 0 0 8px 0;
padding: 8px; padding: 8px;
} }
#side_playlist fieldset.closed .zend_form { #side_playlist fieldset.closed .zend_form {
display: none; display: none;
} }
#side_playlist fieldset.closed { #side_playlist fieldset.closed {
border-width: 1px 0 0; border-width: 1px 0 0;
margin-bottom: -6px; margin-bottom: -6px;
margin-left: 1px; margin-left: 1px;
} }
fieldset>legend { fieldset>legend {
color: #4f4f4f; color: #4f4f4f;
font-size: 12px; font-size: 12px;
line-height: 140%; line-height: 140%;
} }
.ui-widget-content fieldset legend .ui-icon { .ui-widget-content fieldset legend .ui-icon {
float: left; float: left;
background-image: url(redmond/images/ui-icons_454545_256x240.png); background-image: url(redmond/images/ui-icons_454545_256x240.png);
} }
#side_playlist .zend_form input,#side_playlist .zend_form textarea { #side_playlist .zend_form input,#side_playlist .zend_form textarea {
width: auto; width: auto;
} }
#fieldset-metadate_change { #fieldset-metadate_change {
clear: both; clear: both;
} }
@ -494,7 +534,6 @@ li.spl_empty {
} }
/*---////// SMART BLOCK /////---*/ /*---////// SMART BLOCK /////---*/
.smart-block-info { .smart-block-info {
padding: 5px 35px 10px 36px; padding: 5px 35px 10px 36px;
width: 100%; width: 100%;
@ -502,6 +541,7 @@ li.spl_empty {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.smart-block-info>li { .smart-block-info>li {
display: block; display: block;
float: none; float: none;
@ -509,19 +549,27 @@ li.spl_empty {
width: 100%; width: 100%;
font-size: 13px; font-size: 13px;
} }
.smart-block-info>li span.block-item-time { .smart-block-info>li span.block-item-time {
text-align: right; text-align: right;
float: right; float: right;
color: #D5D5D5; color: #D5D5D5;
font-size: 12px; font-size: 12px;
} }
.smart-block-info>li span.block-item-title { .smart-block-info>li span.block-item-title {
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
padding-right: 6px; padding-right: 6px;
} }
.smart-block-info>li span.block-item-author { .smart-block-info>li span.block-item-author {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
} }
.smart-block-info>li span.block-item-criteria {
font-weight: normal;
display: inline-block;
padding-right: 6px;
}

21
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -429,24 +429,33 @@ var AIRTIME = (function(AIRTIME){
if (isStatic) { if (isStatic) {
$.each(data, function(index, ele){ $.each(data, function(index, ele){
if (ele.track_title !== undefined) { if (ele.track_title !== undefined) {
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>"; $html += "<li>" +
"<span class='block-item-title'>"+ele.track_title+"</span>" +
"<span class='block-item-author'>"+ele.creator+"</span>" +
"<span class='block-item-time'>"+ele.length+"</span>" +
"</li>";
} }
}) })
} else { } else {
for (var key in data.crit){ for (var key in data.crit){
$.each(data.crit[key], function(index, ele){ $.each(data.crit[key], function(index, ele){
var extra = (ele['extra']==null)?"":ele['extra']; var extra = (ele['extra']==null)?"":"- "+ele['extra'];
$html += "<div>"+ele['display_name']+" "+ele['modifier']+" "+ele['value']+" "+extra+"</div>"; $html += "<li>" +
"<span class='block-item-title'>"+ele['display_name']+"</span>" +
"<span class='block-item-criteria'>"+ele['modifier']+"</span>" +
"<span class='block-item-criteria'>"+ele['value']+"</span>" +
"<span class='block-item-criteria'>"+extra+"</span>" +
"</li>";
}); });
} }
$html += "<div>"+data.limit.value+" "+data.limit.modifier; $html += "<li><br /><span class='block-item-title'>Limit to: "+data.limit.value+" "+data.limit.modifier+"</span></li>";
} }
$pl.find("#block_"+id+"_info").html($html); $pl.find("#block_"+id+"_info").html($html).show();
mod.enableUI(); mod.enableUI();
}); });
$(this).removeClass('close'); $(this).removeClass('close');
} else { } else {
$pl.find("#block_"+id+"_info").html(""); $pl.find("#block_"+id+"_info").html("").hide();
$(this).addClass('close'); $(this).addClass('close');
} }
}}); }});