X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fframe.html.sh;h=a2d8feefe579e5bd95222de7089247fcce26f78a;hp=5fd6e7c971137a25043f7f1ec4215793ebdd88f5;hb=3b1ba429c9c2f361e62041037d9555d92bbeb6c1;hpb=015242823eb4a79cf615bef6951b0af6bd0a5b01 diff --git a/templates/frame.html.sh b/templates/frame.html.sh index 5fd6e7c..a2d8fee 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,56 +29,42 @@ 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\n' "${page}" "$(l10n "p_${page}")" + done |grep -E '^ + ' \ + "$(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: