minor cleaning on lectures page and lecture page, fixed links on home page

diff --git a/.vimrc b/.vimrc
new file mode 100644 (file)
index 0000000..b949622
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,4 @@
+set tabstop=2
+set shiftwidth=2
+set softtabstop=2
+

diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css
index 6d73d293a6e41e1ffa0afe87bf0eddab71b23b54..cad05e399c778a63079c3ff5e54af9c0143d3466 100755 (executable)
--- a/public/assets/css/screen.css
+++ b/public/assets/css/screen.css
@@ -57,7 +57,7 @@ Please have a look around, I hope you enjoy your stay.
   margin-left: 1.705%;
   margin-right: 1.705%; }
 
-.grid-3, #g-logo {
+.grid-3, .sidebar, #g-logo {
   float: left;
   width: 34.091%;
   padding: 0;
@@ -71,7 +71,7 @@ Please have a look around, I hope you enjoy your stay.
   margin-left: 1.705%;
   margin-right: 1.705%; }
 
-.grid-5, #g-nav-main {
+.grid-5, #g-nav-main, #pg_lectures .main-content {
   float: left;
   width: 59.091%;
   padding: 0;
@@ -92,14 +92,14 @@ Please have a look around, I hope you enjoy your stay.
   margin-left: 1.705%;
   margin-right: 1.705%; }
 
-.grid-8, #g-nav-user, #g-masthead-hr, .breadcrumb, .subheader, .main-content, #g-footer, #intro-schools {
+.grid-8, #g-nav-user, #g-masthead-hr, .breadcrumb, .subheader, .main-content, #g-footer, #messages, #intro-schools {
   float: left;
   width: 96.591%;
   padding: 0;
   margin-left: 1.705%;
   margin-right: 1.705%; }
 
-.futura, .futura-oblique, .breadcrumb .location, #schools .number_of_courses, #schools .number_of_notes, #pg_courses .course .course-data-number, .futura-light, h1, .subheader h2, .futura-light-oblique, .futura-bold, .link-bar a, body, p, #g-masthead, #pg_home h1 {
+.futura, .futura-oblique, .breadcrumb .location, #schools .number_of_courses, #schools .number_of_notes, #pg_courses .course .course-data-number, .futura-light, h1, .subheader h2, .futura-light-oblique, .futura-bold, .info, .error, .link-bar a, body, p, #g-masthead, #pg_home h1 {
   font-family: "futura-pt", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
   font-weight: 500;
   -webkit-font-smoothing: antialiased; }
@@ -114,7 +114,7 @@ Please have a look around, I hope you enjoy your stay.
   font-style: italic;
   font-weight: 300; }
 
-.futura-bold, .link-bar a {
+.futura-bold, .info, .error, .link-bar a {
   font-weight: 700; }
 
 body {
@@ -143,7 +143,7 @@ body {
   line-height: 1.5em;
   /* 24 */ }
 
-.big, p, #g-nav-main a, .breadcrumb {
+.big, h4, p, #g-nav-main a, .breadcrumb, #pg_lectures .lecture-name {
   /* 18px / 24px */
   font-size: 1.125em;
   line-height: 1.333em; }
@@ -500,6 +500,15 @@ body {
 .centered-rt-parent {
   margin: 0 auto; }
 
+.light {
+  color: #444; }
+
+.info {
+  color: #6bcf77; }
+
+.error {
+  color: #b7300b; }
+
 /* A.Sprites
 ----------------------------------------------------------------
 
@@ -627,14 +636,19 @@ body {
 
 [Table of contents]
 
- 0.Home
- 1.Schools
- 2.Courses
- 3.Course
- 4.Legal
+ 0.General
+ 1.Home
+ 2.Schools
+ 3.Courses
+ 4.Course
 
 ----------------------------------------------------------------*/
-/* 0.`Home
+/* 0.`General
+---------------------------------------------- */
+#messages {
+  padding: 0.75em; }
+
+/* 1.`Home
 ---------------------------------------------- */
 #pg_home .subheader {
   text-align: center;
@@ -659,7 +673,7 @@ body {
     height: 2px;
     background-color: #999; }
 
-/* 1.`Schools
+/* 2.`Schools
 ---------------------------------------------- */
 #schools a {
   display: block;
@@ -688,7 +702,7 @@ body {
 #schools .number_of_courses, #schools .number_of_notes {
   color: #999; }
 
-/* 2.`Courses
+/* 3.`Courses
 ---------------------------------------------- */
 #pg_courses .course {
   position: relative;
@@ -723,8 +737,15 @@ body {
   #pg_courses .course .course-data-description {
     margin-top: -0.5em; }
 
-/* 3.`Course
+/* 4.`Course
 ---------------------------------------------- */
+#pg_lectures .lecture {
+  padding-bottom: 0.75em;
+  margin-bottom: 1em;
+  background-image: url("../img/dotted-x.png");
+  background-position: bottom;
+  background-repeat: repeat-x; }
+
 .link-bar {
   margin-left: -0.375em; }
   .link-bar li {
@@ -753,14 +774,5 @@ body {
 .schools em {
   margin: 0 auto; }
 
-/* 4. Legal
----------------------------------------------- */
-
-#pg_legal .subheader {
-  text-align: center;
-  padding: 3em 0; }
-#pg_legal .section-home {
-  margin-bottom: 1.5em; }
-
 /* media queries
 ============================================== */

diff --git a/public/assets/css/scss/partials/_mixins.scss b/public/assets/css/scss/partials/_mixins.scss
index 9cc0509e7eccc8c76c91c78fca39380f2e5dc7b6..2952bae3441be36b5ca1ccfefacf1c6cef049180 100755 (executable)
--- a/public/assets/css/scss/partials/_mixins.scss
+++ b/public/assets/css/scss/partials/_mixins.scss
@@ -36,6 +36,11 @@
     background-repeat: repeat-x;
 }
 
+@mixin dotted-y($position: left) {
+    background-image: url('../img/dotted-y.png');
+    background-position: $position;
+    background-repeat: repeat-y;
+}
 
 // css3
 

diff --git a/public/assets/css/scss/partials/_pages.scss b/public/assets/css/scss/partials/_pages.scss
index 133ee26fabedb8ba637363df386cded2d30095ef..1d05d3620f079a39d4a02fe5b9d7f3d3b1011fb9 100644 (file)
--- a/public/assets/css/scss/partials/_pages.scss
+++ b/public/assets/css/scss/partials/_pages.scss
@@ -2,15 +2,23 @@
 
 [Table of contents]
 
- 0.Home
- 1.Schools
- 2.Courses
- 3.Course
+ 0.General
+ 1.Home
+ 2.Schools
+ 3.Courses
+ 4.Course
 
 ----------------------------------------------------------------*/
 
+/* 0.`General
+---------------------------------------------- */
+
+#messages {
+       @extend .grid-8;
+       padding: $base/2;
+}
 
-/* 0.`Home
+/* 1.`Home
 ---------------------------------------------- */
 
 #pg_home {
@@ -63,7 +71,7 @@
 }
 
 
-/* 1.`Schools
+/* 2.`Schools
 ---------------------------------------------- */
 
 #schools {
@@ -113,7 +121,7 @@
     }
 }
 
-/* 2.`Courses
+/* 3.`Courses
 ---------------------------------------------- */
 
 #pg_courses {
@@ -171,5 +179,22 @@
     }
 }
 
-/* 3.`Course
+/* 4.`Course
 ---------------------------------------------- */
+
+#pg_lectures {
+
+       .main-content {
+               @extend .grid-5;
+       }
+
+       .lecture {
+               padding-bottom: $base/2;
+               margin-bottom: $base/1.5;
+               @include dotted-x( bottom );
+       }
+
+       .lecture-name {
+               @extend .big;
+       }
+}

diff --git a/public/assets/css/scss/screen.scss b/public/assets/css/scss/screen.scss
index 21d386918b7e8e78ab8fccc189e0a2e6f89ad7e1..3cd1d5b94d5fdb13baf8b3af6faf4859e4c56bf9 100755 (executable)
--- a/public/assets/css/scss/screen.scss
+++ b/public/assets/css/scss/screen.scss
@@ -70,6 +70,10 @@ h3 {
     @extend .large;
 }
 
+h4 {
+       @extend .big;
+}
+
 a {
     @include transition( color );
     color: $mustard;
@@ -124,6 +128,9 @@ body {
     background-position: 20% 0;
 }
 
+.sidebar {
+       @extend .grid-3;
+}
 
 
 /* a.`header
@@ -420,6 +427,19 @@ body {
 .centered { text-align: center;}
 .centered-rt-parent { margin: 0 auto;}
 
+.light {
+       color: #444;
+}
+
+.info {
+       @extend .futura-bold;
+       color: #6bcf77;
+}
+
+.error {
+       @extend .futura-bold;
+       color: #b7300b;
+}
 
 @import "partials/sprites"; // A
 @import "partials/pages";   // B

diff --git a/public/assets/img/dotted-y.png b/public/assets/img/dotted-y.png
new file mode 100644 (file)
index 0000000..4474304
Binary files /dev/null and b/public/assets/img/dotted-y.png differ

diff --git a/public/index.html b/public/index.html
index 2b74592852b40ee5891a4ae4a3f817822909dda9..60b7cabae2738e25902b9f2436cd8b3da09b1211 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -80,7 +80,9 @@
             </div>
         </header>
         <div id="topofcontent"></div>
-        <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
+                               <div class="wrapper">
+                                       <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
+                               </div>
         <div id="g-page">
             <div class="wrapper">
                 <style>
@@ -121,7 +123,7 @@
                             </p>
                             <nav class="link-bar">
                                 <ul>
-                                    <li><a href="#">Sign Up</a></li>
+                                    <li><a href="/register" id="sign_up-link">Sign Up</a></li>
                                     <li class="last"><a href="#">Learn Something</a></li>
                                 </ul>
                             </nav>
@@ -265,51 +267,58 @@
 
                 <!--================================================================= -->
                 <div class=page id=pg_lectures>
-                    <div class="proto lectures_head" id=PROTO_lectures_head>
-                        <h1>Lectures for Course __number__ : __name__</h1>
-                        Subject: __subject__<br>
-                        Department: __department__<br>
-                    </div>
-                    <div class="proto lectures_instructor" id=PROTO_lectures_instructor>
-              Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
-                    </div>
-                    <div class="proto lecture" id=PROTO_lecture>
-                        <div class=name>
-                            <a href="/lecture/___id__">__name__</a><br>
-                            Created: __date__<br>
-                        </div>
-                    </div>
-            <div>
-              <span class="sub_menu" style="display:none;">
-                <a href="" id="new_lecture">New Lecture</a>
-              </span>
-              <form method="POST" id="form_lecture" style="display:none;">
-                <h1>Create New Lecture</h1>
-                <p>Use this form to create a new lecture. After creating the lecture, you can then create a notes-taking session within it.</p>
-                <div class="row">
-                  <div class="label">Lecture Name</div>
-                  <div class="field">
-                    <input type="text" name="name">
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="label">&nbsp;</div>
-                  <div class="field">
-                    <button>Create Lecture</button>
-                  </div>
-                </div>
-              </form>
-            </div>
-                </div>
+                                                                       <header class="subheader">
+                                                                               <div class="proto lectures_head" id=PROTO_lectures_head>
+                                                                                       <h2>Lectures for Course __number__ : __name__</h2>
+                                                                                       <h4>Subject:<span class="light futura"> __subject__</span></h4>
+                                                                                       <h4>Department:<span class="light futura"> __department__</span></h4>
+                                                                               </div>
+                                                                               <div class="proto lectures_instructor" id=PROTO_lectures_instructor>
+                                                                                       <h4>Instructor: <span class="futura light"> __name__ <a href="mailto:__email__" class="instructor_email">__email__</span></h4>
+                                                                               </div>
+                                                                       </header>
+                                                               <div class="main-content">
+                                                                       <div class="lectures">
+                                                                               <div class="proto lecture" id=PROTO_lecture>
+                                                                                       <div class=lecture-name>
+                                                                                               <a href="/lecture/___id__">__name__</a><br>
+                                                                                               Created: __date__<br>
+                                                                                       </div>
+                                                                               </div>
+                                                                       </div>
+                                                               </div>
+                                                               <div class="sidebar">
+                                                                       <span class="sub_menu" style="display:none;">
+                                                                               <a href="" id="new_lecture">New Lecture</a>
+                                                                       </span>
+                                                                       <form method="POST" id="form_lecture" style="display:none;">
+                                                                               <h4>Create New Lecture</h4>
+                                                                               <p>Use this form to create a new lecture. After creating the lecture, you can then create a notes-taking session within it.</p>
+                                                                               <div class="row">
+                                                                                       <div class="label">Lecture Name</div>
+                                                                                       <div class="field">
+                                                                                               <input type="text" name="name">
+                                                                                       </div>
+                                                                               </div>
+                                                                               <div class="row">
+                                                                                       <div class="label">&nbsp;</div>
+                                                                                       <div class="field">
+                                                                                               <button>Create Lecture</button>
+                                                                                       </div>
+                                                                               </div>
+                                                                       </form>
+                                                               </div>
+                                                       </div>
           <!--================================================================= -->
                 <div class=page id=pg_notes>
+                                                                       <header class="subheader">
                     <div class="proto notes_head" id=PROTO_notes_head>
-                        <h1>Note pads for Course __number__ : __name__</h1>
-                        Subject: __subject__<br>
-                        Department: __department__<br>
+                        <h2>Note pads for Course __number__ : __name__</h2>
+                                                                                               <h4>Subject:<span class="light futura">__subject__</span></h4>
+                                                                                               <h4>Department:<span class="light futura">__department__</span></h4>
                     </div>
                     <div class="proto notes_instructor" id=PROTO_notes_instructor>
-              Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
+                                                                                       <h4> Instructor: <span class="italic futura"> __name__ <a href="mailto:__email__" class="instructor_email">(__email__)</a></span></h4>
                     </div>
                     <div class="proto note" id=PROTO_note>
                         <div class=name>
@@ -559,7 +568,10 @@
           </div>
           <!--================================================================= -->
                 <div class=page id=pg_login>
-                    <h1>Login</h1>
+                                                                       <header class="subheader">
+                                                                               <h1>Login</h1>
+                                                                       </header>
+                                                                       <div class="main-content">
                     <form id="form_login" action="/login" method="POST">
                         <div class="zarea">
                             <div class="row">
@@ -600,6 +612,7 @@
                         </div>
                     </form>
                 </div>
+                                                       </div>
           <!--================================================================= -->
           <div class="page" id="pg_resetpass">
             <h1>Password Reset</h1>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index d5859e67cc22bf77ff056b05ada91ae4c23d2897..09f255d79ba0455ee03c65b364c39ee9076f19e3 100644 (file)
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -66,12 +66,14 @@ function render(pageId, response) {
     $('#login_link').text('Logout').attr('href', '/logout');
     $('#register_link').hide();
     $('#profile_link').show();
+               $('#sign_up-link').hide();
   } else {
     $('.username').text('Guest');
     $("#login_status").hide();
     $('#login_link').text('Login').attr('href', '/login');
     $('#register_link').show();
     $('#profile_link').hide();
+               $('#sign_up-link').show();
   }
   //if (asdfasdfasdf){
   if (response) {