Move HTML/JS/CSS UI source files.

Also rename the resources/report folder to resources/ui to be a bit more
self-descriptive.

.gitignore

@@ -52,5 +52,4 @@ build/
 docs/html
 docs/latex
 *.mo
-resources/report/bower_components
-resources/report/index.html
+bower_components

README.md

@@ -42,7 +42,7 @@ LOOT's UI relies on a few web libraries:
 
 These dependencies are most easily managed using [Bower](http://bower.io/), and are built for distribution using [Vulcanize](https://github.com/Polymer/vulcanize).
 
-To install Bower and Vulcanize, first install [Node](http://nodejs.org/), and run `npm install -g bower vulcanize@0.7.11` from the command line. Once they are installed, fetch and build the dependencies by running `bower install && vulcanize --inline --strip --config vulcanize.config.json -o index.html report.html` from inside this repository's `resources/report` folder.
+To install Bower and Vulcanize, first install [Node](http://nodejs.org/), and run `npm install -g bower vulcanize@0.7.11` from the command line. Once they are installed, fetch and build the dependencies by running `bower install && vulcanize --inline --strip --config vulcanize.config.json -o build/Release/resources/ui/index.html src/gui/html/index.html`.
 
 ## Packaging Releases
 

src/archive.py

@@ -89,18 +89,21 @@ def getNameSuffix():
 
     return ''
 
-def buildUIFiles(ui_path):
+def buildUIFiles():
     # Vulcanize the UI's files.
     vulcanize = which('vulcanize.cmd')
+    dest_path = os.path.join('..', 'build', 'Release', 'resources', 'ui')
     args = [
         vulcanize,
         '--inline',
         '--strip',
         '--config',
-        os.path.join(ui_path, 'vulcanize.config.json'),
+        os.path.join('..', 'vulcanize.config.json'),
         '-o',
-        os.path.join(ui_path, 'index.html'),
-        os.path.join(ui_path, 'report.html')];
+        os.path.join(dest_path, 'index.html'),
+        os.path.join('gui', 'html', 'index.html')];
+    if not os.path.exists(dest_path):
+        os.makedirs(dest_path)
     subprocess.call(args);
 
 def createArchive(folder_path, archive_path):
@@ -147,11 +150,10 @@ def createAppArchive(archive_path):
         shutil.copy( os.path.join('..', 'resources', 'l10n', lang, 'LC_MESSAGES', 'loot.mo'), os.path.join(temp_path, 'resources', 'l10n', lang, 'LC_MESSAGES') )
 
     # UI files.
-    os.makedirs( os.path.join(temp_path, 'resources', 'report') )
-    os.makedirs( os.path.join(temp_path, 'resources', 'report', 'css') )
-    shutil.copy( os.path.join('..', 'resources', 'report', 'index.html'), os.path.join(temp_path, 'resources', 'report') )
-    shutil.copy( os.path.join('..', 'resources', 'report', 'css', 'dark-theme.css'), os.path.join(temp_path, 'resources', 'report', 'css') )
-    shutil.copytree( os.path.join('..', 'resources', 'report', 'fonts'), os.path.join(temp_path, 'resources', 'report', 'fonts') )
+    os.makedirs( os.path.join(temp_path, 'resources', 'ui', 'css') )
+    shutil.copy( os.path.join('..', 'build', 'Release', 'resources', 'ui', 'index.html'), os.path.join(temp_path, 'resources', 'ui') )
+    shutil.copy( os.path.join('..', 'resources', 'ui', 'css', 'dark-theme.css'), os.path.join(temp_path, 'resources', 'ui', 'css') )
+    shutil.copytree( os.path.join('..', 'resources', 'ui', 'fonts'), os.path.join(temp_path, 'resources', 'ui', 'fonts') )
 
     # Docs.
     shutil.copytree( os.path.join('..', 'docs', 'images'), os.path.join(temp_path, 'docs', 'images') )
@@ -192,6 +194,6 @@ def createApiArchive(archive_path):
 
 # Create the archives.
 archive_suffix = getNameSuffix()
-buildUIFiles( os.path.join('..', 'resources', 'report') );
+buildUIFiles();
 createAppArchive( os.path.join('..', 'build', 'LOOT ' + archive_suffix) )
 createApiArchive( os.path.join('..', 'build', 'LOOT API ' + archive_suffix) )

src/backend/globals.cpp.in

@@ -36,7 +36,7 @@ namespace loot {
 
     //Common paths.
     const boost::filesystem::path g_path_readme         = boost::filesystem::current_path() / "docs" / "LOOT Readme.html";
-    const boost::filesystem::path g_path_report         = boost::filesystem::current_path() / "resources" / "report" / "index.html";
+    const boost::filesystem::path g_path_report         = boost::filesystem::current_path() / "resources" / "ui" / "index.html";
     const boost::filesystem::path g_path_l10n           = boost::filesystem::current_path() / "resources" / "l10n";
 #ifdef _WIN32
     const boost::filesystem::path g_path_local          = GetLocalAppDataPath() / "LOOT";

src/gui/html/elements/editable-table.html

@@ -1,9 +1,9 @@
-<link rel="import" href="../bower_components/polymer/polymer.html">
-<link rel="import" href="../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../bower_components/core-icons/core-icons.html">
-<link rel="import" href="../bower_components/core-tooltip/core-tooltip.html">
+<link rel="import" href="../../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../../bower_components/core-icons/core-icons.html">
+<link rel="import" href="../../../../bower_components/core-tooltip/core-tooltip.html">
 
 <link rel="import" href="loot-dropdown-menu.html">
 <link rel="import" href="loot-validated-input.html">

src/gui/html/elements/loot-custom-icons.html

@@ -1,4 +1,4 @@
-<link rel="import" href="../bower_components/core-iconset-svg/core-iconset-svg.html">
+<link rel="import" href="../../../../bower_components/core-iconset-svg/core-iconset-svg.html">
 
 <core-iconset-svg id="loot-custom-icons">
     <svg viewBox="0 0 24 24" height="100%" width="100%" preserveAspectRatio="xMidYMid meet" fit style="pointer-events: none; display: block;">