diff --git a/packages/rocketchat-assets/server/assets.coffee b/packages/rocketchat-assets/server/assets.coffee index e08e9f4bf6e..05901337192 100644 --- a/packages/rocketchat-assets/server/assets.coffee +++ b/packages/rocketchat-assets/server/assets.coffee @@ -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' diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee index 09e5a6991b5..78a864e62d9 100644 --- a/packages/rocketchat-lib/server/startup/settings.coffee +++ b/packages/rocketchat-lib/server/startup/settings.coffee @@ -158,10 +158,10 @@ RocketChat.settings.addGroup 'Layout', -> @add 'Layout_Home_Body', 'Welcome to Rocket.Chat
Go to APP SETTINGS -> Layout to customize this intro.', { type: 'string', multiline: true, public: true } @add 'Layout_Terms_of_Service', 'Terms of Service
Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, public: true } @add 'Layout_Privacy_Policy', 'Privacy Policy
Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, public: true } - @add 'Layout_Sidenav_Footer', '
with on
', { type: 'string', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' } + @add 'Layout_Sidenav_Footer', '
with on
', { type: 'string', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' } @section 'Login', -> - @add 'Layout_Login_Header', '', { type: 'string', multiline: true, public: true } + @add 'Layout_Login_Header', '', { 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 Terms of Service and Privacy Policy. If you do not agree, you cannot use Rocket.Chat.', { type: 'string', multiline: true, public: true } diff --git a/packages/rocketchat-livechat/app/client/stylesheets/fontello.css b/packages/rocketchat-livechat/app/client/stylesheets/fontello.css index fc28243c86e..ee84408162d 100644 --- a/packages/rocketchat-livechat/app/client/stylesheets/fontello.css +++ b/packages/rocketchat-livechat/app/client/stylesheets/fontello.css @@ -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'); } } */ diff --git a/packages/rocketchat-mailer/client/views/mailerUnsubscribe.html b/packages/rocketchat-mailer/client/views/mailerUnsubscribe.html index c308fb973f9..1f2739055cd 100644 --- a/packages/rocketchat-mailer/client/views/mailerUnsubscribe.html +++ b/packages/rocketchat-mailer/client/views/mailerUnsubscribe.html @@ -3,7 +3,7 @@
diff --git a/packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less b/packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less index a8956d799c8..2bdf1593b38 100644 --- a/packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less +++ b/packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less @@ -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; diff --git a/packages/rocketchat-sharedsecret/sharedsecret.coffee b/packages/rocketchat-sharedsecret/sharedsecret.coffee index 19b72c746ad..d74265ec741 100644 --- a/packages/rocketchat-sharedsecret/sharedsecret.coffee +++ b/packages/rocketchat-sharedsecret/sharedsecret.coffee @@ -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 = " " + decrypted message.html = " " + decrypted diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index f40b38d0004..7621aa04438 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -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; diff --git a/packages/rocketchat-theme/assets/stylesheets/fontello.css b/packages/rocketchat-theme/assets/stylesheets/fontello.css index ec23624c697..394dae67049 100644 --- a/packages/rocketchat-theme/assets/stylesheets/fontello.css +++ b/packages/rocketchat-theme/assets/stylesheets/fontello.css @@ -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; } diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less b/packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less index f7b02c4ed54..3f2b38785b5 100644 --- a/packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less +++ b/packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less @@ -1,4 +1,4 @@ -@octicons-font-path: "/fonts/github"; +@octicons-font-path: "fonts/github"; @octicons-version: "396334ee3da78f4302d25c758ae3e3ce5dc3c97d"; @font-face { diff --git a/packages/rocketchat-ui-master/master/error.html b/packages/rocketchat-ui-master/master/error.html index c818e16b9b9..4290413f22f 100644 --- a/packages/rocketchat-ui-master/master/error.html +++ b/packages/rocketchat-ui-master/master/error.html @@ -3,7 +3,7 @@

{{_ "Not_found_or_not_allowed"}}

diff --git a/packages/rocketchat-ui-master/master/logoLayout.html b/packages/rocketchat-ui-master/master/logoLayout.html index e1228b4a62f..c7decca4f52 100644 --- a/packages/rocketchat-ui-master/master/logoLayout.html +++ b/packages/rocketchat-ui-master/master/logoLayout.html @@ -3,7 +3,7 @@
{{> Template.dynamic template=render}} diff --git a/packages/rocketchat-ui-master/master/main.html b/packages/rocketchat-ui-master/master/main.html index 533296138fa..dbb54db5b8e 100644 --- a/packages/rocketchat-ui-master/master/main.html +++ b/packages/rocketchat-ui-master/master/main.html @@ -9,32 +9,32 @@ - - + + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee b/packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee index b913816c52d..215c6615173 100644 --- a/packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee +++ b/packages/rocketchat-ui/lib/getAvatarUrlFromUsername.coffee @@ -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}" diff --git a/packages/rocketchat-ui/views/app/audioNotification.html b/packages/rocketchat-ui/views/app/audioNotification.html index 8441e702ddd..d64d58f1508 100644 --- a/packages/rocketchat-ui/views/app/audioNotification.html +++ b/packages/rocketchat-ui/views/app/audioNotification.html @@ -1,9 +1,9 @@ diff --git a/packages/rocketchat-ui/views/fxos.html b/packages/rocketchat-ui/views/fxos.html index 34418ad7ddf..23c767884d1 100644 --- a/packages/rocketchat-ui/views/fxos.html +++ b/packages/rocketchat-ui/views/fxos.html @@ -3,7 +3,7 @@
@@ -19,7 +19,7 @@
@@ -35,7 +35,7 @@
@@ -45,4 +45,4 @@
- \ No newline at end of file + diff --git a/server/startup/avatar.coffee b/server/startup/avatar.coffee index 7392b051e3f..00ed7f52241 100644 --- a/server/startup/avatar.coffee +++ b/server/startup/avatar.coffee @@ -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(/\?.*$/, ''))