1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

trim down listview

This commit is contained in:
Luke Pulverenti 2016-02-07 14:47:09 -05:00
parent 484e60e328
commit dd1b33021d
26 changed files with 175 additions and 159 deletions

View file

@ -4,7 +4,7 @@
<title>${TitlePlugins}</title> <title>${TitlePlugins}</title>
</head> </head>
<body> <body>
<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="registrationservices,scripts/ratingdialog,scripts/addpluginpage"> <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="jqmcollapsible,registrationservices,scripts/ratingdialog,scripts/addpluginpage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleAdvanced}</title> <title>${TitleAdvanced}</title>
</head> </head>
<body> <body>
<div id="advancedConfigurationPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="scripts/advancedconfigurationpage,paper-input"> <div id="advancedConfigurationPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmcollapsible,scripts/advancedconfigurationpage,paper-input">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title> <title>${TitleAutoOrganize}</title>
</head> </head>
<body> <body>
<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,scripts/autoorganizetv,paper-input"> <div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmcollapsible,jqmtable,scripts/autoorganizetv,paper-input">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -729,7 +729,7 @@
html += '</li>'; html += '</li>';
} }
//elem.html(html).listview('refresh'); //elem.html(html);
$('.btnDeletePerson', elem).on('click', function () { $('.btnDeletePerson', elem).on('click', function () {

View file

@ -808,7 +808,6 @@ h1 .imageLink {
} }
.fieldDescription { .fieldDescription {
font-size: 12px;
padding-left: 5px; padding-left: 5px;
font-weight: normal; font-weight: normal;
white-space: normal !important; white-space: normal !important;

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab"> <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="jqmcollapsible,scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleServer}</title> <title>${TitleServer}</title>
</head> </head>
<body> <body>
<div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Server%20Settings" data-require="scripts/dashboardgeneral,paper-textarea,paper-input"> <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Server%20Settings" data-require="jqmcollapsible,scripts/dashboardgeneral,paper-textarea,paper-input">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -23,7 +23,7 @@
</div> </div>
<br /><br /> <br /><br />
<div> <div>
<label for="selectLocalizationLanguage">${LabelPreferredDisplayLanguage}</label> <label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
<select id="selectLocalizationLanguage" data-mini="true"></select> <select id="selectLocalizationLanguage" data-mini="true"></select>
<div class="fieldDescription"> <div class="fieldDescription">
<div>${LabelPreferredDisplayLanguageHelp}</div> <div>${LabelPreferredDisplayLanguageHelp}</div>

View file

@ -4,7 +4,7 @@
<title>${TitleDlna}</title> <title>${TitleDlna}</title>
</head> </head>
<body> <body>
<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmpopup,scripts/dlnaprofile"> <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleMediaLibrary}</title> <title>${TitleMediaLibrary}</title>
</head> </head>
<body> <body>
<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="scripts/librarysettings"> <div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="jqmcollapsible,scripts/librarysettings">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleMetadata}</title> <title>${TitleMetadata}</title>
</head> </head>
<body> <body>
<div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataadvanced,paper-checkbox,paper-input"> <div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="jqmcollapsible,scripts/metadataadvanced,paper-checkbox,paper-input">
<div data-role="content"> <div data-role="content">

View file

@ -4,7 +4,7 @@
<title>${TitleMetadata}</title> <title>${TitleMetadata}</title>
</head> </head>
<body> <body>
<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataimagespage"> <div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="jqmcollapsible,scripts/metadataimagespage">
<div data-role="content"> <div data-role="content">

View file

@ -4,7 +4,7 @@
<title>${TitlePlayback}</title> <title>${TitlePlayback}</title>
</head> </head>
<body> <body>
<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="scripts/playbackconfiguration"> <div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="jqmcollapsible,scripts/playbackconfiguration">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -11,12 +11,17 @@
<div class="readOnlyContent"> <div class="readOnlyContent">
<h2 class="taskName"></h2> <h2 class="taskName"></h2>
<p id="pTaskDescription"></p> <p id="pTaskDescription"></p>
<p> <div>
<button type="button" data-icon="plus" onclick="ScheduledTaskPage.showAddTriggerPopup();"> <br />
${ButtonAddScheduledTaskTrigger} <h1 style="margin: .6em 0; vertical-align: middle; display: inline-block;">
</button> ${HeaderTaskTriggers}
</p> </h1>
<ul id="ulTaskTriggers" data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="minus"></ul> <paper-button raised class="btnInvite submit mini" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}" onclick="ScheduledTaskPage.showAddTriggerPopup();">
<iron-icon icon="add"></iron-icon>
<span>${ButtonAdd}</span>
</paper-button>
</div>
<div class="taskTriggers"></div>
</div> </div>
</div> </div>
</div> </div>
@ -26,10 +31,10 @@
<h3>${HeaderAddScheduledTaskTrigger}</h3> <h3>${HeaderAddScheduledTaskTrigger}</h3>
</div> </div>
<div data-role="content"> <div data-role="content">
<br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="selectTriggerType">${LabelTriggerType}</label> <label for="selectTriggerType" class="selectLabel">${LabelTriggerType}</label>
<select id="selectTriggerType" name="selectTriggerType" onchange="ScheduledTaskPage.refreshTriggerFields(this.value);"> <select id="selectTriggerType" name="selectTriggerType" onchange="ScheduledTaskPage.refreshTriggerFields(this.value);">
<option value="DailyTrigger">${OptionDaily}</option> <option value="DailyTrigger">${OptionDaily}</option>
<option value="WeeklyTrigger">${OptionWeekly}</option> <option value="WeeklyTrigger">${OptionWeekly}</option>
@ -39,7 +44,7 @@
</select> </select>
</li> </li>
<li id="fldDayOfWeek"> <li id="fldDayOfWeek">
<label for="selectDayOfWeek">${LabelDay}</label> <label for="selectDayOfWeek" class="selectLabel">${LabelDay}</label>
<select id="selectDayOfWeek" name="selectDayOfWeek"> <select id="selectDayOfWeek" name="selectDayOfWeek">
<option value="Sunday">${OptionSunday}</option> <option value="Sunday">${OptionSunday}</option>
<option value="Monday">${OptionMonday}</option> <option value="Monday">${OptionMonday}</option>
@ -55,13 +60,13 @@
<input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" /> <input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" />
</li> </li>
<li id="fldSelectSystemEvent"> <li id="fldSelectSystemEvent">
<label for="selectSystemEvent">${LabelEvent}</label> <label for="selectSystemEvent" class="selectLabel">${LabelEvent}</label>
<select id="selectSystemEvent" name="selectSystemEvent"> <select id="selectSystemEvent" name="selectSystemEvent">
<option value="WakeFromSleep">${OptionWakeFromSleep}</option> <option value="WakeFromSleep">${OptionWakeFromSleep}</option>
</select> </select>
</li> </li>
<li id="fldSelectInterval"> <li id="fldSelectInterval">
<label for="selectInterval">${LabelEveryXMinutes}</label> <label for="selectInterval" class="selectLabel">${LabelEveryXMinutes}</label>
<select id="selectInterval"> <select id="selectInterval">
<option value="9000000000">15 minutes</option> <option value="9000000000">15 minutes</option>
<option value="18000000000">30 minutes</option> <option value="18000000000">30 minutes</option>

View file

@ -1,4 +1,4 @@
define(['https://www.gstatic.com/cv/js/sender/v1/cast_sender.js'], function () { define([], function () {
// Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js // Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
var currentResolve; var currentResolve;
@ -874,6 +874,10 @@
})); }));
} }
initializeChromecast(); var fileref = document.createElement('script');
fileref.setAttribute("type", "text/javascript");
fileref.onload = initializeChromecast;
fileref.setAttribute("src", "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js");
document.querySelector('head').appendChild(fileref);
}); });

View file

@ -596,7 +596,7 @@
html += '</li>'; html += '</li>';
} }
elem.html(html).listview('refresh'); elem.html(html);
$('.btnDeletePerson', elem).on('click', function () { $('.btnDeletePerson', elem).on('click', function () {
@ -716,7 +716,7 @@
for (var i = 0; i < items.length; i++) { for (var i = 0; i < items.length; i++) {
html += '<li data-mini="true"><a class="data">' + items[i] + '</a><a href="#" onclick="EditItemMetadataPage.removeElementFromListview(this)" class="btnRemoveFromEditorList"></a></li>'; html += '<li data-mini="true"><a class="data">' + items[i] + '</a><a href="#" onclick="EditItemMetadataPage.removeElementFromListview(this)" class="btnRemoveFromEditorList"></a></li>';
} }
list.html(html).listview('refresh'); list.html(html);
} }
function editableListViewValues(list) { function editableListViewValues(list) {
@ -1008,7 +1008,6 @@
self.removeElementFromListview = function (source) { self.removeElementFromListview = function (source) {
var list = $(source).parents('ul[data-role="listview"]'); var list = $(source).parents('ul[data-role="listview"]');
$(source).parent().remove(); $(source).parent().remove();
list.listview('refresh');
}; };
self.onRefreshFormSubmit = function () { self.onRefreshFormSubmit = function () {

View file

@ -18,37 +18,39 @@ var ScheduledTaskPage = {
loadScheduledTask: function (task) { loadScheduledTask: function (task) {
var page = $.mobile.activePage; var page = $($.mobile.activePage)[0];
$('.taskName', page).html(task.Name); $('.taskName', page).html(task.Name);
$('#pTaskDescription', page).html(task.Description); $('#pTaskDescription', page).html(task.Description);
ScheduledTaskPage.loadTaskTriggers(task); require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
ScheduledTaskPage.loadTaskTriggers(page, task);
});
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}, },
loadTaskTriggers: function (task) { loadTaskTriggers: function (context, task) {
var html = ''; var html = '';
html += '<li data-role="list-divider"><h3>' + Globalize.translate('HeaderTaskTriggers') + '</h3></li>'; html += '<div class="paperList">';
for (var i = 0, length = task.Triggers.length; i < length; i++) { for (var i = 0, length = task.Triggers.length; i < length; i++) {
var trigger = task.Triggers[i]; var trigger = task.Triggers[i];
html += '<li>'; html += '<paper-icon-item>';
html += '<a href="#">'; html += '<paper-fab mini icon="schedule" item-icon></paper-fab>';
html += '<h3>'; html += '<paper-item-body two-line>';
html += ScheduledTaskPage.getTriggerFriendlyName(trigger);
html += '</h3>'; html += "<div>" + ScheduledTaskPage.getTriggerFriendlyName(trigger) + "</div>";
if (trigger.MaxRuntimeMs) { if (trigger.MaxRuntimeMs) {
html += '<p>'; html += '<div secondary>';
var hours = trigger.MaxRuntimeMs / 3600000; var hours = trigger.MaxRuntimeMs / 3600000;
@ -57,19 +59,19 @@ var ScheduledTaskPage = {
} else { } else {
html += Globalize.translate('ValueTimeLimitMultiHour', hours); html += Globalize.translate('ValueTimeLimitMultiHour', hours);
} }
html += '</p>'; html += '</div>';
} }
html += '</a>'; html += '</paper-item-body>';
html += '<a href="#" onclick="ScheduledTaskPage.confirmDeleteTrigger(' + i + ');">'; html += '<paper-icon-button icon="delete" title="' + Globalize.translate('ButtonDelete') + '" onclick="ScheduledTaskPage.confirmDeleteTrigger(' + i + ');"></paper-icon-button>';
html += Globalize.translate('Delete');
html += '</a>';
html += '</li>'; html += '</paper-icon-item>';
} }
$('#ulTaskTriggers', $.mobile.activePage).html(html).listview('refresh'); html += '</div>';
context.querySelector('.taskTriggers').innerHTML = html;
}, },
getTriggerFriendlyName: function (trigger) { getTriggerFriendlyName: function (trigger) {

View file

@ -1958,6 +1958,8 @@ var AppInfo = {};
define("paper-icon-item", ["html!" + bowerPath + "/paper-item/paper-icon-item.html"]); define("paper-icon-item", ["html!" + bowerPath + "/paper-item/paper-icon-item.html"]);
define("paper-item-body", ["html!" + bowerPath + "/paper-item/paper-item-body.html"]); define("paper-item-body", ["html!" + bowerPath + "/paper-item/paper-item-body.html"]);
define("paper-collapse-item", ["html!" + bowerPath + "/paper-collapse-item/paper-collapse-item.html"]);
define("jstree", [bowerPath + "/jstree/dist/jstree.min", "css!thirdparty/jstree/themes/default/style.min.css"]); define("jstree", [bowerPath + "/jstree/dist/jstree.min", "css!thirdparty/jstree/themes/default/style.min.css"]);
define("jqmicons", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']); define("jqmicons", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']);
@ -1969,7 +1971,7 @@ var AppInfo = {};
define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup", 'css!thirdparty/jquerymobile-1.4.5/jqm.popup.css']); define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup", 'css!thirdparty/jquerymobile-1.4.5/jqm.popup.css']);
define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview", 'css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']); define("jqmlistview", ['css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']);
define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup", 'css!thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css']); define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup", 'css!thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css']);
@ -2238,12 +2240,7 @@ var AppInfo = {};
depends = depends || []; depends = depends || [];
if (newHtml.indexOf('type-interior') != -1) { if (newHtml.indexOf('type-interior') != -1) {
depends.push('jqmpopup'); addLegacyDependencies(depends, window.location.href);
depends.push('jqmlistview');
depends.push('jqmcollapsible');
depends.push('jqmcontrolgroup');
depends.push('jqmcheckbox');
depends.push('scripts/notifications');
} }
require(depends, function () { require(depends, function () {
@ -2508,6 +2505,21 @@ var AppInfo = {};
})(); })();
function addLegacyDependencies(depends, url) {
var isPluginpage = url.toLowerCase().indexOf('/configurationpage?') != -1;
if (isPluginpage) {
depends.push('jqmpopup');
depends.push('jqmcollapsible');
}
depends.push('jqmcontrolgroup');
depends.push('jqmlistview');
depends.push('jqmcheckbox');
depends.push('scripts/notifications');
}
function pageClassOn(eventName, className, fn) { function pageClassOn(eventName, className, fn) {
document.addEventListener(eventName, function (e) { document.addEventListener(eventName, function (e) {

View file

@ -58,6 +58,7 @@
"ButtonCancel": "Cancel", "ButtonCancel": "Cancel",
"ButtonExit": "Exit", "ButtonExit": "Exit",
"ButtonNew": "New", "ButtonNew": "New",
"HeaderTaskTriggers": "Task Triggers",
"HeaderTV": "TV", "HeaderTV": "TV",
"HeaderAudio": "Audio", "HeaderAudio": "Audio",
"HeaderVideo": "Video", "HeaderVideo": "Video",

View file

@ -127,7 +127,6 @@
"LabelAbortedByServerShutdown": "(Aborted by server shutdown)", "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
"LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.", "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
"HeaderDeleteTaskTrigger": "Delete Task Trigger", "HeaderDeleteTaskTrigger": "Delete Task Trigger",
"HeaderTaskTriggers": "Task Triggers",
"MessageDeleteTaskTrigger": "Are you sure you wish to delete this task trigger?", "MessageDeleteTaskTrigger": "Are you sure you wish to delete this task trigger?",
"MessageNoPluginsInstalled": "You have no plugins installed.", "MessageNoPluginsInstalled": "You have no plugins installed.",
"LabelVersionInstalled": "{0} installed", "LabelVersionInstalled": "{0} installed",

View file

@ -4,7 +4,7 @@
<title>${TitleSupport}</title> <title>${TitleSupport}</title>
</head> </head>
<body> <body>
<div id="supporterKeyPage" data-role="page" class="page type-interior" data-require="jqmpopup,scripts/supporterkeypage"> <div id="supporterKeyPage" data-role="page" class="page type-interior" data-require="jqmcollapsible,scripts/supporterkeypage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -128,7 +128,7 @@
</div> </div>
</div> </div>
</div> </div>
<div data-role="popup" class="popupAddUser popup" data-theme="a"> <div class="popupAddUser popup hide" data-theme="a">
<div class="ui-bar-a" style="text-align: center; padding: 0 20px; position: relative;"> <div class="ui-bar-a" style="text-align: center; padding: 0 20px; position: relative;">

View file

@ -1,34 +1,34 @@
 
.ui-listview, ul[data-role="listview"],
.ui-listview > li { ul[data-role="listview"] > li {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style: none; list-style: none;
} }
.ui-content .ui-listview, .ui-content ul[data-role="listview"],
.ui-panel-inner > .ui-listview { .ui-panel-inner > ul[data-role="listview"] {
margin: -1em; margin: -1em;
} }
.ui-content .ui-listview-inset, /*.ui-content ul[data-role="listview"],
.ui-panel-inner > .ui-listview-inset { .ui-panel-inner > ul[data-role="listview"] {
margin: 1em 0; margin: 1em 0;
} }*/
.ui-collapsible-content > .ui-listview { .ui-collapsible-content > ul[data-role="listview"] {
margin: -.5em -1em; margin: -.5em -1em;
} }
.ui-collapsible-content > .ui-listview-inset { .ui-collapsible-content > ul[data-role="listview"] {
margin: .5em 0; margin: .5em 0;
} }
.ui-listview > li { ul[data-role="listview"] > li {
display: block; display: block;
position: relative; position: relative;
overflow: visible; overflow: visible;
} }
.ui-listview > .ui-li-static, ul[data-role="listview"] > li,
.ui-listview > .ui-li-divider, ul[data-role="listview"] > .ui-li-divider,
.ui-listview > li > a.ui-btn { ul[data-role="listview"] > li > a.ui-btn {
margin: 0; margin: 0;
display: block; display: block;
position: relative; position: relative;
@ -37,104 +37,104 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.ui-listview > li > .ui-btn:focus { ul[data-role="listview"] > li > .ui-btn:focus {
z-index: 1; z-index: 1;
} }
.ui-listview > .ui-li-static, ul[data-role="listview"] > li,
.ui-listview > .ui-li-divider, ul[data-role="listview"] > .ui-li-divider,
.ui-listview > li > a.ui-btn { ul[data-role="listview"] > li > a.ui-btn {
border-width: 1px 0 0 0; border-width: 1px 0 0 0;
border-style: solid; border-style: solid;
} }
.ui-listview-inset > .ui-li-static, ul[data-role="listview"] > li,
.ui-listview-inset > .ui-li-divider, ul[data-role="listview"] > .ui-li-divider,
.ui-listview-inset > li > a.ui-btn { ul[data-role="listview"] > li > a.ui-btn {
border-right-width: 1px; /*border-right-width: 1px;
border-left-width: 1px; border-left-width: 1px;*/
} }
.ui-listview > .ui-li-static.ui-last-child, ul[data-role="listview"] > li:last-child,
.ui-listview > .ui-li-divider.ui-last-child, ul[data-role="listview"] > .ui-li-divider.ui-last-child,
.ui-listview > li.ui-last-child > a.ui-btn { ul[data-role="listview"] > li.ui-last-child > a.ui-btn {
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > li.ui-first-child, .ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-first-child,
.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > li.ui-first-child > a.ui-btn { .ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-first-child > a.ui-btn {
border-top-width: 0; border-top-width: 0;
} }
.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > li.ui-last-child, .ui-collapsible-themed-content ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-last-child,
.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > li.ui-last-child > a.ui-btn { .ui-collapsible-themed-content ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-last-child > a.ui-btn {
border-bottom-width: 0; border-bottom-width: 0;
} }
.ui-listview > li.ui-first-child, ul[data-role="listview"] > li.ui-first-child,
.ui-listview > li.ui-first-child > a.ui-btn { ul[data-role="listview"] > li.ui-first-child > a.ui-btn {
-webkit-border-top-right-radius: inherit; -webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit; border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit; -webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit; border-top-left-radius: inherit;
} }
.ui-listview > li.ui-last-child, ul[data-role="listview"] > li.ui-last-child,
.ui-listview > li.ui-last-child > a.ui-btn { ul[data-role="listview"] > li.ui-last-child > a.ui-btn {
-webkit-border-bottom-right-radius: inherit; -webkit-border-bottom-right-radius: inherit;
border-bottom-right-radius: inherit; border-bottom-right-radius: inherit;
-webkit-border-bottom-left-radius: inherit; -webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit; border-bottom-left-radius: inherit;
} }
.ui-listview > li.ui-li-has-alt > a.ui-btn { ul[data-role="listview"] > li.ui-li-has-alt > a.ui-btn {
-webkit-border-top-right-radius: 0; -webkit-border-top-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0; -webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.ui-listview > li.ui-first-child > a.ui-btn + a.ui-btn { ul[data-role="listview"] > li.ui-first-child > a.ui-btn + a.ui-btn {
-webkit-border-top-left-radius: 0; -webkit-border-top-left-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
-webkit-border-top-right-radius: inherit; -webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit; border-top-right-radius: inherit;
} }
.ui-listview > li.ui-last-child > a.ui-btn + a.ui-btn { ul[data-role="listview"] > li.ui-last-child > a.ui-btn + a.ui-btn {
-webkit-border-bottom-left-radius: 0; -webkit-border-bottom-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
-webkit-border-bottom-right-radius: inherit; -webkit-border-bottom-right-radius: inherit;
border-bottom-right-radius: inherit; border-bottom-right-radius: inherit;
} }
.ui-listview > li.ui-first-child img:first-child:not(.ui-li-icon) { ul[data-role="listview"] > li.ui-first-child img:first-child:not(.ui-li-icon) {
-webkit-border-top-left-radius: inherit; -webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit; border-top-left-radius: inherit;
} }
.ui-listview > li.ui-last-child img:first-child:not(.ui-li-icon) { ul[data-role="listview"] > li.ui-last-child img:first-child:not(.ui-li-icon) {
-webkit-border-bottom-left-radius: inherit; -webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit; border-bottom-left-radius: inherit;
} }
.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) { .ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) {
-webkit-border-radius: inherit; -webkit-border-radius: inherit;
border-radius: inherit; border-radius: inherit;
} }
.ui-listview > .ui-li-static { ul[data-role="listview"] > li {
padding: .7em 1em; padding: .7em 1em;
} }
.ui-listview > .ui-li-divider { ul[data-role="listview"] > .ui-li-divider {
padding: .5em 1.143em; padding: .5em 1.143em;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
cursor: default; cursor: default;
outline: 0; /* Dividers in custom selectmenus have tabindex */ outline: 0; /* Dividers in custom selectmenus have tabindex */
} }
.ui-listview > .ui-li-has-count > .ui-btn, ul[data-role="listview"] > .ui-li-has-count > .ui-btn,
.ui-listview > .ui-li-static.ui-li-has-count, ul[data-role="listview"] > .ui-li-static.ui-li-has-count,
.ui-listview > .ui-li-divider.ui-li-has-count { ul[data-role="listview"] > .ui-li-divider.ui-li-has-count {
padding-right: 2.8125em; padding-right: 2.8125em;
} }
.ui-listview > .ui-li-has-count > .ui-btn-icon-right { ul[data-role="listview"] > .ui-li-has-count > .ui-btn-icon-right {
padding-right: 4.6875em; padding-right: 4.6875em;
} }
.ui-listview > .ui-li-has-thumb > .ui-btn, ul[data-role="listview"] > .ui-li-has-thumb > .ui-btn,
.ui-listview > .ui-li-static.ui-li-has-thumb { ul[data-role="listview"] > .ui-li-static.ui-li-has-thumb {
min-height: 3.625em; min-height: 3.625em;
padding-left: 6.25em; padding-left: 6.25em;
} }
/* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */ /* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */
.ui-listview > .ui-li-has-icon > .ui-btn, ul[data-role="listview"] > .ui-li-has-icon > .ui-btn,
.ui-listview > .ui-li-static.ui-li-has-icon { ul[data-role="listview"] > .ui-li-static.ui-li-has-icon {
min-height: 1.25em; min-height: 1.25em;
padding-left: 2.5em; padding-left: 2.5em;
} }
@ -154,12 +154,12 @@
top: 50%; top: 50%;
margin-top: -.88em; margin-top: -.88em;
} }
.ui-listview .ui-btn-icon-right .ui-li-count { ul[data-role="listview"] .ui-btn-icon-right .ui-li-count {
right: 3.2em; right: 3.2em;
} }
.ui-listview .ui-li-has-thumb > img:first-child, ul[data-role="listview"] .ui-li-has-thumb > img:first-child,
.ui-listview .ui-li-has-thumb > .ui-btn > img:first-child, ul[data-role="listview"] .ui-li-has-thumb > .ui-btn > img:first-child,
.ui-listview .ui-li-has-thumb .ui-li-thumb { ul[data-role="listview"] .ui-li-has-thumb .ui-li-thumb {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
@ -167,20 +167,20 @@
max-width: 5em; max-width: 5em;
} }
/* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */ /* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */
.ui-listview > .ui-li-has-icon > img:first-child, ul[data-role="listview"] > .ui-li-has-icon > img:first-child,
.ui-listview > .ui-li-has-icon > .ui-btn > img:first-child { ul[data-role="listview"] > .ui-li-has-icon > .ui-btn > img:first-child {
position: absolute; position: absolute;
left: .625em; left: .625em;
top: .9em; top: .9em;
max-height: 1em; max-height: 1em;
max-width: 1em; max-width: 1em;
} }
.ui-listview > li h1, ul[data-role="listview"] > li h1,
.ui-listview > li h2, ul[data-role="listview"] > li h2,
.ui-listview > li h3, ul[data-role="listview"] > li h3,
.ui-listview > li h4, ul[data-role="listview"] > li h4,
.ui-listview > li h5, ul[data-role="listview"] > li h5,
.ui-listview > li h6 { ul[data-role="listview"] > li h6 {
font-size: 1em; font-size: 1em;
display: block; display: block;
margin: .45em 0; margin: .45em 0;
@ -188,7 +188,7 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.ui-listview > li p { ul[data-role="listview"] > li p {
font-size: .75em; font-size: .75em;
font-weight: normal; font-weight: normal;
display: block; display: block;
@ -197,18 +197,18 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.ui-listview .ui-li-aside { ul[data-role="listview"] .ui-li-aside {
position: absolute; position: absolute;
top: 1em; top: 1em;
right: 3.333em; right: 3.333em;
margin: 0; margin: 0;
text-align: right; text-align: right;
} }
.ui-listview > li.ui-li-has-alt > .ui-btn { ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn {
margin-right: 2.5em; margin-right: 2.5em;
border-right-width: 0; border-right-width: 0;
} }
.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn { ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn {
position: absolute; position: absolute;
width: 2.5em; width: 2.5em;
height: 100%; height: 100%;
@ -223,24 +223,24 @@
padding: 0; padding: 0;
z-index: 2; z-index: 2;
} }
.ui-listview-inset > li.ui-li-has-alt > .ui-btn + .ui-btn { ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn {
border-right-width: 1px; border-right-width: 1px;
} }
.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn:focus { ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn:focus {
z-index: 3; z-index: 3;
} }
ol.ui-listview, ol[data-role="listview"],
ol.ui-listview > .ui-li-divider { ol[data-role="listview"] > .ui-li-divider {
counter-reset: listnumbering; counter-reset: listnumbering;
} }
ol.ui-listview > li > .ui-btn, ol[data-role="listview"] > li > .ui-btn,
ol.ui-listview > li.ui-li-static { ol[data-role="listview"] > li {
vertical-align: middle; vertical-align: middle;
} }
ol.ui-listview > li > .ui-btn:first-child:before, ol[data-role="listview"] > li > .ui-btn:first-child:before,
ol.ui-listview > li.ui-li-static:before, ol[data-role="listview"] > li:before,
ol.ui-listview > li.ui-field-contain > label:before, ol[data-role="listview"] > li.ui-field-contain > label:before,
ol.ui-listview > li.ui-field-contain > .ui-controlgroup-label:before { ol[data-role="listview"] > li.ui-field-contain > .ui-controlgroup-label:before {
display: inline-block; display: inline-block;
font-size: .9em; font-size: .9em;
font-weight: normal; font-weight: normal;
@ -251,29 +251,29 @@ ol.ui-listview > li.ui-field-contain > .ui-controlgroup-label:before {
counter-increment: listnumbering; counter-increment: listnumbering;
content: counter(listnumbering) "."; content: counter(listnumbering) ".";
} }
ol.ui-listview > li.ui-field-contain:before { ol[data-role="listview"] > li.ui-field-contain:before {
content: none; content: none;
display: none; display: none;
} }
ol.ui-listview > li h1:first-child, ol[data-role="listview"] > li h1:first-child,
ol.ui-listview > li h2:first-child, ol[data-role="listview"] > li h2:first-child,
ol.ui-listview > li h3:first-child, ol[data-role="listview"] > li h3:first-child,
ol.ui-listview > li h4:first-child, ol[data-role="listview"] > li h4:first-child,
ol.ui-listview > li h5:first-child, ol[data-role="listview"] > li h5:first-child,
ol.ui-listview > li h6:first-child, ol[data-role="listview"] > li h6:first-child,
ol.ui-listview > li p:first-child, ol[data-role="listview"] > li p:first-child,
ol.ui-listview > li img:first-child + * { ol[data-role="listview"] > li img:first-child + * {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
ol.ui-listview > li h1:first-child ~ *, ol[data-role="listview"] > li h1:first-child ~ *,
ol.ui-listview > li h2:first-child ~ *, ol[data-role="listview"] > li h2:first-child ~ *,
ol.ui-listview > li h3:first-child ~ *, ol[data-role="listview"] > li h3:first-child ~ *,
ol.ui-listview > li h4:first-child ~ *, ol[data-role="listview"] > li h4:first-child ~ *,
ol.ui-listview > li h5:first-child ~ *, ol[data-role="listview"] > li h5:first-child ~ *,
ol.ui-listview > li h6:first-child ~ *, ol[data-role="listview"] > li h6:first-child ~ *,
ol.ui-listview > li p:first-child ~ *, ol[data-role="listview"] > li p:first-child ~ *,
ol.ui-listview > li img:first-child + * ~ * { ol[data-role="listview"] > li img:first-child + * ~ * {
margin-top: 0; margin-top: 0;
text-indent: 2.04em; /* (1.4em + .3em) * .9em / .75em */ text-indent: 2.04em; /* (1.4em + .3em) * .9em / .75em */
} }

View file

@ -1196,12 +1196,7 @@
if (contentElem.classList.contains('type-interior')) { if (contentElem.classList.contains('type-interior')) {
dependencies = dependencies || []; dependencies = dependencies || [];
dependencies.push('jqmpopup'); addLegacyDependencies(dependencies, absUrl);
dependencies.push('jqmlistview');
dependencies.push('jqmcollapsible');
dependencies.push('jqmcontrolgroup');
dependencies.push('jqmcheckbox');
dependencies.push('scripts/notifications');
} }
require(dependencies, function () { require(dependencies, function () {

View file

@ -448,11 +448,11 @@ paper-input label, paper-textarea label {
font-family: inherit !important; font-family: inherit !important;
} }
.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label { .ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription {
color: #858585; color: #858585;
} }
.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label { .ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription {
color: #656565; color: #656565;
} }

View file

@ -4,7 +4,7 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/useredit"> <div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmcollapsible,scripts/useredit">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userparentalcontrol"> <div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userparentalcontrol">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -4,7 +4,7 @@
<title>${TitleUsers}</title> <title>${TitleUsers}</title>
</head> </head>
<body> <body>
<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userprofilespage"> <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userprofilespage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">