Skip to content

Commit

Permalink
"Replaced FOSS@Amrita to amFOSS at all places"
Browse files Browse the repository at this point in the history
  • Loading branch information
DheerajMalisetty committed Jul 16, 2018
1 parent 0df8cef commit 73b8740
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Home/static/home/assets/css/template.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! -----------------------------------------------------------------
[Master Stylesheet]
Project: FOSS@Amrita
Project: amFOSS
Version: 2.0
------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions Home/templates/base/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>FOSS@Amrita. Code | Share | Grow</title>
<title> amFOSS. Code | Share | Grow</title>

<!-- Favicons -->
<link rel="shortcut icon" href="{% static 'home/assets/images/favicon.png' %}">
Expand All @@ -18,7 +18,8 @@

<!-- Fonts -->
<link href='https://fonts.googleapis.com/css?family=Roboto+Condensed:400,300,400italic,700' rel='stylesheet'
type='text/css'>
type='t
ext/css'>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700' rel='stylesheet' type='text/css'>

<!-- Bootstrap core CSS -->
Expand Down
2 changes: 1 addition & 1 deletion Home/templates/base/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="row">
<div class="col-sm-8">
<div class="copyright text-right font-alt">
© 2017 <a href="{% url 'home' %}">FOSS@Amrita</a>, All Rights Reserved.
© 2017 <a href="{% url 'home' %}">amFOSS</a>, All Rights Reserved.
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Home/templates/base/side-nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

</div>

<p>© 2017 <a href="https://amfoss.in/">FOSS@Amrita</a></p>
<p>© 2017 <a href="https://amfoss.in/">amFOSS</a></p>
</div>
<!-- /SOCIAL LINKS -->

Expand Down
4 changes: 2 additions & 2 deletions Home/templates/home/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- HERO TEXT -->
<div class="hero-caption">
<div class="hero-text">
<h1 class="hero-title">FOSS@Amrita</h1>
<h1 class="hero-title">amFOSS</h1>
<p class="hero-subtitle font-serif m-t-40">Your freedom begins here. <br>
Converge your obssesion into something great. For the greater cause.</p>
</div>
Expand Down Expand Up @@ -127,7 +127,7 @@ <h2 class="module-title font-alt">A short note..!</h2>
<!-- text area -->
<div class="col-md-12">
<div class="counter text-light">
<p> FOSS@Amrita is one of the most active student communities on the campus,
<p> amFOSS is one of the most active student communities on the campus,
living and breathing on the motto of Code | Share | Grow. We are a community
of students who support and guide each other towards making open source contributions
and the usage of free software. Here we encourage, support and mentor students to improve
Expand Down
8 changes: 4 additions & 4 deletions Home/templates/home/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="hero-caption">
<div class="hero-text">
<h6 class="m-b-30">amrita vishwa vidyapeetham</h6>
<h1 class="m-b-30">FOSS@Amrita</h1>
<h1 class="m-b-30">amFOSS</h1>
<h6 class="m-b-60">Code | Share | Grow</h6>
<a href="#LearnMore" class="btn btn-dark anim-scroll">Learn More</a>
</div>
Expand Down Expand Up @@ -109,7 +109,7 @@ <h4 class="panel-title"><a data-toggle="collapse" data-parent="#accordion" href=
</div>
<div id="support2" class="panel-collapse collapse">
<div class="panel-body">
One thing that is deeply rooted in the club is that FOSS@Amrita is helping its fellow
One thing that is deeply rooted in the club is that amFOSS is helping its fellow
members get their foot in the door with the tech industry. Our members are hence able to
land a seat in the top universities abroad, boosting their career ahead. We are exposed
to various opportunities too, which give us a feel of what it's like to be working in
Expand All @@ -125,8 +125,8 @@ <h4 class="panel-title"><a data-toggle="collapse" data-parent="#accordion" href=
</div>
<div id="support3" class="panel-collapse collapse">
<div class="panel-body">
FOSS@Amrita is one of the oldest student community at Amrita University. This club has
been active throughout 10 years. FOSS@Amrita is the only university club that follows a
amFOSS is one of the oldest student community at Amrita University. This club has
been active throughout 10 years. amFOSS is the only university club that follows a
culture where juniors are mentored by seniors. Moreover, the university club provides
better emphasis on molding the students in a better human being with strong and
versatile technical skillset.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# **Project**

It’s been 10+ years now that FOSS@Amrita came into existence. We are a community of students who support and guide each other towards making open source contributions, which not only helps them to build their technical skills but also helps them to contribute back to the society. Being one of the most active student communities of the country, we have made our presence felt all over. We have been getting a lot of exposure & opportunities via different platforms such as conferences & social media to name a few.
It’s been 10+ years now that amFOSS came into existence. We are a community of students who support and guide each other towards making open source contributions, which not only helps them to build their technical skills but also helps them to contribute back to the society. Being one of the most active student communities of the country, we have made our presence felt all over. We have been getting a lot of exposure & opportunities via different platforms such as conferences & social media to name a few.

**Idea / Goal of the club**: To be a better human being.

Expand Down Expand Up @@ -137,7 +137,7 @@ Add the command to source:
* **RGSoC**: A timeline enlisting the details of students selected for RGSoC every year.
* **Talks**: Referencing to the talks and conferences given/attended by the students of the club.
* **Internships**: Provides a brief outline of various internship programs enrolled in by the club members.
* **Contests**: Gives out a detailed account of various contests participated and the rank obtained by the members of FOSS@Amrita.
* **Contests**: Gives out a detailed account of various contests participated and the rank obtained by the members of amFOSS.
* **Club Management**
There are various activities in-store to manage and keep up the work-environment. We list them below:
* **Attendance management**: Reflects number of people present during lab working hours and their respective attendance percentage.
Expand Down
2 changes: 1 addition & 1 deletion admissions/templates/admissions/already_registered.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1 class="hero-title font-alt">Already Logged In!</h1>
<h1 class="card-title col-md-12">Sorry :(</h1>
<hr>
<p class="card-text col-md-12">
You are already a member of FOSS@Amrita.
You are already a member of amFOSS.
<hr class="my-4">
</p>
<div style="margin-left: 70px">
Expand Down
12 changes: 6 additions & 6 deletions admissions/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion clubManagement/templates/clubManagement/team_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="hero-caption">
<div class="hero-text">
<h1 class="hero-title font-alt">Teams</h1>
<p class="hero-subtitle font-serif">A list of all the Teams, FOSS@Amrita.</p>
<p class="hero-subtitle font-serif">A list of all the Teams, amFOSS.</p>
</div>
</div>
<!-- /HERO TEXT -->
Expand Down
2 changes: 1 addition & 1 deletion registration/templates/registration/example_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>FOSS@Amrita. Code | Share | Grow</title>
<title>amFOSS. Code | Share | Grow</title>

<!-- Favicons -->
<link rel="shortcut icon" href="{% static 'home/assets/images/favicon.png' %}">
Expand Down
2 changes: 1 addition & 1 deletion registration/templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>FOSS@Amrita. Code | Share | Grow</title>
<title>amFOSS. Code | Share | Grow</title>

<!-- Favicons -->
<link rel="shortcut icon" href="{% static 'home/assets/images/favicon.png' %}">
Expand Down
4 changes: 2 additions & 2 deletions registration/templates/registration/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>FOSS@Amrita</title>
<title>amFOSS</title>
<meta name="description" content="">

<!-- Google Fonts -->
Expand Down Expand Up @@ -551,7 +551,7 @@ <h2 class="text-upper">Ola Lowe</h2>
<footer id="crt-footer" class="crt-container-lg">
<div class="crt-container">
<div class="crt-container-sm clear-mrg text-center">
<p>FOSS@Amrita @ All Rights Reserved 2018</p>
<p>amFOSS @ All Rights Reserved 2018</p>
</div>
</div>
<!-- .crt-container -->
Expand Down
2 changes: 1 addition & 1 deletion registration/templates/registration/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>FOSS@Amrita. Code | Share | Grow</title>
<title>amFOSS. Code | Share | Grow</title>

<!-- Favicons -->
<link rel="shortcut icon" href="{% static 'home/assets/images/favicon.png' %}">
Expand Down
2 changes: 1 addition & 1 deletion registration/templates/registration/signup_success.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1 class="hero-title font-alt">Welcome</h1>
<div class="card">
<div class="card-block">
<div style="margin-left: 70px">
<h3 class="card-title col-md-12">Welcome to FOSS@Amrita!</h3>
<h3 class="card-title col-md-12">Welcome to amFOSS!</h3>
<hr>
<br>
<p style="margin-left: 20px" class="card-text col-md-12">
Expand Down
4 changes: 2 additions & 2 deletions workshop/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 73b8740

Please sign in to comment.