# HG changeset patch # User Aleksej Bobylev # Date 1428616910 -10800 # Node ID 77d13290c89cc846bcd898266ec8a4f5a97e8896 # Parent 5a23f8f56323dd0a29ee54e94ec88bad56e3de7e Tiny edits: fix linking if tazpanel installed to host, fix .scroll height, fix textdomain in the menu. diff -r 5a23f8f56323 -r 77d13290c89c Makefile --- a/Makefile Thu Apr 09 23:15:45 2015 +0200 +++ b/Makefile Fri Apr 10 01:01:50 2015 +0300 @@ -46,6 +46,7 @@ cp -a tazpanel $(DESTDIR)$(PREFIX)/bin -[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel cp -a *.cgi lib/ styles/ doc/ README* $(DESTDIR)$(PANEL) + if [ -e $(DESTDIR)$(PANEL)/user ] ; then rm -rf $(DESTDIR)$(PANEL)/user; fi ln -s . $(DESTDIR)$(PANEL)/user cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale cp -a data/*.conf $(DESTDIR)$(SYSCONFDIR) diff -r 5a23f8f56323 -r 77d13290c89c styles/default/base.css --- a/styles/default/base.css Thu Apr 09 23:15:45 2015 +0200 +++ b/styles/default/base.css Fri Apr 10 01:01:50 2015 +0300 @@ -161,9 +161,9 @@ section table { margin-bottom: 0.3rem; } .nogap { word-spacing: 0; } /* remove gap between buttons in line */ -.scroll { height: 12rem; overflow: auto; border: 1pt solid; } -section .scroll { padding: 0; margin: 0; } - +.scroll { max-height: 12rem; overflow: auto; } +section .scroll { padding: 0; margin: 0; border: 1pt solid; } +section pre.scroll { margin: 0.1rem; padding: 0.1rem; } diff -r 5a23f8f56323 -r 77d13290c89c styles/default/header.html --- a/styles/default/header.html Thu Apr 09 23:15:45 2015 +0200 +++ b/styles/default/header.html Fri Apr 10 01:01:50 2015 +0300 @@ -1,4 +1,5 @@ rootclass='user'; [ $(id -u) == '0' ] && rootclass='root' +export TEXTDOMAIN='tazpanel' cat << EOT