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

remove another jqm panel

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-15 09:41:07 -05:00
parent 914a579a66
commit 8a8ca495fd
10 changed files with 56 additions and 55 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

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.0.77",
"_release": "1.0.77",
"version": "1.0.79",
"_release": "1.0.79",
"_resolution": {
"type": "version",
"tag": "1.0.77",
"commit": "68a71ffeed9dad3e3d06d163b51ae4c555f3c1f9"
"tag": "1.0.79",
"commit": "f00dd984581d53272229de71458c8a8f6b5878fc"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",

16
dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js vendored
View file

@ -32,8 +32,20 @@ define(['paperdialoghelper', 'layoutManager', 'globalize', 'dialogText', 'html!.
html += '<paper-icon-button tabindex="-1" icon="dialog:arrow-back" class="btnPromptExit"></paper-icon-button>';
}
if (options.title) {
html += '<h2>';
html += options.title;
html += '</h2>';
}
html += '<paper-input autoFocus class="txtPromptValue"></paper-input>';
if (options.description) {
html += '<div class="fieldDescription">';
html += options.description;
html += '</div>';
}
// TODO: An actual form element should probably be added
html += '<br/>';
if (raisedButtons) {
@ -53,8 +65,8 @@ define(['paperdialoghelper', 'layoutManager', 'globalize', 'dialogText', 'html!.
dlg.querySelector('.txtPromptValue').value = options.text;
}
if (options.title) {
dlg.querySelector('.txtPromptValue').label = options.title;
if (options.label) {
dlg.querySelector('.txtPromptValue').label = options.label;
}
document.body.appendChild(dlg);

2
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -228,7 +228,7 @@
require(['prompt'], function (prompt) {
prompt({
title: 'Value:'
label: 'Value:'
}).then(function (text) {
var list = $(source).parents('.editableListviewContainer').find('.paperList');
var items = editableListViewValues(list);

15
dashboard-ui/scripts/medialibrarypage.js
View file

@ -72,17 +72,16 @@
require(['prompt'], function (prompt) {
prompt({
title: Globalize.translate('LabelNewName'),
callback: function (newName) {
label: Globalize.translate('LabelNewName')
if (newName && newName != virtualFolder.Name) {
}).then(function (newName) {
if (newName && newName != virtualFolder.Name) {
var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () {
reloadLibrary(page);
});
}
ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () {
reloadLibrary(page);
});
}
});

39
dashboard-ui/scripts/serversecurity.js
View file

@ -95,28 +95,33 @@
});
}
function onSubmit() {
var form = this;
var page = $(form).parents('.page');
function showNewKeyPrompt(page) {
require(['prompt'], function (prompt) {
// HeaderNewApiKeyHelp not used
Dashboard.showLoadingMsg();
prompt({
title: Globalize.translate('HeaderNewApiKey'),
label: Globalize.translate('LabelAppName'),
description: Globalize.translate('LabelAppNameExample')
ApiClient.ajax({
type: "POST",
url: ApiClient.getUrl('Auth/Keys', {
}).then(function (value) {
App: $('#txtAppName', form).val()
ApiClient.ajax({
type: "POST",
url: ApiClient.getUrl('Auth/Keys', {
})
App: value
}).then(function () {
})
$('.newKeyPanel', page).panel('close');
}).then(function () {
loadData(page);
});
});
loadData(page);
});
return false;
}
pageIdOn('pageinit', "serverSecurityPage", function () {
@ -125,14 +130,10 @@
$('.btnNewKey', page).on('click', function () {
$('.newKeyPanel', page).panel('toggle');
$('#txtAppName', page).val('').focus();
showNewKeyPrompt(page);
});
$('.newKeyForm').off('submit', onSubmit).on('submit', onSubmit);
});
pageIdOn('pagebeforeshow', "serverSecurityPage", function () {

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

@ -343,7 +343,7 @@
require(['prompt'], function (prompt) {
prompt({
title: Globalize.translate('LabelTag')
label: Globalize.translate('LabelTag')
}).then(function (value) {
var tags = getBlockedTagsFromPage(page);

17
dashboard-ui/serversecurity.html
View file

@ -4,7 +4,7 @@
<title>${TitleAdvanced}</title>
</head>
<body>
<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmpanel,jqmtable,scripts/serversecurity,detailtablecss">
<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmtable,scripts/serversecurity,detailtablecss">
<div data-role="content">
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
@ -38,21 +38,6 @@
</table>
</div>
</div>
<div data-role="panel" class="newKeyPanel" data-position="right" data-display="overlay" data-position-fixed="true">
<form class="newKeyForm">
<h3>${HeaderNewApiKey}</h3>
<p>${HeaderNewApiKeyHelp}</p>
<div>
<label for="txtAppName">${LabelAppName}</label>
<input type="text" id="txtAppName" required="required" />
<div class="fieldDescription">${LabelAppNameExample}</div>
</div>
<br />
<p>
<button type="submit" data-icon="plus" data-mini="true" data-theme="b">${ButtonCreate}</button>
</p>
</form>
</div>
</div>
</body>
</html>

4
dashboard-ui/strings/html/server.json
View file

@ -1033,10 +1033,6 @@
"HeaderUser": "User",
"HeaderDateIssued": "Date Issued",
"LabelChapterName": "Chapter {0}",
"HeaderNewApiKey": "New Api Key",
"LabelAppName": "App name",
"LabelAppNameExample": "Example: Sickbeard, NzbDrone",
"HeaderNewApiKeyHelp": "Grant an application permission to communicate with Emby Server.",
"ButtonEnterSupporterKey": "Enter Emby Premiere key",
"HeaderHttpHeaders": "Http Headers",
"HeaderIdentificationHeader": "Identification Header",

4
dashboard-ui/strings/javascript/en-US.json
View file

@ -37,6 +37,10 @@
"MessageKeyRemoved": "Thank you. Your Emby Premiere key has been removed.",
"HeaderSupportTheTeam": "Support the Emby Team",
"TextEnjoyBonusFeatures": "Enjoy Bonus Features",
"HeaderNewApiKey": "New Api Key",
"LabelAppName": "App name",
"LabelAppNameExample": "Example: Sickbeard, NzbDrone",
"HeaderNewApiKeyHelp": "Grant an application permission to communicate with Emby Server.",
"TitleLiveTV": "Live TV",
"ButtonCancelSyncJob": "Cancel sync",
"HeaderAddTag": "Add Tag",

4
dashboard-ui/strings/javascript/javascript.json
View file

@ -30,6 +30,10 @@
"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
"NoPluginsInstalledMessage": "You have no plugins installed.",
"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins.",
"HeaderNewApiKey": "New Api Key",
"LabelAppName": "App name",
"LabelAppNameExample": "Example: Sickbeard, NzbDrone",
"HeaderNewApiKeyHelp": "Grant an application permission to communicate with Emby Server.",
"MessageKeyEmailedTo": "Key emailed to {0}.",
"MessageKeysLinked": "Keys linked.",
"HeaderConfirmation": "Confirmation",