Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ module.exports = function(grunt) {
'frontend/express/public/javascripts/dom/drop/drop-theme-countly.min.css',
'frontend/express/public/javascripts/utils/tooltipster/tooltipster.bundle.min.css',
'frontend/express/public/stylesheets/bulma/bulma-custom.css',
'frontend/express/public/stylesheets/styles/manifest.css',
'frontend/express/public/stylesheets/styles/manifest2.css',
'frontend/express/public/stylesheets/vue/element-tiptap.css',
]
}
Expand Down Expand Up @@ -324,7 +324,25 @@ module.exports = function(grunt) {

grunt.registerTask('default', ['mochaTest']);

grunt.registerTask('dist', ['sass', 'concat', 'uglify', 'cssmin']);
grunt.registerTask('replace-paths', 'Replace image paths in prod CSS files', function() {
var cssFiles = [
{
filepath: 'frontend/express/public/stylesheets/styles/manifest.css',
lookup: '../../images',
replacement: '../images',
newPath: 'frontend/express/public/stylesheets/styles/manifest2.css'
}
];

cssFiles.forEach(function(file) {
var content = grunt.file.read(file.filepath);
var newContent = content.replace(/\.\.\/\.\.\/images/g, file.replacement);
grunt.file.write(file.newPath, newContent);
grunt.log.writeln('Processed file: ' + file.filepath);
});
});

grunt.registerTask('dist', ['sass', 'concat', 'uglify', 'replace-paths', 'cssmin']);

grunt.registerTask('plugins', 'Minify plugin JS / CSS files and copy images', function() {
var js = [], css = [], img = [], fs = require('fs'), path = require('path');
Expand Down
6 changes: 6 additions & 0 deletions api/parts/mgmt/mail.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ mail.sendToNewMember = function(member, memberPassword) {
mail.sendToNewMemberLink = function(member, prid) {
member.lang = member.lang || "en";
mail.lookup(function(err, host) {
if (config.path) {
host = host + config.path;
}
localize.getProperties(member.lang, function(err2, properties) {
var message = localize.format(properties["mail.new-member-prid"], mail.escapedHTMLString(mail.getUserFirstName(member)), host, mail.escapedHTMLString(member.username), prid);
mail.sendMessage(member.email, properties["mail.new-member-subject"], message);
Expand Down Expand Up @@ -217,6 +220,9 @@ mail.sendToUpdatedMember = function(member, memberPassword) {
mail.sendPasswordResetInfo = function(member, prid) {
member.lang = member.lang || "en";
mail.lookup(function(err, host) {
if (config.path) {
host = host + config.path;
}
localize.getProperties(member.lang, function(err2, properties) {
var message = localize.format(properties["mail.password-reset"], mail.escapedHTMLString(mail.getUserFirstName(member)), host, prid);
mail.sendMessage(member.email, properties["mail.password-reset-subject"], message);
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/events/stylesheets/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
&--image {
width: 242px;
height: 242px;
background-image: url('../../../images/dashboard/events-overview-noevents.svg');
background-image: url('../../images/dashboard/events-overview-noevents.svg');
}
}
&--text{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@
}

.setup-radio-icon {
background-image: url('../../../images/dashboard/onboarding/box.svg');
background-image: url('../../images/dashboard/onboarding/box.svg');
background-position: center;
background-repeat: no-repeat;
width: 100%;
height: 100%;
}

.setup-radio-icon--app-type-mobile {
background-image: url('../../../images/dashboard/onboarding/app-type-mobile.svg');
background-image: url('../../images/dashboard/onboarding/app-type-mobile.svg');
}

.setup-radio-icon--app-type-web {
background-image: url('../../../images/dashboard/onboarding/app-type-web.svg');
background-image: url('../../images/dashboard/onboarding/app-type-web.svg');
}

.setup-radio-icon--app-type-desktop {
background-image: url('../../../images/dashboard/onboarding/app-type-desktop.svg');
background-image: url('../../images/dashboard/onboarding/app-type-desktop.svg');
}

.is-checked .setup-radio-icon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
versionInfo: countlyGlobal.countlyTypeName,
countlySidebarVersionPath: '/dashboard#/' + countlyCommon.ACTIVE_APP_ID + '/versions',
showMainMenu: true,
redirectHomePage: '/dashboard#/' + countlyCommon.ACTIVE_APP_ID,
redirectHomePage: 'dashboard#/' + countlyCommon.ACTIVE_APP_ID,
onOptionsMenu: false,
onMainMenu: false,
enableGuides: CountlyHelpers.isPluginEnabled('guides'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
border: 1px solid #E2E4E8;
background-color: #F8FAFD;
border-radius:8px;
background-image: url('/images/icons/empty-background.svg');
background-image: url('../../images/icons/empty-background.svg');
background-position: 100% 100%;
background-repeat: no-repeat;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/stylesheets/vue/clyvue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
display: inline-block;
width: 60px;
height: 60px;
background-image: url("../images/dashboard/graph-no-data.svg");
background-image: url("../../images/dashboard/graph-no-data.svg");
background-size: contain;
margin-right: 20px;
background-repeat: no-repeat;
Expand Down
Loading