X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fframe.html.sh;h=db31ad839b92755f639e77a4191d5f43da8b3a23;hp=4c6cb1dcd2663049672f8d784b97c44e1995c4a4;hb=406ba29b6abd1c12a56d754bf3c1f6aadb27aab6;hpb=356f7bfd0f78d116c95ec0aa940c902378f341dd diff --git a/templates/frame.html.sh b/templates/frame.html.sh index 4c6cb1d..db31ad8 100755 --- a/templates/frame.html.sh +++ b/templates/frame.html.sh @@ -1,6 +1,6 @@ #!/bin/zsh -# Copyright 2014, 2015 Paul Hänsch +# Copyright 2014, 2015, 2017 Paul Hänsch # # This file is part of Confetti. # @@ -20,6 +20,8 @@ . "${_EXEC}/templates/text_frame.sh" [ -x "${_EXEC}/templates/text_${PAGE}.sh" ] && . "${_EXEC}/templates/text_${PAGE}.sh" +bmfile="${_DATA}/mappings/bookmarks" + cat < @@ -27,52 +29,35 @@ cat < $(l10n p_${PAGE}) - + +
- $(debug NAVIGATION = "$NAVIGATION"; for each in ${NAVIGATION}; do printf %s "$(l10n "p_${each}")"; done) + $(sed -rn '/^[^ ]+\t[^ ]+$/p' "$bmfile" \ + | while read page name; do + printf '%s' "${page}" "${name}" + done) + + +
+ $(for page in "${_EXEC}/pages/"*.sh; do + page="${page##*/}" + page="${page%.sh}" + printf '%s' "${page}" "$(l10n "p_${page}")" + done) + $(if grep -qF "$REQUEST_URI" "$bmfile"; then + printf ' + ' \ + "$(attribsafe ${REQUEST_URI})" "$(attribsafe $(grep -F "$REQUEST_URI " "$bmfile" |sed -r 's;.*\t;;'))" "$(l10n bm_del)" + else + printf ' + ' \ + "$(attribsafe ${REQUEST_URI})" "$(l10n Bookmark)" "$(l10n bm_add)" + fi) +
EOF