Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sat, 19 Nov 2011 21:11:47 +0000 (21:11 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sat, 19 Nov 2011 21:11:47 +0000 (21:11 +0000)
1  2 
public/index.html

diff --combined public/index.html
index ee11f231330a2952fd02cc5733d717f8e52e38d7,5b5d069ecc8fc834dac195b23b0a4fdc0fe21b25..4a6e3828b29c6fc4ca448900884593167e53f642
@@@ -24,7 -24,7 +24,7 @@@
  
                <div class="masthead">
                        <div class="logbar">
-         <div class="loginstatus"><div id="login_status" class="page"><div id="PROTO_login_info">Currently logged in as <span class="username">__name__</span></div></div></div>
+         <div class="loginstatus"><div id="login_status"><div id="PROTO_login_info">Currently logged in as <span class="username">__name__</span></div></div></div>
                        </div>
                        <div class="navbar">
                                <table>
@@@ -49,9 -49,7 +49,9 @@@
  
                <div id="topofcontent"></div>
  
 -    <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
 +              <div id="messages" class="page">
 +                      <div id="PROTO_message" class="__type__">__msg__</div>
 +              </div>
  
                <div class="content">
                        <style>
                                        Department: __department__<br>
                                </div>
                                <div class="proto lectures_instructor" id=PROTO_lectures_instructor>
-                                       Instructor: __name__ (__email__)<br>
+           Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
                                </div>
                                <div class="proto lecture" id=PROTO_lecture>
                                        <div class=name>
  
  
                        <div class=page id=pg_notes>
-                               <h1>Notepads </h1>
+                               <div class="proto notes_head" id=PROTO_notes_head>
+                                       <h1>Note pads for Course __number__ : __name__</h1>
+                                       Subject: __subject__<br>
+                                       Department: __department__<br>
+                               </div>
+                               <div class="proto notes_instructor" id=PROTO_notes_instructor>
+           Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
+                               </div>
                                <div class="proto note" id=PROTO_note>
                                        <div class=name>
-                                               <a href="/note/___id__">__name__</a>
+                                               <a href="/note/___id__">__name__</a> Visits: __visits__
                                        </div>
                                </div>
          <div>