aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.WebDashboard/Html/css/site.css139
-rw-r--r--MediaBrowser.WebDashboard/Html/login.html2
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/LoginPage.js26
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js6
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/site.js20
5 files changed, 58 insertions, 135 deletions
diff --git a/MediaBrowser.WebDashboard/Html/css/site.css b/MediaBrowser.WebDashboard/Html/css/site.css
index c9b2089c7..186266c4d 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,129 +501,33 @@ 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;
- }
-}
-
-.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;
+ max-height: 352px;
}
- .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;
+ .posterViewItemText {
+ max-width: 352px;
}
}
diff --git a/MediaBrowser.WebDashboard/Html/login.html b/MediaBrowser.WebDashboard/Html/login.html
index 4cb73c06e..36c453d55 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 46e7d53cc..ca4677e04 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 51034a033..5b6dc982e 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 d358b974e..2660697dc 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>';
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-06 12:42:00 +0000