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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

This commit is contained in:
Rudi Grinberg 2012-10-10 10:50:56 -04:00
parent 0fac533036 fa8c561dab
commit 4b110ccf7c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
View File

@ -37,8 +37,8 @@
<?php if ($this->type == "playlist") { ?>
<div class='file-md-qtip-legend'>
<span class='webstream'>o</span> <span>Web Stream</span><br />
<span class='dynamic'>o</span> <span>Dynamic Playlist</span><br />
<span class='static'>o</span> <span>Static Playlist</span><br />
<span class='dynamic'>o</span> <span>Dynamic Smart Block</span><br />
<span class='static'>o</span> <span>Static Smart Block</span><br />
<span>o</span> <span>Audio Track</span>
</div>
<?php } ?>
@ -47,7 +47,7 @@
<?php if ($this->type == "playlist") { ?>
<div class='file-md-qtip-left'><span>Playlist Contents: </span></div>
<?php } else { ?>
<div class='file-md-qtip-left'><span>Static Playlist Contents: </span></div>
<div class='file-md-qtip-left'><span>Static Smart Block Contents: </span></div>
<?php } ?>
<table class='library-get-file-md'>
<?php foreach($this->contents as $row) : ?>
@ -86,7 +86,7 @@
</table>
<?php } elseif ($this->blType == "Dynamic") { ?>
<div class='file-md-qtip-left'><span>Dynamic Playlist Criteria: </span></div>
<div class='file-md-qtip-left'><span>Dynamic Smart Block Criteria: </span></div>
<table class='library-get-file-md table-small'>
<?php foreach ($this->contents["crit"] as $criterias) : ?>
<?php foreach ($criterias as $crit ) : ?>

2
airtime_mvc/public/css/styles.css
View File

@ -493,7 +493,7 @@ table.library-get-file-md.table-small{
.file-md-qtip-legend {
float: right;
width: 30%;
width: 34%;
font-size: 9px;
padding: 0px;
vertical-align:top;