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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tim Hobbs 2014-04-09 16:58:14 -07:00
commit ab0941be90
21 changed files with 127 additions and 101 deletions

View file

@ -19,31 +19,31 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtPortNumber">Http server port number: </label> <label for="txtPortNumber">${LabelHttpServerPortNumber}</label>
<input type="number" id="txtPortNumber" name="txtPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" /> <input type="number" id="txtPortNumber" name="txtPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" />
</li> </li>
<li id="fldWebSocketPortNumber" style="display: none;"> <li id="fldWebSocketPortNumber" style="display: none;">
<label for="txtWebSocketPortNumber">Web socket port number: </label> <label for="txtWebSocketPortNumber">${LabelWebSocketPortNumber}</label>
<input type="number" id="txtWebSocketPortNumber" name="txtWebSocketPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" /> <input type="number" id="txtWebSocketPortNumber" name="txtWebSocketPortNumber" pattern="[0-9]*" required="required" min="1" data-mini="true" />
</li> </li>
<li> <li>
<label for="chkEnableUpnp">Enable UPnP</label> <label for="chkEnableUpnp">${LabelEnableAutomaticPortMapping}</label>
<input type="checkbox" id="chkEnableUpnp" data-mini="true" /> <input type="checkbox" id="chkEnableUpnp" data-mini="true" />
<div class="fieldDescription">UPnP allows automated router configuration for remote access. This may not work with some router models.</div> <div class="fieldDescription">${LabelEnableAutomaticPortHelp}</div>
</li> </li>
<li> <li>
<label for="txtDdns">External DDNS:</label> <label for="txtDdns">${LabelExternalDDNS}</label>
<input id="txtDdns" data-mini="true" /> <input id="txtDdns" data-mini="true" />
<div class="fieldDescription">If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.</div> <div class="fieldDescription">${LabelExternalDDNSHelp}</div>
</li> </li>
</ul> </ul>
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<button type="submit" data-theme="b" data-icon="check" data-mini="true"> <button type="submit" data-theme="b" data-icon="check" data-mini="true">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>

View file

@ -35,10 +35,10 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<button type="submit" data-theme="b" data-icon="check"> <button type="submit" data-theme="b" data-icon="check">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>
</ul> </ul>

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>App Settings</title> <title>${TitleAppSettings}</title>
</head> </head>
<body> <body>
<div id="appsPlaybackPage" data-role="page" class="page appsPage type-interior"> <div id="appsPlaybackPage" data-role="page" class="page appsPage type-interior">
@ -9,39 +9,39 @@
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Resume</a> <a href="#" data-role="button" class="ui-btn-active">${TabResume}</a>
<a href="appsweather.html" data-role="button">Weather</a> <a href="appsweather.html" data-role="button">${TabWeather}</a>
</div> </div>
<form class="appsPlaybackForm"> <form class="appsPlaybackForm">
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtMinResumePct">Min resume percentage: </label> <label for="txtMinResumePct">${LabelMinResumePercentage}</label>
<input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required="required" min="0" max="100" /> <input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required="required" min="0" max="100" />
<div class="fieldDescription"> <div class="fieldDescription">
Titles are assumed unplayed if stopped before this time ${LabelMinResumePercentageHelp}
</div> </div>
</li> </li>
<li> <li>
<label for="txtMaxResumePct">Max resume percentage: </label> <label for="txtMaxResumePct">${LabelMaxResumePercentage}</label>
<input type="number" id="txtMaxResumePct" name="txtMaxResumePct" pattern="[0-9]*" required="required" min="1" max="100" /> <input type="number" id="txtMaxResumePct" name="txtMaxResumePct" pattern="[0-9]*" required="required" min="1" max="100" />
<div class="fieldDescription"> <div class="fieldDescription">
Titles are assumed fully played if stopped after this time ${LabelMaxResumePercentageHelp}
</div> </div>
</li> </li>
<li> <li>
<label for="txtMinResumeDuration">Min resume duration (seconds): </label> <label for="txtMinResumeDuration">${LabelMinResumeDuration}</label>
<input type="number" id="txtMinResumeDuration" name="txtMinResumeDuration" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtMinResumeDuration" name="txtMinResumeDuration" pattern="[0-9]*" required="required" min="0" />
<div class="fieldDescription"> <div class="fieldDescription">
Titles shorter than this will not be resumable ${LabelMinResumeDurationHelp}
</div> </div>
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="check"> <button type="submit" data-theme="b" data-icon="check">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>
</ul> </ul>

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>App Settings</title> <title>${TitleAppSettings}</title>
</head> </head>
<body> <body>
<div id="appsWeatherPage" data-role="page" class="page appsPage type-interior"> <div id="appsWeatherPage" data-role="page" class="page appsPage type-interior">
@ -9,8 +9,8 @@
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="appsplayback.html" data-role="button">Resume</a> <a href="appsplayback.html" data-role="button">${TabResume}</a>
<a href="#" data-role="button" class="ui-btn-active">Weather</a> <a href="#" data-role="button" class="ui-btn-active">${TabWeather}</a>
</div> </div>
<form class="appsWeatherForm"> <form class="appsWeatherForm">
@ -31,10 +31,10 @@
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="check"> <button type="submit" data-theme="b" data-icon="check">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>
</ul> </ul>

View file

@ -16,30 +16,30 @@
</div> </div>
<div class="listTopPaging"> <div class="listTopPaging">
</div> </div>
<button id="btnNewCollection" data-mini="true" data-icon="plus" data-inline="true" class="hide">New</button> <button id="btnNewCollection" data-mini="true" data-icon="plus" data-inline="true" class="hide">${ButtonNew}</button>
</div> </div>
<div id="items" class="itemsContainer"></div> <div id="items" class="itemsContainer"></div>
</div> </div>
<div data-role="panel" id="newCollectionPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true"> <div data-role="panel" id="newCollectionPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
<form class="newCollectionForm"> <form class="newCollectionForm">
<h3>New Collection</h3> <h3>${HeaderNewCollection}</h3>
<br /> <br />
<div> <div>
<label for="txtNewCollectionName">Name:</label> <label for="txtNewCollectionName">${LabelName}</label>
<input type="text" id="txtNewCollectionName" required="required" /> <input type="text" id="txtNewCollectionName" required="required" />
<div class="fieldDescription">Example: Star Wars Collection</div> <div class="fieldDescription">${NewCollectionNameExample}</div>
</div> </div>
<br /> <br />
<div> <div>
<label for="chkEnableInternetMetadata">Search the internet for artwork and metadata</label> <label for="chkEnableInternetMetadata">${OptionSearchForInternetMetadata}</label>
<input type="checkbox" id="chkEnableInternetMetadata" data-mini="true" /> <input type="checkbox" id="chkEnableInternetMetadata" data-mini="true" />
</div> </div>
<br /> <br />
<p> <p>
<button id="btnSubmitNewCollection" type="submit" data-icon="plus" data-mini="true" data-theme="b">Create</button> <button id="btnSubmitNewCollection" type="submit" data-icon="plus" data-mini="true" data-theme="b">${ButtonCreate}</button>
</p> </p>
</form> </form>
</div> </div>
@ -49,11 +49,12 @@
<form> <form>
<div id="sortpanel"> <div id="sortpanel">
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">
<legend>Sort By: <legend>
<strong>${HeaderSortBy}</strong>
</legend> </legend>
<input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true"> <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
<label for="radioSortName">Name</label> <label for="radioSortName">${OptionNameSort}</label>
<input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
<label for="radioCommunityRating">${OptionCommunityRating}</label> <label for="radioCommunityRating">${OptionCommunityRating}</label>
@ -63,7 +64,8 @@
</fieldset> </fieldset>
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">
<legend>Sort Order: <legend>
<strong>${HeaderSortOrder}</strong>
</legend> </legend>
<input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true"> <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">

View file

@ -602,7 +602,7 @@ a.itemTag:hover {
} }
.libraryPanelHeader { .libraryPanelHeader {
margin: 10px 0 20px 0; margin: 5px 0 25px 0;
} }
.libraryPanelHeader a { .libraryPanelHeader a {

View file

@ -299,7 +299,6 @@ h1 .imageLink {
padding: .75em .5em .75em 1.25em; padding: .75em .5em .75em 1.25em;
display: block; display: block;
text-decoration: none; text-decoration: none;
font-size: 14px;
color: #fff!important; color: #fff!important;
font-weight: normal !important; font-weight: normal !important;
} }

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Dashboard</title> <title>${TitleDashboard}</title>
</head> </head>
<body> <body>
<div id="dashboardPage" data-role="page" class="page type-interior adminPage dashboardHomePage"> <div id="dashboardPage" data-role="page" class="page type-interior adminPage dashboardHomePage">
@ -10,9 +10,9 @@
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Home</a> <a href="#" data-role="button" class="ui-btn-active">${TabHome}</a>
<a href="dashboardgeneral.html" data-role="button">${TabGeneral}</a> <a href="dashboardgeneral.html" data-role="button">${TabGeneral}</a>
<a href="dashboardinfopage.html" data-role="button">Info</a> <a href="dashboardinfopage.html" data-role="button">${TabInfo}</a>
</div> </div>
<div class="dashboardContent"> <div class="dashboardContent">

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Dashboard</title> <title>${TitleDashboard}</title>
</head> </head>
<body> <body>
<div id="dashboardGeneralPage" data-role="page" class="page type-interior adminPage dashboardHomePage"> <div id="dashboardGeneralPage" data-role="page" class="page type-interior adminPage dashboardHomePage">
@ -10,33 +10,38 @@
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="dashboard.html" data-role="button">Home</a> <a href="dashboard.html" data-role="button">${TabHome}</a>
<a href="#" data-role="button" class="ui-btn-active">${TabGeneral}</a> <a href="#" data-role="button" class="ui-btn-active">${TabGeneral}</a>
<a href="dashboardinfopage.html" data-role="button">Info</a> <a href="dashboardinfopage.html" data-role="button">${TabInfo}</a>
</div> </div>
<form class="dashboardGeneralForm"> <form class="dashboardGeneralForm">
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtServerName">Friendly server name:</label> <label for="txtServerName">${LabelFriendlyServerName}</label>
<input id="txtServerName" data-mini="true" /> <input id="txtServerName" data-mini="true" />
<div class="fieldDescription">This name will be used to identify this server. If left blank, the computer name will be used.</div> <div class="fieldDescription">${LabelFriendlyServerNameHelp}</div>
</li> </li>
<li> <li>
<label for="selectLocalizationLanguage">Preferred display language</label> <label for="selectLocalizationLanguage">${LabelPreferredDisplayLanguage}</label>
<select id="selectLocalizationLanguage" data-mini="true"> <select id="selectLocalizationLanguage" data-mini="true">
</select> </select>
<div class="fieldDescription">Translating Media Browser is an ongoing project and is not yet complete. <a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">Read about how you can contribute</a>.</div> <div class="fieldDescription">
<div>${LabelPreferredDisplayLanguageHelp}</div>
<div>
<a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">${LabelReadHowYouCanContribute}</a>
</div>
</div>
</li> </li>
</ul> </ul>
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<button type="submit" data-theme="b" data-icon="check" data-mini="true"> <button type="submit" data-theme="b" data-icon="check" data-mini="true">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Dashboard</title> <title>${TitleDashboard}</title>
</head> </head>
<body> <body>
<div id="dashboardInfoPage" data-role="page" class="page type-interior adminPage dashboardHomePage"> <div id="dashboardInfoPage" data-role="page" class="page type-interior adminPage dashboardHomePage">
@ -11,22 +11,22 @@
<div class="readOnlyContent"> <div class="readOnlyContent">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="dashboard.html" data-role="button">Home</a> <a href="dashboard.html" data-role="button">${TabHome}</a>
<a href="dashboardgeneral.html" data-role="button">${TabGeneral}</a> <a href="dashboardgeneral.html" data-role="button">${TabGeneral}</a>
<a href="#" data-role="button" class="ui-btn-active">Info</a> <a href="#" data-role="button" class="ui-btn-active">${TabInfo}</a>
</div> </div>
<div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;"> <div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;">
<h3>Links</h3> <h3>${HeaderLinks}</h3>
<div> <div>
<p><a href="http://mediabrowser3.com/community" target="_blank">Community</a> - Join us!</p> <p><a href="http://mediabrowser3.com/community" target="_blank">${LinkCommunity}</a></p>
<p><a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank">Github</a></p> <p><a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank">${LinkGithub}</a></p>
<p><a href="../swagger-ui/index.html" target="_blank">Api Documentation</a></p> <p><a href="../swagger-ui/index.html" target="_blank">${LinkApiDocumentation}</a></p>
</div> </div>
</div> </div>
<div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;"> <div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;">
<h3>System Paths</h3> <h3>${HeaderSystemPaths}</h3>
<div> <div>
<p><b>Cache:</b> <span id="cachePath"></span></p> <p><b>Cache:</b> <span id="cachePath"></span></p>
<p><b>Images by name:</b> <span id="imagesByNamePath"></span></p> <p><b>Images by name:</b> <span id="imagesByNamePath"></span></p>

View file

@ -11,7 +11,7 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="dlnasettings.html" data-role="button">${TabSettings}</a> <a href="dlnasettings.html" data-role="button">${TabSettings}</a>
<a href="dlnaprofiles.html" data-role="button" class="ui-btn-active">Profiles</a> <a href="dlnaprofiles.html" data-role="button" class="ui-btn-active">${TabProfiles}</a>
</div> </div>
<form class="dlnaProfileForm" style="max-width: 650px;"> <form class="dlnaProfileForm" style="max-width: 650px;">
@ -365,7 +365,7 @@
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<label for="txtCodecProfileCodec">Codecs:</label> <label for="txtCodecProfileCodec">Codecs:</label>
<input type="text" id="txtCodecProfileCodec" data-mini="true" /> <input type="text" id="txtCodecProfileCodec" data-mini="true" />
<div>Separated by comma. This can be left empty to apply to all containers</div> <div>Separated by comma. This can be left empty to apply to all codecs</div>
</div> </div>
<p> <p>
@ -407,13 +407,13 @@
<div id="fldResponseProfileVideoCodec" style="margin: 1em 0;"> <div id="fldResponseProfileVideoCodec" style="margin: 1em 0;">
<label for="txtResponseProfileVideoCodec">Video codecs:</label> <label for="txtResponseProfileVideoCodec">Video codecs:</label>
<input type="text" id="txtResponseProfileVideoCodec" data-mini="true" /> <input type="text" id="txtResponseProfileVideoCodec" data-mini="true" />
<div>Separated by comma. This can be left empty to apply to all containers</div> <div>Separated by comma. This can be left empty to apply to all codecs</div>
</div> </div>
<div id="fldResponseProfileAudioCodec" style="margin: 1em 0 2em;"> <div id="fldResponseProfileAudioCodec" style="margin: 1em 0 2em;">
<label for="txtResponseProfileAudioCodec">Audio codecs:</label> <label for="txtResponseProfileAudioCodec">Audio codecs:</label>
<input type="text" id="txtResponseProfileAudioCodec" data-mini="true" /> <input type="text" id="txtResponseProfileAudioCodec" data-mini="true" />
<div>Separated by comma. This can be left empty to apply to all containers</div> <div>Separated by comma. This can be left empty to apply to all codecs</div>
</div> </div>
<p> <p>

View file

@ -11,26 +11,26 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="dlnasettings.html" data-role="button">${TabSettings}</a> <a href="dlnasettings.html" data-role="button">${TabSettings}</a>
<a href="#" data-role="button" class="ui-btn-active">Profiles</a> <a href="#" data-role="button" class="ui-btn-active">${TabProfiles}</a>
</div> </div>
<div class="readOnlyContent"> <div class="readOnlyContent">
<div style="position: relative;"> <div style="position: relative;">
<h2>Custom Profiles</h2> <h2>${HeaderCustomDlnaProfiles}</h2>
<div style="position: absolute; right: 0; top: -12px;"> <div style="position: absolute; right: 0; top: -12px;">
<a data-role="button" data-icon="plus" data-mini="true" href="dlnaprofile.html">New</a> <a data-role="button" data-icon="plus" data-mini="true" href="dlnaprofile.html">${ButtonNew}</a>
</div> </div>
</div> </div>
<p>Create a custom profile to target a new device or override a system profile.</p> <p>${CustomDlnaProfilesHelp}</p>
<div class="customProfiles"></div> <div class="customProfiles"></div>
<br /> <br />
<h2>System Profiles</h2> <h2>${HeaderSystemDlnaProfiles}</h2>
<p>System profiles are read-only. To override a system profile, create a custom profile targeting the same device.</p> <p>${SystemDlnaProfilesHelp}</p>
<div class="systemProfiles"></div> <div class="systemProfiles"></div>
</div> </div>

View file

@ -11,33 +11,33 @@
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a> <a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
<a href="dlnaprofiles.html" data-role="button">Profiles</a> <a href="dlnaprofiles.html" data-role="button">${TabProfiles}</a>
</div> </div>
<form class="dlnaSettingsForm"> <form class="dlnaSettingsForm">
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="chkEnablePlayTo">Enable DLNA Play To</label> <label for="chkEnablePlayTo">${LabelEnableDlnaPlayTo}</label>
<input type="checkbox" id="chkEnablePlayTo" data-mini="true" /> <input type="checkbox" id="chkEnablePlayTo" data-mini="true" />
<div class="fieldDescription">Media Browser can detect devices within your network and offer the ability to remote control them.</div> <div class="fieldDescription">${LabelEnableDlnaPlayToHelp}</div>
</li> </li>
<li> <li>
<label for="chkEnableDlnaDebugLogging">Enable DLNA debug logging</label> <label for="chkEnableDlnaDebugLogging">${LabelEnableDlnaDebugLogging}</label>
<input type="checkbox" id="chkEnableDlnaDebugLogging" data-mini="true" /> <input type="checkbox" id="chkEnableDlnaDebugLogging" data-mini="true" />
<div class="fieldDescription">This will create large log files and should only be used as needed for troubleshooting purposes.</div> <div class="fieldDescription">${LabelEnableDlnaDebugLoggingHelp}</div>
</li> </li>
<li> <li>
<label for="txtClientDiscoveryInterval">Client discovery interval (seconds)</label> <label for="txtClientDiscoveryInterval">${LabelEnableDlnaClientDiscoveryInterval}</label>
<input type="number" id="txtClientDiscoveryInterval" data-mini="true" min="1" max="300" /> <input type="number" id="txtClientDiscoveryInterval" data-mini="true" min="1" max="300" />
<div class="fieldDescription">Determines the duration in seconds of the interval between SSDP searches performed by Media Browser.</div> <div class="fieldDescription">${LabelEnableDlnaClientDiscoveryIntervalHelp}</div>
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="check"> <button type="submit" data-theme="b" data-icon="check">
Save ${ButtonSave}
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
Cancel ${ButtonCancel}
</button> </button>
</li> </li>
</ul> </ul>

View file

@ -17,19 +17,19 @@
<h1 class="itemName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" id="btnEditMetadata">Metadata</a> <a href="#" data-role="button" id="btnEditMetadata">${TabMetadata}</a>
<a id="btnEditPeople" style="display: none;" href="#" data-role="button">${TabPeople}</a> <a id="btnEditPeople" style="display: none;" href="#" data-role="button">${TabPeople}</a>
<a href="#" data-role="button" class="ui-btn-active">Titles</a> <a href="#" data-role="button" class="ui-btn-active">${TabCollectionTitles}</a>
<a id="btnEditImages" href="#" data-role="button">Images</a> <a id="btnEditImages" href="#" data-role="button">${TabImages}</a>
</div> </div>
<p style="margin-top: -20px;"> <p style="margin-top: -20px;">
Add or remove any movies, series, albums, books or games you wish to group within this collection. ${EditCollectionItemsHelp}
</p> </p>
<div> <div>
<button type="button" id="btnAddItem" data-icon="plus" data-inline="true" data-mini="true">Add</button> <button type="button" id="btnAddItem" data-icon="plus" data-inline="true" data-mini="true">${ButtonAdd}</button>
<button type="button" id="btnRemoveItems" data-icon="delete" data-inline="true" data-mini="true" disabled="disabled">Remove</button> <button type="button" id="btnRemoveItems" data-icon="delete" data-inline="true" data-mini="true" disabled="disabled">${ButtonRemove}</button>
</div> </div>
<br /> <br />
<div class="collectionItems"></div> <div class="collectionItems"></div>
@ -39,7 +39,7 @@
<div data-role="popup" data-transition="slidefade" class="popupIdentify popup" data-theme="a"> <div data-role="popup" data-transition="slidefade" class="popupIdentify popup" data-theme="a">
<div class="ui-bar-a" style="text-align: center; padding: 0 20px;"> <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
<h3>Add Titles <h3>${HeaderAddTitles}
</h3> </h3>
</div> </div>
@ -48,14 +48,14 @@
<form class="collectionItemSearchForm" style="max-width: initial;"> <form class="collectionItemSearchForm" style="max-width: initial;">
<div> <div>
<label for="txtLookupName">Name:</label> <label for="txtLookupName">${LabelName}</label>
<div style="display: inline-block; width: 75%;"> <div style="display: inline-block; width: 75%;">
<input type="text" id="txtLookupName" data-mini="true" required="required" /> <input type="text" id="txtLookupName" data-mini="true" required="required" />
</div> </div>
<button type="submit" data-icon="search" data-mini="true" data-inline="true" data-iconpos="notext"> <button type="submit" data-icon="search" data-mini="true" data-inline="true" data-iconpos="notext">
Search ${ButtonSearch}
</button> </button>
</div> </div>
@ -63,7 +63,7 @@
</div> </div>
<button id="btnAddItems" type="button" data-icon="plus" data-mini="true"> <button id="btnAddItems" type="button" data-icon="plus" data-mini="true">
Add ${ButtonAdd}
</button> </button>
</form> </form>
</div> </div>

View file

@ -17,10 +17,10 @@
<h1 class="itemName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" id="btnEditMetadata">Metadata</a> <a href="#" data-role="button" id="btnEditMetadata">${TabMetadata}</a>
<a href="#" data-role="button" id="btnEditPeople" style="display: none;">${TabPeople}</a> <a href="#" data-role="button" id="btnEditPeople" style="display: none;">${TabPeople}</a>
<a id="btnEditCollectionTitles" style="display: none;" href="#" data-role="button">Titles</a> <a id="btnEditCollectionTitles" style="display: none;" href="#" data-role="button">${TabCollectionTitles}</a>
<a href="#" data-role="button" class="ui-btn-active">Images</a> <a href="#" data-role="button" class="ui-btn-active">${TabImages}</a>
</div> </div>
<div style="margin: -25px 0 1em;"> <div style="margin: -25px 0 1em;">

View file

@ -16,10 +16,10 @@
<h1 class="itemName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Metadata</a> <a href="#" data-role="button" class="ui-btn-active">${TabMetadata}</a>
<a id="btnEditPeople" style="display: none;" href="#" data-role="button">${TabPeople}</a> <a id="btnEditPeople" style="display: none;" href="#" data-role="button">${TabPeople}</a>
<a id="btnEditCollectionTitles" style="display: none;" href="editcollectionitems.html" data-role="button">Titles</a> <a id="btnEditCollectionTitles" style="display: none;" href="editcollectionitems.html" data-role="button">${TabCollectionTitles}</a>
<a href="#" data-role="button" id="btnEditImages">Images</a> <a href="#" data-role="button" id="btnEditImages">${TabImages}</a>
</div> </div>
<form class="editItemMetadataForm editMetadataForm" style="margin-top: -20px;"> <form class="editItemMetadataForm editMetadataForm" style="margin-top: -20px;">

View file

@ -16,13 +16,13 @@
<h1 class="itemName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" id="btnEditMetadata">Metadata</a> <a href="#" data-role="button" id="btnEditMetadata">${TabMetadata}</a>
<a href="#" data-role="button" class="ui-btn-active">${TabPeople}</a> <a href="#" data-role="button" class="ui-btn-active">${TabPeople}</a>
<a id="btnEditCollectionTitles" style="display: none;" href="#" data-role="button">Titles</a> <a id="btnEditCollectionTitles" style="display: none;" href="#" data-role="button">${TabCollectionTitles}</a>
<a href="#" data-role="button" id="btnEditImages">Images</a> <a href="#" data-role="button" id="btnEditImages">${TabImages}</a>
</div> </div>
<div id="divAddPerson" style="display: none;"> <div id="divAddPerson" style="display: none;">
<button type="button" data-icon="plus" data-inline="true" data-mini="true" onclick="EditItemPeoplePage.addPerson();">Add Person</button> <button type="button" data-icon="plus" data-inline="true" data-mini="true" onclick="EditItemPeoplePage.addPerson();">${ButtonAdd}</button>
</div> </div>
<div class="itemsContainer" id="peopleContainer" style="text-align: left;"></div> <div class="itemsContainer" id="peopleContainer" style="text-align: left;"></div>
</div> </div>

View file

@ -220,11 +220,31 @@ function humane_elapsed(firstDateStr, secondDateStr) {
} }
function getWindowUrl(win) {
return (win || window).location.href;
}
function getWindowLocationSearch(win) {
var search = (win || window).location.search;
if (!search) {
var index = window.location.href.indexOf('?');
if (index != -1) {
search = window.location.href.substring(index);
}
}
return search || '';
}
function getParameterByName(name, url) { function getParameterByName(name, url) {
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]"); name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
var regexS = "[\\?&]" + name + "=([^&#]*)"; var regexS = "[\\?&]" + name + "=([^&#]*)";
var regex = new RegExp(regexS, "i"); var regex = new RegExp(regexS, "i");
var results = regex.exec(url || window.location.search);
var results = regex.exec(url || getWindowLocationSearch());
if (results == null) if (results == null)
return ""; return "";
else else

View file

@ -87,7 +87,7 @@
$('#playButtonContainer', page).hide(); $('#playButtonContainer', page).hide();
} }
var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + window.location.search : null; var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + getWindowLocationSearch() : null;
$('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref)); $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref));
if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {
@ -524,7 +524,7 @@
reload(page); reload(page);
$('#btnEdit', page).attr('href', 'edititemmetadata.html' + window.location.search); $('#btnEdit', page).attr('href', 'edititemmetadata.html' + getWindowLocationSearch());
}).on('pagehide', "#itemByNameDetailPage", function () { }).on('pagehide', "#itemByNameDetailPage", function () {

View file

@ -649,7 +649,7 @@
} }
// Just use the first audio stream // Just use the first audio stream
return audioStreams[0]; return audioStreams[0].Index;
} }
function getVideoQualityOptions(mediaStreams) { function getVideoQualityOptions(mediaStreams) {

View file

@ -344,7 +344,7 @@ var Dashboard = {
navigate: function (url, preserveQueryString) { navigate: function (url, preserveQueryString) {
var queryString = window.location.search; var queryString = getWindowLocationSearch();
if (preserveQueryString && queryString) { if (preserveQueryString && queryString) {
url += queryString; url += queryString;
} }