# HG changeset patch # User Pascal Bellard # Date 1430658463 -7200 # Node ID d3e416b5fcfc7f07316e56d08e8a70e2a30f8c51 # Parent c99a53b953aaec6b1dc3355ea778f94eb37c87f7 header.html/submenus: no icon in submenu diff -r c99a53b953aa -r d3e416b5fcfc styles/default/header.html --- a/styles/default/header.html Sun May 03 13:23:31 2015 +0200 +++ b/styles/default/header.html Sun May 03 15:07:43 2015 +0200 @@ -2,13 +2,17 @@ export TEXTDOMAIN='tazpanel' extra_menu() { - local i j - for i in menu.d/$1/* ; do - [ -f $i ] && sh $i menu $i - [ -d $i ] || continue - icon="$(sed '/data-icon/!d;s/.*data-icon="\([^"]*\).*/\1/;q' $i/*)" - echo -e "
  • $(gettext "$(basename $i)")\n" - extra_menu ${i#menu.d/} + local x + case "$1" in + */*) filter="s/data-icon=\\\"[^\\\"]*\\\"/data-icon=\\\"\\\"/" ;; + *) filter= ;; + esac + for x in menu.d/$1/* ; do + [ -f $x ] && sh $x menu $x | sed "$filter" + [ -d $x ] || continue + icon="$(sed '/data-icon/!d;s/.*data-icon="\([^"]*\).*/\1/;q' $x/*)" + echo -e "
  • $(_ "$(basename $x)")\n" + extra_menu ${x#menu.d/} echo -e "\n
  • " done }