Merge branch 'mvc' into live

Conflicts:
	includes/style.css

diff --git a/.htaccess b/.htaccess
index dc5f0ab..1793730 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,8 @@ ErrorDocument 404 /404.php
 RewriteEngine on
 
 RewriteRule ^resume$ /res.pdf [L]
+RewriteCond %{HTTPS} off
+RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
 
 RewriteRule ^notes/rss/?$ /index.php?rss=true [L]
 

diff --git a/images/gray_jean.png b/images/gray_jean.png
new file mode 100644 (file)
index 0000000..355fba2
Binary files /dev/null and b/images/gray_jean.png differ

diff --git a/includes/style.css b/includes/style.css
index 467a730..c8d2309 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -25,6 +25,11 @@ margin:0;
 padding:0;
 }
 
+body {
+background-image: url('../images/gray_jean.png');
+margin-bottom: 15px;
+}
+
 h3 {
 margin-top:15px;
 font-family:MuseoSlab500;
@@ -102,7 +107,7 @@ clear:both;
 
 #notes,#note {
 text-align:left;
-margin-top:20px;
+margin-top:40px;
 font-family:InconsolataMedium;
 }
 
@@ -156,8 +161,7 @@ text-align:left;
 }
 
 #comment .submit {
-background:#FFF;
-border:1px solid #FFF;
+border:none;
 color:blue;
 cursor:pointer;
 font-size:120%;
@@ -187,7 +191,7 @@ font-size:80%;
 font-size:1.6em;
 }
 
-#youtube_backup_entry,#i_like_pandora_entry,#matrixnullspace_entry,#fvlc_entry,#irssi-notify_entry,#dylansserver_entry,#metadata_writer_entry, #powermate_entry {
+#youtube_backup_entry,#i_like_pandora_entry,#matrixnullspace_entry,#fvlc_entry,#irssi-notify_entry,#dylansserver_entry,#metadata_writer_entry,#powermate_entry,#cellular-automaton_entry {
 font-size:1.4em;
 }
 

diff --git a/includes/syntax/styles/shCoreDefault.css b/includes/syntax/styles/shCoreDefault.css
index 08f9e10..81f2a3b 100644 (file)
--- a/includes/syntax/styles/shCoreDefault.css
+++ b/includes/syntax/styles/shCoreDefault.css
@@ -92,7 +92,7 @@
   width: 100% !important;
   height: 100% !important;
   border: none !important;
-  background: white !important;
+  /*background: white !important;*/
   padding-left: 1em !important;
   overflow: hidden !important;
   white-space: pre !important;
@@ -225,6 +225,7 @@
   color: black !important;
 }
 
+/*
 .syntaxhighlighter {
   background-color: white !important;
 }
@@ -237,6 +238,8 @@
 .syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
   background-color: #e0e0e0 !important;
 }
+*/
+
 .syntaxhighlighter .line.highlighted.number {
   color: black !important;
 }
@@ -251,7 +254,7 @@
 }
 .syntaxhighlighter .gutter .line.highlighted {
   background-color: #6ce26c !important;
-  color: white !important;
+  /*color: white !important;*/
 }
 .syntaxhighlighter.printing .line .content {
   border: none !important;
@@ -261,7 +264,7 @@
 }
 .syntaxhighlighter.collapsed .toolbar {
   color: blue !important;
-  background: white !important;
+  /*background: white !important;*/
   border: 1px solid #6ce26c !important;
 }
 .syntaxhighlighter.collapsed .toolbar a {

diff --git a/includes/syntax/styles/shThemeDefault.css b/includes/syntax/styles/shThemeDefault.css
index 1365411..bbf1d05 100644 (file)
--- a/includes/syntax/styles/shThemeDefault.css
+++ b/includes/syntax/styles/shThemeDefault.css
@@ -14,6 +14,8 @@
  * @license
  * Dual licensed under the MIT and GPL licenses.
  */
+
+/*
 .syntaxhighlighter {
   background-color: white !important;
 }
@@ -26,6 +28,8 @@
 .syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
   background-color: #e0e0e0 !important;
 }
+*/
+
 .syntaxhighlighter .line.highlighted.number {
   color: black !important;
 }

diff --git a/model/note.php b/model/note.php
index 8e863f1..f0c54cb 100644 (file)
--- a/model/note.php
+++ b/model/note.php
@@ -85,11 +85,11 @@ class note extends model {
     $i = 0;
     foreach ($result as $row => $entry) {
       $this->comment[$i]['date_posted'] = $entry['date_posted'];
-      $this->comment[$i]['author']  = $entry['author'];
+      $this->comment[$i]['author']  = htmlspecialchars($entry['author']);
       $this->comment[$i]['text'] = htmlspecialchars($entry['text']);
-      $this->comment[$i]['head'] = "<h3>" . htmlspecialchars($author) . "</h3>";
       $i++;
     }
+    require_once('view/comment.php');
   }
 
   public function display_comment_form() {

diff --git a/view/archive.php b/view/archive.php
index 073c65f..4231b17 100644 (file)
--- a/view/archive.php
+++ b/view/archive.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">

diff --git a/view/comment.php b/view/comment.php
new file mode 100644 (file)
index 0000000..44f62fd
--- /dev/null
+++ b/view/comment.php
@@ -0,0 +1,5 @@
+<?php
+    foreach ($this->comment as $comment) {
+        //echo '<h3>' . $comment['text'] . '</h3>';
+    }
+?>

diff --git a/view/index.php b/view/index.php
index 2f9b0c9..d13cbc3 100644 (file)
--- a/view/index.php
+++ b/view/index.php
@@ -7,23 +7,7 @@
   <link rel="icon" href="/favicon.ico" type="image/png">
   <link href='/includes/style.css' rel='stylesheet' type='text/css'>
   <script type='text/javascript' src='/includes/index.js'></script>
-  <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
-  <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
-  <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
-  <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
-  <script type='text/javascript'>
-    function highlight() {
-      SyntaxHighlighter.autoloader(
-       'js /includes/syntax/scripts/shBrushJScript.js',
-       'bash /includes/syntax/scripts/shBrushBash.js',
-       'sql /includes/syntax/scripts/shBrushSql.js',
-       'cpp /includes/syntax/scripts/shBrushCpp.js');
-      SyntaxHighlighter.defaults['gutter'] = false;
-      SyntaxHighlighter.defaults['toolbar'] = false;
-      SyntaxHighlighter.all();
-    }
-  </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">
@@ -51,21 +35,24 @@
           }
         ?>
         <li>
-          <h3>things i've done for others:</h3>
+          <h3>things i've worked on:</h3>
         </li>
  
         <li><a href=
-        "http://activehamptons.com">activehamptons.com</a></li>
+        "https://duckduckgo.com">duckduckgo.com</a></li>
  
         <li><a href=
-        "http://transfishing.com">transfishing.com</a></li>
+        "http://tempositions.com">tempositions.com</a></li>
  
         <li>
-          <h3>something i've worked on:</h3>
+          <h3>things i've made for others:</h3>
         </li>
  
         <li><a href=
-        "http://tempositions.com">tempositions.com</a></li>
+        "http://activehamptons.com">activehamptons.com</a></li>
+ 
+        <li><a href=
+        "http://transfishing.com">transfishing.com</a></li>
  
         <li>
           <h3>my repositories:</h3>
@@ -74,6 +61,9 @@
         <li><a href=
         "/git/">git://dylansserver.com</a></li>
  
+        <li><a href=
+        "https://github.com/nospampleasemam">git://github.com/nospampleasemam</a></li>
+ 
         <li>
           <h3>some notes:</h3>
         </li>
@@ -92,16 +82,21 @@
         </li>
 
         <li>
-          <div id="contact_me"><h1><a href=
-          "mailto:dylan@psu.edu">dylan</a></h1><a href=
-          "mailto:dylan@psu.edu">@psu.edu</a>
+          <div id="contact_me">
+            <h1><a href= "mailto:dylan@dylansserver.com">dylan</a></h1>
+            <a href= "mailto:dylan@dylansserver.com">@dylansserver.com</a>
+           <br>
+           [<a href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&amp;search=0xBE93C5C18CD4C40F">pgp key</a>]
           </div>
         </li>
       </ul>
     </div>
     <br>
     <br>
+    <br>
+    <br>
+    <br>
+    &nbsp;
   </div>
 </body>
 </html>
-</html>

diff --git a/view/note.php b/view/note.php
index 367b334..36a3dd2 100644 (file)
--- a/view/note.php
+++ b/view/note.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">

diff --git a/view/page.php b/view/page.php
index 72d5edd..10de5f4 100644 (file)
--- a/view/page.php
+++ b/view/page.php
@@ -22,8 +22,9 @@
       SyntaxHighlighter.all();
     }
   </script>
-  <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
+  <script type='text/javascript' src='https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
   <script type='text/javascript' src='/includes/comment.js'></script>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 </head>
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">

diff --git a/view/rss.php b/view/rss.php
index 7d0c60c..a2ac042 100644 (file)
--- a/view/rss.php
+++ b/view/rss.php
@@ -1,9 +1,9 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>dylansserver.com/notes/rss</title>
-    <link>http://dylansserver.com/notes</link>
+    <link>https://dylansserver.com/notes</link>
     <description>dylansserver.com/notes/rss</description>
-    <atom:link href="http://dylansserver.com/notes/rss" rel="self" type="application/rss+xml" />
+    <atom:link href="https://dylansserver.com/notes/rss" rel="self" type="application/rss+xml" />
     <?php
       foreach ($this->items as $item) {
         echo "<item>";