From eebc688f376479c0dbfb6331619975f76cdf2f69 Mon Sep 17 00:00:00 2001
From: apfelmaennchen <apfelmaennchen@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Thu, 24 Jan 2008 20:13:08 +0000
Subject: [PATCH] moved Login link to submenu added Folders to add/edit
 bookmark form

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4384 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/Bookmarks.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html
index d72747702..ed5215a80 100644
--- a/htroot/Bookmarks.html
+++ b/htroot/Bookmarks.html
@@ -14,12 +14,10 @@
 		<div class="SubMenu">
 			<h3>Bookmarks</h3>
 			<ul class="SubMenu">
-				<li>
-					<a href="Bookmarks.html?login=true&mode=add" class="MenuItemLink lock">Add Bookmark</a>
-				</li>
-				<li>
-					<a href="Bookmarks.html?login=true&mode=importxml" class="MenuItemLink lock">Import XML Bookmarks</a>
-				</li>
+				<li><a href="Bookmarks.html?login=true&login=true" class="MenuItemLink">Login</a></li>
+				<li><a href="Bookmarks.html?login=true&mode=add" class="MenuItemLink lock">Add Bookmark</a></li>
+				<li><a href="Bookmarks.html?login=true&mode=importxml" class="MenuItemLink lock">Import Bookmarks</a></li>
+				<li><a href="Bookmarks.html?login=true&mode=importxml" class="MenuItemLink lock">Export Bookmarks</a></li>
 			</ul>
 			<p/>
 		</div>
@@ -27,12 +25,9 @@
 		<div class="SubMenu">
 			<h3>Bookmarks</h3>
 			<ul class="SubMenu">
-				<li>
-					<a href="Bookmarks.html?mode=add" class="MenuItemLink lock">Add Bookmark</a>
-				</li>
-				<li>
-					<a href="Bookmarks.html?mode=importxml" class="MenuItemLink lock">Import XML Bookmarks</a>
-				</li>
+				<li><a href="Bookmarks.html?mode=add" class="MenuItemLink lock">Add Bookmark</a></li>
+				<li><a href="Bookmarks.html?mode=importxml" class="MenuItemLink lock">Import Bookmarks</a></li>
+				<li><a href="Bookmarks.html?mode=importxml" class="MenuItemLink lock">Export Bookmarks</a></li>
 			</ul>
 			<p/>
 		</div>
@@ -42,7 +37,7 @@
 				<legend>#(edit)#Add Bookmark::Edit Bookmark#(/edit)#</legend>
 				<dl>
 					<dt>
-						<label for="url">URL:</label>
+						<label for="url">URL:</label>					
 					</dt>
 					<dd>
 						<input type="text" name="url" id="url" value="#[url]#" onblur="loadTitle()" size="80" />
@@ -59,6 +54,12 @@
 					<dd>
 						<input type="text" name="description" id="description" value="#[description]#" size="80" />
 					</dd>
+					<dt>
+						<label for="folder">Folder (/folder/subfolder):</label>
+					</dt>
+					<dd>
+						<input type="text" name="path" id="path" value="#[path]#" size="80" />
+					</dd>
 					<dt>
 						<label for="tags">Tags (comma separated):</label>
 					</dt>
@@ -220,7 +221,7 @@
 				<a href="Bookmarks.html?tag=#[tag]#&amp;start=#[start]#&amp;num=10">10</a>
 				<a href="Bookmarks.html?tag=#[tag]#&amp;start=#[start]#&amp;num=50">50</a>
 				<a href="Bookmarks.html?tag=#[tag]#&amp;start=#[start]#&amp;num=100">100</a>
-                                 Bookmarks per page. #(admin)# - <a href="Bookmarks.html?login=true">Login</a>::#(/admin)#
+                                 Bookmarks per page. 
 			</p>
 		</div>
 		#%env/templates/footer.template%#