From: Dylan Lloyd Date: Wed, 13 Feb 2013 08:54:31 +0000 (-0500) Subject: Merge branch 'mvc' into live X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=950e73c8a7e3c2f2c4ff18b825d3cd0281afc693;hp=4ef61b4530c383aebd63702517d254b43c6b68f1;p=dylansserver.git Merge branch 'mvc' into live Conflicts: includes/style.css --- diff --git a/.htaccess b/.htaccess index dc5f0ab..1793730 100644 --- 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 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 --- 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 --- 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 --- 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 --- 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'] = "

" . htmlspecialchars($author) . "

"; $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 --- a/view/archive.php +++ b/view/archive.php @@ -22,8 +22,9 @@ SyntaxHighlighter.all(); } - + + diff --git a/view/comment.php b/view/comment.php new file mode 100644 index 0000000..44f62fd --- /dev/null +++ b/view/comment.php @@ -0,0 +1,5 @@ +comment as $comment) { + //echo '

' . $comment['text'] . '

'; + } +?> diff --git a/view/index.php b/view/index.php index 2f9b0c9..d13cbc3 100644 --- a/view/index.php +++ b/view/index.php @@ -7,23 +7,7 @@ - - - - - - + @@ -51,21 +35,24 @@ } ?>
  • -

    things i've done for others:

    +

    things i've worked on:

  • activehamptons.com
    • + "https://duckduckgo.com">duckduckgo.com
  • transfishing.com
    • + "http://tempositions.com">tempositions.com
  • -

    something i've worked on:

    +

    things i've made for others:

  • tempositions.com
    • + "http://activehamptons.com">activehamptons.com + +
  • transfishing.com

  • my repositories:

    @@ -74,6 +61,9 @@
  • git://dylansserver.com
    • +
  • git://github.com/nospampleasemam
    • +

  • some notes:

    • @@ -92,16 +82,21 @@
  • -


    • +
    +
    +
    +   - diff --git a/view/note.php b/view/note.php index 367b334..36a3dd2 100644 --- a/view/note.php +++ b/view/note.php @@ -22,8 +22,9 @@ SyntaxHighlighter.all(); } - + + diff --git a/view/page.php b/view/page.php index 72d5edd..10de5f4 100644 --- a/view/page.php +++ b/view/page.php @@ -22,8 +22,9 @@ SyntaxHighlighter.all(); } - + + diff --git a/view/rss.php b/view/rss.php index 7d0c60c..a2ac042 100644 --- a/view/rss.php +++ b/view/rss.php @@ -1,9 +1,9 @@ dylansserver.com/notes/rss - http://dylansserver.com/notes + https://dylansserver.com/notes dylansserver.com/notes/rss - + items as $item) { echo "";