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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-08-09 11:44:43 -04:00
parent 685354e000 bad418062e
commit 825abca61b
2 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,19 +23,31 @@
<?php endif; ?> <?php endif; ?>
<?php if($this->type == "playlist" || $this->type == "block") : ?> <?php if($this->type == "playlist" || $this->type == "block") : ?>
<div><span>Name:</span><span><?php echo ($this->md["dc:title"]);?></span></div> <div class='file-md-qtip-left'>
<div><span>Creator:</span><span><?php echo ($this->md["dc:creator"]);?></span></div> <span>Name:</span><span><?php echo ($this->md["dc:title"]);?></span><br />
<?php if ($this->type == "block" && $this->blType == "Dynamic") { ?> <span>Creator:</span><span><?php echo ($this->md["dc:creator"]);?></span><br />
<div><span>Length:</span><span><?php echo $this->block->getFormattedLength();?></span></div> <?php if ($this->type == "block" && $this->blType == "Dynamic") { ?>
<?php } else { ?> <span>Length:</span><span><?php echo $this->block->getFormattedLength();?></span><br />
<div><span>Length:</span><span><?php echo ($this->md["dcterms:extent"]);?></span></div> <?php } else { ?>
<span>Length:</span><span><?php echo ($this->md["dcterms:extent"]);?></span><br />
<?php } ?>
<span>Description:</span><span><?php echo ($this->md["dc:description"]);?></span>
</div>
<?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>o</span> <span>Audio Track</span>
</div>
<?php } ?> <?php } ?>
<div><span>Description:</span><span><?php echo ($this->md["dc:description"]);?></span></div>
<?php if ($this->type == "playlist" || ($this->type == "block" && $this->blType == "Static")) {?> <?php if ($this->type == "playlist" || ($this->type == "block" && $this->blType == "Static")) {?>
<?php if ($this->type == "playlist") { ?> <?php if ($this->type == "playlist") { ?>
<div><span>Playlist Contents: </span></div> <div class='file-md-qtip-left'><span>Playlist Contents: </span></div>
<?php } else { ?> <?php } else { ?>
<div><span>Static Playlist Contents: </span></div> <div class='file-md-qtip-left'><span>Static Playlist Contents: </span></div>
<?php } ?> <?php } ?>
<table class='library-get-file-md'> <table class='library-get-file-md'>
<?php foreach($this->contents as $row) : ?> <?php foreach($this->contents as $row) : ?>
@ -52,14 +64,17 @@
<?php if ($row["type"] == 2) { <?php if ($row["type"] == 2) {
$bl = new Application_Model_Block($row["item_id"]); $bl = new Application_Model_Block($row["item_id"]);
$isStatic = $bl->isStatic(); ?> $isStatic = $bl->isStatic(); ?>
<tr class='file-md-qtip-playlist <?php if ($isStatic) echo 'static'; else echo 'dynamic';?>'>
<td colspan="3"><?php if ($isStatic) echo 'Static Playlist'; else echo 'Dynamic Playlist';?></td>
</tr>
<tr class='file-md-qtip-playlist <?php if ($isStatic) echo 'static'; else echo 'dynamic';?>'> <tr class='file-md-qtip-playlist <?php if ($isStatic) echo 'static'; else echo 'dynamic';?>'>
<td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td> <td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td>
<td class='file-md-qtip-row-width-artist file-md-qtip-nowrap'><?php echo $row["creator"] ?></td> <td class='file-md-qtip-row-width-artist file-md-qtip-nowrap'><?php echo $row["creator"] ?></td>
<td class='file-md-qtip-row-width-small'><?php echo $bl->getFormattedLength(); ?></td> <td class='file-md-qtip-row-width-small'><?php echo $bl->getFormattedLength(); ?></td>
</tr> </tr>
<?php } else if ($row["type"] == 1) {?>
<tr class='file-md-qtip-playlist webstream'>
<td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td>
<td class='file-md-qtip-row-width-artist file-md-qtip-nowrap'><?php echo $row["creator"] ?></td>
<td class='file-md-qtip-row-width-small'><?php echo $row["length"] ?></td>
</tr>
<?php } else { ?> <?php } else { ?>
<tr> <tr>
<td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td> <td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td>
@ -71,7 +86,7 @@
</table> </table>
<?php } elseif ($this->blType == "Dynamic") { ?> <?php } elseif ($this->blType == "Dynamic") { ?>
<div><span>Dynamic Playlist Criteria: </span></div> <div class='file-md-qtip-left'><span>Dynamic Playlist Criteria: </span></div>
<table class='library-get-file-md table-small'> <table class='library-get-file-md table-small'>
<?php foreach ($this->contents["crit"] as $criterias) : ?> <?php foreach ($this->contents["crit"] as $criterias) : ?>
<?php foreach ($criterias as $crit ) : ?> <?php foreach ($criterias as $crit ) : ?>
@ -84,13 +99,14 @@
if (strlen($crit["display_name"]) > $critMaxStrLen) { if (strlen($crit["display_name"]) > $critMaxStrLen) {
$crit["display_name"] = substr($crit["display_name"], 0, 12)."..."; $crit["display_name"] = substr($crit["display_name"], 0, 12)."...";
} }
if (strlen($crit["modifier"]) > $critMaxStrLen) { $modMaxStrLen = 16;
$crit["modifier"] = substr($crit["modifier"], 0, 12)."..."; if (strlen($crit["modifier"]) > $modMaxStrLen) {
$crit["modifier"] = substr($crit["modifier"], 0, 15)."...";
} }
?> ?>
<tr> <tr>
<td class='file-md-qtip-criteria-width-crit file-md-qtip-nowrap'><?php echo $crit["display_name"] ?></td> <td class='file-md-qtip-criteria-width-small file-md-qtip-nowrap'><?php echo $crit["display_name"] ?></td>
<td class='file-md-qtip-criteria-width-mod file-md-qtip-nowrap'><?php echo $crit["modifier"] ?></td> <td class='file-md-qtip-criteria-width-small file-md-qtip-nowrap'><?php echo $crit["modifier"] ?></td>
<td class='file-md-qtip-criteria-width file-md-qtip-nowrap'><?php echo $crit["value"] ?> <td class='file-md-qtip-criteria-width file-md-qtip-nowrap'><?php echo $crit["value"] ?>
<?php if (isset($crit["extra"])) { ?> <?php if (isset($crit["extra"])) { ?>
to <?php echo $crit["extra"] ?></td> to <?php echo $crit["extra"] ?></td>

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

@ -446,11 +446,7 @@ table.library-get-file-md.table-small{
white-space: nowrap; white-space: nowrap;
} }
.file-md-qtip-criteria-width-crit{ .file-md-qtip-criteria-width-small{
width:70px;
}
.file-md-qtip-criteria-width-mod{
width:70px; width:70px;
} }
@ -477,13 +473,29 @@ table.library-get-file-md.table-small{
font-style: italic; font-style: italic;
} }
.file-md-qtip-playlist.dynamic td{ .file-md-qtip-left{
color: #63a2f0; float: left;
width: 60%;
} }
.file-md-qtip-playlist.static td{ .file-md-qtip-legend {
float: right;
width: 30%;
font-size: 9px;
padding: 0px;
vertical-align:top;
line-height: 13px;
}
.static {
color: #f09839; color: #f09839;
} }
.dynamic {
color: #63a2f0;
}
.webstream {
color: #4eba70;
}
/***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/ /***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/