KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #297 from zoff-music/fix/new-mailing

Browse Source 
Using zoff.me instead of zoff.no for mailing now
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-06 14:10:10 +01:00
committed by GitHub
parent 0b2819649c 626a6acb5f
commit c9d1b5312f
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/README.md
View File

@@ -1,3 +1,7 @@
## Apps
Under ``` /server/apps/ ```, there are two files, ``` admin.js ``` and ``` client.js ```.``` admin.js ``` are for the adminpanel, and ``` client.js ``` are for zoff itself.
## Events
### To server

4
server/handlers/notifications.js
View File

@@ -14,8 +14,8 @@ function requested_change(type, string, channel) {
var message = "A " + type + " change was requested on <b>" + channel + "</b><br><br>New supposed value is: <br><br><b>" + string + "</b><br><br><br> \
Go to <a href='https://admin.zoff.me/'>https://admin.zoff.me/</a> to accept or decline the request.";
var msg = {
from: 'no-reply@zoff.no',
to: 'kasper@zoff.no',
from: 'no-reply@zoff.me',
to: 'kasper@zoff.me',
subject: 'ZOFF: Requested new ' + type,
text: message,
html: message,

2
server/public/assets/html/offline.html
View File

@@ -27,7 +27,7 @@
We're sorry, but Zoff doesn't seem to be working at the moment. Have you checked your internet connection lately?
</p>
<p>
<a href="mailto:contact@zoff.no?Subject=Zoff%20is%20Down" style="color:darkgrey;text-decoration:none;">Contact Us</a>
<a href="mailto:contact@zoff.me?Subject=Zoff%20is%20Down" style="color:darkgrey;text-decoration:none;">Contact Us</a>
</p>
</div>
</div>

2
server/public/assets/js/helpers.js
View File

@@ -254,7 +254,7 @@ var Helper = {
$("#contact-container").html("Mail has been sent, we'll be back with you shortly.")
}else{
$("#contact-container").empty();
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.no?Subject=Contact%20Zoff'>contact@zoff.no</a>")
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.me?Subject=Contact%20Zoff'>contact@zoff.me</a>")
}
}
});

4
server/routing/client/api.js
View File

@@ -113,8 +113,8 @@ try {
var from = req.body.from;
var message = req.body.message;
var msg = {
from: 'no-reply@zoff.no',
to: 'contact@zoff.no',
from: 'no-reply@zoff.me',
to: 'contact@zoff.me',
subject: 'ZOFF: Contact form webpage',
text: message,
html: message,