diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html index 0154deb492..0656746acd 100644 --- a/dashboard-ui/autoorganizelog.html +++ b/dashboard-ui/autoorganizelog.html @@ -4,7 +4,7 @@ ${TitleAutoOrganize} -
+
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index d337ca2c8f..d87659b2eb 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -4,7 +4,7 @@ ${TitleDashboard} -
+
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index e42b9d797b..ed478ba6ef 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -4,7 +4,7 @@ ${TitleDashboard} -
+
diff --git a/dashboard-ui/dashboardinfopage.html b/dashboard-ui/dashboardinfopage.html index 547565204e..0d44d213e8 100644 --- a/dashboard-ui/dashboardinfopage.html +++ b/dashboard-ui/dashboardinfopage.html @@ -4,7 +4,7 @@ ${TitleDashboard} -
+
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index 8ecd6ff8af..ae3ec500a5 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -4,7 +4,7 @@ ${TitleDlna} -
+
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html index 0fd5ebfdab..8d14168bd8 100644 --- a/dashboard-ui/dlnaprofiles.html +++ b/dashboard-ui/dlnaprofiles.html @@ -4,7 +4,7 @@ ${TitleDlna} -
+
diff --git a/dashboard-ui/dlnaserversettings.html b/dashboard-ui/dlnaserversettings.html index 634e0f34b5..b619d1124f 100644 --- a/dashboard-ui/dlnaserversettings.html +++ b/dashboard-ui/dlnaserversettings.html @@ -4,7 +4,7 @@ ${TitleDlna} -
+
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html index 1b78f8e0b3..d997141704 100644 --- a/dashboard-ui/dlnasettings.html +++ b/dashboard-ui/dlnasettings.html @@ -4,7 +4,7 @@ ${TitleDlna} -
+
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 735c2192dd..3c0feecca2 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -636,7 +636,7 @@ var Dashboard = { $(Dashboard).trigger('interiorheaderrendered', [header, user]); }, - ensureToolsMenu: function (page) { + ensureToolsMenu: function (page, user) { if (!page.hasClass('type-interior')) { return; @@ -650,7 +650,9 @@ var Dashboard = { html += '

MEDIABROWSER

'; - html += ''; + if (user.Configuration.IsAdministrator) { + html += ''; + } html += '
'; @@ -662,6 +664,10 @@ var Dashboard = { link = links[i]; + if (!user.Configuration.IsAdministrator) { + break; + } + if (link.divider) { html += "
"; } @@ -691,6 +697,10 @@ var Dashboard = { link = links[i]; + if (!user.Configuration.IsAdministrator) { + break; + } + if (link.divider) { html += "
"; } @@ -1393,8 +1403,21 @@ $(document).on('pagebeforeshow', ".page", function () { var userId = Dashboard.getCurrentUserId(); ApiClient.currentUserId(userId); - if (!userId) { + if (userId) { + Dashboard.getCurrentUser().done(function (user) { + + if (!user.Configuration.IsAdministrator && page.hasClass('type-interior') && !page.hasClass('publicUserPage')) { + window.location.replace("index.html"); + } + + Dashboard.ensureToolsMenu(page, user); + Dashboard.ensureHeader(page, user); + Dashboard.ensurePageTitle(page); + }); + } + + else { if (this.id !== "loginPage" && !page.hasClass('wizardPage')) { Dashboard.logout(); @@ -1405,21 +1428,6 @@ $(document).on('pagebeforeshow', ".page", function () { Dashboard.ensurePageTitle(page); } - else { - - Dashboard.getCurrentUser().done(function (user) { - - if (user.Configuration.IsAdministrator) { - Dashboard.ensureToolsMenu(page); - } else if (page.hasClass('adminPage')) { - window.location.replace("index.html"); - } - - Dashboard.ensureHeader(page, user); - Dashboard.ensurePageTitle(page); - }); - } - if (!ApiClient.isWebSocketOpen()) { Dashboard.refreshSystemInfoFromServer(); } diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index f535954efe..0bd8d4a8ba 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -4,7 +4,7 @@ -
+
diff --git a/dashboard-ui/userimage.html b/dashboard-ui/userimage.html index 305c03d5c8..250f884ad9 100644 --- a/dashboard-ui/userimage.html +++ b/dashboard-ui/userimage.html @@ -4,7 +4,7 @@ -
+
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html index 05ff996ce9..69b3d79c33 100644 --- a/dashboard-ui/userpassword.html +++ b/dashboard-ui/userpassword.html @@ -4,7 +4,7 @@ -
+
diff --git a/dashboard-ui/usersettings.html b/dashboard-ui/usersettings.html index 164ae7b4d2..d182a787e7 100644 --- a/dashboard-ui/usersettings.html +++ b/dashboard-ui/usersettings.html @@ -4,7 +4,7 @@ -
+