diff --git a/app/talk.hoon b/app/talk.hoon index 8d02fda76a..d5b628ee94 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -72,7 +72,7 @@ == :: ++ pear :: poke fruit $% {$talk-command command} :: - {$write-comment path ship cord} :: + {$write-comment spur ship cord} :: == :: ++ card :: general card $% {$diff lime} :: @@ -1305,17 +1305,17 @@ :: ++ ra-base-hart .^(hart %e /(scot %p our.hid)/host/(scot %da now.hid)) ++ ra-comment - |= {pax/path txt/@t} + |= {pax/path sup/spur txt/@t} =. ..ra-emit %+ ra-emit ost.hid :* %poke /comment [our.hid %hood] - [%write-comment pax src.hid txt] + [%write-comment sup src.hid txt] == =+ man=%comments ?: (~(has by stories) man) - (ra-consume-comment man pax txt) + (ra-consume-comment man pax sup txt) =. ..ra-apply %+ ra-apply our.hid :+ %design man @@ -1328,11 +1328,11 @@ (my [[%& our.hid (main our.hid)] *envelope %pending] ~) now.hid [~ %app %tree 'receiving comments, ;join %comments for details'] - (ra-consume-comment man pax txt) + (ra-consume-comment man pax sup txt) :: ++ ra-consume-comment - |= {man/knot pax/path txt/@t} ^+ +> - =+ nam==+(xap=(flop pax) ?~(xap "" (trip i.xap))) :: file name + |= {man/knot pax/path sup/spur txt/@t} ^+ +> + =+ nam=?~(sup "" (trip i.sup)) :: file name =+ fra=(crip (time-to-id now.hid)) :: url fragment %^ ra-consume & src.hid @@ -2225,8 +2225,8 @@ [ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])] :: ++ poke-talk-comment - |= {pax/path txt/@t} ^- (quip move +>) - ra-abet:(ra-comment:ra pax txt) + |= {pax/path sup/spur txt/@t} ^- (quip move +>) + ra-abet:(ra-comment:ra pax sup txt) :: ++ poke-talk-save |= man/knot diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 015f5115fd..449ef44707 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -53,7 +53,8 @@ == == == :: ++ ixor @t :: oryx hash ++ whir $@ $~ :: wire subset - $% {$at p/hole q/whir} :: authenticated + $% {$ac p/hole q/whir} :: cookied + {$at p/hole q/whir} :: authenticated {$ay p/knot:ship q/knot:@uvH $~} :: remote duct {$ha p/path:beak} :: GET request {$he p/whir} :: HEAD request @@ -788,6 +789,7 @@ $made ?< ?=($tabl -.q.sih) =. our (need hov) :: XX + =| ses/(unit hole) |- ^+ ..axon ?- tee $@($~ {?($on $ay $ow) *}) ~|(e+ford+lost+tee !!) @@ -838,10 +840,12 @@ ~& e+at-lost+[-.p.q.sih q.tee] $(tee q.tee) ?> ?=(@ q.q.p.q.sih) + =. ses (some p.tee) =+ cyz=(~(got by wup) p.tee) =^ jon ..ya ~(stat-json ya p.tee cyz) $(tee q.tee, q.q.p.q.sih (add-json jon q.q.p.q.sih)) :: + {$ac ^} ?>((~(has by wup) p.tee) $(ses `p.tee, tee q.tee)) {$ha *} %- emule |. ^+ ..apex ?. ?=($& -.q.sih) @@ -852,11 +856,14 @@ (give-thou 307 [location+(crip (apex:earn url))]~ ~) ?. ?=($mime p.cay) =+ bek=(norm-beak -:(need (tome p.tee))) - (exec-live tee bek [%flag [p.sih `~] %cast %mime [%$ p.q.sih]]) + =+ tee-ses=?~(ses tee [%ac u.ses tee]) + (exec-live tee-ses bek [%flag [p.sih `~] %cast %mime [%$ p.q.sih]]) ~| q.q.cay + =+ cug=?~(ses ~ cug:(~(got by wup) u.ses)) =+ ((hard {mit/mite rez/octs}) q.q.cay) =+ dep=(crip "W/{(pojo %s (scot %uv p.sih))}") - (give-thou 200 ~[etag+dep content-type+(moon mit)] ~ rez) + =+ hit=[200 ~[etag+dep content-type+(moon mit)] ~ rez] + (give-thou (add-cookies cug hit)) == == :: @@ -1316,7 +1323,7 @@ ?- -.ham $js [%& %js auth:js] $json =^ jon ..ya stat-json.yac - [%| (give-json 200 ~ jon)] + [%| (give-json 200 cug.yac jon)] $xen (show-login-page ~ ses.ham) :: $at @@ -1331,7 +1338,7 @@ [%| (resolve ~ p.pez(p [%at ses.yac p.p.pez]))] :: $js - =^ jon ..ya stat-json.yac + =^ jon ..ya stat-json.yac [%| (resolve cug.yac p.pez(p (add-json jon p.p.pez)))] == :: @@ -1431,7 +1438,7 @@ cip ~ == - [anon ~] + [`@p`(mix anon (lsh 5 1 (rsh 5 1 (shaf %ship ses)))) ~] :: [(set-cookie cookie-prefix ses)]~ :: diff --git a/lib/write.hoon b/lib/write.hoon index 404c05541e..2d553174e7 100644 --- a/lib/write.hoon +++ b/lib/write.hoon @@ -77,8 +77,8 @@ (poke--data [`typ /web/paste/(scot %da now)] %mime / (taco txt)) :: ++ poke-comment - |= {pax/path him/ship txt/@t} ^+ abet - =. pax [%web (welp pax /comments/(scot %da now))] + |= {sup/spur him/ship txt/@t} ^+ abet + =+ pax=(welp (flop sup) /comments/(scot %da now)) =. txt %+ rap 3 :~ '## `' (scot %p him) '`' diff --git a/mar/talk/comment.hoon b/mar/talk/comment.hoon index e4c7d69110..ec965ec003 100644 --- a/mar/talk/comment.hoon +++ b/mar/talk/comment.hoon @@ -3,11 +3,11 @@ :: /? 310 !: -|_ {pax/path txt/@t} +|_ {pax/path sup/spur txt/@t} ++ grab |% - ++ noun {path @t} + ++ noun {path spur @t} ++ json - (corl need =>(jo (ot pax+(su fel:stab) txt+so ~))) + (corl need =>(jo (ot pax+(su fel:stab) sup+(su fel:stab) txt+so ~))) -- -- diff --git a/mar/tree/comments.hoon b/mar/tree/comments.hoon index 7987e1a129..cc3c0fe33a 100644 --- a/mar/tree/comments.hoon +++ b/mar/tree/comments.hoon @@ -6,7 +6,7 @@ !: :::: :: -|_ all/(list (pair time manx)) +|_ all/(list (pair time {ship marl})) :: ++ grow :: convert to |% @@ -14,9 +14,9 @@ :- %a %+ turn (sort all |=({a/* b/*} (lor b a))) - |= {a/time b/manx} ^- ^json - =. a.g.b [id+(time-to-id a) a.g.b] - (jobe time+(jode a) body+(react-to-json:react b) ~) + |= {a/time b/ship c/marl} ^- ^json + =+ bod=[[%div id+(time-to-id a) ~] c] + (jobe time+(jode a) user+(jape +:) body+(react-to-json:react bod) ~) -- ++ grab |% :: convert from ++ noun (list {time manx}) :: clam from %noun diff --git a/ren/tree/comments.hoon b/ren/tree/comments.hoon index c8b801554c..8a2175c932 100644 --- a/ren/tree/comments.hoon +++ b/ren/tree/comments.hoon @@ -2,8 +2,14 @@ :::: /hoon/comments/tree/ren :: /? 310 -/: /%/comments /_ @da /&elem&/md/ +/: /%/comments /_ @da + /; |= a/manx ^- {ship marl} + ~| a + ?> ?=(_[/div ;/(~) ~[[%h2 **] ~[[%code **] ;/(who=**)]] kid=**] a) + => .(a ^+([/div ;/(~) ~[[%h2 **] ~[[%code **] ;/(who=*tape)]] kid=*marl] a)) + [(slav %p (crip who.a)) kid.a] + /&elem&/md/ :: :::: :: -`(list (pair time manx))`-.- +`(list (pair time {ship marl}))`-.- diff --git a/web/talk/main.js b/web/talk/main.js index 9fe39de464..5441e76180 100644 --- a/web/talk/main.js +++ b/web/talk/main.js @@ -875,6 +875,8 @@ module.exports = recl({ _clas = clas({ open: this.state.open === station, closed: !(this.state.open === station), + 'col-md-4': true, + 'col-md-offset-6': true, menu: true, 'depth-2': true }); @@ -943,6 +945,8 @@ module.exports = recl({ _clas = clas({ open: this.props.open === true, closed: this.props.open !== true, + 'col-md-4': true, + 'col-md-offset-2': true, menu: true, 'depth-1': true }); diff --git a/web/tree/main.css b/web/tree/main.css index e63c7e8009..0848a65028 100644 --- a/web/tree/main.css +++ b/web/tree/main.css @@ -98,46 +98,31 @@ div.logo.inverse:before { content: "\25D0"; } @media (min-width: 768px) { - .menu, .ctrl { width: 180px; } .ctrl.open, .ctrl:hover { max-width: 360px; min-width: 180px; - width: auto; } - .menu.depth-1 { - margin-left: 180px; } - .menu.depth-2 { - margin-left: 360px; } } + width: auto; } } @media (min-width: 992px) { - .menu, .ctrl { width: 235px; } .ctrl.open, .ctrl:hover { max-width: 470px; min-width: 235px; - width: auto; } - .menu.depth-1 { - margin-left: 235px; } - .menu.depth-2 { - margin-left: 470px; } } + width: auto; } } @media (min-width: 1200px) { - .menu, .ctrl { width: 285px; } .ctrl.open, .ctrl:hover { max-width: 570px; min-width: 285px; - width: auto; } - .menu.depth-1 { - margin-left: 285px; } - .menu.depth-2 { - margin-left: 570px; } } + width: auto; } } #head .loading { display: none; } diff --git a/web/tree/~.codemirror_fonts_bootstrap_main.css b/web/tree/~.codemirror_fonts_bootstrap_main.css index 08180bed55..13f3963847 100644 --- a/web/tree/~.codemirror_fonts_bootstrap_main.css +++ b/web/tree/~.codemirror_fonts_bootstrap_main.css @@ -6504,46 +6504,31 @@ div.logo.inverse:before { content: "\25D0"; } @media (min-width: 768px) { - .menu, .ctrl { width: 180px; } .ctrl.open, .ctrl:hover { max-width: 360px; min-width: 180px; - width: auto; } - .menu.depth-1 { - margin-left: 180px; } - .menu.depth-2 { - margin-left: 360px; } } + width: auto; } } @media (min-width: 992px) { - .menu, .ctrl { width: 235px; } .ctrl.open, .ctrl:hover { max-width: 470px; min-width: 235px; - width: auto; } - .menu.depth-1 { - margin-left: 235px; } - .menu.depth-2 { - margin-left: 470px; } } + width: auto; } } @media (min-width: 1200px) { - .menu, .ctrl { width: 285px; } .ctrl.open, .ctrl:hover { max-width: 570px; min-width: 285px; - width: auto; } - .menu.depth-1 { - margin-left: 285px; } - .menu.depth-2 { - margin-left: 570px; } } + width: auto; } } #head .loading { display: none; }