Commit c80c9349 authored by Ben Waters's avatar Ben Waters

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

parents de0f4aa6 1009923d
...@@ -11,7 +11,7 @@ New | MySchool Advisor ...@@ -11,7 +11,7 @@ New | MySchool Advisor
<div class="row"> <div class="row">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<h1><strong>New Trajectory</strong></h1> <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> </div>
</div> </div>
......
{% extends 'layouts/base.html' %} {% extends 'layouts/base.html' %}
{% block content %} {% block content %}
{% load gravatar %} {% load gravatar %}
<div class="row clearfix"> <div class="row clearfix">
<div class="col-md-4 column"> <div class="col-md-4 column">
<img class="img-circle img-responsive center-block" src="{% gravatar url <img class="img-circle img-responsive center-block" src="{% gravatar url
'{{ current_user.user.email }}' 200 %}"> '{{ current_user.user.email }}' 200 %}">
...@@ -10,19 +10,19 @@ ...@@ -10,19 +10,19 @@
</div> </div>
<div class="col-md-4 column"> <div class="col-md-4 column">
</div> </div>
</div> </div>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-md-12 column"> <div class="col-md-12 column">
<h3> <h3>
Hello {{ firstname }}! | Your advisor is: {{ advisorname }} Hello {{ firstname }}! | Your advisor is: {{ advisorname }}
</h3> </h3>
<form role="form"> <form role="form">
</form> </form>
</div> </div>
</div> </div>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-md-12 column"> <div class="col-md-12 column">
<h5> Courses Taken </h5> <legend>Courses Taken</legend>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
...@@ -41,6 +41,28 @@ Hello {{ firstname }}! | Your advisor is: {{ advisorname }} ...@@ -41,6 +41,28 @@ Hello {{ firstname }}! | Your advisor is: {{ advisorname }}
</tbody> </tbody>
</table> </table>
</div> </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>
</div> </div>
{% endblock %} {% endblock %}
{% 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 %}
...@@ -10,20 +10,21 @@ YourSchool Advisor ...@@ -10,20 +10,21 @@ YourSchool Advisor
<div class="row"> <div class="row">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<h1><strong>YourSchool Advisor</strong></h1> <h1><strong>YourSchool Advisor</strong></h1>
<p class="lead">Automated student academic advising.</p>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-offset-1 col-md-10"> <div class="col-md-offset-1 col-md-10 text-center">
<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> <h6>Create your potential paths to graduation.</h6>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-6"> <div class="col-md-offset-3 col-md-6">
<a href="{% url 'new-trac' %}"> <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> </a>
</div> </div>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header"> <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>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
...@@ -11,7 +11,7 @@ Search | YourSchool Advisor ...@@ -11,7 +11,7 @@ Search | YourSchool Advisor
<div class="row"> <div class="row">
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<h1>Search</h1> <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> </div>
</div> </div>
......
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