tazpkg rev 806

pkgs.cgi, tazpkg: tiny edits.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon May 18 17:15:30 2015 +0300 (2015-05-18)
parents 918bafc87bf6
children ea1a73795b18
files tazpanel/pkgs.cgi tazpkg
line diff
     1.1 --- a/tazpanel/pkgs.cgi	Sat May 16 17:37:27 2015 +0300
     1.2 +++ b/tazpanel/pkgs.cgi	Mon May 18 17:15:30 2015 +0300
     1.3 @@ -561,7 +561,7 @@
     1.4  		# List linkable packages.
     1.5  		#
     1.6  		search_form; sidebar
     1.7 -		LOADING_MSG=$(_ 'Listing linkable packages...'); loading_msg
     1.8 +		loading_msg "$(_ 'Listing linkable packages...')"
     1.9  
    1.10  		cat <<EOT
    1.11  <h2>$(_ 'Linkable packages')</h2>
    1.12 @@ -641,7 +641,7 @@
    1.13  		# List all packages by category.
    1.14  		#
    1.15  		search_form; sidebar
    1.16 -		LOADING_MSG="$(_ 'Listing packages...')"; loading_msg
    1.17 +		loading_msg "$(_ 'Listing packages...')"
    1.18  
    1.19  		bcat="<b>$cat</b>"; brepo="<b>$repo</b>"
    1.20  		case $repo in
    1.21 @@ -702,7 +702,7 @@
    1.22  
    1.23  		search_form | sed "s|name=\"search\"|& value=\"$pkg\"|"
    1.24  		sidebar
    1.25 -		LOADING_MSG="$(_ 'Searching packages...')"; loading_msg
    1.26 +		loading_msg "$(_ 'Searching packages...')"
    1.27  
    1.28  		cat <<EOT
    1.29  <h2>$(_ 'Search packages')</h2>
    1.30 @@ -762,7 +762,7 @@
    1.31  		# Lets recharge the packages list
    1.32  		#
    1.33  		search_form; sidebar
    1.34 -		LOADING_MSG="$(_ 'Recharging lists...')"; loading_msg
    1.35 +		loading_msg "$(_ 'Recharging lists...')"
    1.36  
    1.37  		cat <<EOT
    1.38  <h2>$(_ 'Recharge')</h2>
    1.39 @@ -792,7 +792,7 @@
    1.40  		# Upgrade packages
    1.41  		#
    1.42  		search_form; sidebar
    1.43 -		LOADING_MSG="$(_ 'Checking for upgrades...')"; loading_msg
    1.44 +		loading_msg "$(_ 'Checking for upgrades...')"
    1.45  
    1.46  		cat <<EOT
    1.47  <h2>$(_ 'Up packages')</h2>
    1.48 @@ -872,7 +872,7 @@
    1.49  		#
    1.50  		pkg=$(GET info)
    1.51  		search_form; sidebar
    1.52 -		LOADING_MSG=$(_ 'Getting package info...'); loading_msg
    1.53 +		loading_msg "$(_ 'Getting package info...')"
    1.54  
    1.55  		cat <<EOT
    1.56  <section>
    1.57 @@ -1052,7 +1052,7 @@
    1.58  EOT
    1.59  		case "$(GET action)" in
    1.60  			saveconf)
    1.61 -				LOADING_MSG=$(_ 'Creating the package...'); loading_msg
    1.62 +				loading_msg "$(_ 'Creating the package...')"
    1.63  				echo "<pre>"
    1.64  				cd /tmp
    1.65  				tazpkg repack-config | filter_taztools_msgs
    1.66 @@ -1070,12 +1070,12 @@
    1.67  				done
    1.68  				echo "</ul>" ;;
    1.69  			quickcheck)
    1.70 -				LOADING_MSG=$(_ 'Checking packages consistency...'); loading_msg
    1.71 +				loading_msg "$(_ 'Checking packages consistency...')"
    1.72  				echo "<pre>"
    1.73  				tazpkg check
    1.74  				echo "</pre>" ;;
    1.75  			fullcheck)
    1.76 -				LOADING_MSG=$(_ 'Full packages check...'); loading_msg
    1.77 +				loading_msg "$(_ 'Full packages check...')"
    1.78  				echo "<pre>"
    1.79  				tazpkg check --full
    1.80  				echo "</pre>" ;;
    1.81 @@ -1575,10 +1575,10 @@
    1.82  		#
    1.83  		# Default to summary
    1.84  		#
    1.85 -		search_form; sidebar
    1.86 +		search_form; sidebar; loading_msg
    1.87  
    1.88  		cat <<EOT
    1.89 -<form id="actions2">
    1.90 +<form>
    1.91  EOT
    1.92  		fslink=$(readlink $PKGS_DB/fslink)
    1.93  		[ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && show_button linkable
     2.1 --- a/tazpkg	Sat May 16 17:37:27 2015 +0300
     2.2 +++ b/tazpkg	Mon May 18 17:15:30 2015 +0300
     2.3 @@ -2351,7 +2351,8 @@
     2.4  list, a list of differences will be displayed to show new and upgradeable \
     2.5  packages.")"
     2.6  			fi
     2.7 -		done ;;
     2.8 +		done
     2.9 +		newline ;;
    2.10  
    2.11  
    2.12  	help-up)