Commit 27ce41f7 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'movearound'

Oh god this is messy
parents dd62dd78 ad0a49c3
{% extends 'layouts/base.html' %}
{% block title %}
GMU Advisor
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<p class="lead">Automated Undergraduate Academic Advising*</p>
<p><h4>Select the classes you've already taken, and follow the instructions to start visualizing your way to completing your degree.</h4></p>
<div class="row well">
<div class="col-md-12">
<form class="form-horizontal" action="" method="post" role="form" enctype="multipart/form-data">
{% csrf_token %}
<legend>Select your courses(s).</legend>
{% if courses %}
<div class="alert alert-info">Do you need to update the courses you've already taken?</div>
{% else %}
<div class="form-group">
<label for "departmentAbbr" class="col-sm-2">Department Abbreviation</label>
<div class="col-sm-1">
<input type="text" class="form-control" id="Program" placeholder="ENGH">
<label for "courseNumber" class="col-sm-1">Course Number</label>
<div class="col-sm-1">
<input type="text" class="form-control" id="Program" placeholder="302">
<!-- Name loads automatically -->
<label for "name" class="col-sm-1">Name</label>
<div class="col-sm-5">
<input type="text" class="form-control" id="Program" placeholder="Advanced Composition">
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
<!-- not sure how to have a zillion of these fields keep on appearing -->
{% endif %}
<legend>Select your program(s).</legend>
<div class="form-group">
<label for "Program" class="col-sm-2">Program</label>
<div class="col-sm-5">
<input type="text" class="form-control" id="Program" placeholder="Government and International Politics">
<!-- autocompletion would be awesome -->
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
<legend>Select your minor(s).</legend>
<div class="form-group">
<label for "Minor" class="col-sm-2">Minor</label>
<div class="col-sm-5">
<input type="text" class="form-control" id="Minors" placeholder="Software Engineering">
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
<!-- #cooljsideas for this and select program, have a new field slide out
when one has been entered (2 for degree, 3 for minor)-->
<legend>Are you in the Honors College?</legend>
<div class="form-group">
<label for "honorscollege" class="col-sm-2">Honors</label>
<div class="col-sm-5">
<button type="button" class="btn btn-default">Yes</button>
<button type="button" class="btn btn-primary">No</button>
<legend>What is your current semester?</legend>
<div class="form-group">
<label for "degreeType" class="col-sm-2">Current Semester</label>
<div class="col-sm-3">
<select class="form-control">
<option>First Semester Freshman</option>
<option>Second Semester Freshman </option>
<option>First Semester Sophomore</option>
<option>Second Semester Sophomore</option>
<option>First Semester Junior</option>
<option>Second Semester Junior</option>
<option>First Semester Senior</option>
<option>Second Semester Senior</option>
<option>First Semester SuperSenior</option>
<option>Second Semester SuperSenior</option>
<option>First Semester SuperSuperSenior</option>
<!-- option You Mayyyyy Want to Consider Seeing an Actual Person /option -->
<div class="form-group">
<div class="col-sm-offset-11 col-sm-1">
<button type="submit" class="btn btn-primary" value="Submit">Submit</button>
<!-- need to have the bar across the top loading js -->
<p>*Not intended as a replacement for formal academic advising through your department.</p>
{% endblock %}
from django.conf.urls import patterns, include, url
from django.contrib import admin
from trajectories.views import course, student, trajectory, create, new
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# course
url(r'^course/(?P<courseName>\w+)/$', 'course', name = 'course'),
# student's page
url(r'^user/(?P<username>\w+)/$', 'student', name = 'student'),
# single trajectory page
url(r'^user/(?P<username>\w+)/(?P<trajectoryslug>\w+)$', 'trajectory', name = 'trajectory'),
# a new trajectory
# url(r'^user/(?P<username>\w+)/new/$', 'new', name = 'new'),
url(r'^new/$', 'new', name = 'new'),
# creating the trajectory
# url(r'^user/(?P<username>\w+)/create/$', 'create', name = 'create'),
url(r'^create/$', 'create', name = 'create'),
...@@ -108,23 +108,13 @@ def enoughCourses(coursesTaken): ...@@ -108,23 +108,13 @@ def enoughCourses(coursesTaken):
# page render functions # page render functions
# this is where all users not signed in are redirected # a page for creating new trajectories
#@login_required # @login_required
def index(request): def new(request):
courses = [] # student's courses
return render(request, 'index.html', {
"courses" : courses
# "homepage", create a new trajectory
def index(request):
return render(request, 'index.html', { return render(request, 'new.html', {
}, }
# student selects the classes for their trajectories # student selects the classes for their trajectories
# @login_required # @login_required
...@@ -195,17 +185,3 @@ def trajectory(request, slug): ...@@ -195,17 +185,3 @@ def trajectory(request, slug):
'trajectory' : trajectory, 'trajectory' : trajectory,
}, },
) )
# search
# # # # # STATIC PAGES # # # # #
# SRCT, how to contribute information, how Advisor works
def about(request):
return render(request, 'about.html', {
# def privacy(request):
...@@ -4,3 +4,12 @@ argparse==1.2.1 ...@@ -4,3 +4,12 @@ argparse==1.2.1
django-auth-ldap==1.1.7 django-auth-ldap==1.1.7
python-ldap==2.4.13 python-ldap==2.4.13
wsgiref==0.1.2 wsgiref==0.1.2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment