pagoda-jekyll 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWYwMTVlOGMwNjRjNTdlN2Q4MGI1ZmJkMDE2YmUxNTdlNDYwYjliNQ==
+    N2I4MzRlYTlhNDcyYjNjM2NhZWM4ZTljOWJmY2VmZTllOGRlMTU0YQ==
   data.tar.gz: !binary |-
-    OGU0YTY4NTllYzE0MjNhYzQ5NGFhZDAyYjhmMDZkZDk4MzUyNTY2Nw==
+    Y2UwZTQ4ZTZkZTljNDdiYWJhNGZkZmVlNjQ5YTE5NjNkZDU0OTE3MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODYxZDU2NjUwZGQwN2M3MWIwOGY3YjJiNzE1NTUyYzUzYzcwYmRlMjBlYWZl
-    OTdiMTU4MWI1ZWI4NTlhZWJkMWU4NTg3YmQ1ODIyZTAyNTQ1NGNjMjIyMjUw
-    Y2M1Yzk1ZGVkY2NkMTcxM2Q1MDY1MzZlZmNkZGIxYjdlYWZmZDc=
+    OGNjNTJlNjZjNzQwODdlZWY1NTRkYjllNTFlNzViOTAwYzk0NGU5ODRjYjkx
+    ZGM3NmNiZjc1NjM0OTNiYWMzMWIzMTA5MzFmYzAzZDc1ZjY1NWQzNmQ0NmQ1
+    ZTIyOTk0MmE5NTAwZGE0OWExZTQwM2Q2NmU5Y2VmMWZiMTVkODQ=
   data.tar.gz: !binary |-
-    ODIyZDkzY2Y4MjVkMGE1OWZmZDkxMzdkZjY5MjYwMjE0Y2U2NTQ0N2E2ZmRh
-    MTlkODkxZGE2MjlkOTE5N2Y2YzYwYTY4MDU3MDA3OTk5ODY4Mjk1MzJmMmU5
-    N2FkNWMwYTQwMTAzN2E4MzYzMGRiYjg4NzI3YWUzNjViNjQ1ZmM=
+    NjRiNWQ1YTU1ZGVmN2Q4NjgyZjcxZjE2NjFkMjk3YzMzNTBhMTY3MGNjMGFl
+    MzM4NjFiMDEyM2YxOWM2MmY4ZTQ4YjA3MTI1MDA2ZTI2ZDM0ZjFlN2YwNWVl
+    MzhjOTc5NGYyMjYyMzI5ZDAzN2Y0OTUzMDVlOGVjMmEzMGYwNjI=

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    pagoda-jekyll (0.0.5)
+    pagoda-jekyll (0.0.7)
       grit
       jekyll
       json
       sinatra
       sinatra-mustache
+      sinatra-reloader
       stringex
 
 GEM
@@ -35,7 +36,7 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.2.2)
-    directory_watcher (1.5.1)
+    directory_watcher (1.4.1)
     eventmachine (1.0.3)
     fast-stemmer (1.0.2)
     fssm (0.2.10)
@@ -132,4 +133,3 @@ DEPENDENCIES
   rake (~> 10.0.3)
   shoulda
   simplecov
-  sinatra-reloader

data/config.ru

@@ -1,4 +1,3 @@
-
 $:.unshift File.join(File.dirname(__FILE__), *%w[lib])
 
 require 'rubygems'
@@ -7,5 +6,5 @@ require 'pagoda/app'
 
 use Rack::ShowExceptions
 
-Shwedagon::App.set :blog, '../blog/'
-run Shwedagon::App.new
+Shwedagon::App.set :blog, ENV['blog']
+map ('/admin') { run Shwedagon::App.new }

data/lib/pagoda/app.rb

@@ -13,10 +13,18 @@ require 'pagoda/helper'
 require 'pagoda/config'
 require 'pagoda/jekyll-mod'
 
+
+
 # Sinatra based frontend
 module Shwedagon
-  class App < Sinatra::Base
 
+
+  class App < Sinatra::Base
+   
+    before do
+      @base_url = url('/', false).chomp('/')
+    end
+  
     # Create a new post from scratch. Return filename
     # This would not commit the file.
     def create_new_post(params)      
@@ -79,7 +87,7 @@ module Shwedagon
       repo.remove([full_path])
       data = repo.commit_index "Deleted #{post_file}"
       
-      redirect "/"
+      redirect @base_url
     end
 
     # Edit any post
@@ -142,7 +150,7 @@ module Shwedagon
       if params[:ajax]
         {:status => 'OK'}.to_json
       else
-        redirect '/edit/' + filename
+        redirect @base_url + '/edit/' + filename
       end
     end
 

data/lib/pagoda/helper.rb

@@ -39,6 +39,10 @@ module Shwedagon
     # Gives out a sorted list of post template data
     # for a post or draft
     def posts_template_data(post_items)
+      if post_items.nil?
+        return []
+      end
+
       template_data = post_items.map do |post|
         {
           :title    => post.data['title'],

data/lib/pagoda/public/css/pagoda.css

@@ -156,16 +156,27 @@ code {
   position: fixed;
   bottom: 0;
   left: 0;
-  background: #222;
+  background: #333;
   color: #fff;
   width: 100%;
   text-align: center;
   padding: 10px 0 3px;
 }
+@media only screen and (max-device-width: 480px) {
+  #publish-bar {
+    padding: 2px 0;
+  }
+}
 #publish-bar .contain {
   margin: 0 auto;
   width: 960px;
 }
+@media only screen and (max-device-width: 480px) {
+  #publish-bar .contain {
+    width: 300px;
+    padding: 3px 10px;
+  }
+}
 #publish-bar input[type=text] {
   border: none;
   border-bottom: 1px solid #333;
@@ -209,6 +220,23 @@ code {
   border-radius: 5px;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
+  -webkit-appearance: none;
+}
+@media only screen and (max-device-width: 480px) {
+  #publish-bar input[type=submit],
+  #publish-bar a,
+  .button {
+    padding: 2px 10px;
+    font-size: 12px;
+  }
+}
+
+@media only screen and (max-device-width: 480px) {
+  #publish-bar input[type=submit] {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-top: -1px;
+  }
 }
 
 .button.secondary {
@@ -301,6 +329,32 @@ body.posts.new #admin {
   margin: 0 auto;
   position: relative;
 }
+@media only screen and (max-device-width: 480px) {
+  #admin {
+    width: 320px;
+  }
+}
+#admin .draft-options {
+  display: inline-block;
+  border: 3px solid #777;
+  border-radius: 10px;
+  padding: 4px;
+}
+@media only screen and (max-device-width: 480px) {
+  #admin .draft-options {
+    display: none;
+  }
+}
+#admin .draft-options a {
+  font-size: 12px;
+  padding: 2px 10px;
+}
+#admin .draft-options a.selected {
+  background-color: #00CDCD;
+}
+#admin .draft-options #post_draft {
+  display: none;
+}
 #admin #save-button.saved {
   color: #999;
 }
@@ -320,13 +374,19 @@ body.posts.new #admin {
   padding: 0 0 0 20px;
   border-left: 4px solid lightblue;
 }
-#admin #drafts #post_title {
+#admin #drafts #post-title {
   width: 350px;
   font-size: 16px;
   font-weight: 400;
   margin: 0;
   border-bottom: 1px solid #ddd;
 }
+@media only screen and (max-device-width: 480px) {
+  #admin #drafts #post-title {
+    width: 260px;
+    margin-left: -5px;
+  }
+}
 #admin #published {
   float: right;
 }
@@ -339,11 +399,22 @@ body.posts.new #admin {
 #admin #published h3 a {
   color: #999;
 }
+@media only screen and (max-device-width: 480px) {
+  #admin #published {
+    float: none;
+    display: block;
+  }
+}
 #admin .col h1,
 #admin .col h2 {
   position: relative;
   text-transform: uppercase;
 }
+@media only screen and (max-device-width: 480px) {
+  #admin .col h1 {
+    margin-top: 0;
+  }
+}
 #admin .col h1 a,
 #admin .col h2 a {
   position: absolute;
@@ -358,6 +429,11 @@ body.posts.new #admin {
   width: 360px;
   padding: 20px;
 }
+@media only screen and (max-device-width: 480px) {
+  #admin .col {
+    width: 272px;
+  }
+}
 #admin .col h2 a {
   background: #999;
 }
@@ -452,12 +528,23 @@ fieldset.markdown {
   width: 960px;
   float: left;
 }
+@media only screen and (max-device-width: 480px) {
+  #split #post-editor {
+    width: 310px;
+    padding: 5px;
+  }
+}
 #split #fullscreen {
   float: right;
   position: relative;
   top: 35px;
   border: 0 none;
 }
+@media only screen and (max-device-width: 480px) {
+  #split #fullscreen {
+    display: none;
+  }
+}
 
 .fullScreen #fullscreen {
   visibility: hidden;
@@ -477,15 +564,29 @@ fieldset.markdown {
 #text-title {
   margin: 23px 0 0 0;
 }
+@media only screen and (max-device-width: 480px) {
+  #text-title {
+    margin: 0;
+  }
+}
 
-#post_title {
+#text-content {
+  margin-top: -25px;
+}
+@media only screen and (max-device-width: 480px) {
+  #text-content {
+    margin-top: -45px;
+  }
+}
+
+#post-title {
   width: 100%;
   border: none;
   background: none;
   line-height: 45px;
 }
 
-#post_content {
+#post-content {
   border: none;
   width: 100%;
   position: relative;
@@ -494,13 +595,21 @@ fieldset.markdown {
   font-size: 20px;
   line-height: 30px;
 }
+#post-content.scrolled {
+  border-top: 1px solid rgba(30, 30, 30, 0.1);
+}
 
-textarea#post_title {
+textarea#post-title {
   resize: none;
   font-family: 'Asap', sans-serif;
   font-size: 40px;
   font-weight: normal;
 }
+@media only screen and (max-device-width: 480px) {
+  textarea#post-title {
+    font-size: 25px;
+  }
+}
 
 form .permalink {
   position: absolute;
@@ -554,3 +663,9 @@ body {
 #publish-bar input[type=submit].post-saving {
   background: #40A4FB;
 }
+
+@media only screen and (max-device-width: 480px) {
+  #publish-bar .delete-bar, #publish-bar #draft_label, #publish-bar #post_draft {
+    display: none;
+  }
+}

data/lib/pagoda/public/css/pagoda.scss

@@ -1,6 +1,6 @@
-
 /* TODO: pull out coloring into variables */
 $linkhover: red;
+$iphone: "only screen and (max-device-width : 480px)";
 
 div:before, div:after {content:''; display:table;}
 
@@ -151,15 +151,24 @@ code {
   position: fixed;
   bottom: 0;
   left: 0;
-  background: #222;
+  background: #333;
   color: #fff;
   width: 100%;
   text-align: center;
   padding: 10px 0 3px;
+  
+  @media #{$iphone} {
+    padding: 2px 0;
+  }
 
   .contain {
     margin: 0 auto;
     width: 960px;
+    
+    @media #{$iphone} { 
+      width: 300px;
+      padding: 3px 10px;
+    }
   }
 
   input[type=text] {
@@ -210,6 +219,20 @@ code {
           border-radius: 5px;
      -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
+  -webkit-appearance: none;
+  
+  @media #{$iphone} {
+    padding: 2px 10px;
+    font-size: 12px;
+  }
+}
+
+#publish-bar input[type=submit] {
+  @media #{$iphone} {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-top: -1px; 
+  }
 }
 
 .button.secondary {
@@ -297,6 +320,31 @@ body.posts.new #admin {
   width: 808px;
   margin: 0 auto;
   position: relative;
+  
+  @media #{$iphone} {
+    width: 320px;
+  }
+
+  .draft-options {
+    display: inline-block;
+    border: 3px solid #777;
+    border-radius: 10px;
+    padding: 4px;
+    @media #{$iphone} { display: none; }   
+
+    a {     
+      font-size: 12px;
+      padding: 2px 10px;
+    }
+
+    a.selected {
+      background-color: #00CDCD;
+    }
+
+    #post_draft {
+      display: none;
+    }
+  }
 
   #save-button.saved {
     color: #999;
@@ -320,12 +368,17 @@ body.posts.new #admin {
        border-left: 4px solid lightblue;
      }
 
-    #post_title {
+    #post-title {
       width: 350px;
       font-size: 16px;
       font-weight: 400;
       margin: 0;
       border-bottom: 1px solid #ddd;
+      
+      @media #{$iphone} {
+        width: 260px;
+        margin-left: -5px;
+      }
     }
   }
 
@@ -335,6 +388,11 @@ body.posts.new #admin {
     h2 {color: #999;}
     h2 a {margin-top: -2px;}
     h3 a {color: #999;}
+
+    @media #{$iphone} {
+      float: none;
+      display: block;
+    }
   }
 
   .col h1,
@@ -343,6 +401,12 @@ body.posts.new #admin {
     text-transform: uppercase;
   }
 
+  .col h1 {
+    @media #{$iphone} {
+      margin-top: 0;
+    }
+  }
+
   .col h1 a,
   .col h2 a {
     position: absolute;
@@ -357,6 +421,10 @@ body.posts.new #admin {
   .col {
     width: 360px;
     padding: 20px;
+    
+    @media #{$iphone} {
+      width: 272px;
+    }
 
     h2 a {
       background: #999;
@@ -468,6 +536,11 @@ fieldset.markdown {
   #post-editor {
     width: 960px;
     float: left;
+    
+    @media #{$iphone} {
+      width: 310px;
+      padding: 5px;
+    }
   }
 
   #fullscreen {
@@ -475,6 +548,8 @@ fieldset.markdown {
     position: relative;
     top: 35px;
     border: 0 none;
+    
+    @media #{$iphone} { display: none;}
   }
   
 }
@@ -499,16 +574,23 @@ fieldset.markdown {
 
 #text-title {
   margin: 23px 0 0 0;
+  
+  @media #{$iphone} { margin: 0;}
 }
 
-#post_title {
+#text-content {
+  margin-top: -25px;
+  @media #{$iphone} { margin-top: -45px;}
+}
+
+#post-title {
   width: 100%;
   border: none;
   background: none;
   line-height: 45px;
 }
 
-#post_content {
+#post-content {
   border: none;
   width: 100%;
   position: relative;
@@ -516,13 +598,20 @@ fieldset.markdown {
   resize: none;
   font-size: 20px;
   line-height: 30px;
+  
+  &.scrolled {
+    border-top: 1px solid rgba(30,30,30,0.1);
+  }
 }
 
-textarea#post_title {
+
+textarea#post-title {
   resize: none;
   font-family: 'Asap', sans-serif;
   font-size: 40px;
   font-weight: normal;
+  
+  @media #{$iphone} { font-size: 25px;}
 }
 
 form .permalink {
@@ -580,4 +669,10 @@ body {
 
 #publish-bar input[type=submit].post-saving {
   background: #40A4FB;
+}
+
+#publish-bar {
+  .delete-bar, #draft_label, #post_draft {
+    @media #{$iphone} { display: none; }   
+  }
 }

data/lib/pagoda/public/js/editor.coffee

@@ -5,6 +5,9 @@ $(document).ready ->
   key.filter = (e)->
     true
 
+  is_iphone =->
+    /iPhone/i.test(navigator.userAgent)
+ 
   is_edit_page = ->
     window.location.pathname.indexOf('edit') != -1
 
@@ -23,6 +26,21 @@ $(document).ready ->
       $('#save-button').removeClass('post-saving')
       setTimeout((->set_save_button('saved')),2000)
 
+  draft_post = ->
+    $('#post_draft').prop('checked', true)
+    $('#draft-action').addClass('selected')
+    $('#publish-action').removeClass('selected')
+    save_post()
+    false
+
+  publish_post = ->
+    $('#post_draft').prop('checked', false)
+    $('#draft-action').removeClass('selected')
+    $('#publish-action').addClass('selected')
+    save_post()
+    false
+
+
   # Save post
   save_post = ->
     set_save_button('saving')
@@ -30,14 +48,14 @@ $(document).ready ->
 
     post_obj = 
       post : 
-        title   : $('#post_title').val()
-        content : $('#post_content').val()
+        title   : $('#post-title').val()
+        content : $('#post-content').val()
         name    : $('#post_name').val()
         draft   : draft
 
       ajax    : true
 
-    $.post('/save-post', post_obj, (data)->
+    $.post(baseUrl + '/save-post', post_obj, (data)->
       response = $.parseJSON(data)
       if response['status'] == 'OK'
         setTimeout((->set_save_button('saved')),1000)
@@ -48,7 +66,7 @@ $(document).ready ->
 
   # Dom invoked events
   handle_events =->
-    $('#post-editor #post_title').autosize({append: "\n"})
+    $('#post-editor #post-title').autosize({append: "\n"})
 
     $("#fullscreen").click (e)->
       screenfull.request();
@@ -56,27 +74,37 @@ $(document).ready ->
     screenfull.onchange = ->
       if screenfull.isFullscreen
         $('#fullscreen').hide()
-        $('#post_content').focus()
+        $('#post-content').focus()
 
         setTimeout( ->
-          rows = Math.ceil($(window).height()/48)
-          $('#post_content').attr('rows', rows)
+          rows = Math.ceil($(window).height()/40)
+          $('#post-content').attr('rows', rows)
         , 1000)
 
       else
         $('#fullscreen').show();
-        $('#post_content').attr('rows', 15);
+        $('#post-content').attr('rows', 18);
 
     $('.delete-button').click ->
       if not confirm("Confirm delete?")
         return false
 
+    $('#post-content').bind 'scroll', (e)->
+      if $(this).scrollTop() > 10
+        $(this).addClass('scrolled')
+      else
+        $(this).removeClass('scrolled')
+
     if is_edit_page()
       $('#save-button').click( ->
         save_post()
         false
       )
 
+      $('#draft-action').click(draft_post)
+      $('#publish-action').click(publish_post)
+
+
   keyboard_events =->
     key('⌘+enter, ctrl+enter', (e)->
       screenfull.toggle()
@@ -106,17 +134,25 @@ $(document).ready ->
 
 
   focus_to_type =->
-    if not is_edit_page() and ($('#post_title').val() == '')
-      $('#post_title').focus()
+    if not is_edit_page() and ($('#post-title').val() == '')
+      $('#post-title').focus()
     else
-      $('#post_content').focus()
+      $('#post-content').focus()
 
 
+  fullscreen_mobile =->
+    if(is_iphone())
+      setTimeout (->
+        # Hide the address bar!
+        window.scrollTo 0, 1
+      ), 0
+    $('.links').remove()
+
   init =->
     handle_events()
     keyboard_events()
-    show_shortcuts()
+    show_shortcuts() if not is_iphone()
     focus_to_type()
-
+    fullscreen_mobile()
 
   init()

data/lib/pagoda/public/js/editor.js

@@ -2,10 +2,13 @@
 (function() {
 
   $(document).ready(function() {
-    var focus_to_type, handle_events, init, is_edit_page, keyboard_events, save_post, set_save_button, show_shortcuts;
+    var draft_post, focus_to_type, fullscreen_mobile, handle_events, init, is_edit_page, is_iphone, keyboard_events, publish_post, save_post, set_save_button, show_shortcuts;
     key.filter = function(e) {
       return true;
     };
+    is_iphone = function() {
+      return /iPhone/i.test(navigator.userAgent);
+    };
     is_edit_page = function() {
       return window.location.pathname.indexOf('edit') !== -1;
     };
@@ -27,20 +30,34 @@
         }), 2000);
       }
     };
+    draft_post = function() {
+      $('#post_draft').prop('checked', true);
+      $('#draft-action').addClass('selected');
+      $('#publish-action').removeClass('selected');
+      save_post();
+      return false;
+    };
+    publish_post = function() {
+      $('#post_draft').prop('checked', false);
+      $('#draft-action').removeClass('selected');
+      $('#publish-action').addClass('selected');
+      save_post();
+      return false;
+    };
     save_post = function() {
       var draft, post_obj;
       set_save_button('saving');
       draft = $('#post_draft').is(':checked') ? 'on' : 'off';
       post_obj = {
         post: {
-          title: $('#post_title').val(),
-          content: $('#post_content').val(),
+          title: $('#post-title').val(),
+          content: $('#post-content').val(),
           name: $('#post_name').val(),
           draft: draft
         },
         ajax: true
       };
-      return $.post('/save-post', post_obj, function(data) {
+      return $.post(baseUrl + '/save-post', post_obj, function(data) {
         var response;
         response = $.parseJSON(data);
         if (response['status'] === 'OK') {
@@ -55,7 +72,7 @@
       }));
     };
     handle_events = function() {
-      $('#post-editor #post_title').autosize({
+      $('#post-editor #post-title').autosize({
         append: "\n"
       });
       $("#fullscreen").click(function(e) {
@@ -64,15 +81,15 @@
       screenfull.onchange = function() {
         if (screenfull.isFullscreen) {
           $('#fullscreen').hide();
-          $('#post_content').focus();
+          $('#post-content').focus();
           return setTimeout(function() {
             var rows;
-            rows = Math.ceil($(window).height() / 48);
-            return $('#post_content').attr('rows', rows);
+            rows = Math.ceil($(window).height() / 40);
+            return $('#post-content').attr('rows', rows);
           }, 1000);
         } else {
           $('#fullscreen').show();
-          return $('#post_content').attr('rows', 15);
+          return $('#post-content').attr('rows', 18);
         }
       };
       $('.delete-button').click(function() {
@@ -80,11 +97,20 @@
           return false;
         }
       });
+      $('#post-content').bind('scroll', function(e) {
+        if ($(this).scrollTop() > 10) {
+          return $(this).addClass('scrolled');
+        } else {
+          return $(this).removeClass('scrolled');
+        }
+      });
       if (is_edit_page()) {
-        return $('#save-button').click(function() {
+        $('#save-button').click(function() {
           save_post();
           return false;
         });
+        $('#draft-action').click(draft_post);
+        return $('#publish-action').click(publish_post);
       }
     };
     keyboard_events = function() {
@@ -117,17 +143,28 @@
       });
     };
     focus_to_type = function() {
-      if (!is_edit_page() && ($('#post_title').val() === '')) {
-        return $('#post_title').focus();
+      if (!is_edit_page() && ($('#post-title').val() === '')) {
+        return $('#post-title').focus();
       } else {
-        return $('#post_content').focus();
+        return $('#post-content').focus();
+      }
+    };
+    fullscreen_mobile = function() {
+      if (is_iphone()) {
+        setTimeout((function() {
+          return window.scrollTo(0, 1);
+        }), 0);
       }
+      return $('.links').remove();
     };
     init = function() {
       handle_events();
       keyboard_events();
-      show_shortcuts();
-      return focus_to_type();
+      if (!is_iphone()) {
+        show_shortcuts();
+      }
+      focus_to_type();
+      return fullscreen_mobile();
     };
     return init();
   });

data/lib/pagoda/templates/edit.mustache

@@ -3,19 +3,23 @@
   <div id="admin">
     <div id="save"></div>
     
-    <form accept-charset="UTF-8" action="/save-post" class="edit_post" method="post">
+    <form accept-charset="UTF-8" action="{{base_url}}/save-post" class="edit_post" method="post">
       {{>editor_area}}
       <div id="publish-bar-hover">
         <div id="publish-bar">
           <div class="contain">
             <div class="left">
-              <a href="/">&laquo; Admin</a>
-              <a href="/delete/{{ name }}" class="delete-bar delete-button" >Delete</a>
+              <a href="{{base_url}}/">&laquo; ADMIN</a>
+              <a href="{{base_url}}/delete/{{ name }}" class="delete-bar delete-button" >DELETE</a>
             </div>
             <div class="right">
-              <label for="post_draft">Draft</label>
-              <input id="post_draft" name="post[draft]" type="checkbox" {{#draft}}checked{{/draft}} />
-              <input id="save-button" name="commit" type="submit" value="Save" />
+
+              <div class="draft-options">
+                <a id="draft-action" class="button {{#draft}}selected{{/draft}}" href="#">DRAFT</a>
+                <a id="publish-action" class="button {{^draft}}selected{{/draft}}" href="#">DONE</a>
+                <input id="post_draft" name="post[draft]" type="checkbox" {{#draft}}checked{{/draft}} />
+              </div>
+              <input id="save-button" name="commit" type="submit" value="SAVE" />
             </div>
           </div>
         </div>

data/lib/pagoda/templates/editor_area.mustache

@@ -1,13 +1,13 @@
 <div id="split">
   <div id="post-editor" class="split-section">
-    <a href="#fullscreen" id="fullscreen"><img src="/images/fullscreen.png"></a>
+    <a href="#fullscreen" id="fullscreen"><img src="{{base_url}}/images/fullscreen.png"></a>
     <div id="text-title">
-      <textarea cols="40" id="post_title" name="post[title]" placeholder="Title here" rows="1">{{#ptitle}}{{ ptitle }}{{/ptitle}}{{^ptitle}}{{ title }}{{/ptitle}}</textarea>
+      <textarea cols="40" id="post-title" name="post[title]" placeholder="Title here" rows="1">{{#ptitle}}{{ ptitle }}{{/ptitle}}{{^ptitle}}{{ title }}{{/ptitle}}</textarea>
       <input type="hidden" id="post_name" name="post[name]" value="{{ name }}">
     </div>
 
     <div id="text-content">
-      <textarea cols="40" id="post_content" name="post[content]" placeholder="Write post here" rows="15">{{content}}</textarea>
+      <textarea cols="40" id="post-content" name="post[content]" placeholder="Write post here" rows="18">{{content}}</textarea>
     </div>
   </div>
 </div>

data/lib/pagoda/templates/home.mustache

@@ -3,9 +3,9 @@
     <div id="save"></div>
     
     <div id="drafts" class="col">
-      <h1>Drafts <a href="/new" class="button">New Draft</a></h1>
-      <form accept-charset="UTF-8" action="/new" class="new_post" id="new_post" method="get">
-        <input id           = "post_title" 
+      <h1>Drafts <a href="{{base_url}}/new" class="button">New Draft</a></h1>
+      <form accept-charset="UTF-8" action="{{base_url}}/new" class="new_post" id="new_post" method="get">
+        <input id           = "post-title" 
                name         = "ptitle" 
                autocomplete = "off"
                placeholder  = "Start typing your title here..." size="30" type="text" />
@@ -15,10 +15,10 @@
         {{#drafts}}
         <li id="post-{{filename}}">
           <h3>
-            <a href="/edit/{{filename}}">{{title}}</a>
+            <a href="{{base_url}}/edit/{{filename}}">{{title}}</a>
             <span class="links">
-              <a href="/this-is-brilliant" class="admin-view">view</a>
-              <a href="/delete/{{filename}}" class="delete-button admin-delete" rel="nofollow">x</a>
+              <a href="{{base_url}}/404" class="admin-view">view</a>
+              <a href="{{base_url}}/delete/{{filename}}" class="delete-button admin-delete" rel="nofollow">x</a>
             </span>
           </h3>
         </li>
@@ -28,15 +28,15 @@
 
   <div id="published" class="col">
   <h2>Published 
-  <a href="/settings" class="button">Settings</a></h2>
+  <a href="{{base_url}}/settings" class="button">Settings</a></h2>
   <ul>
     {{#published}}
     <li id="post-{{filename}}">
       <h3>
-        <a href="/edit/{{filename}}">{{title}}</a>
+        <a href="{{base_url}}/edit/{{filename}}">{{title}}</a>
         <span class="links">
-          <a href="/vniverse" class="admin-view">view</a>
-          <a href="/delete/{{filename}}" class="delete-button admin-delete" rel="nofollow">x</a>
+          <a href="{{base_url}}/404" class="admin-view">view</a>
+          <a href="{{base_url}}/delete/{{filename}}" class="delete-button admin-delete" rel="nofollow">x</a>
         </span>
       </h3>
     </li>

data/lib/pagoda/templates/layout.mustache

@@ -2,16 +2,14 @@
 <html>
 <head>
   <meta http-equiv="Content-type" content="text/html;charset=utf-8">
-    <link rel="stylesheet" type="text/css" href="{{base_url}}/css/pagoda.css" media="all">
-    <link rel="stylesheet" type="text/css" href="{{base_url}}/css/tiptip.css" media="all">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/pagoda.css" media="screen, projection">
+  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/tiptip.css" media="screen, projection">
   <link href='http://fonts.googleapis.com/css?family=Lato:300,900|Asap' rel='stylesheet' type='text/css' />
-  {{#css}}
-  <link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">
-  {{/css}}
+  <link rel="apple-touch-icon" href="{{base_url}}/images/apple-touch-icon.png" />
+
 
-  <!--[if IE 7]>
-  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">
-  <![endif]-->
 
   <script type="text/javascript" src="{{base_url}}/js/jquery.js"></script>
   <script type="text/javascript" src="{{base_url}}/js/screenfull.js"></script>
@@ -19,6 +17,9 @@
   <script type="text/javascript" src="{{base_url}}/js/keymaster.min.js"></script>
   <script type="text/javascript" src="{{base_url}}/js/jquery.tiptip.min.js"></script>
   <script type="text/javascript" src="{{base_url}}/js/editor.js"></script>
+  <script type="text/javascript">
+    var baseUrl = "{{base_url}}";
+  </script>
   <title>{{title}}</title>
 </head>
 

data/lib/pagoda/templates/new_post.mustache

@@ -2,7 +2,7 @@
   <div id="admin">
     <div id="save"></div>
     
-    <form accept-charset="UTF-8" action="/save-post" class="edit_post" method="post">
+    <form accept-charset="UTF-8" action="{{base_url}}/save-post" class="edit_post" method="post">
     <input type="hidden" name="method" value="put" />
 
       {{>editor_area}}
@@ -11,7 +11,7 @@
         <div id="publish-bar">
           <div class="contain">
             <div class="left">
-              <a href="/">&laquo; Admin</a>
+              <a href="{{base_url}}/">&laquo; Admin</a>
             </div>
             <div class="right">
               <input id="save-button" name="commit" type="submit" value="Save" />

data/lib/pagoda/templates/settings.mustache

@@ -1,12 +1,12 @@
 <body class="settings">
 
   <div class="settings-bd">
-    <a class="admin-btn button" href="/">« Admin</a>
+    <a class="admin-btn button" href="{{base_url}}/">« Admin</a>
     <h1>SETTINGS</h1>
 
     <ul>
-      <li><h2 class="left-col"> Push to origin </h2><span class="right-col"><a class="button" href="/settings/push">Push</a></span></li>
-      <li><h2 class="left-col"> Pull from origin/master </h2><span class="right-col"><a class="button" href="/settings/pull">Pull</a></span></li>
+      <li><h2 class="left-col"> Push to origin </h2><span class="right-col"><a class="button" href="{{base_url}}/settings/push">Push</a></span></li>
+      <li><h2 class="left-col"> Pull from origin/master </h2><span class="right-col"><a class="button" href="{{base_url}}/settings/pull">Pull</a></span></li>
 
     </ul>
   </div>

data/lib/pagoda/views/layout.rb

@@ -12,6 +12,10 @@ module Shwedagon
         "Home"
       end
 
+      def base_url
+        @base_url
+      end
+
     end
   end
 end

data/pagoda.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'pagoda-jekyll'
-  s.version           = '0.0.7'
-  s.date              = '2013-05-04'
+  s.version           = '0.0.8'
+  s.date              = '2013-05-13'
   s.rubyforge_project = 'pagoda-jekyll'
 
   s.summary     = "A simple admin for Jekyll"
@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_dependency('stringex')
   s.add_dependency('sinatra-mustache')
   s.add_dependency('sinatra')
+  s.add_dependency('sinatra-reloader')
   
-  s.add_development_dependency('sinatra-reloader')
   s.add_development_dependency('compass')
   s.add_development_dependency('fssm')
   s.add_development_dependency('rack-test')

data/unicorn.rb

@@ -1 +1,2 @@
 pid "./tmp/pids/unicorn.pid"
+listen "unix:./tmp/sock/unicorn.sock"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagoda-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alagu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -101,7 +101,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -195,6 +195,7 @@ files:
 - lib/pagoda/public/css/pagoda.css
 - lib/pagoda/public/css/pagoda.scss
 - lib/pagoda/public/css/tiptip.css
+- lib/pagoda/public/images/apple-touch-icon.png
 - lib/pagoda/public/images/fullscreen.png
 - lib/pagoda/public/js/editor.coffee
 - lib/pagoda/public/js/editor.js