From 047e97cb22327076fb10e842d03c680b0e12b487 Mon Sep 17 00:00:00 2001
From: Chris Schneider <schneifu@hotmail.com>
Date: Fri, 22 Feb 2013 09:08:51 -0600
Subject: [PATCH 1/3] make metro styled tiles look and act the same

---
 MediaBrowser.WebDashboard/Html/css/site.css   | 44 ++++++++++++-------
 MediaBrowser.WebDashboard/Html/login.html     |  2 +-
 .../Html/scripts/LoginPage.js                 | 32 +++++++++-----
 .../Html/scripts/PluginCatalogPage.js         |  6 ++-
 .../Html/scripts/site.js                      | 27 ++++--------
 5 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/MediaBrowser.WebDashboard/Html/css/site.css b/MediaBrowser.WebDashboard/Html/css/site.css
index c9b2089c73..2c4971bcc7 100644
--- a/MediaBrowser.WebDashboard/Html/css/site.css
+++ b/MediaBrowser.WebDashboard/Html/css/site.css
@@ -425,7 +425,6 @@ form, .readOnlyContent {
     font-size: 15px;
     padding: 0;
     position: relative;
-    padding-bottom: 28px;
 }
 
     .posterViewItem a {
@@ -436,7 +435,7 @@ form, .readOnlyContent {
 
     .posterViewItem img {
         max-width: 155px;
-        max-height: 148px;
+        max-height: 155px;
         vertical-align: bottom;
     }
 
@@ -454,19 +453,25 @@ form, .readOnlyContent {
 .posterViewItemText {
     text-overflow: ellipsis;
     overflow: hidden;
-    text-wrap: none;
     white-space: nowrap;
     margin: 0;
-    padding: 4px 2px 0;
-    position: absolute;
+    padding: 4px 0px 0;
     bottom: 0;
     left: 0;
     right: 0;
-    height: 24px;
     background: #181818;
     text-shadow: none;
+    max-width: 155px;
 }
 
+    .posterViewItemText div{
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        margin: 0px 4px;
+        height: 24px;
+    }
+
 .posterViewItem:hover, .userItem:hover {
     -moz-box-shadow: 0 0 20px 3px #2572EB;
     -webkit-box-shadow: 0 0 20px 3px #2572EB;
@@ -477,11 +482,11 @@ form, .readOnlyContent {
 
     .posterViewItem {
         font-size: 16px;
-        padding-bottom: 29px;
     }
 
     .posterViewItemText {
         padding-top: 5px;
+        max-width: 190px;
     }
 
     .posterViewItem img {
@@ -496,29 +501,37 @@ form, .readOnlyContent {
         font-size: 17px;
     }
 
-        .posterViewItem img {
-            max-width: 280px;
-            max-height: 250px;
-        }
+    .posterViewItem img {
+        max-width: 280px;
+        max-height: 280px;
+    }
+
+    .posterViewItemText {
+        max-width: 280px;
+    }
 }
 
 @media all and (min-width: 1920px) {
 
     .posterViewItem {
         font-size: 19px;
-        padding-bottom: 33px;
     }
 
-    .posterViewItemText {
+    .posterViewItemText div{
         height: 28px;
     }
 
     .posterViewItem img {
         max-width: 352px;
-        max-height: 300px;
+        max-height: 352px;
+    }
+
+    .posterViewItemText {
+        max-width: 352px;
     }
 }
 
+/*DEPRECATED userItem classes
 .userItem {
     display: inline-block;
     margin: 5px;
@@ -620,7 +633,8 @@ form, .readOnlyContent {
     .userItemHeader {
         font-size: 40px;
     }
-}
+}*/
+/*DEPRECATED userItem classes END
 
 /* Startup wizard */
 .wizardPage {
diff --git a/MediaBrowser.WebDashboard/Html/login.html b/MediaBrowser.WebDashboard/Html/login.html
index 4cb73c06ef..36c453d555 100644
--- a/MediaBrowser.WebDashboard/Html/login.html
+++ b/MediaBrowser.WebDashboard/Html/login.html
@@ -7,7 +7,7 @@
     <div id="loginPage" data-role="page" class="page standalonePage">
 
         <div data-role="content">
-            <div id="divUsers" style="margin: 50px 20px 20px; text-align: center;"></div>
+            <div id="divUsers" style="margin: 50px 0px 20px; text-align: center;"></div>
         </div>
 
         <div data-role="popup" id="popupLogin" class="ui-corner-all popup">
diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
index 46e7d53cca..c6d89a4c11 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
@@ -23,8 +23,7 @@
 
         return ApiClient.getUserImageUrl(user.Id, {
             width: 240,
-            tag: user.PrimaryImageTag,
-            type: "Primary"
+            tag: user.PrimaryImageTag
         });
     },
 
@@ -62,34 +61,43 @@
 
             var background = Dashboard.getRandomMetroColor();
 
+            html += '<div class="posterViewItem">';
+
             if (user.HasPassword) {
-                html += "<a id='" + linkId + "' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#popupLogin' data-rel='popup' onclick='LoginPage.authenticatingLinkId=this.id;' class='userItem'>";
+                html += "<a id='" + linkId + "' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#popupLogin' data-rel='popup' onclick='LoginPage.authenticatingLinkId=this.id;' \">";
             } else {
-                html += "<a id='" + linkId + "' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#' onclick='LoginPage.authenticateUserLink(this);' class='userItem'>";
+                html += "<a id='" + linkId + "' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#' onclick='LoginPage.authenticateUserLink(this);' \">";
             }
 
             if (user.PrimaryImageTag) {
 
                 var imgUrl = ApiClient.getUserImageUrl(user.Id, {
                     width: 500,
-                    tag: user.PrimaryImageTag,
-                    type: "Primary"
+                    tag: user.PrimaryImageTag
                 });
 
-                html += '<img class="userItemImage" src="' + imgUrl + '" />';
+                html += '<img src="' + imgUrl + '" />';
             } else {
-                html += '<img class="userItemImage" src="css/images/logindefault.png" style="background:' + background + ';" />';
+                html += '<img style="background:' + background + ';" src="css/images/logindefault.png"/>';
             }
 
-            html += '<div class="userItemContent" style="background:' + background + ';">';
+            html += '<div class="posterViewItemText">';
 
-            html += '<div class="userItemContentInner">';
-            html += '<p class="userItemHeader">' + user.Name + '</p>';
-            html += '<p>' + LoginPage.getLastSeenText(user.LastActivityDate) + '</p>';
+            html += '<div>' + user.Name + '</div>';
+            html += '<div>';
+            var lastSeen = LoginPage.getLastSeenText(user.LastActivityDate);
+            if (lastSeen != "") {
+                html += lastSeen;
+            }
+            else {
+                html += "&nbsp;";
+            }
             html += '</div>';
 
             html += '</div>';
             html += '</a>';
+
+            html += '</div>';
         }
 
         $('#divUsers', '#loginPage').html(html);
diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js
index 51034a0337..5b6dc982e4 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js
@@ -49,21 +49,23 @@
             if (plugin.isPremium) {
                 html += "<div class='premiumBanner'><img src='css/images/premiumflag.png' /></div>";
             }
-            
+
             var color = plugin.tileColor || Dashboard.getRandomMetroColor();
-            
+
             html += "<div class='posterViewItemText' style='background:" + color + "'>";
 
             var installedPlugin = installedPlugins.filter(function (ip) {
                 return ip.Name == plugin.name;
             })[0];
 
+            html += "<div>";
             if (installedPlugin) {
 
                 html += plugin.name + " (Installed)";
             } else {
                 html += plugin.name;
             }
+            html += "</div>";
 
             html += "</div>";
 
diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js
index d358b974ef..67f28aeeba 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/site.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/site.js
@@ -444,7 +444,9 @@ var Dashboard = {
             }
 
             if (options.showTitle || !hasPrimaryImage || (item.Type !== 'Movie' && item.Type !== 'Series' && item.Type !== 'Season')) {
-                html += "<div class='posterViewItemText'>" + item.Name + "</div>";
+                html += "<div class='posterViewItemText'>";
+                html += "<div>" + item.Name + "</div>";
+                html += "</div>"
             }
 
             html += "</a></div>";
@@ -472,8 +474,7 @@ var Dashboard = {
             var imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, {
 
                 height: 400,
-                tag: user.PrimaryImageTag,
-                type: "Primary"
+                tag: user.PrimaryImageTag
 
             }) : "css/images/userFlyoutDefault.png";
 
@@ -565,18 +566,7 @@ var Dashboard = {
 
         Dashboard.showLoadingMsg();
 
-        var promise;
-        
-        if (path === "Network") {
-            promise = ApiClient.getNetworkComputers();
-        }
-        else if (path) {
-            promise = ApiClient.getDirectoryContents(path, { includeDirectories: true });
-        } else {
-            promise = ApiClient.getDrives();
-        }
-        
-        promise.done(function (folders) {
+        ApiClient.getDirectoryContents(path, { includeDirectories: true }).done(function (folders) {
 
             $('#txtDirectoryPickerPath', page).val(path || "");
 
@@ -693,8 +683,7 @@ var Dashboard = {
 
                 var url = ApiClient.getUserImageUrl(user.Id, {
                     width: 225,
-                    tag: user.PrimaryImageTag,
-                    type: "Primary"
+                    tag: user.PrimaryImageTag
                 });
 
                 headerHtml += '<img src="' + url + '" />';
@@ -1108,7 +1097,7 @@ var Dashboard = {
     setPageTitle: function (title) {
 
         $('.pageTitle', $.mobile.activePage).html(title);
-        
+
         if (title) {
             document.title = title;
         }
@@ -1142,7 +1131,7 @@ $(function () {
     footerHtml += '</div>';
 
     footerHtml += '<div id="footerNotifications"></div>';
-    
+
     footerHtml += '</div>';
 
 

From 58cfcd412672d213af01630cf2894ff78a7bf24c Mon Sep 17 00:00:00 2001
From: Chris Schneider <schneifu@hotmail.com>
Date: Fri, 22 Feb 2013 09:28:35 -0600
Subject: [PATCH 2/3] added missing type: attr

type: attributes were accidentally omitted during the merge
---
 .../Html/scripts/LoginPage.js                 |  6 ++++--
 .../Html/scripts/site.js                      | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
index c6d89a4c11..ca4677e04e 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
@@ -23,7 +23,8 @@
 
         return ApiClient.getUserImageUrl(user.Id, {
             width: 240,
-            tag: user.PrimaryImageTag
+            tag: user.PrimaryImageTag,
+            type: "Primary"
         });
     },
 
@@ -73,7 +74,8 @@
 
                 var imgUrl = ApiClient.getUserImageUrl(user.Id, {
                     width: 500,
-                    tag: user.PrimaryImageTag
+                    tag: user.PrimaryImageTag,
+                    type: "Primary"
                 });
 
                 html += '<img src="' + imgUrl + '" />';
diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js
index 67f28aeeba..2660697dc2 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/site.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/site.js
@@ -474,7 +474,8 @@ var Dashboard = {
             var imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, {
 
                 height: 400,
-                tag: user.PrimaryImageTag
+                tag: user.PrimaryImageTag,
+                type: "Primary"
 
             }) : "css/images/userFlyoutDefault.png";
 
@@ -566,7 +567,18 @@ var Dashboard = {
 
         Dashboard.showLoadingMsg();
 
-        ApiClient.getDirectoryContents(path, { includeDirectories: true }).done(function (folders) {
+        var promise;
+                
+        if (path === "Network") {
+                promise = ApiClient.getNetworkComputers();
+            }
+        else if (path) {
+                promise = ApiClient.getDirectoryContents(path, { includeDirectories: true });
+            } else {
+            promise = ApiClient.getDrives();
+                }
+        
+        promise.done(function (folders) {
 
             $('#txtDirectoryPickerPath', page).val(path || "");
 
@@ -683,7 +695,8 @@ var Dashboard = {
 
                 var url = ApiClient.getUserImageUrl(user.Id, {
                     width: 225,
-                    tag: user.PrimaryImageTag
+                    tag: user.PrimaryImageTag,
+                    type: "Primary"
                 });
 
                 headerHtml += '<img src="' + url + '" />';

From 5623abb2869d7f3d9c7a06ef39342b4569a3f710 Mon Sep 17 00:00:00 2001
From: Chris Schneider <schneifu@hotmail.com>
Date: Fri, 22 Feb 2013 09:46:39 -0600
Subject: [PATCH 3/3] removed deprecated code

---
 MediaBrowser.WebDashboard/Html/css/site.css | 105 --------------------
 1 file changed, 105 deletions(-)

diff --git a/MediaBrowser.WebDashboard/Html/css/site.css b/MediaBrowser.WebDashboard/Html/css/site.css
index 2c4971bcc7..186266c4dc 100644
--- a/MediaBrowser.WebDashboard/Html/css/site.css
+++ b/MediaBrowser.WebDashboard/Html/css/site.css
@@ -531,111 +531,6 @@ form, .readOnlyContent {
     }
 }
 
-/*DEPRECATED userItem classes
-.userItem {
-    display: inline-block;
-    margin: 5px;
-    font-size: 15px;
-    text-align: left;
-}
-
-.userItemImage {
-    height: 100px;
-    width: 100px;
-    vertical-align: bottom;
-}
-
-.userItemContent {
-    display: inline-block;
-    height: 100px;
-    width: 180px;
-    float: right;
-    text-shadow: none;
-    font-family: 'Segoe UI Light', 'Open Sans', Arial;
-}
-
-.userItemContentInner {
-    padding: 15px 5px 5px 10px;
-    color: #fff;
-}
-
-.userItemHeader {
-    margin: 0 0 10px;
-    font-size: 16px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    text-wrap: avoid;
-    font-family: 'Segoe UI Semilight', 'Open Sans', Arial;
-}
-
-@media all and (min-width: 750px) {
-
-    .userItem {
-        font-size: 16px;
-    }
-
-    .userItemContentInner {
-        padding: 30px 20px 20px;
-    }
-
-    .userItemImage {
-        height: 140px;
-        width: 140px;
-    }
-
-    .userItemContent {
-        height: 140px;
-        width: 210px;
-    }
-
-    .userItemHeader {
-        font-size: 26px;
-    }
-}
-
-@media all and (min-width: 1200px) {
-
-    .userItem {
-        font-size: 18px;
-    }
-
-    .userItemImage {
-        height: 180px;
-        width: 180px;
-    }
-
-    .userItemContent {
-        height: 180px;
-        width: 270px;
-    }
-
-    .userItemHeader {
-        font-size: 32px;
-    }
-}
-
-@media all and (min-width: 1920px) {
-
-    .userItem {
-        font-size: 20px;
-    }
-
-    .userItemImage {
-        height: 240px;
-        width: 240px;
-    }
-
-    .userItemContent {
-        height: 240px;
-        width: 360px;
-    }
-
-    .userItemHeader {
-        font-size: 40px;
-    }
-}*/
-/*DEPRECATED userItem classes END
-
 /* Startup wizard */
 .wizardPage {
     background: #e2e2e2;