resolve conflict

[oweals/finalsclub.git] / public / index.html

diff --git a/public/index.html b/public/index.html
index 5b0fc3416a3c714ae53df95694059b16e0c5c5b2..d2e188391706a86b6879f524e5a389140825b798 100755 (executable)
--- a/public/index.html
+++ b/public/index.html
@@ -54,6 +54,9 @@
                <div class="content">
                        <div class="container-12">
 
+               <div id="messages" class="page">
+                       <div id="PROTO_message" class="__type__">__msg__</div>
+               </div>
 
                        <!--
                        ***********************************************************
@@ -275,12 +278,14 @@
                                        Department: __department__<br>
                                </div>
                                <div class="proto lectures_instructor" id=PROTO_lectures_instructor>
-          Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
+                                       Instructor: __name__ <span class="instructor_email">(__email__)</span>
                                </div>
                                <div class="proto lecture" id=PROTO_lecture>
                                        <div class=name>
-                                               <a href="/lecture/___id__">__name__</a><br>
-                                               Created: __date__<br>
+                                               <a href="/lecture/___id__">__name__</a>
+                                       </div>
+                                       <div class=created>
+                                               Created: __date__
                                        </div>
                                </div>
         <div>
@@ -319,7 +324,10 @@
                                </div>
                                <div class="proto note" id=PROTO_note>
                                        <div class=name>
-                                               <a href="/note/___id__">__name__</a> Visits: __visits__
+                                               <a href="/note/___id__">__name__</a><br>
+                                       </div>
+                                       <div class=visits>
+                                               Visits: __visits__
                                        </div>
                                </div>
         <div>