diff --git a/src/css/clearbutton.css b/src/assets/css/clearbutton.css
similarity index 100%
rename from src/css/clearbutton.css
rename to src/assets/css/clearbutton.css
diff --git a/src/css/dashboard.css b/src/assets/css/dashboard.css
similarity index 100%
rename from src/css/dashboard.css
rename to src/assets/css/dashboard.css
diff --git a/src/css/detailtable.css b/src/assets/css/detailtable.css
similarity index 100%
rename from src/css/detailtable.css
rename to src/assets/css/detailtable.css
diff --git a/src/css/flexstyles.css b/src/assets/css/flexstyles.css
similarity index 100%
rename from src/css/flexstyles.css
rename to src/assets/css/flexstyles.css
diff --git a/src/css/fonts.css b/src/assets/css/fonts.css
similarity index 100%
rename from src/css/fonts.css
rename to src/assets/css/fonts.css
diff --git a/src/css/fonts.sized.css b/src/assets/css/fonts.sized.css
similarity index 100%
rename from src/css/fonts.sized.css
rename to src/assets/css/fonts.sized.css
diff --git a/src/css/ios.css b/src/assets/css/ios.css
similarity index 100%
rename from src/css/ios.css
rename to src/assets/css/ios.css
diff --git a/src/css/librarybrowser.css b/src/assets/css/librarybrowser.css
similarity index 100%
rename from src/css/librarybrowser.css
rename to src/assets/css/librarybrowser.css
diff --git a/src/css/livetv.css b/src/assets/css/livetv.css
similarity index 100%
rename from src/css/livetv.css
rename to src/assets/css/livetv.css
diff --git a/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff b/src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
similarity index 100%
rename from src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
rename to src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
diff --git a/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 b/src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
similarity index 100%
rename from src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
rename to src/assets/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
diff --git a/src/css/material-icons/style.css b/src/assets/css/material-icons/style.css
similarity index 100%
rename from src/css/material-icons/style.css
rename to src/assets/css/material-icons/style.css
diff --git a/src/css/metadataeditor.css b/src/assets/css/metadataeditor.css
similarity index 100%
rename from src/css/metadataeditor.css
rename to src/assets/css/metadataeditor.css
diff --git a/src/css/scrollstyles.css b/src/assets/css/scrollstyles.css
similarity index 100%
rename from src/css/scrollstyles.css
rename to src/assets/css/scrollstyles.css
diff --git a/src/css/site.css b/src/assets/css/site.css
similarity index 100%
rename from src/css/site.css
rename to src/assets/css/site.css
diff --git a/src/css/videoosd.css b/src/assets/css/videoosd.css
similarity index 100%
rename from src/css/videoosd.css
rename to src/assets/css/videoosd.css
diff --git a/src/img/logindefault.png b/src/assets/img/avatar.png
similarity index 100%
rename from src/img/logindefault.png
rename to src/assets/img/avatar.png
diff --git a/src/img/devices/chrome.svg b/src/assets/img/devices/chrome.svg
similarity index 100%
rename from src/img/devices/chrome.svg
rename to src/assets/img/devices/chrome.svg
diff --git a/src/img/devices/edge.svg b/src/assets/img/devices/edge.svg
similarity index 100%
rename from src/img/devices/edge.svg
rename to src/assets/img/devices/edge.svg
diff --git a/src/img/devices/firefox.svg b/src/assets/img/devices/firefox.svg
similarity index 100%
rename from src/img/devices/firefox.svg
rename to src/assets/img/devices/firefox.svg
diff --git a/src/img/devices/html5.svg b/src/assets/img/devices/html5.svg
similarity index 100%
rename from src/img/devices/html5.svg
rename to src/assets/img/devices/html5.svg
diff --git a/src/img/devices/msie.svg b/src/assets/img/devices/msie.svg
similarity index 100%
rename from src/img/devices/msie.svg
rename to src/assets/img/devices/msie.svg
diff --git a/src/img/devices/opera.svg b/src/assets/img/devices/opera.svg
similarity index 100%
rename from src/img/devices/opera.svg
rename to src/assets/img/devices/opera.svg
diff --git a/src/img/devices/other.svg b/src/assets/img/devices/other.svg
similarity index 100%
rename from src/img/devices/other.svg
rename to src/assets/img/devices/other.svg
diff --git a/src/img/devices/playstation.svg b/src/assets/img/devices/playstation.svg
similarity index 100%
rename from src/img/devices/playstation.svg
rename to src/assets/img/devices/playstation.svg
diff --git a/src/img/devices/safari.svg b/src/assets/img/devices/safari.svg
similarity index 100%
rename from src/img/devices/safari.svg
rename to src/assets/img/devices/safari.svg
diff --git a/src/img/devices/samsungtv.svg b/src/assets/img/devices/samsungtv.svg
similarity index 100%
rename from src/img/devices/samsungtv.svg
rename to src/assets/img/devices/samsungtv.svg
diff --git a/src/img/devices/windows.svg b/src/assets/img/devices/windows.svg
similarity index 100%
rename from src/img/devices/windows.svg
rename to src/assets/img/devices/windows.svg
diff --git a/src/img/devices/xbox.svg b/src/assets/img/devices/xbox.svg
similarity index 100%
rename from src/img/devices/xbox.svg
rename to src/assets/img/devices/xbox.svg
diff --git a/src/img/equalizer.gif b/src/assets/img/equalizer.gif
similarity index 100%
rename from src/img/equalizer.gif
rename to src/assets/img/equalizer.gif
diff --git a/src/img/logo.png b/src/assets/img/logo.png
similarity index 100%
rename from src/img/logo.png
rename to src/assets/img/logo.png
diff --git a/src/splashscreens/ipad_splash.png b/src/assets/splash/ipad_splash.png
similarity index 100%
rename from src/splashscreens/ipad_splash.png
rename to src/assets/splash/ipad_splash.png
diff --git a/src/splashscreens/ipad_splash_l.png b/src/assets/splash/ipad_splash_l.png
similarity index 100%
rename from src/splashscreens/ipad_splash_l.png
rename to src/assets/splash/ipad_splash_l.png
diff --git a/src/splashscreens/ipadpro1_splash.png b/src/assets/splash/ipadpro1_splash.png
similarity index 100%
rename from src/splashscreens/ipadpro1_splash.png
rename to src/assets/splash/ipadpro1_splash.png
diff --git a/src/splashscreens/ipadpro1_splash_l.png b/src/assets/splash/ipadpro1_splash_l.png
similarity index 100%
rename from src/splashscreens/ipadpro1_splash_l.png
rename to src/assets/splash/ipadpro1_splash_l.png
diff --git a/src/splashscreens/ipadpro2_splash.png b/src/assets/splash/ipadpro2_splash.png
similarity index 100%
rename from src/splashscreens/ipadpro2_splash.png
rename to src/assets/splash/ipadpro2_splash.png
diff --git a/src/splashscreens/ipadpro2_splash_l.png b/src/assets/splash/ipadpro2_splash_l.png
similarity index 100%
rename from src/splashscreens/ipadpro2_splash_l.png
rename to src/assets/splash/ipadpro2_splash_l.png
diff --git a/src/splashscreens/ipadpro3_splash.png b/src/assets/splash/ipadpro3_splash.png
similarity index 100%
rename from src/splashscreens/ipadpro3_splash.png
rename to src/assets/splash/ipadpro3_splash.png
diff --git a/src/splashscreens/ipadpro3_splash_l.png b/src/assets/splash/ipadpro3_splash_l.png
similarity index 100%
rename from src/splashscreens/ipadpro3_splash_l.png
rename to src/assets/splash/ipadpro3_splash_l.png
diff --git a/src/splashscreens/iphone5_splash.png b/src/assets/splash/iphone5_splash.png
similarity index 100%
rename from src/splashscreens/iphone5_splash.png
rename to src/assets/splash/iphone5_splash.png
diff --git a/src/splashscreens/iphone5_splash_l.png b/src/assets/splash/iphone5_splash_l.png
similarity index 100%
rename from src/splashscreens/iphone5_splash_l.png
rename to src/assets/splash/iphone5_splash_l.png
diff --git a/src/splashscreens/iphone6_splash.png b/src/assets/splash/iphone6_splash.png
similarity index 100%
rename from src/splashscreens/iphone6_splash.png
rename to src/assets/splash/iphone6_splash.png
diff --git a/src/splashscreens/iphone6_splash_l.png b/src/assets/splash/iphone6_splash_l.png
similarity index 100%
rename from src/splashscreens/iphone6_splash_l.png
rename to src/assets/splash/iphone6_splash_l.png
diff --git a/src/splashscreens/iphoneplus_splash.png b/src/assets/splash/iphoneplus_splash.png
similarity index 100%
rename from src/splashscreens/iphoneplus_splash.png
rename to src/assets/splash/iphoneplus_splash.png
diff --git a/src/splashscreens/iphoneplus_splash_l.png b/src/assets/splash/iphoneplus_splash_l.png
similarity index 100%
rename from src/splashscreens/iphoneplus_splash_l.png
rename to src/assets/splash/iphoneplus_splash_l.png
diff --git a/src/splashscreens/iphonex_splash.png b/src/assets/splash/iphonex_splash.png
similarity index 100%
rename from src/splashscreens/iphonex_splash.png
rename to src/assets/splash/iphonex_splash.png
diff --git a/src/splashscreens/iphonex_splash_l.png b/src/assets/splash/iphonex_splash_l.png
similarity index 100%
rename from src/splashscreens/iphonex_splash_l.png
rename to src/assets/splash/iphonex_splash_l.png
diff --git a/src/splashscreens/iphonexr_splash.png b/src/assets/splash/iphonexr_splash.png
similarity index 100%
rename from src/splashscreens/iphonexr_splash.png
rename to src/assets/splash/iphonexr_splash.png
diff --git a/src/splashscreens/iphonexr_splash_l.png b/src/assets/splash/iphonexr_splash_l.png
similarity index 100%
rename from src/splashscreens/iphonexr_splash_l.png
rename to src/assets/splash/iphonexr_splash_l.png
diff --git a/src/splashscreens/iphonexsmax_splash.png b/src/assets/splash/iphonexsmax_splash.png
similarity index 100%
rename from src/splashscreens/iphonexsmax_splash.png
rename to src/assets/splash/iphonexsmax_splash.png
diff --git a/src/splashscreens/iphonexsmax_splash_l.png b/src/assets/splash/iphonexsmax_splash_l.png
similarity index 100%
rename from src/splashscreens/iphonexsmax_splash_l.png
rename to src/assets/splash/iphonexsmax_splash_l.png
diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index 0b6a2dbbc5..19e8e38ca2 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -182,7 +182,7 @@
.playlistIndexIndicatorImage {
-webkit-background-size: initial initial !important;
background-size: initial !important;
- background-image: url(../../img/equalizer.gif) !important;
+ background-image: url(../../assets/img/equalizer.gif) !important;
}
.hideVideoButtons .videoButton {
diff --git a/src/controllers/loginpage.js b/src/controllers/loginpage.js
index 8dd041a9f1..54fb6ce5e9 100644
--- a/src/controllers/loginpage.js
+++ b/src/controllers/loginpage.js
@@ -92,7 +92,7 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
html += '";
} else {
var background = getMetroColor(user.Id);
- imgUrl = "img/logindefault.png";
+ imgUrl = "assets/img/avatar.png";
html += '';
}
html += "";
diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile.js
index 8bd2bdd376..3b85cb1d8c 100644
--- a/src/controllers/user/profile.js
+++ b/src/controllers/user/profile.js
@@ -8,7 +8,7 @@ define(["controllers/userpasswordpage", "loading", "libraryMenu", "apphost", "em
page.querySelector(".username").innerHTML = user.Name;
libraryMenu.setTitle(user.Name);
- var imageUrl = "img/logindefault.png";
+ var imageUrl = "assets/img/avatar.png";
if (user.PrimaryImageTag) {
imageUrl = ApiClient.getUserImageUrl(user.Id, {
tag: user.PrimaryImageTag,
diff --git a/src/controllers/videoosd.js b/src/controllers/videoosd.js
index a93b5b61a8..3c211cb50e 100644
--- a/src/controllers/videoosd.js
+++ b/src/controllers/videoosd.js
@@ -1,4 +1,4 @@
-define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
+define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!assets/css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
"use strict";
function seriesImageUrl(item, options) {
diff --git a/src/index.html b/src/index.html
index ad42c2618a..5924ec5e6f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -22,44 +22,44 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index bcb3883755..1ec70cc7cd 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -299,7 +299,7 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
$(document).on("itemsaved", ".metadataEditorPage", function (e, item) {
updateEditorNode(this, item);
}).on("pagebeforeshow", ".metadataEditorPage", function () {
- require(["css!css/metadataeditor.css"]);
+ require(["css!assets/css/metadataeditor.css"]);
}).on("pagebeforeshow", ".metadataEditorPage", function () {
var page = this;
Dashboard.getCurrentUser().then(function (user) {
diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js
index 486a030a54..e3b8aa54f0 100644
--- a/src/scripts/imagehelper.js
+++ b/src/scripts/imagehelper.js
@@ -2,7 +2,7 @@ define(["browser"], function (browser) {
"use strict";
function getDeviceIcon(device) {
- var baseUrl = "img/devices/";
+ var baseUrl = "assets/img/devices/";
switch (device) {
case "Opera":
case "Opera TV":
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index 7e3b109500..70be73b659 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -419,7 +419,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
var html = "";
html += '';
- html += '
';
+ html += '
';
html += "";
html += toolsMenuHtml;
navDrawerScrollContainer.innerHTML = html;
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 14d7d01bbb..7859a85ee8 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -453,8 +453,8 @@ var AppInfo = {};
}
function init() {
- define("livetvcss", ["css!css/livetv.css"], returnFirstDependency);
- define("detailtablecss", ["css!css/detailtable.css"], returnFirstDependency);
+ define("livetvcss", ["css!assets/css/livetv.css"], returnFirstDependency);
+ define("detailtablecss", ["css!assets/css/detailtable.css"], returnFirstDependency);
var promises = [];
if (!window.fetch) {
@@ -517,7 +517,7 @@ var AppInfo = {};
require(["systemFontsCss"]);
}
- require(["apphost", "css!css/librarybrowser"], function (appHost) {
+ require(["apphost", "css!assets/css/librarybrowser"], function (appHost) {
loadPlugins(appHost, browser).then(function () {
onAppReady(browser);
});
@@ -573,7 +573,7 @@ var AppInfo = {};
console.log("onAppReady - loading dependencies");
if (browser.iOS) {
- require(['css!css/ios.css']);
+ require(['css!assets/css/ios.css']);
}
window.Emby.Page = appRouter;
@@ -712,21 +712,21 @@ var AppInfo = {};
window.jQuery = jQuery;
});
- require(["css!css/site"]);
+ require(["css!assets/css/site"]);
// define styles
// TODO determine which of these files can be moved to the components themselves
- define("material-icons", ["css!css/material-icons/style"], returnFirstDependency);
- define("systemFontsCss", ["css!css/fonts"], returnFirstDependency);
- define("systemFontsSizedCss", ["css!css/fonts.sized"], returnFirstDependency);
- define("scrollStyles", ["css!css/scrollstyles"], returnFirstDependency);
- define("dashboardcss", ["css!css/dashboard"], returnFirstDependency);
+ define("material-icons", ["css!assets/css/material-icons/style"], returnFirstDependency);
+ define("systemFontsCss", ["css!assets/css/fonts"], returnFirstDependency);
+ define("systemFontsSizedCss", ["css!assets/css/fonts.sized"], returnFirstDependency);
+ define("scrollStyles", ["css!assets/css/scrollstyles"], returnFirstDependency);
+ define("dashboardcss", ["css!assets/css/dashboard"], returnFirstDependency);
define("programStyles", ["css!" + componentsPath + "/guide/programs"], returnFirstDependency);
define("listViewStyle", ["css!" + componentsPath + "/listview/listview"], returnFirstDependency);
define("formDialogStyle", ["css!" + componentsPath + "/formdialog"], returnFirstDependency);
- define("clearButtonStyle", ["css!css/clearbutton"], returnFirstDependency);
+ define("clearButtonStyle", ["css!assets/css/clearbutton"], returnFirstDependency);
define("cardStyle", ["css!" + componentsPath + "/cardbuilder/card"], returnFirstDependency);
- define("flexStyles", ["css!css/flexstyles"], returnFirstDependency);
+ define("flexStyles", ["css!assets/css/flexstyles"], returnFirstDependency);
// define legacy features
// TODO delete the rest of these