X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fframe.html.sh;h=90e0e32d76f4b37cebc19ecef93ff95d2d05d001;hp=738ec2994438fc3094f6c66c44bb23c80d193f9a;hb=e8efec5d9a0e2afba62d6212e11e2b637bcb859b;hpb=badf769c566295e6ceaf9a9d80de664c227666a4 diff --git a/templates/frame.html.sh b/templates/frame.html.sh index 738ec29..90e0e32 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,62 +20,51 @@ . "${_EXEC}/templates/text_frame.sh" [ -x "${_EXEC}/templates/text_${PAGE}.sh" ] && . "${_EXEC}/templates/text_${PAGE}.sh" +bmfile="${_DATA}/mappings/bookmarks" + 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 -m1 -F "$REQUEST_URI " "$bmfile" |sed -r 's;.*\t;;'))" \ + "$(l10n bm_del)" + else + printf ' + ' \ + "$(attribsafe ${REQUEST_URI})" "$(l10n Bookmark)" "$(l10n bm_add)" + fi) +
- $(debug BODY; [ -x "${BODY}" ] && . "${BODY}" || printf %s 'Error') - - EOF +debug BODY; [ -x "${BODY}" ] && . "${BODY}" || printf %s 'Error' + +printf '' + # vi:set filetype=html: