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

advisor/mainapp/urls.py

@@ -22,7 +22,8 @@ urlpatterns = patterns('',
     url(r'^api/', include(router.urls)),
     url(r'^build/', build_trajectory, name='build'),
     url(r'^new/', StartTrajectoryView.as_view(), name='new-trac'),
-    url(r'^search/', search, name='search'),
+    url(r'^compare/', compare, name='compare'),
+    #url(r'^search/', search, name='search'),
     #url(r'^student/(?P<slug>[^/]+)/$', DetailStudent.as_view(),
     #name='detail-student'),
     url(r'^profile/', profile, name='profile-detail'), 

advisor/templates/layouts/navbar.html

@@ -12,7 +12,7 @@
         <li><a href="#"> File Upload </a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{% url 'search' %}">Search</a></li>
+        <li><a href="{% url 'haystack_search' %}">Search</a></li>
 	{% if user.is_anonymous %}
         <li><a href="{% url 'django.contrib.auth.views.login' %}">Log In</a></li>
 	{% else %}

advisor/templates/search/indexes/mainapp/major_text.txt

-{{ object.title }}
+{{ object.name }}
 {{ object.description }}

advisor/templates/search/indexes/mainapp/minor_text.txt

-{{ object.title }}
+{{ object.name }}
 {{ object.description }}