From: Dylan Lloyd <dylan@psu.edu>
Date: Sat, 26 Mar 2011 04:06:33 +0000 (-0400)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=be5a0cbae65d695ff538d62af97a57637ff00d86;hp=353b047dd912955763184787347927b58bd0e84f;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/includes/style.css b/includes/style.css
index 18878f5..3613b69 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -8,6 +8,11 @@ h3 {
 	font-family:sans-serif;
 }
 
+h1, h2 {
+    font-family:sans-serif;
+    font-size:150%;
+}
+
 a {
 	text-decoration:none;
 }
@@ -139,13 +144,13 @@ li {
 	margin-top:20px;
 }
 
-#notes h2 {
+#notes h1 {
 	margin-bottom:10px;
-	font-family:sans-serif;
 }
 
-#note h2 {
-	font-family:sans-serif;
+
+.date {
+    color:grey;
 }
 
 #comment_link {
@@ -226,8 +231,7 @@ pre {
     margin-bottom:15px;
 }
 
-#blank_comment {
-    display:none;
+#blank_comment { display:none;
     font-weight:bold;
     font-family:sans-serif;
     color:red;
diff --git a/index.php b/index.php
index a2c85ea..c6914b1 100644
--- a/index.php
+++ b/index.php
@@ -283,7 +283,7 @@ class page extends cms {
       $datetime_posted = explode(' ', $date_posted[2]);
       $day_posted = $datetime_posted[0];
       echo "<div class='note'>";
-      echo "<h2><span style='color:grey;'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h2>";
+      echo "<h1><span class='date'>$year_posted/$month_posted/$day_posted/</span><a href='$url'>$title</a></h1>";
       echo $entry['text'];
       echo "</div>";
     }
@@ -294,7 +294,7 @@ class page extends cms {
 
   private function write_navigation() {
     echo "<div id='navigation'>";
-    echo "<h2>";
+    echo "<h1>";
     if($this->page > 1){
       $previous_page = $this->page - 1;
       echo "<a href='/notes/page/$previous_page'>prev</a>";
@@ -303,7 +303,7 @@ class page extends cms {
     $forward_page = $this->page + 1;
     echo " <a href='/notes/page/$forward_page'>next</a>";
     }
-    echo "</h2>";
+    echo "</h1>";
     echo "</div>";
   }
 
@@ -402,7 +402,7 @@ class note extends cms {
   private function display_note() {
     echo <<<END_OF_NOTE
     <div id='note'>
-    <h2><span style='color:grey;'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h2>
+    <h1><span class='date'>$this->year_posted/$this->month_posted/$this->day_posted/</span>$this->title</h1>
     $this->text
     </div>
 END_OF_NOTE;
@@ -412,14 +412,14 @@ END_OF_NOTE;
     echo <<<END_OF_NAVIGATION
     <br>
     <div id='navigation'>
-    <h2>
+    <h1>
 END_OF_NAVIGATION;
     if (!$this->comments_enabled) {
       $this->display_comment_link();
     }
     echo <<<END_OF_NAVIGATION
     <a href="/notes/">back to notes</a>/
-    </h2>
+    </h1>
     </div>
 END_OF_NAVIGATION;
   }
@@ -589,9 +589,9 @@ class archive extends cms {
         $datetime_posted = explode(' ', $date_posted[2]);
         $day_posted = $datetime_posted[0];
         echo "<div class='note'>";
-        echo "<h2><span style='color:grey;'>";
+        echo "<h1><span class='date'>";
         echo "$year_posted/$month_posted/$day_posted/";
-        echo "</span><a href='$url'>$title</a></h2>";
+        echo "</span><a href='$url'>$title</a></h1>";
         echo $entry['text'];
         echo "</div>";
       }
@@ -599,7 +599,7 @@ class archive extends cms {
       $this->write_navigation();
     } else {
       echo "<br>";
-      echo "<h2 style='font-family:sans-serif;'>sorry, nothing here</h2>";
+      echo "<h1>sorry, nothing here</h2>";
       echo "<pre>Empty set (0.00 sec)</pre>";
     }
     $this->display_close();
@@ -608,9 +608,7 @@ class archive extends cms {
   private function write_navigation() {
     echo "<br>";
     echo "<div id='navigation'>";
-    echo "<h2>";
     // fill me in!
-    echo "</h2>";
     echo "</div>";
   }