Move WebUI views into separate folder

src/webui/www/private/scripts/client.js

@@ -223,7 +223,7 @@ window.addEvent('load', function() {
             left: 0
         },
         loadMethod: 'xhr',
-        contentURL: 'filters.html',
+        contentURL: 'views/filters.html',
         onContentLoaded: function() {
             setFilter(selected_filter);
         },
@@ -826,7 +826,7 @@ window.addEvent('load', function() {
                 left: 0
             },
             loadMethod: 'xhr',
-            contentURL: 'search.html',
+            contentURL: 'views/search.html',
             content: '',
             column: 'searchTabColumn',
             height: null
@@ -844,7 +844,7 @@ window.addEvent('load', function() {
             left: 0
         },
         loadMethod: 'xhr',
-        contentURL: 'transferlist.html',
+        contentURL: 'views/transferlist.html',
         onContentLoaded: function() {
             handleDownloadParam();
             updateMainData();
@@ -868,12 +868,12 @@ window.addEvent('load', function() {
             bottom: 0,
             left: 0
         },
-        contentURL: 'properties.html',
+        contentURL: 'views/properties.html',
         require: {
             css: ['css/Tabs.css', 'css/dynamicTable.css'],
             js: ['scripts/prop-general.js', 'scripts/prop-trackers.js', 'scripts/prop-peers.js', 'scripts/prop-webseeds.js', 'scripts/prop-files.js'],
         },
-        tabsURL: 'propertiesToolbar.html',
+        tabsURL: 'views/propertiesToolbar.html',
         tabsOnload: function() {
             MochaUI.initializeTabs('propertiesTabs');
 

src/webui/www/private/scripts/mocha-init.js

@@ -169,11 +169,11 @@ const initializeWindows = function() {
             title: "QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog]",
             loadMethod: 'xhr',
             toolbar: true,
-            contentURL: 'preferences.html',
+            contentURL: 'views/preferences.html',
             require: {
                 css: ['css/Tabs.css']
             },
-            toolbarURL: 'preferencesToolbar.html',
+            toolbarURL: 'views/preferencesToolbar.html',
             maximizable: false,
             closable: true,
             paddingVertical: 0,
@@ -362,7 +362,7 @@ const initializeWindows = function() {
             id: id,
             title: 'QBT_TR(Statistics)QBT_TR[CONTEXT=StatsDialog]',
             loadMethod: 'xhr',
-            contentURL: 'statistics.html',
+            contentURL: 'views/statistics.html',
             maximizable: false,
             padding: 10,
             width: loadWindowWidth(id, 275),
@@ -920,12 +920,12 @@ const initializeWindows = function() {
             id: id,
             title: 'QBT_TR(About qBittorrent)QBT_TR[CONTEXT=AboutDialog]',
             loadMethod: 'xhr',
-            contentURL: 'about.html',
+            contentURL: 'views/about.html',
             require: {
                 css: ['css/Tabs.css']
             },
             toolbar: true,
-            toolbarURL: 'aboutToolbar.html',
+            toolbarURL: 'views/aboutToolbar.html',
             padding: 10,
             width: loadWindowWidth(id, 550),
             height: loadWindowHeight(id, 360),

src/webui/www/private/views/search.html

@@ -350,7 +350,7 @@
                 id: id,
                 title: "QBT_TR(Search plugins)QBT_TR[CONTEXT=PluginSelectDlg]",
                 loadMethod: 'xhr',
-                contentURL: 'searchplugins.html',
+                contentURL: 'views/searchplugins.html',
                 scrollbars: false,
                 maximizable: false,
                 paddingVertical: 0,

src/webui/www/private/views/searchplugins.html

@@ -106,7 +106,7 @@
             id: 'installSearchPlugin',
             title: "QBT_TR(Install plugin)QBT_TR[CONTEXT=PluginSourceDlg]",
             loadMethod: 'xhr',
-            contentURL: 'installsearchplugin.html',
+            contentURL: 'views/installsearchplugin.html',
             scrollbars: false,
             resizable: false,
             maximizable: false,

src/webui/www/webui.qrc

@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/www">
-        <file>private/about.html</file>
-        <file>private/aboutToolbar.html</file>
         <file>private/addpeers.html</file>
         <file>private/addtrackers.html</file>
         <file>private/confirmdeletion.html</file>
@@ -15,18 +13,10 @@
         <file>private/download.html</file>
         <file>private/downloadlimit.html</file>
         <file>private/edittracker.html</file>
-        <file>private/filters.html</file>
         <file>private/index.html</file>
-        <file>private/installsearchplugin.html</file>
         <file>private/newcategory.html</file>
         <file>private/newtag.html</file>
-        <file>private/preferencesToolbar.html</file>
-        <file>private/preferences.html</file>
-        <file>private/propertiesToolbar.html</file>
-        <file>private/properties.html</file>
         <file>private/rename.html</file>
-        <file>private/search.html</file>
-        <file>private/searchplugins.html</file>
         <file>private/scripts/client.js</file>
         <file>private/scripts/contextmenu.js</file>
         <file>private/scripts/download.js</file>
@@ -48,10 +38,20 @@
         <file>private/scripts/speedslider.js</file>
         <file>private/setlocation.html</file>
         <file>private/shareratio.html</file>
-        <file>private/statistics.html</file>
-        <file>private/transferlist.html</file>
         <file>private/upload.html</file>
         <file>private/uploadlimit.html</file>
+        <file>private/views/about.html</file>
+        <file>private/views/aboutToolbar.html</file>
+        <file>private/views/filters.html</file>
+        <file>private/views/installsearchplugin.html</file>
+        <file>private/views/preferences.html</file>
+        <file>private/views/preferencesToolbar.html</file>
+        <file>private/views/properties.html</file>
+        <file>private/views/propertiesToolbar.html</file>
+        <file>private/views/search.html</file>
+        <file>private/views/searchplugins.html</file>
+        <file>private/views/statistics.html</file>
+        <file>private/views/transferlist.html</file>
         <file>public/css/login.css</file>
         <file>public/css/noscript.css</file>
         <file>public/index.html</file>