From 677d523ef46f0698a9921fab54fc92ee088dac09 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 9 Aug 2012 11:20:49 -0400
Subject: [PATCH] CC-4187: Media Library -> Regular Playlist : Use legend
 instead of label for different elements in context view

-done
---
 .../library/get-file-metadata.ajax.phtml      | 50 ++++++++++++-------
 airtime_mvc/public/css/styles.css             | 28 ++++++++---
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index ca14ac39f..468bcf57c 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -23,19 +23,31 @@
 <?php endif; ?>
 
 <?php if($this->type == "playlist" || $this->type == "block") : ?>
-<div><span>Name:</span><span><?php echo ($this->md["dc:title"]);?></span></div>
-<div><span>Creator:</span><span><?php echo ($this->md["dc:creator"]);?></span></div>
-<?php if ($this->type == "block" && $this->blType == "Dynamic") { ?>
-<div><span>Length:</span><span><?php echo $this->block->getFormattedLength();?></span></div>
-<?php } else { ?>
-<div><span>Length:</span><span><?php echo ($this->md["dcterms:extent"]);?></span></div>
+<div class='file-md-qtip-left'>
+    <span>Name:</span><span><?php echo ($this->md["dc:title"]);?></span><br />
+    <span>Creator:</span><span><?php echo ($this->md["dc:creator"]);?></span><br />
+    <?php if ($this->type == "block" && $this->blType == "Dynamic") { ?>
+    <span>Length:</span><span><?php echo $this->block->getFormattedLength();?></span><br />
+    <?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 } ?>
-<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") { ?>
-            <div><span>Playlist Contents: </span></div>
+            <div class='file-md-qtip-left'><span>Playlist Contents: </span></div>
         <?php } else { ?>
-            <div><span>Static Playlist Contents: </span></div>
+            <div class='file-md-qtip-left'><span>Static Playlist Contents: </span></div>
         <?php } ?>
         <table class='library-get-file-md'>
         <?php foreach($this->contents as $row) : ?>
@@ -52,14 +64,17 @@
             <?php if ($row["type"] == 2) {
                 $bl = new Application_Model_Block($row["item_id"]);
                 $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';?>'>
                     <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 $bl->getFormattedLength(); ?></td>
                 </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 { ?>
                 <tr>
                     <td class='file-md-qtip-row-width-title file-md-qtip-nowrap'><?php echo $row["track_title"] ?></td>
@@ -71,7 +86,7 @@
         </table>
         
     <?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'>
         <?php foreach ($this->contents["crit"] as $criterias) : ?>
             <?php foreach ($criterias as $crit ) : ?>
@@ -84,13 +99,14 @@
                 if (strlen($crit["display_name"]) > $critMaxStrLen) {
                     $crit["display_name"] = substr($crit["display_name"], 0, 12)."...";
                 }
-                if (strlen($crit["modifier"]) > $critMaxStrLen) {
-                    $crit["modifier"] = substr($crit["modifier"], 0, 12)."...";
+                $modMaxStrLen = 16;
+                if (strlen($crit["modifier"]) > $modMaxStrLen) {
+                    $crit["modifier"] = substr($crit["modifier"], 0, 15)."...";
                 }
                 ?>
                 <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-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["display_name"] ?></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"] ?>
                     <?php if (isset($crit["extra"])) { ?>
                         to <?php echo $crit["extra"] ?></td>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index b4a398055..41d230e8a 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -446,11 +446,7 @@ table.library-get-file-md.table-small{
     white-space: nowrap;
 }
 
-.file-md-qtip-criteria-width-crit{
-    width:70px;
-}
-
-.file-md-qtip-criteria-width-mod{
+.file-md-qtip-criteria-width-small{
     width:70px;
 }
 
@@ -477,13 +473,29 @@ table.library-get-file-md.table-small{
     font-style: italic;
 }
 
-.file-md-qtip-playlist.dynamic td{
-    color: #63a2f0;
+.file-md-qtip-left{
+    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;
 }
+.dynamic {
+    color: #63a2f0;
+}
+.webstream {
+    color: #4eba70;
+}
+	
 /***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/