Improved login page, fixed menu links, started home page

thedjpetersen · Jun 1, 2011 · d048c38 · d048c38
1 parent fe6fa66
commit d048c38
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 86 deletions.
diff --git a/main/templates/application.html b/main/templates/application.html
@@ -6,6 +6,7 @@
     </style>
 
   <head>
+    <title>Reggit | DK awesomeness</title>
     <link rel="stylesheet" type="text/css" href="/site_media/stylesheets/screen.css" />
     <link rel="stylesheet" type="text/css" href="/site_media/stylesheets/print.css" />
     <link rel="stylesheet" type="text/css" href="/site_media/stylesheets/ie.css" />
@@ -26,11 +27,11 @@
 			{% block navigation %}
                 <div id="navigation" style="float: right;">
                     {% ifnotequal no_show_nav 1 %} 
-                        <span><a href="/main">Home</a></span>
-                        <span><a href="/scheduler">Scheduler</a></span>
-                        <span><a href="/transcript">Transcript</a></span>
-                        <span><a href="/schedule">Current Schedule</a></span>
-                        <span><a href="/logout">Logout</a></span>
+                        <a href="/main"><span>Home</span></a>
+                        <a href="/scheduler"><span>Scheduler</span></a>
+                        <a href="/transcript"><span>Transcript</span></a>
+                        <a href="/schedule"><span>Current Schedule</span></a>
+                        <a href="/logout"><span>Logout</span></a>
                     {% endifnotequal %}
                 </div>
 			{% endblock %}

diff --git a/main/templates/index.html b/main/templates/index.html
@@ -1,13 +1,25 @@
 {% extends "application.html" %}
 
+{% block header %}
+	<link rel="stylesheet" type="text/css" href="/site_media/stylesheets/index.css" />
+{% endblock %}
+
 {% block content %}
 
-<h1>Login</h1><br/></br>
+<div id="login-bar" class="span-6">
+<h3>Login</h3>
 <span>Enter your OSU ID/GAP or ONID</span>
-<form action="/login/" method="POST" align="center">
+<form action="/login/" method="POST" >
     Username:<input name="username"></input><br/>
     Password:<input type="password" name="password"></input><br/>
     <input type="submit" value="Login"><br/>
 </form>
+</div>
+
+<div class="span-17 last">
+	<h2 id="welcome">Welcome to Reggit!</h2>
+	<span id="slogan">A student project for better registration.</span>
+	<p style="margin-top:10px">The Oregon State Registration system works well, but in our opinion, not well enough. Inspired by a repeating never ending senior project, the students have set out to correct this by writing a better frontend. </p>
+</div>
 
 {% endblock %}
diff --git a/main/templates/main.html b/main/templates/main.html
@@ -2,7 +2,8 @@
 
 {% block content %}
 
-<h1>Home</h1>
+<h2>Home</h2>
+<p>Eventually a dashboard will go here, where you can quickly see a overview of your past and present progress, as well as future suggestions.</p>
 
 {% endblock %}
 
diff --git a/main/templates/schedule/index.html b/main/templates/schedule/index.html
diff --git a/main/templates/transcript/index.html b/main/templates/transcript/index.html
diff --git a/site_media/stylesheets/application.css b/site_media/stylesheets/application.css
@@ -12,18 +12,18 @@
   margin-bottom:10px;
 }
 
-#navigation span{
+#navigation a{
+  text-decoration: none;
+  color:white;
+}
+
+#navigation a span{
   background: #06276F;
   padding:8px;
   border-radius:6px;
   margin-right: 4px;
 }
 
-#navigation span a{
-  text-decoration: none;
-  color:white;
-}
-
-#navigation span:hover{
+#navigation a span:hover{
   background:#6C8DD5;
 }