# HG changeset patch # User Aleksej Bobylev # Date 1428613966 -10800 # Node ID c62e153dab378fb0c828f2821361d08335bb1aa7 # Parent fbc217002307361f43bdaf299e4ad84ff71b419a pkgs.cgi: package info: show packages list as pending operation using AJAX. diff -r fbc217002307 -r c62e153dab37 po/el.po --- a/po/el.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/el.po Fri Apr 10 00:12:46 2015 +0300 @@ -1526,8 +1526,8 @@ msgstr "Προτεινόμενα" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Εγκατεστημένα αρχεία: %s" +msgid "Installed files" +msgstr "Εγκατεστημένα αρχεία" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/es.po --- a/po/es.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/es.po Fri Apr 10 00:12:46 2015 +0300 @@ -1558,8 +1558,8 @@ msgstr "Sugerido" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Archivos instalados: %s" +msgid "Installed files" +msgstr "Archivos instalados" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/fr.po --- a/po/fr.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/fr.po Fri Apr 10 00:12:46 2015 +0300 @@ -1461,8 +1461,8 @@ msgstr "Suggéré" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Fichiers installés : %s" +msgid "Installed files" +msgstr "Fichiers installés" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/pl.po --- a/po/pl.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/pl.po Fri Apr 10 00:12:46 2015 +0300 @@ -1541,8 +1541,8 @@ msgstr "Sugerowane :" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Zainstalowanych plików: %s" +msgid "Installed files" +msgstr "Zainstalowanych plików" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/pt_BR.po --- a/po/pt_BR.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/pt_BR.po Fri Apr 10 00:12:46 2015 +0300 @@ -1494,8 +1494,8 @@ msgstr "Sugeridos:" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Arquivos instalados: %s" +msgid "Installed files" +msgstr "Arquivos instalados" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/ru.po --- a/po/ru.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/ru.po Fri Apr 10 00:12:46 2015 +0300 @@ -1512,8 +1512,8 @@ msgstr "Предлагает" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Установленные файлы: %s" +msgid "Installed files" +msgstr "Установленные файлы" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/sv.po --- a/po/sv.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/sv.po Fri Apr 10 00:12:46 2015 +0300 @@ -1519,8 +1519,8 @@ msgstr "Föreslagen:" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "Installerade filer: %s" +msgid "Installed files" +msgstr "Installerade filer" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/tazpkg.pot --- a/po/tazpkg.pot Thu Apr 09 22:55:48 2015 +0200 +++ b/po/tazpkg.pot Fri Apr 10 00:12:46 2015 +0300 @@ -1442,7 +1442,7 @@ msgstr "" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" +msgid "Installed files" msgstr "" #: tazpanel/pkgs.cgi:894 diff -r fbc217002307 -r c62e153dab37 po/zh_CN.po --- a/po/zh_CN.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/zh_CN.po Fri Apr 10 00:12:46 2015 +0300 @@ -1474,8 +1474,8 @@ msgstr "建议:" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "已安装文件: %s" +msgid "Installed files" +msgstr "已安装文件" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 po/zh_TW.po --- a/po/zh_TW.po Thu Apr 09 22:55:48 2015 +0200 +++ b/po/zh_TW.po Fri Apr 10 00:12:46 2015 +0300 @@ -1477,8 +1477,8 @@ msgstr "建議:" #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 -msgid "Installed files: %s" -msgstr "已安裝文件: %s" +msgid "Installed files" +msgstr "已安裝文件" #: tazpanel/pkgs.cgi:894 msgid "TazPkg administration and settings" diff -r fbc217002307 -r c62e153dab37 tazpanel/pkgs.cgi --- a/tazpanel/pkgs.cgi Thu Apr 09 22:55:48 2015 +0200 +++ b/tazpanel/pkgs.cgi Fri Apr 10 00:12:46 2015 +0300 @@ -15,6 +15,8 @@ . /etc/slitaz/slitaz.conf . /etc/slitaz/tazpkg.conf +export TEXTDOMAIN='tazpkg' + get_config _() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; } @@ -23,9 +25,11 @@ local S="$1" P="$2" N="$3"; shift 3; printf "$(ngettext "$S" "$P" "$N")" "$@"; } + #------ # menu #------ + case "$1" in menu) TEXTDOMAIN_original=$TEXTDOMAIN @@ -47,13 +51,54 @@ exit esac + header + +# AJAX commands + +case " $(GET) " in + + + *\ filelist\ * ) + # Show installed files list + pkg=$(GET pkg) + cd $PKGS_DB + + if [ -d $INSTALLED/$pkg ]; then + files="$(wc -l < $INSTALLED/$pkg/files.list)" + cat << EOT +
$(sort $INSTALLED/$pkg/files.list)
+ +EOT + else + cat << EOT +
$(lzcat files.list.lzma undigest/*/files.list.lzma \
+		2>/dev/null | awk -vp="$pkg:" '$1==p{print $2}' | sort)
+EOT + fi + exit 0 ;; + + + *\ status\ * ) + # Show package status + pkg=$(GET pkg) + class='pkg' + + if grep -q "^$PACKAGE"$'\t' $PKGS_DB/installed.info; then + class='pkgi' + grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib' + fi + + exit 0 ;; + +esac + + # xHTML 5 header with special side bar for categories. TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages') xhtml_header | sed 's/id="content"/id="content-sidebar"/' -export TEXTDOMAIN='tazpkg' pkg_info_link() { echo "$1" | sed 's| data-icon=""||' @@ -830,21 +875,15 @@ EOT # Show installed files list - if [ -d $INSTALLED/$pkg ]; then - cat << EOT + cat < -
$(_ 'Installed files: %s' $(wc -l < $INSTALLED/$pkg/files.list))
-
$(sort $INSTALLED/$pkg/files.list)
+
$(_ 'Installed files')
+ +
$(_ 'Please wait')
+
+ EOT - else - cat << EOT -
-
$(_ 'Installed files: %s' ' ')
-
$(lzcat files.list.lzma undigest/*/files.list.lzma 2> /dev/null | awk -vp="$pkg:" '$1==p{print $2}' | sort)
-
-EOT - fi ;; diff -r fbc217002307 -r c62e153dab37 tazpkg --- a/tazpkg Thu Apr 09 22:55:48 2015 +0200 +++ b/tazpkg Fri Apr 10 00:12:46 2015 +0300 @@ -1921,7 +1921,7 @@ cd $DESTDIR extract_package [ -e "receipt" ] && \ - footer "$(_ 'Package "%s" is extracted to "%s"') $PACKAGE $DESTDIR" + footer "$(_ 'Package "%s" is extracted to "%s"' $PACKAGE $DESTDIR)" ;;