Merge branch 'master' of https://github.com/kyledrake/neocities-web

Conflicts:
	views/templates/index.slim

views/about.slim

@@ -18,12 +18,12 @@
 
       p The technology has become affordable enough where we can provide this creative space without requiring a business plan that involves selling people out to the marketing industry. But it still costs money, especially since server demand is so high right now. And there are some possible surprise costs I haven't figured out yet (bandwidth estimates are difficult). <b>But if NeoCities can get enough donations, NeoCities can survive!</b> Together, we can prevent <a href="http://www.business-standard.com/article/technology/yahoo-writes-geocities-obituary-109042500035_1.html" target="_blank">what happened to GeoCities</a> from happening again.
 
-      p Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a free round of beers at your pub, <a href="http://slideshare.net/kyledrake" target="_blank">speaking invites to conferences</a> so I can spread the word, free server hosting, anything helps. Thank you!
+      p Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a free round of beers at your pub, speaking invites <small><a href="http://slideshare.net/kyledrake" target="_blank">(I put on a pretty good show)</a></small> so I can spread the word, free server hosting, anything helps. Thank you!
 
 .row
   .span12
     h2.text-center Where your Money Goes
-    
+
     .row
       .span8.offset2
         h4 <b>$150</b> provides hosting for <b>2 million</b> NeoCities sites for 1 month.
@@ -33,9 +33,13 @@
 .row
   .span12.text-center
     h2 How to Donate
-    
+
     div
-      h3 Bitcoin: <small>preferred</small>
+      h3 Gittip:
+      script data-gittip-username="kyledrake" src="https://www.gittip.com/assets/widgets/0002.js"
+
+    div
+      h3 Bitcoin:
       h4: b 1MPYyfoWK8CkAzhLzLLtZGa9dwEGT5dm2T
 
     div style="margin-top: 30px"
@@ -46,12 +50,8 @@
       <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
       <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
       </form>
-    
-    div
-      h3 Gittip:
-      iframe style="border: 0; margin: 0; padding: 0;" src="https://www.gittip.com/kyledrake/widget.html" width="48pt" height="22pt"
-    
-    h3 Sponsorships, alternative payments:
+
+    h3 Sponsorships, press, speaking invites, general inquiries:
     h3: a href="mailto:kyledrake@gmail.com" Contact Me Directly
-    
+
     h4 style="margin-top: 30px; margin-bottom: 30px" Thanks. You are great! Now go and make an awesome web site!

views/layout.slim

@@ -23,6 +23,7 @@ html
               a.brand href="/" NeoCities
               ul.nav
                 li: a href="/browse" <b>Browse</b>
+                li: a href="/blog" <b>Blog</b>
                 li: a href="/about" <b>About</b>
 
               ul.nav.pull-right

views/site_files/text_editor.slim

@@ -65,7 +65,7 @@ css:
     div id="editorUpdates" class="alert alert-success hidden"
       span
     
-script src="http://rawgithub.com/ajaxorg/ace-builds/master/src-noconflict/ace.js" type="text/javascript" charset="utf-8"
+script src="/js/ace/ace.js" type="text/javascript" charset="utf-8"
 javascript:
 
   function setTheme(name) {

views/templates/index.slim

@@ -8,10 +8,10 @@ html
     meta name="description" content=""
     meta name="keywords" content=""
     
-    link href="http://groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all"
+    link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all"
     
     <!--[if lt IE 9]> 
-      <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
     
   body
@@ -25,7 +25,7 @@ html
     
     main
       p This is a new page! Coming soon.
-      p This page uses <strong>Ground Floor NC</strong> to style the page, <a href="http://groundfloor.neocities.org" target="_blank">click here</a> to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML.
+      p This page uses <strong>Ground Floor</strong> to style the page, <a href="//groundfloor.neocities.org" target="_blank">click here</a> to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML.
     
     footer
       p Copyright 2013

views/templates/not_found.slim

@@ -5,10 +5,10 @@ html
     
     title #{template_site_title @site.username} - Not Found
     
-    link href="http://groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all"
+    link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all"
     
     <!--[if lt IE 9]> 
-      <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
     
   body