forked from amfoss/club-website-2018
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
"Replaced FOSS@Amrita to amFOSS at all places"
- Loading branch information
1 parent
0df8cef
commit 73b8740
Showing
16 changed files
with
30 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ | |
|
||
approve_mail_content = ',\\n\\nWe are excited to inform that you are selected for the interview. Be there at ' + \ | ||
'ground floor computer lab by 5PM. \\n\\nIf you have any queries contact : Chirath,'+ \ | ||
' 8547801861 \\n\\nThank you, \\n\\nFOSS@Amrita' | ||
' 8547801861 \\n\\nThank you, \\n\\namFOSS' | ||
|
||
reject_mail_content = ',\\n\\nWe are sorry to inform that you are not selected for the interview. Please try again ' \ | ||
'next time.' | ||
|
@@ -62,9 +62,9 @@ class JoinApplicationDetailView(DetailView): | |
|
||
def get_context_data(self, **kwargs): | ||
context = super(JoinApplicationDetailView, self).get_context_data(**kwargs) | ||
context['approve_mail_subject'] = 'Congrats! FOSS@Amrita membership application' | ||
context['approve_mail_subject'] = 'Congrats! amFOSS membership application' | ||
context['approve_mail_content'] = 'Hi ' + self.get_object().name + approve_mail_content | ||
context['reject_mail_subject'] = 'FOSS@Amrita membership application' | ||
context['reject_mail_subject'] = 'amFOSS membership application' | ||
context['reject_mail_content'] = 'Hi ' + self.get_object().name + reject_mail_content | ||
context['mail_error'] = self.request.GET.get('errors', None) | ||
return context | ||
|
@@ -126,10 +126,10 @@ def form_valid(self, form): | |
"solved. This is to test if you are really interested and we expect you to be honest. " + \ | ||
"If you have any queries feel free to reply to this mail." + \ | ||
"\n\n[1] http://foss.amrita.ac.in/foss/#sixth\n[2] https://www.hackerrank.com/" + \ | ||
"\n[3] http://cs50.tv/2016/fall/\n\nWith regards, \n\nFOSS@Amrita" | ||
"\n[3] http://cs50.tv/2016/fall/\n\nWith regards, \n\namFOSS" | ||
to_address_list = ['[email protected]', form.cleaned_data.get('email')] | ||
email = EmailMessage( | ||
'Tasks to complete, FOSS@Amrita', | ||
'Tasks to complete, amFOSS', | ||
mail_content, | ||
'[email protected]', | ||
to_address_list, | ||
|
@@ -220,7 +220,7 @@ def get(self, request): | |
cc_list += user.email + ", " | ||
|
||
reply_to = join_application_reply_to[0] | ||
mail_subject = "FOSS@Amrita" | ||
mail_subject = "amFOSS" | ||
mail_content = "Namah Shivaya, \n\n" | ||
|
||
context = {'to_list': to_list, 'bcc_list': bcc_list, 'cc_list': cc_list, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -150,13 +150,13 @@ def form_valid(self, form): | |
|
||
mail_content = "Hi " + form.cleaned_data.get('name') + ", \n\n" + \ | ||
"Great to know that you are interested in '" + workshop.name + "' workshop conducted by" \ | ||
"FOSS@Amrita. We got your application and it's being processed. " + \ | ||
"amFOSS. We got your application and it's being processed. " + \ | ||
"We will get back to you once your payment process is is complete.\n\n" \ | ||
"Please pay Rs" + str(workshop.price) + " at FOSS club, ground floor lab after 4:30pm on or " + \ | ||
"before " + str(workshop.start_date_time.date()) + " or contact us at " + \ | ||
str(workshop.contact_info) + " during breaks. \n\nNote: Payment has to completed " + \ | ||
"before the last date. You should show the confirmation e-mail to attend the workshop." + \ | ||
" \n\nThank you, \n\nFOSS@Amrita" | ||
" \n\nThank you, \n\namFOSS" | ||
|
||
to_address_list = ['[email protected]', form.cleaned_data.get('email')] | ||
email = EmailMessage( | ||
|