1page updates

diff --git a/public/index.html b/public/index.html
index 52ce36a83d4711156cef27956cac093389b21737..e2c1b61baeef21806bbc504317291432d05f06d4 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -10,8 +10,9 @@
 
                <script type='text/javascript' src='javascripts/jquery.min.js'></script>
                <script type='text/javascript' src='javascripts/es5-shim.min.js'></script>
-               <script type='text/javascript' src='javascripts/protodiv.js'></script>
                <script type='text/javascript' src='socket.io/socket.io.js'></script>
+               <script type='text/javascript' src='javascripts/protodiv.js'></script>
+               <script type='text/javascript' src='javascripts/main.js'></script>
 
                <meta name="viewport" content="width=device-width,user-scalable=no,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0">
                <meta name="apple-touch-icon" href=""> <!-- XXX -->
@@ -34,10 +35,10 @@
                                                <td class="menu">
                                                        <a href="javascript:goSchools()">Courses</a>
                                                        <a href="http://blog.finalsclub.org">Blog</a>
-                                                       <a href="/archive">Archive</a>
+                                                       <a href="javascript:goArchivedSubjects()">Archive</a>
                                                        <a href="javascript:goPress()">Press</a>
                                                        <a href="javascript:goRegister()">Create an Account</a>
-                                                       <a href="/login" class="special">Login</a>
+                                                       <a href="javascript:goLogin()" class="special">Login</a>
                                                </td>
                                        </tr>
                                </table>
@@ -105,6 +106,21 @@
 
 
 
+                       <div class=page id=pg_archive>
+                               <h1>Archived Subjects</h1>
+                               <p>
+                               Please browse our archive of past courses
+                               covered at Harvard from 2008 through 2010.
+                               </p>
+                               <ul>
+                                       <li id=PROTO_archived_subjects>
+                                               <a href="/archive/subject/__id__">__title__</a>
+                                       </li>
+                               </ul>
+
+                       </div>
+
+
 
                        <div class=page id=pg_register>
                                <h1>Create an Account</h1>
@@ -235,87 +251,6 @@
 
 
 
-<script>
-
-       /* This is the core logic for the main page. */
-
-
-       /* Convert a JSON string to an object, or null if unparseable */
-       function j2o(json) { try { return JSON.parse(json); } catch(e) { return null; } }
-
-       /* Convert an object to a JSON string (just easier to type than "JSON.stringify" */
-       function o2j(obj) { return JSON.stringify(obj); }
-
-
-       // hide all page divs, then show just the one with the given id
-       function hideAllPages() {
-               $(".page").fadeOut(100);
-       }
-       function showPage(id) {
-               $("#pg_"+id).fadeIn(100);
-       }
-
-
-
-       var schools = []
-
-       function goSchools() {
-               hideAllPages();
-               $.get("/schools", {}, function(response) {
-                       if(typeof response == 'object')
-                               schools = response.schools
-                       ProtoDiv.reset("PROTO_school");
-                       ProtoDiv.replicate("PROTO_school", schools);
-                       showPage("schools")
-               });
-       }
-
-
-
-       var courses = []
-
-       function goCourses(name) {
-               hideAllPages();
-               $("#school_name").html(name);
-//             $.get("/courses", {}, function(response) {
-//                     if(typeof response == 'object')
-//                             courses = response.courses
-var courses = [
-       { id: "4e6d1e9b42bbef522c000a8f", name: "History 12: Introduction to the Middle East" },
-       { id: "4e8aa3f62e4b97e67b001f47", name: "ANTH160AC/ISF 160: The Forms of Folklorek" }
-]
-                       ProtoDiv.reset("PROTO_course");
-                       ProtoDiv.replicate("PROTO_course", courses);
-                       showPage("courses")
-//             });
-       }
-
-
-       function goRegister() {
-               hideAllPages();
-               // xxx clear fields?
-               // xxx change FORM to use AJAX
-               showPage("register");
-       }
-
-
-       function goPress() {
-               hideAllPages();
-               showPage("press");
-       }
-
-
-       function goConduct() {
-               hideAllPages();
-               showPage("conduct");
-       }
-
-
-
-       showPage("home");
-
-
-</script>
 
 
                </div>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
new file mode 100644 (file)
index 0000000..f33d601
--- /dev/null
+++ b/public/javascripts/main.js
@@ -0,0 +1,119 @@
+
+/*
+
+This is the core logic for the main page.
+It implements most page transitions by showing and hiding DIV elements
+in the page with javascript+jquery
+
+*/
+
+
+/* Convert a JSON string to an object, or null if unparseable */
+function j2o(json) { try { return JSON.parse(json); } catch(e) { return null; } }
+
+/* Convert an object to a JSON string (just easier to type than "JSON.stringify" */
+function o2j(obj) { return JSON.stringify(obj); }
+
+
+// hide all page divs, then show just the one with the given id
+function hideAllPages() {
+       $(".page").fadeOut(100);
+}
+function showPage(id) {
+       $("#pg_"+id).fadeIn(100);
+}
+
+
+
+var schools = []
+
+// go to the page that lists the schools
+function goSchools() {
+       hideAllPages();
+       $.get("/schools", {}, function(response) {
+               if(typeof response == 'object')
+                       schools = response.schools
+               ProtoDiv.reset("PROTO_school");
+               ProtoDiv.replicate("PROTO_school", schools);
+               showPage("schools")
+       });
+}
+
+
+
+var courses = []
+
+// go to the page that lists the courses for a specific school
+function goCourses(name) {
+       hideAllPages();
+       $("#school_name").html(name);
+//             $.get("/courses", {}, function(response) {
+//                     if(typeof response == 'object')
+//                             courses = response.courses
+var courses = [
+{ id: "4e6d1e9b42bbef522c000a8f", name: "History 12: Introduction to the Middle East" },
+{ id: "4e8aa3f62e4b97e67b001f47", name: "ANTH160AC/ISF 160: The Forms of Folklorek" }
+]
+               ProtoDiv.reset("PROTO_course");
+               ProtoDiv.replicate("PROTO_course", courses);
+               showPage("courses")
+//             });
+}
+
+
+
+
+var archivedSubjects = []
+
+// go to the page that lists the archived subject names
+function goArchivedSubjects() {
+       hideAllPages();
+
+       // fake data
+       archivedSubjects = [
+               { id: 83, title: "Anthropology" },
+               { id: 44, title: "CORE-Foreign Cultures" },
+               { id: 80, title: "CORE-Historical Study" }
+       ]
+
+       ProtoDiv.reset("PROTO_archived_subjects");
+       ProtoDiv.replicate("PROTO_archived_subjects", archivedSubjects);
+
+       showPage("archive");
+}
+
+
+
+// go to the account registration page
+function goRegister() {
+       hideAllPages();
+       // xxx clear fields?
+       // xxx change FORM to use AJAX
+       showPage("register");
+}
+
+
+// go to the press articles page
+function goPress() {
+       hideAllPages();
+       showPage("press");
+}
+
+
+// go to the "code of conduct" page
+function goConduct() {
+       hideAllPages();
+       showPage("conduct");
+}
+
+
+
+$(document).ready(function() {
+       // This executes after the page has been fully loaded
+       showPage("home");
+})
+
+
+
+
+