changed text on some of the pages, merged students and profiles

advisor/mainapp/templates/new.html

@@ -11,7 +11,7 @@ New | MySchool Advisor
   <div class="row">
     <div class="col-md-12 text-center">
       <h1><strong>New Trajectory</strong></h1>
-      <p class="lead">Pick the programs you'd like to visualize completing your degree.</p>
+      <p class="lead">Pick the programs you'd like to visualize for completing your degree.</p>
     </div>
   </div>
 </div>

advisor/mainapp/templates/profile.html

 {% extends 'layouts/base.html' %}
 {% block content %}
 {% load gravatar %}
-    <div class="row clearfix">
-        <div class="col-md-4 column">
- <img class="img-circle img-responsive center-block" src="{% gravatar url
+<div class="row clearfix">
+  <div class="col-md-4 column">
+     <img class="img-circle img-responsive center-block" src="{% gravatar url
  '{{ current_user.user.email }}' 200 %}">
-        </div>
-        <div class="col-md-4 column">
-        </div>
-        <div class="col-md-4 column">
-        </div>
-    </div>
-    <div class="row clearfix">
-        <div class="col-md-12 column">
-<h3>
-Hello {{ firstname }}! | Your advisor is:  {{ advisorname }}
-</h3>
-            <form role="form">
-            </form>
-        </div>
-    </div>
-    <div class="row clearfix">
-        <div class="col-md-12 column">
-            <h5> Courses Taken </h5>
-            <table class="table">
-                <thead>
-                    <tr>
-                        <th>
-                            Course Number
-                        </th>
-                        <th>
-                            Course Name
-                        </th>
-                        <th>
-                            Semester Taken
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-    </div>
+  </div>
+  <div class="col-md-4 column">
+  </div>
+  <div class="col-md-4 column">
+  </div>
+</div>
+<div class="row clearfix">
+  <div class="col-md-12 column">
+    <h3>
+      Hello {{ firstname }}! | Your advisor is:  {{ advisorname }}
+    </h3>
+    <form role="form">
+    </form>
+  </div>
+</div>
+<div class="row clearfix">
+  <div class="col-md-12 column">
+    <legend>Courses Taken</legend>
+    <table class="table">
+      <thead>
+        <tr>
+          <th>
+            Course Number
+          </th>
+          <th>
+            Course Name
+          </th>
+          <th>
+            Semester Taken
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+      </tbody>
+    </table>
+  </div>
+</div>
+<div class="row clearfix">
+  <div class="col-md-12 column">
+    <legend>My Trajectories</legend>
+  </div>
+  <div class="row-md-6">
+    <h4><a href="#">Trajectory One Name</a></h4>
+  </div>
+  <div class="row-md-6">
+    <button type="button" class="btn btn-primary">Edit</button>
+    <button type="button" class="btn btn-default">Public</button>
+    <button type="button" class="btn btn-primary">Private</button>
+    <button type="button" class="btn btn-danger">Delete</button>
+  </div>
+  <div class="row-md-6">
+    <h4><a href="#">Trajectory Two Name</a></h4>
+  </div>
+  <div class="row-md-6">
+    <button type="button" class="btn btn-primary">Edit</button>
+    <button type="button" class="btn btn-default">Public</button>
+    <button type="button" class="btn btn-primary">Private</button>
+    <button type="button" class="btn btn-danger">Delete</button>
+  </div>
 </div>
 {% endblock %}

advisor/mainapp/templates/student.html

-{% extends 'layouts/base.html' %}
-
-{% block title %}
-Student Name | YourSchool Advisor
-{% endblock %}
-
-{% block content %}
-
-{% load gravatar %}
-
-<div class="row">
-  <div class="col-md-4">
-    <img class="img-circle img-responsive center-block" src="{% gravatar url 'student@theiremail.address' 200 %}">
-  </div>
-  <div class="col-md-4">
-    <h2>Student Name</h2>
-  </div>
-  <div class="col-md-4">
-    <button type="button" class="btn btn-primary">Edit My Info</button>
-  </div>
-</div>
-
-<legend>My Trajectories</legend>
-
-<div class="row">
-  <div class="row-md-6">
-    <h4>Trajectory Name</h4>
-  </div>
-  <div class="row-md-6">
-    <button type="button" class="btn btn-primary">Edit</button>
-    <button type="button" class="btn btn-default">Public</button>
-    <button type="button" class="btn btn-default">Private</button>
-    <button type="button" class="btn btn-danger">Delete</button>
-  </div>
-</div>
-
-{% endblock %}

advisor/templates/index.html

@@ -10,20 +10,21 @@ YourSchool Advisor
   <div class="row">
     <div class="col-md-12 text-center">
       <h1><strong>YourSchool Advisor</strong></h1>
+      <p class="lead">Automated student academic advising.</p>
     </div>
   </div>
 </div>
 
 <div class="row">
-  <div class="col-md-offset-1 col-md-10">
-    <p>Some truly lovely information explaining all about advisor and why you should use it. It's probably the greatest best that thing god ever gave man on the face of this earth.</p>
+  <div class="col-md-offset-1 col-md-10 text-center">
+    <h6>Create your potential paths to graduation.</h6>
   </div>
 </div>
 
 <div class="row">
   <div class="col-md-offset-3 col-md-6">
     <a href="{% url 'new-trac' %}">
-      <button type="button" class="btn btn-standard btn-lg btn-block">Create a new Trajectory</button>
+      <button type="button" class="btn btn-standard btn-lg btn-block">Create a New Trajectory</button>
      </a>
   </div>
 </div>

advisor/templates/layouts/navbar.html

@@ -2,7 +2,7 @@
 <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
-      <a class="navbar-brand" href="{% url 'home' %}"><strong>Your School</strong>&nbsp;Advisor</a>
+      <a class="navbar-brand" href="{% url 'home' %}"><strong>YourSchool</strong> Advisor</a>
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">

advisor/templates/search/search.html

@@ -11,7 +11,7 @@ Search | YourSchool Advisor
   <div class="row">
     <div class="col-lg-12 text-center">
       <h1>Search</h1>
-      <p class="lead">Search for... wait what are we indexing?</p>
+      <p class="lead">Search for courses, majors, and minors.</p>
     </div>
   </div>
 </div>