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.
This commit is contained in:
damencho
parent
989161159d
commit
1d7da21e48
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
Loading…
Reference in New Issue