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

update live stream sharing

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-11 17:33:38 -04:00
parent 8bf645c346
commit a511a2fa84
10 changed files with 89 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.295",
"_release": "1.4.295",
"version": "1.4.296",
"_release": "1.4.296",
"_resolution": {
"type": "version",
"tag": "1.4.295",
"commit": "1cfe41bab16e66d13ef8a613b251ee3edccde3a8"
"tag": "1.4.296",
"commit": "b1299a1ac50def9b8cdd03ec54b6170eb6c983f4"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

3
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -292,8 +292,9 @@ button {
margin-right: 2em;
}
.cardCenteredText {
.cardDefaultText {
white-space: normal;
text-align: center;
}
.textActionButton {

11
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -804,7 +804,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
var showMediaTitle = (showTitle && !titleAdded) || (options.showParentTitleOrTitle && !lines.length);
if (!showMediaTitle && showTitle && forceName && !titleAdded) {
if (!showMediaTitle && !titleAdded && (showTitle || forceName)) {
showMediaTitle = true;
}
@ -958,9 +958,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
} else {
if (item.EndDate && item.ProductionYear) {
lines.push(item.ProductionYear + ' - ' + datetime.parseISO8601Date(item.EndDate).getFullYear());
} else {
lines.push(item.ProductionYear || '');
}
}
}
@ -1160,7 +1165,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var imgInfo = getCardImageUrl(item, apiClient, options);
var imgUrl = imgInfo.imgUrl;
var forceName = imgInfo.forceName || !imgUrl;
var forceName = imgInfo.forceName;
var showTitle = options.showTitle === 'auto' ? true : (options.showTitle || item.Type === 'PhotoAlbum' || item.Type === 'Folder');
var overlayText = options.overlayText;
@ -1336,7 +1341,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (!imgUrl) {
var defaultName = item.Type === 'Program' || item.Type == 'Timer' || item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item);
cardImageContainerOpen += '<div class="cardText cardCenteredText">' + defaultName + '</div>';
cardImageContainerOpen += '<div class="cardText cardDefaultText">' + defaultName + '</div>';
}
var tagName = (layoutManager.tv || !scalable) && !overlayButtons ? 'button' : 'div';

4
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -10,7 +10,7 @@
"Repeat": "Repeat",
"TrackCount": "{0} tracks",
"ItemCount": "{0} items",
"ValueSeriesYearToPresent": "{0}-Present",
"ValueSeriesYearToPresent": "{0} - Present",
"ReleaseYearValue": "Release year: {0}",
"OriginalAirDateValue": "Original air date: {0}",
"EndsAtValue": "Ends at {0}",
@ -223,7 +223,7 @@
"PackageInstallCompleted": "{0} installation completed.",
"PackageInstallFailed": "{0} installation failed.",
"PackageInstallCancelled": "{0} installation cancelled.",
"SeriesYearToPresent": "{0}-Present",
"SeriesYearToPresent": "{0} - Present",
"ValueOneSong": "1 song",
"ValueSongCount": "{0} songs",
"ValueOneMovie": "1 movie",

2
dashboard-ui/css/librarymenu.css
View file

@ -245,7 +245,7 @@ i.sidebarLinkIcon {
}
.darkDrawer i.sidebarLinkIcon {
margin-left: 1em;
margin-left: 1.7em;
}
.darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink {

159
dashboard-ui/dlnaprofile.html
View file

@ -17,91 +17,85 @@
<br />
<div class="tabContent tabInfo">
<div>
<label for="txtName">${LabelName}</label>
<input type="text" id="txtName" required="required" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtName" required="required" label="${LabelName}" />
</div>
<br />
<div>
<label for="selectUser">${LabelUserLibrary}</label>
<select id="selectUser" data-mini="true"></select>
<div class="selectContainer">
<select is="emby-select" id="selectUser" label="${LabelUserLibrary}"></select>
<div class="fieldDescription">${LabelUserLibraryHelp}</div>
</div>
<div>
<h3 class="checkboxListLabel">${LabelSupportedMediaTypes}</h3>
<div class="checkboxList paperList checkboxList-paperList">
<label>
<input is="emby-checkbox" type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" />
<span>${OptionProfileAudio}</span>
</label>
<label>
<input is="emby-checkbox" type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" />
<span>${OptionProfilePhoto}</span>
</label>
<label>
<input is="emby-checkbox" type="checkbox" id="chkVideo" data-value="Video" class="chkMediaType" />
<span>${OptionProfileVideo}</span>
</label>
</div>
</div>
<br />
<div class="inputContainer">
<input is="emby-input" type="number" id="txtMaxAllowedBitrate" pattern="[0-9]*" min="1" label="${LabelMaxStreamingBitrate}" />
<div class="fieldDescription">${LabelMaxStreamingBitrateHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" label="${LabelMusicStreamingTranscodingBitrate}" />
<div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
</div>
<div style="display:none;">
<label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
<input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
<div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>
</div>
<fieldset data-role="controlgroup">
<legend>${LabelSupportedMediaTypes}</legend>
<input type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" />
<label for="chkAudio">${OptionProfileAudio}</label>
<input type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" />
<label for="chkPhoto">${OptionProfilePhoto}</label>
<input type="checkbox" id="chkVideo" data-value="Video" class="chkMediaType" />
<label for="chkVideo">${OptionProfileVideo}</label>
</fieldset>
<br />
<div is="emby-collapse" title="${HeaderIdentification}">
<div class="collapseContent">
<br />
<p>${HeaderIdentificationCriteriaHelp}</p>
<br />
<div>
<label for="txtIdFriendlyName">${LabelFriendlyName}</label>
<input type="text" id="txtIdFriendlyName" />
<h3>${HeaderIdentificationCriteriaHelp}</h3>
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdFriendlyName" label="${LabelFriendlyName}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdManufacturer">${LabelManufacturer}</label>
<input type="text" id="txtIdManufacturer" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdManufacturer" label="${LabelManufacturer}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdManufacturerUrl">${LabelManufacturerUrl}</label>
<input type="text" id="txtIdManufacturerUrl" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdManufacturerUrl" label="${LabelManufacturerUrl}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdModelName">${LabelModelName}</label>
<input type="text" id="txtIdModelName" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdModelName" label="${LabelModelName}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdModelNumber">${LabelModelNumber}</label>
<input type="text" id="txtIdModelNumber" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdModelNumber" label="${LabelModelNumber}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdModelDesription">${LabelModelDescription}</label>
<input type="text" id="txtIdModelDesription" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdModelDesription" label="${LabelModelDescription}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdModelUrl">${LabelModelUrl}</label>
<input type="text" id="txtIdModelUrl" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdModelUrl" label="${LabelModelUrl}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdSerialNumber">${LabelSerialNumber}</label>
<input type="text" id="txtIdSerialNumber" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdSerialNumber" label="${LabelSerialNumber}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<label for="txtIdDeviceDescription">${LabelDeviceDescription}</label>
<input type="text" id="txtIdDeviceDescription" />
<div class="inputContainer">
<input is="emby-input" type="text" id="txtIdDeviceDescription" label="${LabelDeviceDescription}" />
<div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
</div>
<br />
<div>
<h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
@ -117,16 +111,20 @@
<div is="emby-collapse" title="${HeaderDisplaySettings}">
<div class="collapseContent">
<br />
<div>
<label for="chkRequiresPlainFolders">${OptionPlainStorageFolders}</label>
<input type="checkbox" id="chkRequiresPlainFolders" data-mini="true" />
<div class="fieldDescription">${OptionPlainStorageFoldersHelp}</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="chkRequiresPlainFolders" />
<span>${OptionPlainStorageFolders}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${OptionPlainStorageFoldersHelp}</div>
</div>
<br />
<div>
<label for="chkRequiresPlainVideoItems">${OptionPlainVideoItems}</label>
<input type="checkbox" id="chkRequiresPlainVideoItems" data-mini="true" />
<div class="fieldDescription">${OptionPlainVideoItemsHelp}</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="chkRequiresPlainVideoItems" />
<span>${OptionPlainVideoItems}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${OptionPlainVideoItemsHelp}</div>
</div>
</div>
</div>
@ -178,29 +176,6 @@
</div>
</div>
<div is="emby-collapse" title="${HeaderPlaybackSettings}">
<div class="collapseContent">
<br />
<div>
<label for="txtMaxAllowedBitrate">${LabelMaxStreamingBitrate}</label>
<input type="number" id="txtMaxAllowedBitrate" pattern="[0-9]*" min="1" />
<div class="fieldDescription">${LabelMaxStreamingBitrateHelp}</div>
</div>
<br />
<div>
<label for="txtMusicStreamingTranscodingBitrate">${LabelMusicStreamingTranscodingBitrate}</label>
<input type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" />
<div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
</div>
<br />
<div style="display:none;">
<label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
<input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
<div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>
</div>
</div>
</div>
<div is="emby-collapse" title="${HeaderServerSettings}">
<div class="collapseContent">
<p>${HeaderProfileServerSettingsHelp}</p>

2
dashboard-ui/scripts/dlnaprofile.js
View file

@ -1,4 +1,4 @@
define(['jQuery', 'fnchecked', 'jqmlistview'], function ($) {
define(['jQuery', 'fnchecked', 'jqmlistview', 'emby-select', 'emby-button', 'emby-input', 'emby-checkbox'], function ($) {
var currentProfile;

2
dashboard-ui/scripts/sections.js
View file

@ -699,7 +699,7 @@
coverImage: true,
lazy: true,
showDetailsMenu: true,
centerText: true,
centerText: !supportsImageAnalysis,
overlayText: false,
overlayPlayButton: true,
allowBottomPadding: !enableScrollX(),

2
dashboard-ui/scripts/tvshows.js
View file

@ -144,7 +144,7 @@
shape: "portrait",
context: 'tv',
showTitle: true,
showYear: true,
showSeriesYear: true,
lazy: true,
cardLayout: true,
vibrant: supportsImageAnalysis

2
dashboard-ui/strings/en-US.json
View file

@ -1774,7 +1774,7 @@
"HeaderUnaired": "Unaired",
"HeaderMissing": "Missing",
"ButtonWebsite": "Website",
"ValueSeriesYearToPresent": "{0}-Present",
"ValueSeriesYearToPresent": "{0} - Present",
"ValueAwards": "Awards: {0}",
"ValueBudget": "Budget: {0}",
"ValueRevenue": "Revenue: {0}",