From 1fe08c083a3e6e1403b7ebd341198c0b0cce2fdd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Dec 2013 10:40:38 -0500 Subject: [PATCH] split out parental controls into a separate edit page --- MediaBrowser.WebDashboard/Api/DashboardService.cs | 5 +++-- .../MediaBrowser.WebDashboard.csproj | 14 ++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 8c775fc151..b4cf52bfcc 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -481,7 +481,6 @@ namespace MediaBrowser.WebDashboard.Api "edititemmetadata.js", "edititempeople.js", "edititemimages.js", - "edituserpage.js", "gamesrecommendedpage.js", "gamesystemspage.js", "gamespage.js", @@ -542,10 +541,12 @@ namespace MediaBrowser.WebDashboard.Api "tvshows.js", "tvstudios.js", "tvupcoming.js", - "updatepasswordpage.js", + "useredit.js", + "userpassword.js", "userimagepage.js", "userprofilespage.js", "usersettings.js", + "userparentalcontrol.js", "wizardfinishpage.js", "wizardimagesettings.js", "wizardservice.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 3ae7e7f1d9..5975c3c924 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -457,6 +457,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -1093,6 +1096,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -1420,7 +1426,7 @@ - + PreserveNewest @@ -1446,7 +1452,7 @@ - + PreserveNewest @@ -1506,7 +1512,7 @@ - + PreserveNewest @@ -1514,7 +1520,7 @@ PreserveNewest - + PreserveNewest