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

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

3 files changed, 33 insertions, 19 deletions

diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
index 46e7d53cca..ca4677e04e 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
@@ -62,10 +62,12 @@
 
             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) {
@@ -76,20 +78,28 @@
                     type: "Primary"
                 });
 
-                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..2660697dc2 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>";
@@ -566,15 +568,15 @@ var Dashboard = {
         Dashboard.showLoadingMsg();
 
         var promise;
-        
+                
         if (path === "Network") {
-            promise = ApiClient.getNetworkComputers();
-        }
+                promise = ApiClient.getNetworkComputers();
+            }
         else if (path) {
-            promise = ApiClient.getDirectoryContents(path, { includeDirectories: true });
-        } else {
+                promise = ApiClient.getDirectoryContents(path, { includeDirectories: true });
+            } else {
             promise = ApiClient.getDrives();
-        }
+                }
         
         promise.done(function (folders) {
 
@@ -1108,7 +1110,7 @@ var Dashboard = {
     setPageTitle: function (title) {
 
         $('.pageTitle', $.mobile.activePage).html(title);
-        
+
         if (title) {
             document.title = title;
         }
@@ -1142,7 +1144,7 @@ $(function () {
     footerHtml += '</div>';
 
     footerHtml += '<div id="footerNotifications"></div>';
-    
+
     footerHtml += '</div>';