Pastebin and source web app updates

diff --git a/extra/webapps/pastebin/new-paste.furnace b/extra/webapps/pastebin/new-paste.furnace
index c647df82b0c480c7598e0fdbd514ea8f20782ff3..46cf0df8181081087711705f61da8367b719ab3c 100755 (executable)
--- a/extra/webapps/pastebin/new-paste.furnace
+++ b/extra/webapps/pastebin/new-paste.furnace
@@ -1,7 +1,7 @@
 <% USING: furnace namespaces ; %>
 
 <%
-    "new paste" "title" set
+    "New paste" "title" set
     "header" render-template
 %>
 

diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index cd81c748289fb6bdea04776fdd6e8465563eae99..555670e7fad2c1b69b4d5c43cbfce88409544c7c 100755 (executable)
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -79,9 +79,10 @@ SYMBOL: store
     pastebin-pastes 2dup length swap set-paste-n push ;
 
 : submit-paste ( summary author channel mode contents -- )
-    <paste>
-    \ pastebin get-global add-paste
-    save-pastebin-store ;
+    <paste> [
+        \ pastebin get-global add-paste
+        save-pastebin-store
+    ] keep paste-link permanent-redirect ;
 
 \ submit-paste {
     { "summary" v-required }
@@ -91,8 +92,6 @@ SYMBOL: store
     { "contents" v-required }
 } define-action
 
-\ submit-paste [ paste-list ] define-redirect
-
 : annotate-paste ( n summary author mode contents -- )
     <annotation> swap get-paste
     paste-annotations push

diff --git a/extra/webapps/source/source.factor b/extra/webapps/source/source.factor
index 36fbf9d5ae66cad57bab0f16f9930e40cf0cb428..efc46c68b718cb62f76314ffdd5cb474f0b8f7ef 100755 (executable)
--- a/extra/webapps/source/source.factor
+++ b/extra/webapps/source/source.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files namespaces webapps.file http.server.responders
-xmode.code2html kernel ;
+xmode.code2html kernel html ;
 IN: webapps.source
 
 global [
@@ -12,7 +12,7 @@ global [
             [
                 drop
                 serving-html
-                swap htmlize-stream
+                [ swap htmlize-stream ] with-html-stream
             ] serve-file-hook set
             file-responder
         ] with-scope