From 214e37b6e3cd53e8957a63f3ac4191848b3fdf8a Mon Sep 17 00:00:00 2001 From: daburna Date: Mon, 7 Jan 2008 20:01:53 +0000 Subject: [PATCH] added changes made by apfelmaennchen git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4307 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Bookmarks.html | 55 ++++++++++++++++++++++++++++++------------- htroot/Bookmarks.java | 3 +++ htroot/env/base.css | 10 ++++---- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index 41083d96e..7a93dd3ad 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -9,14 +9,23 @@ #%env/templates/header.template%# -

Bookmarks

- #(mode)# -
Login
- :: -
- Add Bookmark - Import XML Bookmarks - + #(mode)# +
+

Bookmarks

+ +

+

+ :: +
+

Bookmarks

+ +

::
@@ -89,15 +98,27 @@
#(/mode)# -
-

Tags

-
    -
  • All (#[num-bookmarks]#)
    • - #{taglist}# -
  • #[name]# (#[num]#)
    • - #{/taglist}# -
-
+
+
+ Tags +

+

+ + +
+

+

+ #{taglist}# + #[name]# + #{/taglist}# +

+
+

Bookmark List

#{bookmarks}# diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index e08653788..f43db007c 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -52,6 +52,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Set; +import java.lang.Math; + import de.anomic.data.bookmarksDB; import de.anomic.data.listManager; import de.anomic.data.userDB; @@ -247,6 +249,7 @@ public class Bookmarks { prop.putHTML("taglist_"+count+"_name", tag.getFriendlyName()); prop.putHTML("taglist_"+count+"_tag", tag.getTagName()); prop.put("taglist_"+count+"_num", tag.size()); + prop.put("taglist_"+count+"_size", 1.1+(Math.log(tag.size())/4)); count++; } prop.put("taglist", count); diff --git a/htroot/env/base.css b/htroot/env/base.css index e1d6001df..ecae6a505 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -222,10 +222,10 @@ tt, *.tt {
*/ -div.Tags { +div.TagList { float:right; - width:12em; - text-align:right; + width:25em; + text-align:left; padding-left: 5px; } @@ -271,8 +271,8 @@ div.ProgressBarFill { top: 0px; } -div.bookmarkList, div.Tags { - margin-top:1em; +div.bookmarkList { + margin-top:3em; } div.bookmark {