From 03665de5377516b36ae30a0c834875f45be39790 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Sun, 31 Mar 2024 14:11:31 +0300 Subject: [PATCH] wip, better --- hbs2-browser/assets/icon/xclip.svg | 6 +++++ hbs2-browser/lib/HBS2/Peer/Browser/Assets.hs | 3 +++ .../lib/HBS2/Git/Oracle/Html.hs | 11 +++++++-- hbs2-peer/app/Browser/Root.hs | 23 ++++++++++++++++++- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 hbs2-browser/assets/icon/xclip.svg diff --git a/hbs2-browser/assets/icon/xclip.svg b/hbs2-browser/assets/icon/xclip.svg new file mode 100644 index 00000000..6d08196a --- /dev/null +++ b/hbs2-browser/assets/icon/xclip.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/hbs2-browser/lib/HBS2/Peer/Browser/Assets.hs b/hbs2-browser/lib/HBS2/Peer/Browser/Assets.hs index 064245f8..6c3524fa 100644 --- a/hbs2-browser/lib/HBS2/Peer/Browser/Assets.hs +++ b/hbs2-browser/lib/HBS2/Peer/Browser/Assets.hs @@ -5,6 +5,9 @@ import Data.FileEmbed import Data.ByteString +version :: Int +version = 3 + cssDir :: [(FilePath, ByteString)] cssDir = $(embedDir "assets") diff --git a/hbs2-git/hbs2-git-oracle/lib/HBS2/Git/Oracle/Html.hs b/hbs2-git/hbs2-git-oracle/lib/HBS2/Git/Oracle/Html.hs index 5833c616..1715d403 100644 --- a/hbs2-git/hbs2-git-oracle/lib/HBS2/Git/Oracle/Html.hs +++ b/hbs2-git/hbs2-git-oracle/lib/HBS2/Git/Oracle/Html.hs @@ -29,6 +29,13 @@ renderMarkdown markdown = case markdownToHtml markdown of Left{} -> mempty Right html -> toHtmlRaw $ Text.pack html +-- +-- +-- +-- +-- +-- + -- FIXME: move-to-hbs2-browser-lib hyper_ :: Text -> Attribute @@ -60,9 +67,9 @@ renderEntries args items = pure $ renderBS do div_ [class_ "repo-list-item"] do div_ [class_ "repo-info"] do - h2_ $ a_ [href_ "", onClickCopy ref] $ toHtml (s <> "-" <> refpart) + h2_ [class_ "xclip", onClickCopy ref] $ toHtml (s <> "-" <> refpart) - a_ [href_ "", hyper_ ""] (toHtml (show $ pretty h)) + p_ $ a_ [href_ ""] (toHtml (show $ pretty h)) renderMarkdown b diff --git a/hbs2-peer/app/Browser/Root.hs b/hbs2-peer/app/Browser/Root.hs index 15d09ef6..b1786021 100644 --- a/hbs2-peer/app/Browser/Root.hs +++ b/hbs2-peer/app/Browser/Root.hs @@ -234,6 +234,27 @@ form.search input[type="search"] { form.search button { align: center; } + +.xclip::after { + content: ""; + display: inline-block; + height: 16px; + width: 16px; + vertical-align: top; +} + +.xclip:hover::after { + content: url('/icon/xclip.svg'); + margin-left: 1rem; + height: 16px; + width: 16x; + vertical-align: top; +} + +.xclip:hover { + text-decoration: underline dotted; +} + |] @@ -309,7 +330,7 @@ browserRootPage syn = rootPage do div_ [class_ "channel-list-item"] do h2_ $ toHtml title - a_ [href_ (path [url])] (toHtml (show $ pretty $ AsBase58 rchan)) + p_ $ a_ [href_ (path [url])] (toHtml (show $ pretty $ AsBase58 rchan)) for_ [ s | LitStrVal s <- desc ] $ \s -> do p_ (toHtml s)