From 00d19637c11c35ff9ba292c4fa3abc2d1728869e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Mon, 10 Dec 2007 02:34:56 -0500
Subject: [PATCH] pastebin cleanups

---
 extra/webapps/pastebin/new-paste.furnace     | 2 ++
 extra/webapps/pastebin/paste-summary.furnace | 8 ++------
 extra/webapps/pastebin/pastebin.factor       | 6 +++---
 extra/webapps/pastebin/show-paste.furnace    | 2 +-
 extra/webapps/pastebin/style.css             | 5 -----
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/extra/webapps/pastebin/new-paste.furnace b/extra/webapps/pastebin/new-paste.furnace
index 46cf0df818..8f48f670d3 100755
--- a/extra/webapps/pastebin/new-paste.furnace
+++ b/extra/webapps/pastebin/new-paste.furnace
@@ -24,10 +24,12 @@
 <td><% "modes" render-template %></td>
 </tr>
 
+<!--
 <tr>
 <th align="right">Channel:</th>
 <td><input type="TEXT" name="channel" value="#concatenative" /></td>
 </tr>
+-->
 
 <tr>
 <th align="right" valign="top">Content:</th>
diff --git a/extra/webapps/pastebin/paste-summary.furnace b/extra/webapps/pastebin/paste-summary.furnace
index 2840110549..dc25fe1924 100644
--- a/extra/webapps/pastebin/paste-summary.furnace
+++ b/extra/webapps/pastebin/paste-summary.furnace
@@ -4,13 +4,9 @@ furnace webapps.pastebin calendar sequences ; %>
 <tr>
     <td>
         <a href="<% model get paste-link write %>">
-        <%
-            "summary" get
-            dup empty? [ drop "- no title -" ] when
-            write
-        %>
+        <% "summary" get write %>
         </a>
     </td>
     <td><% "author" get write %></td>
-    <td><% "date" get timestamp>string print %></td>
+    <td><% "date" get timestamp>string write %></td>
 </tr>
diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index 48154fef85..9d6b949ee1 100755
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -85,8 +85,8 @@ SYMBOL: store
     ] keep paste-link permanent-redirect ;
 
 \ submit-paste {
-    { "summary" v-required }
-    { "author" v-required }
+    { "summary" "- no summary -" v-default }
+    { "author" "- no author -" v-default }
     { "channel" "#concatenative" v-default }
     { "mode" "factor" v-default }
     { "contents" v-required }
@@ -99,7 +99,7 @@ SYMBOL: store
 
 \ annotate-paste {
     { "n" v-required v-number }
-    { "summary" v-required }
+    { "summary" "- no summary -" v-default }
     { "author" v-required }
     { "mode" "factor" v-default }
     { "contents" v-required }
diff --git a/extra/webapps/pastebin/show-paste.furnace b/extra/webapps/pastebin/show-paste.furnace
index 6a78135343..30129eda24 100755
--- a/extra/webapps/pastebin/show-paste.furnace
+++ b/extra/webapps/pastebin/show-paste.furnace
@@ -7,7 +7,7 @@
 
 <table>
 <tr><th>Paste by:</th><td><% "author" get write %></td></tr>
-<tr><th>Channel:</th><td><% "channel" get write %></td></tr>
+<!-- <tr><th>Channel:</th><td><% "channel" get write %></td></tr> -->
 <tr><th>Created:</th><td><% "date" get timestamp>string write %></td></tr>
 <tr><th>File type:</th><td><% "mode" get write %></td></tr>
 </table>
diff --git a/extra/webapps/pastebin/style.css b/extra/webapps/pastebin/style.css
index 11a9e26c5e..e3c7c19fc5 100644
--- a/extra/webapps/pastebin/style.css
+++ b/extra/webapps/pastebin/style.css
@@ -23,11 +23,6 @@ pre.code {
 	padding:5px;
 	font-size:150%;
 	color:#000000;
-
-	white-space: pre-wrap;       /* css-3 */
-	white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-	white-space: -o-pre-wrap;    /* Opera 7 */
-	word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 .navbar {