Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

dashboard-ui/css/librarybrowser.css

@@ -141,6 +141,14 @@
     display: block;
 }
 
+.itemTag {
+    display: inline-block;
+    background-color: #999;
+    border-radius: 4px;
+    padding: 3px 5px;
+    font-size: 13px;
+    margin: 0 5px 0 0;
+}
 
 
 @media all and (min-width: 750px) {

dashboard-ui/itemdetails.html

@@ -133,7 +133,7 @@
                         <p id="itemGenres"></p>
                         <p id="itemStudios"></p>
                         <p id="itemLinks"></p>
-
+                        <p id="itemTags"></p>
                         <p id="criticRatingSummary" class="criticRatingSummary" style="display: none;">
                             <span class="criticRatingSummaryHeader">The bottom line</span>
                             <span id="criticRatingSummaryText"></span>

dashboard-ui/scripts/Itemdetailpage.js

@@ -233,6 +233,27 @@
         } else {
             $('#criticRatingSummary', page).hide();
         }
+
+        renderTags(page, item);
+    }
+
+    function renderTags(page, item) {
+
+        if (item.Tags && item.Tags.length) {
+
+            var html = '';
+
+            for (var i = 0, length = item.Tags.length; i < length; i++) {
+
+                html += '<div class="itemTag">' + item.Tags[i] + '</div>';
+
+            }
+
+            $('#itemTags', page).show().html(html);
+
+        } else {
+            $('#itemTags', page).hide();
+        }
     }
 
     function renderChildren(page, item) {