From 5cacb437d2896b2a656a2a944e76915cb95dbe7b Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 9 Dec 2017 19:18:58 +0000 Subject: [PATCH] added footer, improved git integration, automatic http:// prefix for urls svn path=/trunk/; revision=15 --- bookmarks.css | 13 ++++++++++--- import.sh | 4 +++- index.cgi | 11 +++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/bookmarks.css b/bookmarks.css index e37d70a..e210965 100644 --- a/bookmarks.css +++ b/bookmarks.css @@ -9,9 +9,8 @@ box-sizing: border-box; } -html, body { - background-color: #DDD; -} +html, body { background-color: #DDD; } +body { position: absolute; width: 100%; min-height: 100%; } .folder, form.newfolder{ display: block; @@ -171,3 +170,11 @@ html, body { margin: 0 .5ex; } +footer { + position: absolute; bottom: 0; + display: block; + width: 100%; + padding: 1em; + background-color: white; + border-top: 1px solid black; +} diff --git a/import.sh b/import.sh index aec5ba1..1c8e1ad 100755 --- a/import.sh +++ b/import.sh @@ -25,7 +25,9 @@ import="$1" order=1000 BDB="users/$(genid)" -mkdir -p "${BDB}/favicons" +mkdir users/ +git init "${BDB}" || mkdir "${BDB}" +mkdir "${BDB}/favicons" while read l; do case "$l" in diff --git a/index.cgi b/index.cgi index 911e5ee..0397816 100755 --- a/index.cgi +++ b/index.cgi @@ -93,7 +93,7 @@ BDB="users/${COKID}" if [ -n "$QRYID" ]; then printf '%s 303 See Other\r\n' "$SERVER_PROTOCOL" - printf 'Location: %s\r\n' "${SCRIPT_NAME}?${QUERY_STRING#id=*&}" + printf 'Location: %s\r\n' "${SCRIPT_NAME}?${QUERY_STRING#id=????????????}" SET_COOKIE +8640000 "id=${QRYID}" printf '\r\n' exit 0 @@ -174,10 +174,10 @@ case "$(GET action)" in tfile="${BDB}/${target}.bm" if [ "$(POST control)" = confirm -a -f "$file" ]; then if [ "$target" = "____________" ]; then - rm -f "$file" >&- + rm -f "$file" "${file%.bm}.cache" >&- git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" >&- elif tail -n+2 "$file" >>"$tfile"; then - rm -f "$file" >&- + rm -f "$file" "${file%.bm}.cache" >&- git -C "${BDB}" commit -m "Deleted folder ${fid}" -- "${fid}.bm" "${target}.bm" >&- fi fi @@ -288,7 +288,6 @@ bookmarkgen(){ url="$(GET nbmurl)" file="${BDB}/${fid}.bm" - [ "$url" = "${url#*://}" ] && url="http://$url" if [ -z "$name" -a -n "$url" ]; then name="$(wget -O- "$url" \ | head -c4096 \ @@ -297,6 +296,7 @@ bookmarkgen(){ fi if [ -n "$fid" -o -n "$name" -o -n "$url" ]; then + [ "$url" = "${url#*://}" ] && url="http://$url" cat <<-EOF

New Bookmark

@@ -496,6 +496,9 @@ cat < + EOF -- 2.39.2