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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Techywarrior 2013-03-28 19:57:47 -07:00
commit 1e5d5344a4
26 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/about.html
View file

@ -13,7 +13,7 @@
<a href="support.html" data-role="button">General</a> <a href="support.html" data-role="button">General</a>
<a href="log.html" data-role="button">View Log</a> <a href="log.html" data-role="button">View Log</a>
<a href="supporter.html" data-role="button">Become a Supporter</a> <a href="supporter.html" data-role="button">Become a Supporter</a>
<a href="supporterKey.html" data-role="button">Supporter Key</a> <a href="supporterkey.html" data-role="button">Supporter Key</a>
<a href="about.html" data-role="button" class="ui-btn-active">About</a> <a href="about.html" data-role="button" class="ui-btn-active">About</a>
</div> </div>
<p> <p>

2
dashboard-ui/addplugin.html
View file

@ -9,7 +9,7 @@
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
<p> <p>
<a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="pluginCatalog.html">Plugin Catalog</a> <a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="plugincatalog.html">Plugin Catalog</a>
</p> </p>
<form id="addPluginForm"> <form id="addPluginForm">
<p id="tagline" style="font-style: italic;"></p> <p id="tagline" style="font-style: italic;"></p>

4
dashboard-ui/advancedmetadata.html
View file

@ -11,8 +11,8 @@
<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="metadata.html" data-role="button">Basics</a> <a href="metadata.html" data-role="button">Basics</a>
<a href="metadataImages.html" data-role="button">Images</a> <a href="metadataimages.html" data-role="button">Images</a>
<a href="advancedMetadata.html" data-role="button" class="ui-btn-active">Advanced</a> <a href="advancedmetadata.html" data-role="button" class="ui-btn-active">Advanced</a>
</div> </div>
<form id="advancedMetadataConfigurationForm"> <form id="advancedMetadataConfigurationForm">

2
dashboard-ui/dashboard.html
View file

@ -47,7 +47,7 @@
<h3>Running Tasks</h3> <h3>Running Tasks</h3>
<div id="divRunningTasks"> <div id="divRunningTasks">
</div> </div>
<p><a href="scheduledTasks.html">Manage Scheduled Tasks</a></p> <p><a href="scheduledtasks.html">Manage Scheduled Tasks</a></p>
</div> </div>
</div> </div>
</div> </div>

4
dashboard-ui/edituser.html
View file

@ -10,8 +10,8 @@
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Profile</a> <a href="#" data-role="button" class="ui-btn-active">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a> <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a> <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a> <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
</div> </div>
<form id="editUserProfileForm"> <form id="editUserProfileForm">

6
dashboard-ui/library.html
View file

@ -9,9 +9,9 @@
<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" id="userProfileNavigation" style="display: none;" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
<a href="#" data-role="button" onclick="Dashboard.navigate('editUser.html', true);">Profile</a> <a href="#" data-role="button" onclick="Dashboard.navigate('edituser.html', true);">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a> <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a> <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" class="ui-btn-active">Media Library</a> <a href="#" data-role="button" class="ui-btn-active">Media Library</a>
</div> </div>
<div class="readOnlyContent"> <div class="readOnlyContent">

2
dashboard-ui/log.html
View file

@ -12,7 +12,7 @@
<a href="support.html" data-role="button">General</a> <a href="support.html" data-role="button">General</a>
<a href="log.html" data-role="button" class="ui-btn-active">View Log</a> <a href="log.html" data-role="button" class="ui-btn-active">View Log</a>
<a href="supporter.html" data-role="button">Become a Supporter</a> <a href="supporter.html" data-role="button">Become a Supporter</a>
<a href="supporterKey.html" data-role="button">Supporter Key</a> <a href="supporterkey.html" data-role="button">Supporter Key</a>
<a href="about.html" data-role="button">About</a> <a href="about.html" data-role="button">About</a>
</div> </div>
<p> <p>

4
dashboard-ui/metadata.html
View file

@ -11,8 +11,8 @@
<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="metadata.html" data-role="button" class="ui-btn-active">Basics</a> <a href="metadata.html" data-role="button" class="ui-btn-active">Basics</a>
<a href="metadataImages.html" data-role="button">Images</a> <a href="metadataimages.html" data-role="button">Images</a>
<a href="advancedMetadata.html" data-role="button">Advanced</a> <a href="advancedmetadata.html" data-role="button">Advanced</a>
</div> </div>
<form id="metadataConfigurationForm"> <form id="metadataConfigurationForm">

4
dashboard-ui/metadataimages.html
View file

@ -11,8 +11,8 @@
<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="metadata.html" data-role="button">Basics</a> <a href="metadata.html" data-role="button">Basics</a>
<a href="metadataImages.html" data-role="button" class="ui-btn-active">Images</a> <a href="metadataimages.html" data-role="button" class="ui-btn-active">Images</a>
<a href="advancedMetadata.html" data-role="button">Advanced</a> <a href="advancedmetadata.html" data-role="button">Advanced</a>
</div> </div>
<form id="metadataImagesConfigurationForm"> <form id="metadataImagesConfigurationForm">

4
dashboard-ui/plugincatalog.html
View file

@ -10,8 +10,8 @@
<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="plugins.html" data-role="button">Installed Plugins</a> <a href="plugins.html" data-role="button">Installed Plugins</a>
<a href="pluginCatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a> <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
<a href="pluginUpdates.html" data-role="button">Automatic Updates</a> <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
</div> </div>
<div id="pluginTiles"></div> <div id="pluginTiles"></div>

4
dashboard-ui/plugins.html
View file

@ -10,8 +10,8 @@
<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="plugins.html" data-role="button" class="ui-btn-active">Installed Plugins</a> <a href="plugins.html" data-role="button" class="ui-btn-active">Installed Plugins</a>
<a href="pluginCatalog.html" data-role="button">Plugin Catalog</a> <a href="plugincatalog.html" data-role="button">Plugin Catalog</a>
<a href="pluginUpdates.html" data-role="button">Automatic Updates</a> <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
</div> </div>
<div class="readOnlyContent"> <div class="readOnlyContent">

4
dashboard-ui/pluginupdates.html
View file

@ -10,8 +10,8 @@
<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="plugins.html" data-role="button">Installed Plugins</a> <a href="plugins.html" data-role="button">Installed Plugins</a>
<a href="pluginCatalog.html" data-role="button">Plugin Catalog</a> <a href="pluginctalog.html" data-role="button">Plugin Catalog</a>
<a href="pluginUpdates.html" data-role="button" class="ui-btn-active">Automatic Updates</a> <a href="pluginupdates.html" data-role="button" class="ui-btn-active">Automatic Updates</a>
</div> </div>
<form id="pluginUpdatesForm"> <form id="pluginUpdatesForm">

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

@ -150,7 +150,7 @@
if (userId) { if (userId) {
Dashboard.alert("Settings saved."); Dashboard.alert("Settings saved.");
} else { } else {
Dashboard.navigate("userProfiles.html"); Dashboard.navigate("userprofiles.html");
} }
}, },

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

@ -92,7 +92,7 @@
html += "<li>"; html += "<li>";
html += "<a href='scheduledTask.html?id=" + task.Id + "'>"; html += "<a href='scheduledtask.html?id=" + task.Id + "'>";
html += "<h3>" + task.Name + "</h3>"; html += "<h3>" + task.Name + "</h3>";

10
dashboard-ui/scripts/site.js
View file

@ -434,7 +434,7 @@ var Dashboard = {
var hasPrimaryImage = item.ImageTags && item.ImageTags.Primary; var hasPrimaryImage = item.ImageTags && item.ImageTags.Primary;
var href = item.IsFolder ? (item.Id ? "itemList.html?parentId=" + item.Id : "#") : "itemDetails.html?id=" + item.Id; var href = item.IsFolder ? (item.Id ? "itemlist.html?parentId=" + item.Id : "#") : "itemdetails.html?id=" + item.Id;
var showText = options.showTitle || !hasPrimaryImage || (item.Type !== 'Movie' && item.Type !== 'Series' && item.Type !== 'Season' && item.Type !== 'Trailer'); var showText = options.showTitle || !hasPrimaryImage || (item.Type !== 'Movie' && item.Type !== 'Series' && item.Type !== 'Season' && item.Type !== 'Trailer');
@ -539,7 +539,7 @@ var Dashboard = {
html += '<img style="max-height:125px;max-width:200px;" src="' + imageUrl + '" />'; html += '<img style="max-height:125px;max-width:200px;" src="' + imageUrl + '" />';
html += '</p>'; html += '</p>';
html += '<p><button type="button" onclick="Dashboard.navigate(\'editUser.html?userId=' + user.Id + '\');" data-icon="user">View Profile</button></p>'; html += '<p><button type="button" onclick="Dashboard.navigate(\'edituser.html?userId=' + user.Id + '\');" data-icon="user">View Profile</button></p>';
html += '<p><button type="button" onclick="Dashboard.logout();" data-icon="lock">Sign Out</button></p>'; html += '<p><button type="button" onclick="Dashboard.logout();" data-icon="lock">Sign Out</button></p>';
html += '</div>'; html += '</div>';
@ -857,11 +857,11 @@ var Dashboard = {
selected: page.hasClass("pluginConfigurationPage") selected: page.hasClass("pluginConfigurationPage")
}, { }, {
name: "User Profiles", name: "User Profiles",
href: "userProfiles.html", href: "userprofiles.html",
selected: page.hasClass("userProfilesConfigurationPage") selected: page.hasClass("userProfilesConfigurationPage")
}, { }, {
name: "Display Settings", name: "Display Settings",
href: "uiSettings.html", href: "uisettings.html",
selected: pageElem.id == "displaySettingsPage" selected: pageElem.id == "displaySettingsPage"
}, { }, {
name: "Advanced", name: "Advanced",
@ -869,7 +869,7 @@ var Dashboard = {
selected: pageElem.id == "advancedConfigurationPage" selected: pageElem.id == "advancedConfigurationPage"
}, { }, {
name: "Scheduled Tasks", name: "Scheduled Tasks",
href: "scheduledTasks.html", href: "scheduledtasks.html",
selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage" selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage"
}, { }, {
name: "Help", name: "Help",

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

@ -19,7 +19,7 @@
} else { } else {
$('.supporterOnly', page).hide(); $('.supporterOnly', page).hide();
} }
$('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterKey.html")); $('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterkey.html"));
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }

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

@ -22,7 +22,7 @@
html += "<li>"; html += "<li>";
html += "<a onclick='Dashboard.navigate(\"editUser.html?userId=" + user.Id + "\");' href='#'>"; html += "<a onclick='Dashboard.navigate(\"edituser.html?userId=" + user.Id + "\");' href='#'>";
if (user.PrimaryImageTag) { if (user.PrimaryImageTag) {

4
dashboard-ui/scripts/wizardstartpage.js
View file

@ -6,10 +6,10 @@
if (users.length > 1) { if (users.length > 1) {
Dashboard.navigate('wizardLibrary.html'); Dashboard.navigate('wizardlibrary.html');
} else { } else {
Dashboard.navigate('wizardUser.html'); Dashboard.navigate('wizarduser.html');
} }
}); });

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

@ -51,7 +51,7 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
Dashboard.navigate('wizardLibrary.html'); Dashboard.navigate('wizardlibrary.html');
} }
}; };

2
dashboard-ui/support.html
View file

@ -13,7 +13,7 @@
<a href="support.html" data-role="button" class="ui-btn-active">General</a> <a href="support.html" data-role="button" class="ui-btn-active">General</a>
<a href="log.html" data-role="button">View Log</a> <a href="log.html" data-role="button">View Log</a>
<a href="supporter.html" data-role="button">Become a Supporter</a> <a href="supporter.html" data-role="button">Become a Supporter</a>
<a href="supporterKey.html" data-role="button">Supporter Key</a> <a href="supporterkey.html" data-role="button">Supporter Key</a>
<a href="about.html" data-role="button">About</a> <a href="about.html" data-role="button">About</a>
</div> </div>
<h2>General Help</h2> <h2>General Help</h2>

2
dashboard-ui/supporter.html
View file

@ -13,7 +13,7 @@
<a href="support.html" data-role="button">General</a> <a href="support.html" data-role="button">General</a>
<a href="log.html" data-role="button">View Log</a> <a href="log.html" data-role="button">View Log</a>
<a href="supporter.html" data-role="button" class="ui-btn-active">Become a Supporter</a> <a href="supporter.html" data-role="button" class="ui-btn-active">Become a Supporter</a>
<a href="supporterKey.html" data-role="button">Supporter Key</a> <a href="supporterkey.html" data-role="button">Supporter Key</a>
<a href="about.html" data-role="button">About</a> <a href="about.html" data-role="button">About</a>
</div> </div>
<h2>Support the Media Browser Team</h2> <h2>Support the Media Browser Team</h2>

2
dashboard-ui/supporterkey.html
View file

@ -13,7 +13,7 @@
<a href="support.html" data-role="button">General</a> <a href="support.html" data-role="button">General</a>
<a href="log.html" data-role="button">View Log</a> <a href="log.html" data-role="button">View Log</a>
<a href="supporter.html" data-role="button">Become a Supporter</a> <a href="supporter.html" data-role="button">Become a Supporter</a>
<a href="supporterKey.html" data-role="button" class="ui-btn-active">Supporter Key</a> <a href="supporterkey.html" data-role="button" class="ui-btn-active">Supporter Key</a>
<a href="about.html" data-role="button">About</a> <a href="about.html" data-role="button">About</a>
</div> </div>
<h2>Supporter Key</h2> <h2>Supporter Key</h2>

4
dashboard-ui/updatepassword.html
View file

@ -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="#" onclick="Dashboard.navigate('editUser.html', true);" data-role="button">Profile</a> <a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userImage.html', true);">Image</a> <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" class="ui-btn-active">Password</a> <a href="#" data-role="button" class="ui-btn-active">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a> <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
</div> </div>

4
dashboard-ui/userimage.html
View file

@ -9,9 +9,9 @@
<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="#" onclick="Dashboard.navigate('editUser.html', true);" data-role="button">Profile</a> <a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
<a href="#" data-role="button" class="ui-btn-active">Image</a> <a href="#" data-role="button" class="ui-btn-active">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatePassword.html', true);">Password</a> <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a> <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
</div> </div>
<div class="readOnlyContent"> <div class="readOnlyContent">

2
dashboard-ui/userprofiles.html
View file

@ -10,7 +10,7 @@
<div class="content-primary"> <div class="content-primary">
<div class="readOnlyContent"> <div class="readOnlyContent">
<p id="pAddUser"> <p id="pAddUser">
<button type="button" data-icon="plus" onclick="Dashboard.navigate('editUser.html');"> <button type="button" data-icon="plus" onclick="Dashboard.navigate('edituser.html');">
Add User Add User
</button> </button>
</p> </p>

2
dashboard-ui/wizardlibrary.html
View file

@ -50,7 +50,7 @@
<div class="wizardNavigation"> <div class="wizardNavigation">
<button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button> <button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
<button type="button" data-iconpos="right" data-icon="arrow-right" data-inline="true" onclick="Dashboard.navigate('wizardFinish.html');">Next</button> <button type="button" data-iconpos="right" data-icon="arrow-right" data-inline="true" onclick="Dashboard.navigate('wizardfinish.html');">Next</button>
</div> </div>
</div> </div>