diff options
| -rw-r--r-- | src/mulk/benki/book_marx.clj | 12 | ||||
| -rw-r--r-- | src/mulk/benki/webutil.clj | 4 | ||||
| -rw-r--r-- | static/style/bookmarx.css | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/mulk/benki/book_marx.clj b/src/mulk/benki/book_marx.clj index ef5da7e..c74ac63 100644 --- a/src/mulk/benki/book_marx.clj +++ b/src/mulk/benki/book_marx.clj @@ -104,15 +104,15 @@ [:span {:class "bookmark-owner"} " by " (escape-html (:first_name mark))]] [:div {:class "bookmark-description"} (htmlize-description (:description mark))]])]] - [:div {:id "bookmarx-feed-link"} + [:div {:id "bookmarx-footer"} (let [feed-link (linkrel :marx :feed)] - [:span {:id "bookmarx-feed-link-text"} - [:a {:href (resolve-uri feed-link)} "Atom"] + [:span {:id "bookmarx-footer-text"} + "[" [:a {:href (resolve-uri feed-link)} "Atom"] "]" (when *user* (list - " [" - [:a {:href (resolve-uri (authlink feed-link))} "authlink"] - "]"))])])))) + " [" [:a {:href (resolve-uri (authlink feed-link))} "Atom auth"] "]" + " [" [:a {:href (authlink (:uri (request/ring-request)))} "authlink"] "]"))])])))) + (defn marx-feed-for-user [user] (let [marks (bookmarks-visible-by user)] diff --git a/src/mulk/benki/webutil.clj b/src/mulk/benki/webutil.clj index cf34724..7eeb294 100644 --- a/src/mulk/benki/webutil.clj +++ b/src/mulk/benki/webutil.clj @@ -39,7 +39,5 @@ (first results))))] (if *user* [:div {:class "logged-in-as"} - (:first_name user) " " (:last_name user) - " " - "[" [:a {:href (authlink (:uri (request/ring-request)))} "authlink"] "]"] + (:first_name user) " " (:last_name user)] [:div {:class "not-logged-in"} [:a {:href (link :login)} "Log in"]]))) diff --git a/static/style/bookmarx.css b/static/style/bookmarx.css index ea9b855..d8e6b7d 100644 --- a/static/style/bookmarx.css +++ b/static/style/bookmarx.css @@ -10,7 +10,7 @@ margin-bottom: 1em; } -#bookmarx-feed-link { +#bookmarx-footer { text-align: right; position: relative; padding: 0.5em 0.5em 0.5em 0.5em; @@ -19,7 +19,7 @@ font-style: oblique; } -#bookmarx-feed-link-text { +#bookmarx-footer-text { padding: 0.5em 1em 0.5em 1em; border: solid 1px #000; background-color: orange; |