Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

V1.0.1 #66

Merged
merged 10 commits into from
This page is out of date. Refresh to see the latest.
View
BIN  db.sqlite3
Binary file not shown
View
4 info/templates/about.html
@@ -25,8 +25,8 @@ <h1 class="page-header">About the Miami University Colony of &Theta;&Tau;</h1>
Since our certification in January 2013, the Miami University Colony of &Theta;&Tau; has grown to 57 members. We have dedicated ourselves
to the service of the College of Engineering and Computing as well as the greater Oxford community. We have participated in service
events with national charities such as Habitat for Humanity, Feed My Starving Children, and Relay for Life, as well as local organizations
- such as an animal shelter and the Cincinnati Reds. We have worked with the College of Engineering and Computing on events such as Engineers'
- Week, Make It Miami tours, and led tutoring sessions for engineering students in any classes.
+ such as an animal shelter and the Cincinnati Reds. We have worked with the College of Engineering and Computing on events such as
+ Engineers' Week, Make It Miami tours, and led tutoring sessions for engineering students in any classes.
</p>
</div>
View
2  info/templates/brother_profile.html
@@ -56,7 +56,9 @@ <h1 class="page-header"> {{ be.brother.firstName }} {{ be.brother.lastName }} <s
{% endfor %}
</ul>
{% endif %}
+ {% if be.brother.resume %}
<h4><a href="{{ be.brother.resume }}">Resume</a></h4>
+ {% endif %}
</div>
</div>
View
38 info/templates/resume_list.html
@@ -42,33 +42,33 @@ <h1 class="page-header">Resumes</h1>
<hr />
<div class='container'>
- <div class="row">
{% for brother in brothers %}
- <div class='col-md-2'>
- <a href='/info/brother/{{ brother.id }}'>{{ brother.lastName }}, {{ brother.firstName }} {{ brother.middleName }}</a>
- </div>
- <div class='col-md-2'>
- Class of {{ brother.graduationYear }}
- </div>
- <div class='col-md-2'>
- <a href='{{ brother.resume }}'>Resume</a>
- </div>
- {% for major in brother.majors.all %}
+ {% if brother.resume %}
+ <div class="row">
<div class='col-md-2'>
- {{ major }}
+ <a href='/info/brother/{{ brother.id }}'>{{ brother.lastName }}, {{ brother.firstName }} {{ brother.middleName }}</a>
</div>
- {% endfor %}
-
- <br />
- <hr />
+ <div class='col-md-2'>
+ Class of {{ brother.graduationYear }}
+ </div>
+ <div class='col-md-2'>
+ <a href='{{ brother.resume }}'>Resume</a>
+ </div>
+ {% for major in brother.majors.all %}
+ <div class='col-md-2'>
+ {{ major }}
+ </div>
+ {% endfor %}
+
+ </div>
+ <hr />
+ {% endif %}
{% endfor %}
- </div>
-
<hr />
</div>
</div><!-- /.container -->
-{% endblock %}
+{% endblock %}
View
5 info/views.py
@@ -30,6 +30,8 @@ def index(request):
def brother_profile(request, brother_id):
bro = get_object_or_404(Brother, pk = brother_id)
+ if bro.resume.startswith('http://google.com'):
+ bro.resume = ""
return render(request, 'brother_profile.html', {'be': BrotherEntity(bro)})
def officers(request):
@@ -92,7 +94,8 @@ def resumes(request):
major_reqs = Q()
for major_request in major_requests:
major_reqs = major_reqs | Q(majors__majorName=major_request)
- brothers = Brother.objects.filter(major_reqs, grad_year_reqs).order_by('lastName', 'firstName', 'middleName').distinct()
+ valid_resume_Q = ~Q(resume__startswith = 'http://google.com/')
+ brothers = Brother.objects.filter(major_reqs, grad_year_reqs, valid_resume_Q).order_by('lastName', 'firstName', 'middleName').distinct()
majors = Major.objects.all().order_by('majorName')
c = Context({'brothers': brothers, 'majors': majors, 'years': years})
t = loader.get_template('resume_list.html')
View
4 templates/base.html
@@ -31,7 +31,7 @@
<body>
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation" style="background-color: #800000">
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation" style="background-color: #800000;">
<div class="container" >
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"
@@ -48,7 +48,7 @@
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown"><a href="#" class="dropdown-toggle"
- data-toggle="dropdown" style="color:#DADADA;">About Us<b class="caret"></b></a>
+ data-toggle="dropdown" style="color:#DADADA;">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/info/">About the &Theta;&Tau; Miami Colony</a></li>
<li><a href="/info/officers">Officers</a></li>
Something went wrong with that request. Please try again.