X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=index.php;h=298feada5fc0b3a6948708a8dcc614af4662ca78;hb=1f14238ea6e202ee90c200b8f0a12a203dd0772d;hp=7feaa03f350727c58baeed4edf7c45538ab7bf32;hpb=9da61e74c9ee47a13e7e5d13ab951429d51e8629;p=dylansserver.git

diff --git a/index.php b/index.php
index 7feaa03..298fead 100644
--- a/index.php
+++ b/index.php
@@ -145,7 +145,6 @@ class index extends cms {
     echo "<ul id='portfolio' style='text-align:right'>";
     $this->list_projects();
     echo <<<OTHER_PROJECTS
-        <li>
           <h3>things i've done for others:</h3>
         </li>
 
@@ -190,13 +189,13 @@ OTHER_PROJECTS;
   }
 
   protected function display_exhibits() {
+    echo "<div id='exhibit'>";
     $sql = "SELECT text FROM projects";
     $result = $this->db->query($sql);
     while ($entry = $result->fetch_object()) {
-      echo "<div class='exhibit'>";
       echo $entry->text;
-      echo "</div>";
     }
+    echo "</div>";
   }
 
   private function list_projects() {
@@ -283,7 +282,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 +293,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 +302,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>";
   }
 
@@ -385,15 +384,14 @@ class note extends cms {
     }
     if (isset($_POST['captcha']) || $resp->is_valid) {
       $sql = ("INSERT INTO comments (date_posted, author,
-                  email, text, note)
-                VALUES(NOW(), ?, ?, ?, ?)");
+                  text, note)
+                VALUES(NOW(), ?, ?, ?)");
       $stmt = $this->db->prepare($sql);
       // Checks are needed here (no blank text,
-      // and a default author / email need to be set
+      // and a default author needs to be set
       // for no-javascript users.
-      $stmt->bind_param('ssss',
+      $stmt->bind_param('sss',
                           htmlspecialchars($_POST['name']),
-                          htmlspecialchars($_POST['email']),
                           htmlspecialchars($_POST['text']),
                         $this->id);
       $stmt->execute();
@@ -403,7 +401,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;
@@ -413,14 +411,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;
   }
@@ -441,20 +439,15 @@ END_OF_NAVIGATION;
 
   private function display_comments() {
     echo "<div id='comments'>";
-    $sql= "SELECT date_posted, author, email, text
+    $sql= "SELECT date_posted, author, text
              FROM comments WHERE note = ?
              ORDER BY date_posted DESC";
     $result = $this->query($sql, 'd', $this->id);
     foreach ($result as $row => $entry) {
       $date_posted = $entry['date_posted'];
       $author = $entry['author'];
-      $email = $entry['email'];
       $text = htmlspecialchars($entry['text']);
-      if ($email == '') {
-        $head = "<h3>$author</h3>";
-      } else {
-        $head = "<h3><a href='mailto:$email'>$author</a></h3>";
-      }
+      $head = "<h3>$author</h3>";
       echo <<<END_OF_COMMENT
       <div class='comment'>
       $head
@@ -487,8 +480,6 @@ END_CAPTCHA_STYLE;
       <textarea rows="10" cols="70" name="text" id="comment_text"></textarea>
       <h3>name:</h3>
       <input type=text name="name" id="comment_name">
-      <h3>email:</h3>
-      <input type=text name="email" id="comment_email"><br>
   
       <nowiki>
       <div id="recaptcha_widget"> 
@@ -497,7 +488,7 @@ END_CAPTCHA_STYLE;
         <span style="font-size:80%;">
           ( <a href="javascript:Recaptcha.reload()">another</a> /
           <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span> /
-          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">Get an image CAPTCHA</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
+          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
         </span>
         <br><br>
         <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
@@ -510,19 +501,31 @@ END_CAPTCHA_STYLE;
 END_OF_FORM;
     echo recaptcha_get_html($this->recaptcha_publickey); 
     if ($this->failed_captcha) {
-    echo <<<END_OF_FORM
-        <span style='font-weight:bold;font-family:sans-serif;color:red;margin-top:15px;'>reCAPTCHA said you're not human,</span>
-        <input id="submit" class="submit" type="submit" value="try again?">
+    echo <<<END_OF_ERRORS
+        <div id="not_human">
+          reCAPTCHA said you're not human, <br>
+          try again?
+        </div>
+        <input id="submit" class="submit" type="submit" value="post comment">
         </form>
       </div>
-END_OF_FORM;
+END_OF_ERRORS;
     } else {
-      echo <<<END_OF_FORM
+      echo <<<END_OF_ERRORS
+        <div id="not_human">
+          reCAPTCHA said you're not human, <br>
+          try again?
+        </div>
+        <div id="blank_comment">
+          but you didn't write anything! <br>
+        </div>
+END_OF_ERRORS;
+    }
+    echo <<<END_OF_FORM
       <input id="submit" class="submit" type="submit" value="post comment">
       </form>
       </div>
 END_OF_FORM;
-    }
   }
 }
 
@@ -585,9 +588,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>";
       }
@@ -595,7 +598,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();
@@ -604,9 +607,7 @@ class archive extends cms {
   private function write_navigation() {
     echo "<br>";
     echo "<div id='navigation'>";
-    echo "<h2>";
     // fill me in!
-    echo "</h2>";
     echo "</div>";
   }