diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index 794697b3c..d72747702 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -1,146 +1,146 @@ - - - YaCy '#[clientname]#': Bookmarks + + + YaCy '#[clientname]#': Bookmarks #%env/templates/metas.template%# - - - - + + + + #%env/templates/header.template%# #(mode)# -
-

Bookmarks

- -

-

+
+

Bookmarks

+ +

+

:: -
-

Bookmarks

- -

-

+
+

Bookmarks

+ +

+

:: -
-
- #(edit)#Add Bookmark::Edit Bookmark#(/edit)# -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - -
-
+ +
+ #(edit)#Add Bookmark::Edit Bookmark#(/edit)# +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
#(edit)# -

+

:: -

+

#(/edit)# - -
- + +
+ :: -
-
- Import XML Bookmarks -
-
- -
-
- -
-
- -
-
- -
-
- -
-
+
+
+ Import XML Bookmarks +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
:: -
-
- Import Bookmarks -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
+
+
+ Import Bookmarks +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
#(/mode)#
@@ -157,25 +157,25 @@ - + -
- Tags -

-

- + #{optlist}# #{/optlist}# - + -
-

+ +

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

-
+

+
@@ -187,42 +187,42 @@ with Firefox2 (Linux) and Safari (Mac OS X). Please report any issues with other browsers or operating systems. [apfelmaennchen] -

Bookmark List

+

Bookmark List

#{bookmarks}# -
+

#(public)# - private bookmark + private bookmark :: - public bookmark + public bookmark #(/public)# - #[title]# -

-

#[description]#

-

Tagged with | #{tags}##[tag]# | #{/tags}#

-

- Edit + #[title]# + +

#[description]#

+

Tagged with | #{tags}##[tag]# | #{/tags}#

+

+ Edit / - Delete -

-
+ Delete +

+
#{/bookmarks}#

#(prev-page)# - ::previous page + ::previous page #(/prev-page)# #(next-page)# - ::next page + ::next page #(/next-page)# -

+

Show - 10 - 50 - 100 - Bookmarks per page. -

-
+ 10 + 50 + 100 + Bookmarks per page. #(admin)# - Login::#(/admin)# +

+ #%env/templates/footer.template%# - - + + diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 9ce1f4365..f59760221 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -117,10 +117,13 @@ public class Bookmarks { prop.put("address", address); //defaultvalues - if(isAdmin) + if(isAdmin) { prop.put("mode", "1"); - else - prop.put("mode", "0"); + prop.put("admin", "1"); + } else { + prop.put("mode", "0"); + prop.put("admin", "0"); + } prop.put("mode_edit", "0"); prop.put("mode_title", ""); prop.put("mode_description", ""); @@ -315,7 +318,7 @@ public class Bookmarks { tagCount=0; while (tagsIt.hasNext()) { String tname = tagsIt.next(); - if (!tname.startsWith("/")) { + if ((!tname.startsWith("/")) && (!tname.equals(""))) { prop.put("bookmarks_"+count+"_tags_"+tagCount+"_tag", tname); tagCount++; } @@ -389,7 +392,7 @@ public class Bookmarks { } while(it.hasNext()){ tag=(Tag) it.next(); - if (!tag.getTagName().startsWith("/")) { + if ((!tag.getTagName().startsWith("/")) && (!tag.getTagName().equals(""))) { prop.putHTML(id+"_"+count+"_name", tag.getFriendlyName()); prop.putHTML(id+"_"+count+"_tag", tag.getTagName()); prop.put(id+"_"+count+"_num", tag.size());