Merge branch 'master' of github.com:urbit/urbit

main/app/twit/app.js

@@ -13,10 +13,19 @@ $(function() {
   twoDig = function(d) {
     return (d<10) ? "0"+d : d
   }
+  dateStr = function(d) {
+    //~2014.8.11..21.01.58
+    return "~" + d.getFullYear() + 
+      "." + twoDig(d.getMonth()+1) + 
+      "." + twoDig(d.getDate()) + 
+      ".." + twoDig(d.getHours()) + 
+      "." + twoDig(d.getMinutes()) + 
+      "." + twoDig(d.getSeconds())
+  }
   setTime = function() {
     d = new Date()
-    datestr = twoDig(d.getMonth()+1) + "-" + twoDig(d.getDate()) + "-" + d.getFullYear() + " " + twoDig(d.getHours()) + ":" + twoDig(d.getMinutes()) + ":" + twoDig(d.getSeconds())
-    $("#twet .date").text(datestr)
+    _datestr = dateStr(d)
+    $("#twet .date").text(_datestr)
   }
   setInterval(setTime,1000)
   setTime()
@@ -64,13 +73,13 @@ $(function() {
   
   renderTweet = function(tweet) {
     d = new Date(tweet.created_at)
-    datestr = d.getMonth()+1 + "-" + d.getDate() + "-" + d.getFullYear() + " " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds()
+    _datestr = dateStr(d)
     css = "tweet"
     if(tweet.pending == true)
       css += " pending"
     $_tweet = $("<div class='"+css+"'></div>")
     $_tweet.append("<div class='author'>@urbit_test</div>")
-    $_tweet.append("<div class='date'>"+datestr+"</div>")
+    $_tweet.append("<div class='date'>"+_datestr+"</div>")
     $_tweet.append("<div class='text'>"+tweet.text+"</div>")
     return $_tweet
   }

main/mar/hook/door.hook

@@ -0,0 +1,12 @@
+::
+::::  /hook/door/hook/mar
+  ::
+/?  314
+|_  own=@t
+::
+++  grow                                                ::  convert to
+  |%
+  ++  mime  [/text/html (taco own)]                    ::  convert to %mime
+  ++  hymn  ;div:(pre:"{(trip own)}")                   ::  convert to %html
+  --
+--

main/pub/fab/site/tut/demo/hymn.hook

@@ -0,0 +1,18 @@
+/=    bod  /^  manx  /:  /===/app/twit/core  /hymn/
+/=    sty  /^  @t    /:  /===/pub/fab/site/styles  /css/
+::
+::::  ~tomsyt-balsen
+  ::
+;html
+  ;head
+    ;title: Urbit: Personal Cloud Computing
+    ;style:"{(trip sty)}"
+  ==
+  ;body
+    ;div(class "content container")
+      ;div.subpage
+        ;+  bod
+      ==
+    ==
+  ==
+==