apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Misc fixes to allow running from subdirectory rather than root (/)

Browse Source
pull/2518/head
r0p0s3c 10 years ago
parent 72e0d6f4dc
commit f2645ce358
16 changed files with 53 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      packages/rocketchat-assets/server/assets.coffee
  2. 4
      packages/rocketchat-lib/server/startup/settings.coffee
  3. 12
      packages/rocketchat-livechat/app/client/stylesheets/fontello.css
  4. 2
      packages/rocketchat-mailer/client/views/mailerUnsubscribe.html
  5. 2
      packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less
  6. 2
      packages/rocketchat-sharedsecret/sharedsecret.coffee
  7. 8
      packages/rocketchat-theme/assets/stylesheets/base.less
  8. 10
      packages/rocketchat-theme/assets/stylesheets/fontello.css
  9. 2
      packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less
  10. 2
      packages/rocketchat-ui-master/master/error.html
  11. 2
      packages/rocketchat-ui-master/master/logoLayout.html
  12. 38
      packages/rocketchat-ui-master/master/main.html
  13. 5
      packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee
  14. 6
      packages/rocketchat-ui/views/app/audioNotification.html
  15. 8
      packages/rocketchat-ui/views/fxos.html
  16. 2
      server/startup/avatar.coffee

2
packages/rocketchat-assets/server/assets.coffee
Unescape View File

@ -18,7 +18,7 @@ assets =
height: undefined
'favicon.svg':
label: 'favicon.svg'
defaultUrl: '/images/logo/icon.svg?v=3'
defaultUrl: 'images/logo/icon.svg?v=3'
constraints:
type: 'image'
extension: 'svg'

4
packages/rocketchat-lib/server/startup/settings.coffee
Unescape View File

@ -158,10 +158,10 @@ RocketChat.settings.addGroup 'Layout', ->
@add 'Layout_Home_Body', 'Welcome to Rocket.Chat <br> Go to APP SETTINGS -> Layout to customize this intro.', { type: 'string', multiline: true, public: true }
@add 'Layout_Terms_of_Service', 'Terms of Service <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, public: true }
@add 'Layout_Privacy_Policy', 'Privacy Policy <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, public: true }
@add 'Layout_Sidenav_Footer', '<div><a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /></a><div class="github-tagline"><span class="octicon octicon-pencil" style="color: #994C00"></span> with <span class="octicon octicon-heart" style="color: red"></span> on <span class="octicon octicon-mark-github"></span></div></div>', { type: 'string', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
@add 'Layout_Sidenav_Footer', '<div><a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="images/logo/logo.svg?v=3" /></a><div class="github-tagline"><span class="octicon octicon-pencil" style="color: #994C00"></span> with <span class="octicon octicon-heart" style="color: red"></span> on <span class="octicon octicon-mark-github"></span></div></div>', { type: 'string', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
@section 'Login', ->
@add 'Layout_Login_Header', '<a class="logo" href="/"><img src="/images/logo/logo.svg?v=3" /></a>', { type: 'string', multiline: true, public: true }
@add 'Layout_Login_Header', '<a class="logo" href="/"><img src="images/logo/logo.svg?v=3" /></a>', { type: 'string', multiline: true, public: true }
@add 'Layout_Login_Terms', 'By proceeding to create your account and use Rocket.Chat, you are agreeing to our <a href="/terms-of-service">Terms of Service</a> and <a href="/privacy-policy">Privacy Policy</a>. If you do not agree, you cannot use Rocket.Chat.', { type: 'string', multiline: true, public: true }

12
packages/rocketchat-livechat/app/client/stylesheets/fontello.css vendored
Unescape View File

@ -1,10 +1,10 @@
@font-face {
font-family: 'fontello';
src: url('/fonts/fontello.eot?52343198');
src: url('/fonts/fontello.eot?52343198#iefix') format('embedded-opentype'),
url('/fonts/fontello.woff?52343198') format('woff'),
url('/fonts/fontello.ttf?52343198') format('truetype'),
url('/fonts/fontello.svg?52343198#fontello') format('svg');
src: url('fonts/fontello.eot?52343198');
src: url('fonts/fontello.eot?52343198#iefix') format('embedded-opentype'),
url('fonts/fontello.woff?52343198') format('woff'),
url('fonts/fontello.ttf?52343198') format('truetype'),
url('fonts/fontello.svg?52343198#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@ -14,7 +14,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('/fonts/fontello.svg?52343198#fontello') format('svg');
src: url('fonts/fontello.svg?52343198#fontello') format('svg');
}
}
*/

2
packages/rocketchat-mailer/client/views/mailerUnsubscribe.html
Unescape View File

@ -3,7 +3,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
<div class="cms-page">

2
packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less
Unescape View File

@ -1,6 +1,6 @@
.mentioned-messages-list {
&.notready {
background-image: url(/images/logo/loading.gif);
background-image: url(images/logo/loading.gif);
background-repeat: no-repeat;
background-position: 50% 50%;
height: 100px;

2
packages/rocketchat-sharedsecret/sharedsecret.coffee
Unescape View File

@ -53,7 +53,7 @@ if (Meteor.isClient)
message.msg = "~ encrypted message ~"
message.html = "~ encrypted message ~"
else
lockImage = "/images/lock8.png"
lockImage = "images/lock8.png"
message.msg = "<img src=#{lockImage} style='width:8px;height:9px;'></img> " + decrypted
message.html = "<img src=#{lockImage} style='width:8px;height:9px;'></img> " + decrypted

8
packages/rocketchat-theme/assets/stylesheets/base.less
Unescape View File

@ -556,7 +556,7 @@ textarea[disabled] {
&:after {
content: " ";
visibility: visible;
background-image: url('/images/logo/loading.gif');
background-image: url('images/logo/loading.gif');
background-position: center;
background-repeat: no-repeat;
display: block;
@ -604,7 +604,7 @@ label.required:after {
}
.loading {
background-image: url('/images/loading.gif');
background-image: url('images/loading.gif');
background-repeat: no-repeat;
background-position: 50%;
width: 100%;
@ -3892,7 +3892,7 @@ a.github-fork {
bottom: 20px;
width: 100px;
height: 50px;
background: url(/images/meteor.png) no-repeat center center;
background: url(images/meteor.png) no-repeat center center;
background-size: 100% auto;
text-indent: -9999em;
}
@ -4211,7 +4211,7 @@ a.github-fork {
.message-popup-results {
&.notready {
.message-popup-items {
background-image: url(/images/logo/loading.gif);
background-image: url(images/logo/loading.gif);
background-repeat: no-repeat;
background-position: 50% 50%;
height: 100px;

10
packages/rocketchat-theme/assets/stylesheets/fontello.css vendored
Unescape View File

@ -1,10 +1,10 @@
@font-face {
font-family: 'fontello';
src: url('/fonts/fontello.eot?33681247');
src: url('/fonts/fontello.eot?33681247#iefix') format('embedded-opentype'),
url('/fonts/fontello.woff?33681247') format('woff'),
url('/fonts/fontello.ttf?33681247') format('truetype'),
url('/fonts/fontello.svg?33681247#fontello') format('svg');
src: url('fonts/fontello.eot?33681247');
src: url('fonts/fontello.eot?33681247#iefix') format('embedded-opentype'),
url('fonts/fontello.woff?33681247') format('woff'),
url('fonts/fontello.ttf?33681247') format('truetype'),
url('fonts/fontello.svg?33681247#fontello') format('svg');
font-weight: normal;
font-style: normal;
}

2
packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less
Unescape View File

@ -1,4 +1,4 @@
@octicons-font-path: "/fonts/github";
@octicons-font-path: "fonts/github";
@octicons-version: "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
@font-face {

2
packages/rocketchat-ui-master/master/error.html
Unescape View File

@ -3,7 +3,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
<h1>{{_ "Not_found_or_not_allowed"}}</h1>

2
packages/rocketchat-ui-master/master/logoLayout.html
Unescape View File

@ -3,7 +3,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
{{> Template.dynamic template=render}}

38
packages/rocketchat-ui-master/master/main.html
Unescape View File

@ -9,32 +9,32 @@
<meta name="rating" content="general" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<meta name="msapplication-TileColor" content="#04436a">
<meta name="msapplication-TileImage" content="/images/logo/mstile-144x144.png?v=3">
<meta name="msapplication-config" content="/images/logo/browserconfig.xml?v=3">
<meta name="msapplication-TileImage" content="images/logo/mstile-144x144.png?v=3">
<meta name="msapplication-config" content="images/logo/browserconfig.xml?v=3">
<meta name="theme-color" content="#04436a">
<link rel="manifest" href="/images/logo/manifest.json?v=3">
<link rel="manifest" href="images/logo/manifest.json?v=3">
<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/nocfbnnmjnndkbipkabodnheejiegccf">
<link rel="icon" sizes="any" type="image/svg+xml" href="/assets/favicon.svg?v=3">
<link rel="icon" sizes="256x256" type="image/png" href="/assets/favicon_256.png?v=3">
<link rel="icon" sizes="192x192" type="image/png" href="/assets/favicon_192.png?v=3">
<link rel="icon" sizes="128x128" type="image/png" href="/assets/favicon_128.png?v=3">
<link rel="icon" sizes="96x96" type="image/png" href="/assets/favicon_96.png?v=3">
<link rel="icon" sizes="64x64" type="image/png" href="/assets/favicon_64.png?v=3">
<link rel="icon" sizes="any" type="image/svg+xml" href="assets/favicon.svg?v=3">
<link rel="icon" sizes="256x256" type="image/png" href="assets/favicon_256.png?v=3">
<link rel="icon" sizes="192x192" type="image/png" href="assets/favicon_192.png?v=3">
<link rel="icon" sizes="128x128" type="image/png" href="assets/favicon_128.png?v=3">
<link rel="icon" sizes="96x96" type="image/png" href="assets/favicon_96.png?v=3">
<link rel="icon" sizes="64x64" type="image/png" href="assets/favicon_64.png?v=3">
<!--
<link rel="icon" sizes="48x48" type="image/png" href="/images/logo/favicon-48x48.png?v=3">
<link rel="icon" sizes="32x32" type="image/png" href="/images/logo/favicon-32x32.png?v=3">
<link rel="icon" sizes="16x16" type="image/png" href="/images/logo/favicon-16x16.png?v=3">
-->
<link rel="shortcut icon" sizes="16x16 32x32 48x48" type="image/x-icon" href="/assets/favicon.ico?v=3" />
<link rel="apple-touch-icon" sizes="57x57" href="/images/logo/apple-touch-icon-57x57.png?v=3">
<link rel="apple-touch-icon" sizes="60x60" href="/images/logo/apple-touch-icon-60x60.png?v=3">
<link rel="apple-touch-icon" sizes="72x72" href="/images/logo/apple-touch-icon-72x72.png?v=3">
<link rel="apple-touch-icon" sizes="76x76" href="/images/logo/apple-touch-icon-76x76.png?v=3">
<link rel="apple-touch-icon" sizes="114x114" href="/images/logo/apple-touch-icon-114x114.png?v=3">
<link rel="apple-touch-icon" sizes="120x120" href="/images/logo/apple-touch-icon-120x120.png?v=3">
<link rel="apple-touch-icon" sizes="144x144" href="/images/logo/apple-touch-icon-144x144.png?v=3">
<link rel="apple-touch-icon" sizes="152x152" href="/images/logo/apple-touch-icon-152x152.png?v=3">
<link rel="apple-touch-icon" sizes="180x180" href="/images/logo/apple-touch-icon-180x180.png?v=3">
<link rel="shortcut icon" sizes="16x16 32x32 48x48" type="image/x-icon" href="assets/favicon.ico?v=3" />
<link rel="apple-touch-icon" sizes="57x57" href="images/logo/apple-touch-icon-57x57.png?v=3">
<link rel="apple-touch-icon" sizes="60x60" href="images/logo/apple-touch-icon-60x60.png?v=3">
<link rel="apple-touch-icon" sizes="72x72" href="images/logo/apple-touch-icon-72x72.png?v=3">
<link rel="apple-touch-icon" sizes="76x76" href="images/logo/apple-touch-icon-76x76.png?v=3">
<link rel="apple-touch-icon" sizes="114x114" href="images/logo/apple-touch-icon-114x114.png?v=3">
<link rel="apple-touch-icon" sizes="120x120" href="images/logo/apple-touch-icon-120x120.png?v=3">
<link rel="apple-touch-icon" sizes="144x144" href="images/logo/apple-touch-icon-144x144.png?v=3">
<link rel="apple-touch-icon" sizes="152x152" href="images/logo/apple-touch-icon-152x152.png?v=3">
<link rel="apple-touch-icon" sizes="180x180" href="images/logo/apple-touch-icon-180x180.png?v=3">
</head>
<body>

5
packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee
Unescape View File

@ -3,9 +3,8 @@
random = Session?.keys[key] or 0
if not username?
return
if Meteor.isCordova
path = Meteor.absoluteUrl()
else
path = '/'
"#{path}avatar/#{encodeURIComponent(username)}.jpg?_dc=#{random}"
path = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '';
"#{path}/avatar/#{encodeURIComponent(username)}.jpg?_dc=#{random}"

6
packages/rocketchat-ui/views/app/audioNotification.html
Unescape View File

@ -1,9 +1,9 @@
<template name="audioNotification">
<audio id="chatAudioNotification" preload>
<source src="/sounds/notify.ogg" type="audio/ogg" />
<source src="/sounds/notify.mp3" type="audio/mpeg" />
<source src="sounds/notify.ogg" type="audio/ogg" />
<source src="sounds/notify.mp3" type="audio/mpeg" />
</audio>
<audio id="chatNewRoomNotification" preload>
<source src="/sounds/door_chime.mp3" type="audio/mpeg" />
<source src="sounds/door_chime.mp3" type="audio/mpeg" />
</audio>
</template>

8
packages/rocketchat-ui/views/fxos.html
Unescape View File

@ -3,7 +3,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
<div class="cms-page">
@ -19,7 +19,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
<div class="cms-page">
@ -35,7 +35,7 @@
<div class="wrapper">
<header>
<a class="logo" href="/">
<img src="/images/logo/logo.svg?v=3" />
<img src="images/logo/logo.svg?v=3" />
</a>
</header>
<div class="cms-page">
@ -45,4 +45,4 @@
</div>
</div>
</section>
</template>
</template>

2
server/startup/avatar.coffee
Unescape View File

@ -30,7 +30,7 @@ Meteor.startup ->
absolutePath: path
transformWrite: transformWrite
WebApp.connectHandlers.use '/avatar/', Meteor.bindEnvironment (req, res, next) ->
WebApp.connectHandlers.use 'avatar/', Meteor.bindEnvironment (req, res, next) ->
params =
username: decodeURIComponent(req.url.replace(/^\//, '').replace(/\?.*$/, ''))

Write Preview
Loading…
Cancel
Save