tazpkg rev 776
pkgs.cgi: package info: show packages list as pending operation using AJAX.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Apr 10 00:12:46 2015 +0300 (2015-04-10) |
| parents | fbc217002307 |
| children | cd0d92245a1a |
| files | po/el.po po/es.po po/fr.po po/pl.po po/pt_BR.po po/ru.po po/sv.po po/tazpkg.pot po/zh_CN.po po/zh_TW.po tazpanel/pkgs.cgi tazpkg |
line diff
1.1 --- a/po/el.po Thu Apr 09 22:55:48 2015 +0200 1.2 +++ b/po/el.po Fri Apr 10 00:12:46 2015 +0300 1.3 @@ -1526,8 +1526,8 @@ 1.4 msgstr "Προτεινόμενα" 1.5 1.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 1.7 -msgid "Installed files: %s" 1.8 -msgstr "Εγκατεστημένα αρχεία: %s" 1.9 +msgid "Installed files" 1.10 +msgstr "Εγκατεστημένα αρχεία" 1.11 1.12 #: tazpanel/pkgs.cgi:894 1.13 msgid "TazPkg administration and settings"
2.1 --- a/po/es.po Thu Apr 09 22:55:48 2015 +0200 2.2 +++ b/po/es.po Fri Apr 10 00:12:46 2015 +0300 2.3 @@ -1558,8 +1558,8 @@ 2.4 msgstr "Sugerido" 2.5 2.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 2.7 -msgid "Installed files: %s" 2.8 -msgstr "Archivos instalados: %s" 2.9 +msgid "Installed files" 2.10 +msgstr "Archivos instalados" 2.11 2.12 #: tazpanel/pkgs.cgi:894 2.13 msgid "TazPkg administration and settings"
3.1 --- a/po/fr.po Thu Apr 09 22:55:48 2015 +0200 3.2 +++ b/po/fr.po Fri Apr 10 00:12:46 2015 +0300 3.3 @@ -1461,8 +1461,8 @@ 3.4 msgstr "Suggéré" 3.5 3.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 3.7 -msgid "Installed files: %s" 3.8 -msgstr "Fichiers installés : %s" 3.9 +msgid "Installed files" 3.10 +msgstr "Fichiers installés" 3.11 3.12 #: tazpanel/pkgs.cgi:894 3.13 msgid "TazPkg administration and settings"
4.1 --- a/po/pl.po Thu Apr 09 22:55:48 2015 +0200 4.2 +++ b/po/pl.po Fri Apr 10 00:12:46 2015 +0300 4.3 @@ -1541,8 +1541,8 @@ 4.4 msgstr "Sugerowane :" 4.5 4.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 4.7 -msgid "Installed files: %s" 4.8 -msgstr "Zainstalowanych plików: %s" 4.9 +msgid "Installed files" 4.10 +msgstr "Zainstalowanych plików" 4.11 4.12 #: tazpanel/pkgs.cgi:894 4.13 msgid "TazPkg administration and settings"
5.1 --- a/po/pt_BR.po Thu Apr 09 22:55:48 2015 +0200 5.2 +++ b/po/pt_BR.po Fri Apr 10 00:12:46 2015 +0300 5.3 @@ -1494,8 +1494,8 @@ 5.4 msgstr "Sugeridos:" 5.5 5.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 5.7 -msgid "Installed files: %s" 5.8 -msgstr "Arquivos instalados: %s" 5.9 +msgid "Installed files" 5.10 +msgstr "Arquivos instalados" 5.11 5.12 #: tazpanel/pkgs.cgi:894 5.13 msgid "TazPkg administration and settings"
6.1 --- a/po/ru.po Thu Apr 09 22:55:48 2015 +0200 6.2 +++ b/po/ru.po Fri Apr 10 00:12:46 2015 +0300 6.3 @@ -1512,8 +1512,8 @@ 6.4 msgstr "Предлагает" 6.5 6.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 6.7 -msgid "Installed files: %s" 6.8 -msgstr "Установленные файлы: %s" 6.9 +msgid "Installed files" 6.10 +msgstr "Установленные файлы" 6.11 6.12 #: tazpanel/pkgs.cgi:894 6.13 msgid "TazPkg administration and settings"
7.1 --- a/po/sv.po Thu Apr 09 22:55:48 2015 +0200 7.2 +++ b/po/sv.po Fri Apr 10 00:12:46 2015 +0300 7.3 @@ -1519,8 +1519,8 @@ 7.4 msgstr "Föreslagen:" 7.5 7.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 7.7 -msgid "Installed files: %s" 7.8 -msgstr "Installerade filer: %s" 7.9 +msgid "Installed files" 7.10 +msgstr "Installerade filer" 7.11 7.12 #: tazpanel/pkgs.cgi:894 7.13 msgid "TazPkg administration and settings"
8.1 --- a/po/tazpkg.pot Thu Apr 09 22:55:48 2015 +0200 8.2 +++ b/po/tazpkg.pot Fri Apr 10 00:12:46 2015 +0300 8.3 @@ -1442,7 +1442,7 @@ 8.4 msgstr "" 8.5 8.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 8.7 -msgid "Installed files: %s" 8.8 +msgid "Installed files" 8.9 msgstr "" 8.10 8.11 #: tazpanel/pkgs.cgi:894
9.1 --- a/po/zh_CN.po Thu Apr 09 22:55:48 2015 +0200 9.2 +++ b/po/zh_CN.po Fri Apr 10 00:12:46 2015 +0300 9.3 @@ -1474,8 +1474,8 @@ 9.4 msgstr "建议:" 9.5 9.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 9.7 -msgid "Installed files: %s" 9.8 -msgstr "已安装文件: %s" 9.9 +msgid "Installed files" 9.10 +msgstr "已安装文件" 9.11 9.12 #: tazpanel/pkgs.cgi:894 9.13 msgid "TazPkg administration and settings"
10.1 --- a/po/zh_TW.po Thu Apr 09 22:55:48 2015 +0200 10.2 +++ b/po/zh_TW.po Fri Apr 10 00:12:46 2015 +0300 10.3 @@ -1477,8 +1477,8 @@ 10.4 msgstr "建議:" 10.5 10.6 #: tazpanel/pkgs.cgi:836 tazpanel/pkgs.cgi:843 10.7 -msgid "Installed files: %s" 10.8 -msgstr "已安裝文件: %s" 10.9 +msgid "Installed files" 10.10 +msgstr "已安裝文件" 10.11 10.12 #: tazpanel/pkgs.cgi:894 10.13 msgid "TazPkg administration and settings"
11.1 --- a/tazpanel/pkgs.cgi Thu Apr 09 22:55:48 2015 +0200 11.2 +++ b/tazpanel/pkgs.cgi Fri Apr 10 00:12:46 2015 +0300 11.3 @@ -15,6 +15,8 @@ 11.4 . /etc/slitaz/slitaz.conf 11.5 . /etc/slitaz/tazpkg.conf 11.6 11.7 +export TEXTDOMAIN='tazpkg' 11.8 + 11.9 get_config 11.10 11.11 _() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; } 11.12 @@ -23,9 +25,11 @@ 11.13 local S="$1" P="$2" N="$3"; shift 3; 11.14 printf "$(ngettext "$S" "$P" "$N")" "$@"; } 11.15 11.16 + 11.17 #------ 11.18 # menu 11.19 #------ 11.20 + 11.21 case "$1" in 11.22 menu) 11.23 TEXTDOMAIN_original=$TEXTDOMAIN 11.24 @@ -47,13 +51,54 @@ 11.25 exit 11.26 esac 11.27 11.28 + 11.29 header 11.30 11.31 + 11.32 +# AJAX commands 11.33 + 11.34 +case " $(GET) " in 11.35 + 11.36 + 11.37 + *\ filelist\ * ) 11.38 + # Show installed files list 11.39 + pkg=$(GET pkg) 11.40 + cd $PKGS_DB 11.41 + 11.42 + if [ -d $INSTALLED/$pkg ]; then 11.43 + files="$(wc -l < $INSTALLED/$pkg/files.list)" 11.44 + cat << EOT 11.45 + <pre class="scroll">$(sort $INSTALLED/$pkg/files.list)</pre> 11.46 + <footer>$(_p '%s file' '%s files' $files $files)</footer> 11.47 +EOT 11.48 + else 11.49 + cat << EOT 11.50 + <pre class="scroll">$(lzcat files.list.lzma undigest/*/files.list.lzma \ 11.51 + 2>/dev/null | awk -vp="$pkg:" '$1==p{print $2}' | sort)</pre> 11.52 +EOT 11.53 + fi 11.54 + exit 0 ;; 11.55 + 11.56 + 11.57 + *\ status\ * ) 11.58 + # Show package status 11.59 + pkg=$(GET pkg) 11.60 + class='pkg' 11.61 + 11.62 + if grep -q "^$PACKAGE"$'\t' $PKGS_DB/installed.info; then 11.63 + class='pkgi' 11.64 + grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib' 11.65 + fi 11.66 + 11.67 + exit 0 ;; 11.68 + 11.69 +esac 11.70 + 11.71 + 11.72 # xHTML 5 header with special side bar for categories. 11.73 TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages') 11.74 xhtml_header | sed 's/id="content"/id="content-sidebar"/' 11.75 11.76 -export TEXTDOMAIN='tazpkg' 11.77 11.78 pkg_info_link() { 11.79 echo "<a data-icon=\"$2\" href=\"?info=${1//+/%2B}\">$1</a>" | sed 's| data-icon=""||' 11.80 @@ -830,21 +875,15 @@ 11.81 EOT 11.82 11.83 # Show installed files list 11.84 - if [ -d $INSTALLED/$pkg ]; then 11.85 - cat << EOT 11.86 + cat <<EOT 11.87 <section> 11.88 - <header>$(_ 'Installed files: %s' $(wc -l < $INSTALLED/$pkg/files.list))</header> 11.89 - <pre>$(sort $INSTALLED/$pkg/files.list)</pre> 11.90 + <header>$(_ 'Installed files')</header> 11.91 + <span id="fileList"> 11.92 + <div style="text-align: center;"><span id="ajaxStatus"></span>$(_ 'Please wait')</div> 11.93 + </span> 11.94 </section> 11.95 +<script type="text/javascript">ajax('pkgs.cgi?filelist&pkg=$pkg', '1', 'fileList');</script> 11.96 EOT 11.97 - else 11.98 - cat << EOT 11.99 -<section> 11.100 - <header>$(_ 'Installed files: %s' ' ')</header> 11.101 - <pre>$(lzcat files.list.lzma undigest/*/files.list.lzma 2> /dev/null | awk -vp="$pkg:" '$1==p{print $2}' | sort)</pre> 11.102 -</section> 11.103 -EOT 11.104 - fi 11.105 ;; 11.106 11.107
12.1 --- a/tazpkg Thu Apr 09 22:55:48 2015 +0200 12.2 +++ b/tazpkg Fri Apr 10 00:12:46 2015 +0300 12.3 @@ -1921,7 +1921,7 @@ 12.4 cd $DESTDIR 12.5 extract_package 12.6 [ -e "receipt" ] && \ 12.7 - footer "$(_ 'Package "%s" is extracted to "%s"') $PACKAGE $DESTDIR" 12.8 + footer "$(_ 'Package "%s" is extracted to "%s"' $PACKAGE $DESTDIR)" 12.9 ;; 12.10 12.11