Commit 82156aa2 authored by Daniel W Bond's avatar Daniel W Bond

Merge branch 'master' of github.com:srct/advisor

parents 5746d977 db3443a0
......@@ -41,7 +41,7 @@ New | MySchool Advisor
<!-- Ensure no more than two majors -->
<legend>Select your minor(s).</legend>
<div class="form-group{% if starttrajectoryform.name.errors %} has-error {% endif %}">
<div method="post" action="{% url 'build-track' %}" class="form-group{% if starttrajectoryform.name.errors %} has-error {% endif %}">
<label for "{{ starttrajectoryform.name.id_for_label }}" class="col-sm-2">
{{ starttrajectoryform.name.id_for_label }}</label>
<div class="col-sm-8">
......
......@@ -20,7 +20,7 @@ urlpatterns = patterns('',
# url(r'^blog/', include('blog.urls')),
url(r'^$', TemplateView.as_view(template_name='index.html'), name='home'),
url(r'^api/', include(router.urls)),
url(r'^build/', build_trajectory, name='build'),
url(r'^build/', build_trajectory, name='build-trac'),
url(r'^new/', StartTrajectoryView.as_view(), name='new-trac'),
#url(r'^search/', search, name='search'),
#url(r'^student/(?P<slug>[^/]+)/$', DetailStudent.as_view(),
......
......@@ -20,9 +20,8 @@ from mainapp.forms import StartTrajectoryForm, StudentForm
@login_required
def build_trajectory(request):
#process
semester_key = 1
return render(request, 'build.html')
return render_to_response('build.html', {
})
class StartTrajectoryView(FormView):
template_name = 'new.html'
form_class = StartTrajectoryForm
......
......@@ -9,7 +9,6 @@
<li><a href="{% url 'profile-detail' %}">Me</a></li>
<li><a href="{% url 'new-trac' %}">New</a></li>
<li><a href="{% url 'compare' %}">Compare</a></li>
<li><a href="#"> File Upload </a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{% url 'haystack_search' %}">Search</a></li>
......
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