summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-02-29 23:13:51 +0100
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-02-29 23:13:51 +0100
commit4853842b5f8ae85f6331f7361b6cc69d9390767a (patch)
tree7ce0d4c887b4986f2d2fc98b3b1c7b3f967a36b5 /src
parent9a38fec9b6552798bb341ce92f40d1ec92865a73 (diff)
Book Marx: Improve page layout by moving all authlinks to the bottom.
Diffstat (limited to 'src')
-rw-r--r--src/mulk/benki/book_marx.clj12
-rw-r--r--src/mulk/benki/webutil.clj4
2 files changed, 7 insertions, 9 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"]])))