From 1d7da21e48b4c245f2b80ff6418de1df5fb45e96 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 20 Mar 2017 16:05:11 -0500
Subject: [PATCH] Moves all static content/files in a new folder.

Also clears debian package from including *.js files from source roote folder, files which were not used.
---
 conference.js                                   | 6 +++---
 debian/jitsi-meet-web.install                   | 3 ++-
 doc/debian/jitsi-meet/jitsi-meet.example        | 2 +-
 doc/debian/jitsi-meet/jitsi-meet.example-apache | 2 ++
 index.html                                      | 2 +-
 404.html => static/404.html                     | 4 ++--
 authError.html => static/authError.html         | 4 ++--
 close.html => static/close.html                 | 4 ++--
 close.js => static/close.js                     | 0
 close2.html => static/close2.html               | 4 ++--
 utils.js => static/utils.js                     | 0
 11 files changed, 17 insertions(+), 14 deletions(-)
 rename 404.html => static/404.html (68%)
 rename authError.html => static/authError.html (54%)
 rename close.html => static/close.html (84%)
 rename close.js => static/close.js (100%)
 rename close2.html => static/close2.html (85%)
 rename utils.js => static/utils.js (100%)

diff --git a/conference.js b/conference.js
index 51105daf0..8ec3bb43c 100644
--- a/conference.js
+++ b/conference.js
@@ -252,8 +252,8 @@ function maybeRedirectToWelcomePage(options) {
         // save whether current user is guest or not, before navigating
         // to close page
         window.sessionStorage.setItem('guest', APP.tokenData.isGuest);
-        assignWindowLocationPathname(
-                options.feedbackSubmitted ? "close.html" : "close2.html");
+        assignWindowLocationPathname('static/'
+                + (options.feedbackSubmitted ? "close.html" : "close2.html"));
         return;
     }
 
@@ -402,7 +402,7 @@ class ConferenceConnector {
         case ConferenceErrors.NOT_ALLOWED_ERROR:
             {
                 // let's show some auth not allowed page
-                assignWindowLocationPathname('authError.html');
+                assignWindowLocationPathname('static/authError.html');
             }
             break;
 
diff --git a/debian/jitsi-meet-web.install b/debian/jitsi-meet-web.install
index e812e1035..3db7ea181 100644
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@@ -1,4 +1,5 @@
-*.js					/usr/share/jitsi-meet/
+interface_config.js		/usr/share/jitsi-meet/
+logging_config.js		/usr/share/jitsi-meet/
 *.json					/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
 *.ico					/usr/share/jitsi-meet/
diff --git a/doc/debian/jitsi-meet/jitsi-meet.example b/doc/debian/jitsi-meet/jitsi-meet.example
index 28797c6a2..eb6f1c6f4 100644
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -20,7 +20,7 @@ server {
 
     root /usr/share/jitsi-meet;
     index index.html index.htm;
-    error_page 404 /404.html;
+    error_page 404 /static/404.html;
 
     location /config.js {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
diff --git a/doc/debian/jitsi-meet/jitsi-meet.example-apache b/doc/debian/jitsi-meet/jitsi-meet.example-apache
index 3776f0d24..713f8144b 100644
--- a/doc/debian/jitsi-meet/jitsi-meet.example-apache
+++ b/doc/debian/jitsi-meet/jitsi-meet.example-apache
@@ -29,6 +29,8 @@
     Allow from all
   </Directory>
 
+  ErrorDocument 404 /static/404.html
+
   Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
   <Location /config.js>
     Require all granted
diff --git a/index.html b/index.html
index e6a5839fd..b6914c6ba 100644
--- a/index.html
+++ b/index.html
@@ -127,7 +127,7 @@
             'error', loadErrHandler, true /* capture phase type of listener */);
     </script>
     <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
-    <script src="utils.js?v=1"></script>
+    <script src="static/utils.js?v=1"></script>
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
     <script src="connection_optimization/do_external_connect.js?v=1"></script>
     <script><!--#include virtual="/interface_config.js" --></script>
diff --git a/404.html b/static/404.html
similarity index 68%
rename from 404.html
rename to static/404.html
index fba9a69df..59def6539 100644
--- a/404.html
+++ b/static/404.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-    <link rel="stylesheet" href="css/all.css"/>
-    <!--#include virtual="title.html" -->
+    <link rel="stylesheet" href="../css/all.css"/>
+    <!--#include virtual="/title.html" -->
 </head>
 <body>
     <div class="error_page">
diff --git a/authError.html b/static/authError.html
similarity index 54%
rename from authError.html
rename to static/authError.html
index 19954d9f7..3e8f90c1e 100644
--- a/authError.html
+++ b/static/authError.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-    <link rel="stylesheet" href="css/all.css"/>
-    <!--#include virtual="title.html" -->
+    <link rel="stylesheet" href="../css/all.css"/>
+    <!--#include virtual="/title.html" -->
 </head>
 <body>
     <div class="redirectPageMessage">Sorry! You are not allowed to be here :(</div>
diff --git a/close.html b/static/close.html
similarity index 84%
rename from close.html
rename to static/close.html
index 14de8c33f..37a1b2003 100644
--- a/close.html
+++ b/static/close.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-    <link rel="stylesheet" href="css/all.css"/>
-    <!--#include virtual="title.html" -->
+    <link rel="stylesheet" href="../css/all.css"/>
+    <!--#include virtual="/title.html" -->
     <script><!--#include virtual="/interface_config.js" --></script>
     <script src="close.js"></script>
 </head>
diff --git a/close.js b/static/close.js
similarity index 100%
rename from close.js
rename to static/close.js
diff --git a/close2.html b/static/close2.html
similarity index 85%
rename from close2.html
rename to static/close2.html
index f2bd011b9..22fa933a2 100644
--- a/close2.html
+++ b/static/close2.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-    <link rel="stylesheet" href="css/all.css"/>
-    <!--#include virtual="title.html" -->
+    <link rel="stylesheet" href="../css/all.css"/>
+    <!--#include virtual="/title.html" -->
     <script><!--#include virtual="/interface_config.js" --></script>
     <script src="close.js"></script>
 </head>
diff --git a/utils.js b/static/utils.js
similarity index 100%
rename from utils.js
rename to static/utils.js