tazpanel diff pkgs.cgi @ rev 304
Added tag 1.5.5 for changeset fdfc6b494539
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri May 04 13:16:25 2012 +0300 (2012-05-04) |
| parents | 72e9955ebdff |
| children | 3e9acc16f728 |
line diff
1.1 --- a/pkgs.cgi Wed Apr 11 20:12:41 2012 +0300 1.2 +++ b/pkgs.cgi Fri May 04 13:16:25 2012 +0300 1.3 @@ -27,46 +27,53 @@ 1.4 IFS="|" 1.5 cut -f 1,2,3,5 -d "|" | while read PACKAGE VERSION SHORT_DESC WEB_SITE 1.6 do 1.7 - echo '<tr>' 1.8 - if [ -d $INSTALLED/${PACKAGE% } ]; then 1.9 - echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n 1.10 - <a href='$(pkg_info_link $PACKAGE)'> 1.11 - <img src='$IMAGES/tazpkg-installed.png'/>$PACKAGE</a></td>" 1.12 - else 1.13 - echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n 1.14 - <a href='$(pkg_info_link $PACKAGE)'> 1.15 - <img src='$IMAGES/tazpkg.png'/>$PACKAGE</a></td>" 1.16 - fi 1.17 - echo "<td>$VERSION</td>" 1.18 - echo "<td class='desc'>$SHORT_DESC</td>" 1.19 - echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>" 1.20 - echo '</tr>' 1.21 + image=tazpkg-installed.png 1.22 + [ -d $INSTALLED/${PACKAGE% } ] || image=tazpkg.png 1.23 + cat << EOT 1.24 +<tr> 1.25 +<td><input type="checkbox" name="pkg" value="$PACKAGE"> 1.26 + <a href="$(pkg_info_link $PACKAGE)"><img 1.27 + src="$IMAGES/$image"/>$PACKAGE</a></td> 1.28 +<td>$VERSION</td> 1.29 +<td class="desc">$SHORT_DESC</td> 1.30 +<td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td> 1.31 +</tr> 1.32 +EOT 1.33 done 1.34 unset IFS 1.35 } 1.36 1.37 # Display a full summary of packages stats 1.38 packages_summary() { 1.39 - gettext "Last recharge : " 1.40 - stat=`stat -c %y $LOCALSTATE/packages.list | \ 1.41 - sed 's/\(:..\):.*/\1/' | awk '{print $1}'` 1.42 - mtime=`find $LOCALSTATE/packages.list -mtime +10` 1.43 - echo -n "$stat " 1.44 + cat << EOT 1.45 +<table class="zebra"> 1.46 +<tbody> 1.47 +<tr><td>$(gettext 'Last recharge:')</td> 1.48 +EOT 1.49 + stat=$(stat -c %y $LOCALSTATE/packages.list | \ 1.50 + sed 's/\(:..\):.*/\1/' | awk '{print $1}') 1.51 + mtime=$(find $LOCALSTATE/packages.list -mtime +10) 1.52 + echo -n "<td>$stat " 1.53 if [ "$mtime" ]; then 1.54 - echo "(Older than 10 days)" 1.55 + gettext '(Older than 10 days)'; echo 1.56 else 1.57 - echo "(Not older than 10 days)" 1.58 + gettext '(Not older than 10 days)'; echo 1.59 fi 1.60 - gettext "Installed packages : " 1.61 - ls $INSTALLED | wc -l 1.62 - gettext "Mirrored packages : " 1.63 - cat $LOCALSTATE/packages.list | wc -l 1.64 - gettext "Upgradeable packages : " 1.65 - cat $LOCALSTATE/packages.up | wc -l 1.66 - #gettext "Installed files : " 1.67 - #cat $INSTALLED/*/files.list | wc -l 1.68 - gettext "Blocked packages : " 1.69 - cat $LOCALSTATE/blocked-packages.list | wc -l 1.70 + cat << EOT 1.71 +</td></tr> 1.72 +<tr><td>$(gettext 'Installed packages:')</td> 1.73 + <td>$(ls $INSTALLED | wc -l)</td></tr> 1.74 +<tr><td>$(gettext 'Mirrored packages:')</td> 1.75 + <td>$(cat $LOCALSTATE/packages.list | wc -l)</td></tr> 1.76 +<tr><td>$(gettext 'Upgradeable packages:')</td> 1.77 + <td>$(cat $LOCALSTATE/packages.up | wc -l)</td></tr> 1.78 +<tr><td>$(gettext 'Installed files:')</td> 1.79 + <td>$(cat $INSTALLED/*/files.list | wc -l)</td></tr> 1.80 +<tr><td>$(gettext 'Blocked packages:')</td> 1.81 + <td>$(cat $LOCALSTATE/blocked-packages.list | wc -l)</td></tr> 1.82 +</tbody> 1.83 +</table> 1.84 +EOT 1.85 } 1.86 1.87 # Parse mirrors list to be able to have an icon and remove link 1.88 @@ -76,10 +83,10 @@ 1.89 cat << EOT 1.90 <li> 1.91 <a href="$SCRIPT_NAME?admin=rm-mirror=$line&file=$(httpd -e $1)"> 1.92 - <img src="$IMAGES/clear.png" /> 1.93 + <img src="$IMAGES/clear.png" title="$(gettext 'Delete')" /> 1.94 </a> 1.95 <a href="$SCRIPT_NAME?admin=select-mirror&mirror=$line"> 1.96 - <img src="$IMAGES/start.png" /> 1.97 + <img src="$IMAGES/start.png" title="$(gettext 'Use as default')" /> 1.98 </a> 1.99 <a href="$line">$line</a> 1.100 </li> 1.101 @@ -110,9 +117,9 @@ 1.102 <form method="get" action="$SCRIPT_NAME"> 1.103 <p> 1.104 <input type="text" name="search" size="20"> 1.105 - <input type="submit" value="`gettext "Search"`"> 1.106 + <input type="submit" value="$(gettext 'Search')"> 1.107 <input class="radius" type="submit" name="files" 1.108 - value="`gettext "Files"`"> 1.109 + value="$(gettext 'Files')"> 1.110 <input type="hidden" name="repo" value="$repo" /> 1.111 </p> 1.112 </form> 1.113 @@ -122,12 +129,14 @@ 1.114 1.115 table_head() { 1.116 cat << EOT 1.117 - <tr id="thead"> 1.118 - <td>`gettext "Name"`</td> 1.119 - <td>`gettext "Version"`</td> 1.120 - <td>`gettext "Description"`</td> 1.121 - <td>`gettext "Web"`</td> 1.122 + <thead> 1.123 + <tr> 1.124 + <td>$(gettext 'Name')</td> 1.125 + <td>$(gettext 'Version')</td> 1.126 + <td>$(gettext 'Description')</td> 1.127 + <td>$(gettext 'Web')</td> 1.128 </tr> 1.129 + </thead> 1.130 EOT 1.131 } 1.132 1.133 @@ -135,30 +144,29 @@ 1.134 [ -n "$repo" ] || repo=Public 1.135 cat << EOT 1.136 <div id="sidebar"> 1.137 - <h4>Categories</h4> 1.138 - <a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo">Base-system</a> 1.139 - <a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo">X window</a> 1.140 - <a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo">Utilities</a> 1.141 - <a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo">Network</a> 1.142 - <a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo">Games</a> 1.143 - <a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo">Graphics</a> 1.144 - <a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo">Office</a> 1.145 - <a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo">Multimedia</a> 1.146 - <a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo">Development</a> 1.147 - <a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">System tools</a> 1.148 - <a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo">Security</a> 1.149 - <a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo">Misc</a> 1.150 - <a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">Meta</a> 1.151 - <a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">Non free</a> 1.152 - <a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">All</a> 1.153 + <h4>$(gettext 'Categories')</h4> 1.154 + <a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo">$(gettext 'Base-system')</a> 1.155 + <a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo">$(gettext 'X window')</a> 1.156 + <a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo">$(gettext 'Utilities')</a> 1.157 + <a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo">$(gettext 'Network')</a> 1.158 + <a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo">$(gettext 'Games')</a> 1.159 + <a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo">$(gettext 'Graphics')</a> 1.160 + <a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo">$(gettext 'Office')</a> 1.161 + <a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo">$(gettext 'Multimedia')</a> 1.162 + <a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo">$(gettext 'Development')</a> 1.163 + <a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">$(gettext 'System tools')</a> 1.164 + <a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo">$(gettext 'Security')</a> 1.165 + <a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo">$(gettext 'Misc')</a> 1.166 + <a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">$(gettext 'Meta')</a> 1.167 + <a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">$(gettext 'Non free')</a> 1.168 + <a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">$(gettext 'All')</a> 1.169 EOT 1.170 1.171 if [ -d $LOCALSTATE/undigest ]; then 1.172 [ -n "$category" ] || category="base-system" 1.173 cat << EOT 1.174 - <p></p> 1.175 - <h4>Repositories</h4> 1.176 - <a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">Public</a> 1.177 + <h4>$(gettext 'Repositories')</h4> 1.178 + <a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(gettext 'Public')</a> 1.179 EOT 1.180 for i in $(ls $LOCALSTATE/undigest); do 1.181 cat << EOT 1.182 @@ -166,7 +174,7 @@ 1.183 EOT 1.184 done 1.185 cat << EOT 1.186 - <a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">Any</a> 1.187 + <a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">$(gettext 'Any')</a> 1.188 EOT 1.189 fi 1.190 echo "</div>" 1.191 @@ -206,25 +214,30 @@ 1.192 cd $INSTALLED 1.193 search_form 1.194 sidebar 1.195 - LOADING_MSG="Listing packages..." 1.196 + LOADING_MSG="$(gettext 'Listing packages...')" 1.197 loading_msg 1.198 cat << EOT 1.199 -<h2>`gettext "My packages"`</h2> 1.200 +<h2>$(gettext 'My packages')</h2> 1.201 <form method='get' action='$SCRIPT_NAME'> 1.202 + <input type="hidden" name="do" value="Remove" /> 1.203 <div id="actions"> 1.204 <div class="float-left"> 1.205 - `gettext "Selection:"` 1.206 - <input type="submit" name="do" value="Remove" /> 1.207 + $(gettext 'Selection:') 1.208 + <input type="submit" value="$(gettext 'Remove')" /> 1.209 </div> 1.210 <div class="float-right"> 1.211 - `gettext "List:"` 1.212 - <input type="submit" name="recharge" value="Recharge" /> 1.213 - <input type="submit" name="up" value="Upgrade" /> 1.214 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.215 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.216 + <a class="button" href='$SCRIPT_NAME?up'> 1.217 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.218 </div> 1.219 </div> 1.220 EOT 1.221 - table_start 1.222 - table_head 1.223 + cat << EOT 1.224 +<table class="zebra"> 1.225 +$(table_head) 1.226 +<tbody> 1.227 +EOT 1.228 for pkg in * 1.229 do 1.230 . $pkg/receipt 1.231 @@ -234,17 +247,24 @@ 1.232 colorpkg=$pkg 1.233 grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list && 1.234 colorpkg="<span style='color: red;'>$pkg</span>" 1.235 - echo "<td class='pkg'> 1.236 - <input type='checkbox' name='pkg' value=\"$pkg\" /> 1.237 - <a href='$(pkg_info_link $pkg)'><img 1.238 - src='$IMAGES/tazpkg-installed.png'/>$colorpkg</a></td>" 1.239 - echo "<td>$VERSION</td>" 1.240 - echo "<td class='desc'>$SHORT_DESC</td>" 1.241 - echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>" 1.242 - echo '</tr>' 1.243 + cat << EOT 1.244 +<td class="pkg"> 1.245 + <input type="checkbox" name="pkg" value="$pkg" /> 1.246 + <a href="$(pkg_info_link $pkg)"><img 1.247 + src="$IMAGES/tazpkg-installed.png"/>$colorpkg</a></td> 1.248 +<td>$VERSION</td> 1.249 +<td class="desc">$SHORT_DESC</td> 1.250 +<td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td> 1.251 +</tr> 1.252 +EOT 1.253 done 1.254 - table_end 1.255 - echo '</form>' ;; 1.256 + cat << EOT 1.257 +</tbody> 1.258 +</table> 1.259 +</form> 1.260 +EOT 1.261 + ;; 1.262 + 1.263 *\ linkable\ *) 1.264 # 1.265 # List linkable packages. 1.266 @@ -252,42 +272,57 @@ 1.267 cd $INSTALLED 1.268 search_form 1.269 sidebar 1.270 - LOADING_MSG="Listing linkable packages..." 1.271 + LOADING_MSG=$(gettext 'Listing linkable packages...') 1.272 loading_msg 1.273 cat << EOT 1.274 -<h2>`gettext "Linkable packages"`</h2> 1.275 +<h2>$(gettext 'Linkable packages')</h2> 1.276 + 1.277 <form method='get' action='$SCRIPT_NAME'> 1.278 + <input type="hidden" name="do" value="Link" /> 1.279 <div id="actions"> 1.280 <div class="float-left"> 1.281 - `gettext "Selection:"` 1.282 - <input type="submit" name="do" value="Link" /> 1.283 + $(gettext 'Selection:') 1.284 + <input type="submit" value="$(gettext 'Link')" /> 1.285 </div> 1.286 <div class="float-right"> 1.287 - `gettext "List:"` 1.288 - <input type="submit" name="recharge" value="Recharge" /> 1.289 - <input type="submit" name="up" value="Upgrade" /> 1.290 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.291 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.292 + <a class="button" href="$SCRIPT_NAME?up"> 1.293 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.294 </div> 1.295 </div> 1.296 EOT 1.297 - table_start 1.298 - table_head 1.299 + cat << EOT 1.300 +<table class="zebra"> 1.301 +$(table_head) 1.302 +<tbody> 1.303 +EOT 1.304 target=$(readlink $LOCALSTATE/fslink) 1.305 for pkg in $(ls $target/$INSTALLED) 1.306 do 1.307 [ -s $pkg/receipt ] && continue 1.308 . $target/$INSTALLED/$pkg/receipt 1.309 - echo '<tr>' 1.310 - echo "<td class='pkg'> 1.311 - <input type='checkbox' name='pkg' value=\"$pkg\" /> 1.312 - <a href='$(pkg_info_link $pkg)'><img 1.313 - src='$IMAGES/tazpkg.png'/>$pkg</a></td>" 1.314 - echo "<td>$VERSION</td>" 1.315 - echo "<td class='desc'>$SHORT_DESC</td>" 1.316 - echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>" 1.317 - echo '</tr>' 1.318 + cat << EOT 1.319 +<tr> 1.320 + <td class="pkg"> 1.321 + <input type="checkbox" name="pkg" value="$pkg" /> 1.322 + <a href="$(pkg_info_link $pkg)"><img 1.323 + src="$IMAGES/tazpkg.png"/>$pkg</a> 1.324 + </td> 1.325 + <td>$VERSION</td> 1.326 + <td class="desc">$SHORT_DESC</td> 1.327 + <td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td> 1.328 +</tr> 1.329 +EOT 1.330 done 1.331 - table_end 1.332 - echo '</form>' ;; 1.333 + cat << EOT 1.334 +</tbody> 1.335 +</table> 1.336 +</form> 1.337 +EOT 1.338 + ;; 1.339 + 1.340 + 1.341 *\ cat\ *) 1.342 # 1.343 # List all available packages by category on mirror. Listing all 1.344 @@ -301,37 +336,51 @@ 1.345 [ "$grep_category" == "all" ] && grep_category=".*" 1.346 search_form 1.347 sidebar | sed "s/active_$category/active/;s/repo_$repo/active/" 1.348 - LOADING_MSG="Listing packages..." 1.349 + LOADING_MSG="$(gettext 'Listing packages...')" 1.350 loading_msg 1.351 cat << EOT 1.352 -<h2>`gettext "Category:"` $category</h2> 1.353 +<h2>$(eval_gettext 'Category: $category')</h2> 1.354 + 1.355 <form method='get' action='$SCRIPT_NAME'> 1.356 <div id="actions"> 1.357 <div class="float-left"> 1.358 - `gettext "Selection:"` 1.359 + $(gettext 'Selection:') 1.360 <input type="submit" name="do" value="Install" /> 1.361 <input type="submit" name="do" value="Remove" /> 1.362 <input type="hidden" name="repo" value="$repo" /> 1.363 </div> 1.364 <div class="float-right"> 1.365 - `gettext "List:"` 1.366 - <input type="submit" name="recharge" value="Recharge" /> 1.367 - <input type="submit" name="up" value="Upgrade" /> 1.368 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.369 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.370 + <a class="button" href="$SCRIPT_NAME?up"> 1.371 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.372 <a class="button" href='$SCRIPT_NAME?list'> 1.373 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.374 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.375 </div> 1.376 </div> 1.377 EOT 1.378 for i in $(repo_list ""); do 1.379 - [ "$repo" != "Public" ] && 1.380 - echo "<h3>Repository: $(repo_name $i)</h3>" 1.381 - table_start 1.382 - table_head 1.383 + if [ "$repo" != "Public" ]; then 1.384 + Repo_Name="$(repo_name $i)" 1.385 + cat << EOT 1.386 +<h3>$(eval_gettext "Repository: \$Repo_Name")</h3> 1.387 +EOT 1.388 + fi 1.389 + cat << EOT 1.390 +<table class="zebra"> 1.391 +$(table_head) 1.392 +<tbody> 1.393 +EOT 1.394 grep "| $grep_category |" $i/packages.desc | \ 1.395 parse_packages_desc 1.396 - table_end 1.397 + cat << EOT 1.398 +</tbody> 1.399 +</table> 1.400 +EOT 1.401 done 1.402 echo '</form>' ;; 1.403 + 1.404 + 1.405 *\ search\ *) 1.406 # 1.407 # Search for packages. Here default is to search in packages.desc 1.408 @@ -342,92 +391,108 @@ 1.409 cd $LOCALSTATE 1.410 search_form 1.411 sidebar | sed "s/repo_$repo/active/" 1.412 - LOADING_MSG="Searching packages..." 1.413 + LOADING_MSG="$(gettext 'Searching packages...')" 1.414 loading_msg 1.415 cat << EOT 1.416 -<h2>`gettext "Search packages"`</h2> 1.417 +<h2>$(gettext 'Search packages')</h2> 1.418 <form method="get" action="$SCRIPT_NAME"> 1.419 <div id="actions"> 1.420 <div class="float-left"> 1.421 - `gettext "Selection:"` 1.422 + $(gettext 'Selection:') 1.423 <input type="submit" name="do" value="Install" /> 1.424 <input type="submit" name="do" value="Remove" /> 1.425 - <a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a> 1.426 + <a href="`cat $PANEL/lib/checkbox.js`">$(gettext 'Toogle all')</a> 1.427 </div> 1.428 <div class="float-right"> 1.429 - `gettext "List:"` 1.430 - <input type="submit" name="recharge" value="Recharge" /> 1.431 - <input type="submit" name="up" value="Upgrade" /> 1.432 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.433 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.434 + <a class="button" href="$SCRIPT_NAME?up"> 1.435 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.436 <a class="button" href='$SCRIPT_NAME?list'> 1.437 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.438 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.439 </div> 1.440 </div> 1.441 <input type="hidden" name="repo" value="$repo" /> 1.442 + 1.443 + <table class="zebra"> 1.444 EOT 1.445 - table_start 1.446 if [ "$(GET files)" ]; then 1.447 cat <<EOT 1.448 - <tr id="thead"> 1.449 - <td>`gettext "Package"`</td> 1.450 - <td>`gettext "File"`</td> 1.451 + <thead> 1.452 + <tr> 1.453 + <td>$(gettext 'Package')</td> 1.454 + <td>$(gettext 'File')</td> 1.455 </tr> 1.456 - $(unlzma -c $(repo_list /files.list.lzma) \ 1.457 - | grep -Ei ": .*$(GET search)" | \ 1.458 - while read PACKAGE FILE; do 1.459 - PACKAGE=${PACKAGE%:} 1.460 - image=tazpkg-installed.png 1.461 - [ -d $INSTALLED/$PACKAGE ] || image=tazpkg.png 1.462 - echo "<tr> 1.463 - <td><input type='checkbox' name='pkg' value='$PACKAGE'> 1.464 - <a href='$(pkg_info_link $PACKAGE)'><img src='$IMAGES/$image' />$PACKAGE</a></td> 1.465 + <thead> 1.466 + <tbody> 1.467 +EOT 1.468 + unlzma -c $(repo_list /files.list.lzma) \ 1.469 + | grep -Ei ": .*$(GET search)" | \ 1.470 + while read PACKAGE FILE; do 1.471 + PACKAGE=${PACKAGE%:} 1.472 + image=tazpkg-installed.png 1.473 + [ -d $INSTALLED/$PACKAGE ] || image=tazpkg.png 1.474 + cat << EOT 1.475 +<tr> 1.476 + <td><input type="checkbox" name="pkg" value="$PACKAGE"> 1.477 + <a href="$(pkg_info_link $PACKAGE)"><img src="$IMAGES/$image" />$PACKAGE</a></td> 1.478 <td>$FILE</td> 1.479 -</tr>" 1.480 - done) 1.481 +</tr> 1.482 EOT 1.483 + done 1.484 else 1.485 - table_head 1.486 + cat << EOT 1.487 +$(table_head) 1.488 + <tbody> 1.489 +EOT 1.490 grep -ih $pkg $(repo_list /packages.desc) | \ 1.491 parse_packages_desc 1.492 fi 1.493 - table_end 1.494 - echo '</form>' ;; 1.495 + cat << EOT 1.496 + </tbody> 1.497 + </table> 1.498 +</form> 1.499 +EOT 1.500 + ;; 1.501 + 1.502 + 1.503 *\ recharge\ *) 1.504 # 1.505 # Lets recharge the packages list 1.506 # 1.507 search_form 1.508 sidebar 1.509 - LOADING_MSG="Recharging lists..." 1.510 + LOADING_MSG="$(gettext 'Recharging lists...')" 1.511 loading_msg 1.512 cat << EOT 1.513 -<h2>`gettext "Recharge"`</h2> 1.514 +<h2>$(gettext 'Recharge')</h2> 1.515 + 1.516 <form method='get' action='$SCRIPT_NAME'> 1.517 <div id="actions"> 1.518 <div class="float-left"> 1.519 - <p> 1.520 - `gettext "Recharge checks for new or updated packages"` 1.521 - </p> 1.522 + <p>$(gettext 'Recharge checks for new or updated packages')</p> 1.523 </div> 1.524 <div class="float-right"> 1.525 - <p> 1.526 - <a class="button" href='$SCRIPT_NAME?up'> 1.527 - <img src="$IMAGES/update.png" />`gettext "Check upgrades"`</a> 1.528 - <a class="button" href='$SCRIPT_NAME?list'> 1.529 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.530 - </p> 1.531 + <a class="button" href='$SCRIPT_NAME?up'> 1.532 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.533 + <a class="button" href='$SCRIPT_NAME?list'> 1.534 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.535 </div> 1.536 </div> 1.537 +<div class="wrapper"> 1.538 <pre> 1.539 EOT 1.540 - gettext "Recharging packages list" | log 1.541 + echo $(gettext 'Recharging packages list') | log 1.542 tazpkg recharge | filter_taztools_msgs 1.543 cat << EOT 1.544 </pre> 1.545 -<p> 1.546 - `gettext "Packages lists are up-to-date. You should check for upgrades now."` 1.547 -</p> 1.548 +</div> 1.549 +<p>$(gettext "Packages lists are up-to-date. You should check for upgrades \ 1.550 +now.")</p> 1.551 EOT 1.552 ;; 1.553 + 1.554 + 1.555 *\ up\ *) 1.556 # 1.557 # Upgrade packages 1.558 @@ -435,37 +500,47 @@ 1.559 cd $LOCALSTATE 1.560 search_form 1.561 sidebar 1.562 - LOADING_MSG="Checking for upgrades..." 1.563 + LOADING_MSG="$(gettext 'Checking for upgrades...')" 1.564 loading_msg 1.565 cat << EOT 1.566 -<h2>`gettext "Up packages"`</h2> 1.567 +<h2>$(gettext 'Up packages')</h2> 1.568 + 1.569 <form method="get" action="$SCRIPT_NAME"> 1.570 <div id="actions"> 1.571 <div class="float-left"> 1.572 - `gettext "Selection:"` 1.573 + $(gettext 'Selection:') 1.574 <input type="submit" name="do" value="Install" /> 1.575 <input type="submit" name="do" value="Remove" /> 1.576 - <a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a> 1.577 + <a href="$(cat $PANEL/lib/checkbox.js)">$(gettext 'Toogle all')</a> 1.578 </div> 1.579 <div class="float-right"> 1.580 - `gettext "List:"` 1.581 - <input type="submit" name="recharge" value="Recharge" /> 1.582 - <a class="button" href='$SCRIPT_NAME?list'> 1.583 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.584 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.585 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.586 + <a class="button" href="$SCRIPT_NAME?list"> 1.587 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.588 </div> 1.589 </div> 1.590 EOT 1.591 tazpkg up --check >/dev/null 1.592 - table_start 1.593 - table_head 1.594 + cat << EOT 1.595 +<table class="zebra"> 1.596 +$(table_head) 1.597 +<tbody> 1.598 +EOT 1.599 for pkg in `cat packages.up` 1.600 do 1.601 grep -hs "^$pkg |" $LOCALSTATE/packages.desc \ 1.602 $LOCALSTATE/undigest/*/packages.desc | \ 1.603 parse_packages_desc 1.604 done 1.605 - table_end 1.606 - echo '</form>' ;; 1.607 + cat << EOT 1.608 +</tbody> 1.609 +</table> 1.610 +</form> 1.611 +EOT 1.612 + ;; 1.613 + 1.614 + 1.615 *\ do\ *) 1.616 # 1.617 # Do an action on one or some packages 1.618 @@ -480,40 +555,44 @@ 1.619 cmd=$(echo $cmd | tr [:upper:] [:lower:]) 1.620 case $cmd in 1.621 install) 1.622 - cmd=get-install opt=--forced ;; 1.623 + cmd=get-install opt=--forced 1.624 + LOADING_MSG="get-installing packages..." 1.625 + ;; 1.626 link) 1.627 - opt=$(readlink $LOCALSTATE/fslink) ;; 1.628 + opt=$(readlink $LOCALSTATE/fslink) 1.629 + LOADING_MSG="linking packages..." 1.630 + ;; 1.631 esac 1.632 search_form 1.633 sidebar 1.634 - LOADING_MSG="${cmd}ing packages..." 1.635 loading_msg 1.636 cat << EOT 1.637 <h2>Tazpkg: $cmd</h2> 1.638 + 1.639 <form method="get" action="$SCRIPT_NAME"> 1.640 <div id="actions"> 1.641 <div class="float-left"> 1.642 - <p> 1.643 - `gettext "Performing tasks on packages"` 1.644 - </p> 1.645 + <p>$(gettext 'Performing tasks on packages')</p> 1.646 </div> 1.647 <div class="float-right"> 1.648 <p> 1.649 - <a class="button" href='$SCRIPT_NAME?list'> 1.650 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.651 + <a class="button" href="$SCRIPT_NAME?list"> 1.652 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.653 </p> 1.654 </div> 1.655 </div> 1.656 +<div class="box"> 1.657 +$(eval_gettext 'Executing $cmd for: $pkgs') 1.658 +</div> 1.659 EOT 1.660 - echo '<div class="box">' 1.661 - gettext "Executing $cmd for:$pkgs" 1.662 - echo '</div>' 1.663 for pkg in $pkgs 1.664 do 1.665 echo '<pre>' 1.666 echo 'y' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_taztools_msgs 1.667 echo '</pre>' 1.668 done ;; 1.669 + 1.670 + 1.671 *\ info\ *) 1.672 # 1.673 # Packages info 1.674 @@ -524,10 +603,11 @@ 1.675 if [ -d $INSTALLED/$pkg ]; then 1.676 . $INSTALLED/$pkg/receipt 1.677 files=`cat $INSTALLED/$pkg/files.list | wc -l` 1.678 - action=$(gettext "Remove") 1.679 + action="Remove" 1.680 + action_i18n=$(gettext 'Remove') 1.681 else 1.682 cd $LOCALSTATE 1.683 - LOADING_MSG=$(gettext "Getting package info...") 1.684 + LOADING_MSG=$(gettext 'Getting package info...') 1.685 loading_msg 1.686 IFS='|' 1.687 set -- $(grep -hs "^$pkg |" packages.desc \ 1.688 @@ -538,32 +618,36 @@ 1.689 SHORT_DESC="$(echo $3)" 1.690 CATEGORY="$(echo $4)" 1.691 WEB_SITE="$(echo $5)" 1.692 - action=$(gettext "Install") 1.693 + action="Install" 1.694 + action_i18n=$(gettext 'Install') 1.695 temp="$(echo $pkg | sed 's/get-//g')" 1.696 fi 1.697 cat << EOT 1.698 -<h2>`gettext "Package"` $PACKAGE</h2> 1.699 +<h2>$(eval_gettext 'Package $PACKAGE')</h2> 1.700 + 1.701 <div id="actions"> 1.702 <div class="float-left"> 1.703 <p> 1.704 EOT 1.705 - if [ "$temp" != "$pkg" -a "$action" == $(gettext "Install") ]; then 1.706 + if [ "$temp" != "$pkg" -a "$action" == "Install" ]; then 1.707 temp="$(echo $pkg | sed 's/get-//g')" 1.708 - echo "<a class='button' href='$SCRIPT_NAME?do=$action&$temp'>$action (Non Free)</a>" 1.709 + echo "<a class='button' href='$SCRIPT_NAME?do=Install&$temp'>$(gettext 'Install (Non Free)')</a>" 1.710 else 1.711 - 1.712 - echo "<a class='button' href='$SCRIPT_NAME?do=$action&$pkg'>$action</a>" 1.713 + echo "<a class='button' href='$SCRIPT_NAME?do=$action&$pkg'>$action_i18n</a>" 1.714 fi 1.715 1.716 if [ -d $INSTALLED/$pkg ]; then 1.717 if grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list; then 1.718 - block=$(gettext "Unblock") 1.719 + cat << EOT 1.720 + <a class="button" href="$SCRIPT_NAME?do=Unblock&$pkg">$(gettext 'Unblock')</a> 1.721 +EOT 1.722 else 1.723 - block=$(gettext "Block") 1.724 + cat << EOT 1.725 + <a class="button" href='$SCRIPT_NAME?do=Block&$pkg'>$(gettext 'Block')</a> 1.726 +EOT 1.727 fi 1.728 cat << EOT 1.729 - <a class="button" href='$SCRIPT_NAME?do=$block&$pkg'>$block</a> 1.730 - <a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>Repack</a> 1.731 + <a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>$(gettext 'Repack')</a> 1.732 EOT 1.733 fi 1.734 cat << EOT 1.735 @@ -572,53 +656,56 @@ 1.736 <div class="float-right"> 1.737 <p> 1.738 <a class="button" href='$SCRIPT_NAME?list'> 1.739 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.740 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.741 </p> 1.742 </div> 1.743 </div> 1.744 -<pre> 1.745 -Name : $PACKAGE 1.746 -Version : $VERSION 1.747 -Description : $SHORT_DESC 1.748 -Category : $CATEGORY 1.749 +<table class="zebra"> 1.750 +<tbody> 1.751 + <tr><td>$(gettext 'Name:')</td><td>$PACKAGE</td></tr> 1.752 + <tr><td>$(gettext 'Version:')</td><td>$VERSION</td></tr> 1.753 + <tr><td>$(gettext 'Description:')</td><td>$SHORT_DESC</td></tr> 1.754 + <tr><td>$(gettext 'Category:')</td><td>$CATEGORY</td></tr> 1.755 EOT 1.756 if [ -d $INSTALLED/$pkg ]; then 1.757 cat << EOT 1.758 -Maintainer : $MAINTAINER 1.759 -Website : <a href="$WEB_SITE">$WEB_SITE</a> 1.760 -Sizes : $PACKED_SIZE/$UNPACKED_SIZE 1.761 + <tr><td>$(gettext 'Maintainer:')</td><td>$MAINTAINER</td></tr> 1.762 + <tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.763 + <tr><td>$(gettext 'Sizes:')</td><td>$PACKED_SIZE/$UNPACKED_SIZE</td></tr> 1.764 EOT 1.765 if [ -n "$DEPENDS" ]; then 1.766 - echo -n "Depends : " 1.767 + echo "<tr><td>$(gettext 'Depends:')</td><td>" 1.768 for i in $DEPENDS; do 1.769 echo -n "<a href="$(pkg_info_link $i)">$i</a> " 1.770 done 1.771 - echo "" 1.772 + echo "</td></tr>" 1.773 fi 1.774 if [ -n "$SUGGESTED" ]; then 1.775 - echo -n "Suggested : " 1.776 + echo "<tr><td>$(gettext 'Suggested:')</td><td>" 1.777 for i in $SUGGESTED; do 1.778 echo -n "<a href="$(pkg_info_link $i)">$i</a> " 1.779 done 1.780 - echo "" 1.781 + echo "</td></tr>" 1.782 fi 1.783 - [ -n "$TAGS" ] && echo "Tags : $TAGS" 1.784 + [ -n "$TAGS" ] && echo "<tr><td>$(gettext 'Tags:')</td><td>$TAGS</td></tr>" 1.785 + I_FILES=$(cat $INSTALLED/$pkg/files.list | wc -l) 1.786 cat << EOT 1.787 -</pre> 1.788 +</tbody> 1.789 +</table> 1.790 1.791 -<p>`gettext "Installed files:"` `cat $INSTALLED/$pkg/files.list | wc -l`</p> 1.792 -<pre> 1.793 -`cat $INSTALLED/$pkg/files.list` 1.794 -</pre> 1.795 +<p>$(eval_gettext 'Installed files: $I_FILES')</p> 1.796 + 1.797 +<pre>$(cat $INSTALLED/$pkg/files.list)</pre> 1.798 EOT 1.799 else 1.800 cat << EOT 1.801 -Website : <a href="$WEB_SITE">$WEB_SITE</a> 1.802 -Sizes : `grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \ 1.803 - tail -n 1 | sed 's/ *//'` 1.804 -</pre> 1.805 +<tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr> 1.806 +<tr><td>$(gettext 'Sizes:')</td><td>$(grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \ 1.807 + tail -n 1 | sed 's/ *//')</td></tr> 1.808 +</table> 1.809 1.810 -<p>`gettext "Installed files:"`</p> 1.811 +<p>$(gettext 'Installed files:')</p> 1.812 + 1.813 <pre> 1.814 `unlzma -c files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \ 1.815 sed "/^$pkg: /!d;s/^$pkg: //"` 1.816 @@ -626,6 +713,8 @@ 1.817 EOT 1.818 fi 1.819 ;; 1.820 + 1.821 + 1.822 *\ admin\ * ) 1.823 # 1.824 # Tazpkg configuration page 1.825 @@ -663,41 +752,41 @@ 1.826 repository=${cmd#rm-repo=} 1.827 rm -rf $LOCALSTATE/undigest/$repository ;; 1.828 esac 1.829 - [ "$cmd" == "$(gettext "Set link")" ] && 1.830 + [ "$cmd" == "$(gettext 'Set link')" ] && 1.831 [ -d "$(GET link)/$INSTALLED" ] && 1.832 ln -fs $(GET link) $LOCALSTATE/fslink 1.833 - [ "$cmd" == "$(gettext "Remove link")" ] && 1.834 + [ "$cmd" == "$(gettext 'Remove link')" ] && 1.835 rm -f $LOCALSTATE/fslink 1.836 cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l` 1.837 cache_size=`du -sh /var/cache/tazpkg` 1.838 sidebar 1.839 cat << EOT 1.840 -<h2>$(gettext "Administration")</h2> 1.841 +<h2>$(gettext 'Administration')</h2> 1.842 <div> 1.843 - <p>$(gettext "Tazpkg administration and settings")</p> 1.844 + <p>$(gettext 'Tazpkg administration and settings')</p> 1.845 </div> 1.846 <div id="actions"> 1.847 <a class="button" href='$SCRIPT_NAME?admin=&action=saveconf'> 1.848 - <img src="$IMAGES/tazpkg.png" />`gettext "Save configuration"`</a> 1.849 + <img src="$IMAGES/tazpkg.png" />$(gettext 'Save configuration')</a> 1.850 <a class="button" href='$SCRIPT_NAME?admin=&action=listconf'> 1.851 - <img src="$IMAGES/edit.png" />`gettext "List configuration files"`</a> 1.852 + <img src="$IMAGES/edit.png" />$(gettext 'List configuration files')</a> 1.853 <a class="button" href='$SCRIPT_NAME?admin=&action=quickcheck'> 1.854 - <img src="$IMAGES/recharge.png" />`gettext "Quick check"`</a> 1.855 + <img src="$IMAGES/recharge.png" />$(gettext 'Quick check')</a> 1.856 <a class="button" href='$SCRIPT_NAME?admin=&action=fullcheck'> 1.857 - <img src="$IMAGES/recharge.png" />`gettext "Full check"`</a> 1.858 + <img src="$IMAGES/recharge.png" />$(gettext 'Full check')</a> 1.859 </div> 1.860 EOT 1.861 case "$(GET action)" in 1.862 saveconf) 1.863 - LOADING_MSG=$(gettext "Creating the package...") 1.864 + LOADING_MSG=$(gettext 'Creating the package...') 1.865 loading_msg 1.866 echo "<pre>" 1.867 cd $HOME 1.868 tazpkg repack-config | filter_taztools_msgs 1.869 - gettext "Path : " && ls $HOME/config-*.tazpkg 1.870 + echo -n "$(gettext 'Path:') " && ls $HOME/config-*.tazpkg 1.871 echo "</pre>" ;; 1.872 listconf) 1.873 - echo "<h4>`gettext "Configuration files"`</h4>" 1.874 + echo "<h4>$(gettext 'Configuration files')</h4>" 1.875 echo "<ul>" 1.876 tazpkg list-config | while read file; do 1.877 [ "${file:0:1}" == "/" ] || continue 1.878 @@ -710,38 +799,44 @@ 1.879 echo "</ul>" 1.880 echo "</pre>" ;; 1.881 quickcheck) 1.882 - LOADING_MSG=$(gettext "Checking packages consistency...") 1.883 + LOADING_MSG=$(gettext 'Checking packages consistency...') 1.884 loading_msg 1.885 echo "<pre>" 1.886 tazpkg check 1.887 echo "</pre>" ;; 1.888 fullcheck) 1.889 - LOADING_MSG=$(gettext "Full packages check...") 1.890 + LOADING_MSG=$(gettext 'Full packages check...') 1.891 loading_msg 1.892 echo "<pre>" 1.893 tazpkg check --full 1.894 echo "</pre>" ;; 1.895 esac 1.896 cat << EOT 1.897 -<h3>$(gettext "Packages cache")</h3> 1.898 +<h3>$(gettext 'Packages cache')</h3> 1.899 + 1.900 <div> 1.901 <form method="get" action="$SCRIPT_NAME"> 1.902 <p> 1.903 - `gettext "Packages in the cache:"` $cache_files ($cache_size) 1.904 + $(eval_gettext 'Packages in the cache: $cache_files ($cache_size)') 1.905 <input type="hidden" name="admin" value="clean" /> 1.906 <input type="submit" value="Clean" /> 1.907 </p> 1.908 </form> 1.909 </div> 1.910 -<h3>`gettext "Default mirror"`</h3> 1.911 - `cat /var/lib/tazpkg/mirror` 1.912 -<h3>`gettext "Current mirror list"`</h3> 1.913 + 1.914 +<h3>$(gettext 'Default mirror')</h3> 1.915 + 1.916 +<pre>$(cat /var/lib/tazpkg/mirror)</pre> 1.917 + 1.918 +<h3>$(gettext 'Current mirror list')</h3> 1.919 EOT 1.920 for i in $LOCALSTATE/mirrors $LOCALSTATE/undigest/*/mirrors; do 1.921 [ -s $i ] || continue 1.922 echo '<div class="box">' 1.923 - [ $i != $LOCALSTATE/mirrors ] && 1.924 - echo "<h4>Repository: $(repo_name $(dirname $i))</h4>" 1.925 + if [ $i != $LOCALSTATE/mirrors ]; then 1.926 + Repo_Name="$(repo_name $(dirname $i))" 1.927 + echo "<h4>$(eval_gettext 'Repository: $Repo_Name')</h4>" 1.928 + fi 1.929 echo "<ul>" 1.930 list_mirrors $i 1.931 echo "</ul>" 1.932 @@ -757,9 +852,7 @@ 1.933 </form> 1.934 EOT 1.935 done 1.936 - echo "<h3>" 1.937 - gettext "Private repositories" 1.938 - echo "</h3>" 1.939 + echo "<h3>$(gettext 'Private repositories')</h3>" 1.940 [ -n "$(ls $LOCALSTATE/undigest 2> /dev/null)" ] && cat << EOT 1.941 <div class="box"> 1.942 <ul> 1.943 @@ -771,49 +864,49 @@ 1.944 <form method="get" action="$SCRIPT_NAME"> 1.945 <p> 1.946 <input type="hidden" name="admin" value="add-repo" /> 1.947 - Name <input type="text" name="repository" size="10"> 1.948 - mirror 1.949 + $(gettext 'Name') <input type="text" name="repository" size="10"> 1.950 + $(gettext 'mirror') 1.951 <input type="text" name="mirror" value="http://" size="50"> 1.952 <input type="submit" value="Add repository" /> 1.953 </p> 1.954 </form> 1.955 -<h3>`gettext "Link to another SliTaz installation"`</h3> 1.956 -<p> 1.957 -$(gettext "This link points to the root of another SliTaz installation. \ 1.958 -You will be able to install packages using soft links to it.") 1.959 -</p> 1.960 + 1.961 +<h3>$(gettext 'Link to another SliTaz installation')</h3> 1.962 + 1.963 +<p>$(gettext "This link points to the root of another SliTaz installation. \ 1.964 +You will be able to install packages using soft links to it.")</p> 1.965 + 1.966 <form method="get" action="$SCRIPT_NAME"> 1.967 <p> 1.968 <input type="hidden" name="admin" value="add-link" /> 1.969 <input type="text" name="link" 1.970 value="$(readlink $LOCALSTATE/fslink 2> /dev/null)" size="50"> 1.971 - <input type="submit" name="admin" value="$(gettext "Set link")" /> 1.972 - <input type="submit" name="admin" value="$(gettext "Remove link")" /> 1.973 + <input type="submit" name="admin" value="$(gettext 'Set link')" /> 1.974 + <input type="submit" name="admin" value="$(gettext 'Remove link')" /> 1.975 </p> 1.976 </form> 1.977 EOT 1.978 version=$(cat /etc/slitaz-release) 1.979 cat << EOT 1.980 1.981 -<a name="dvd"></a> 1.982 -<h3>`gettext "SliTaz packages DVD"`</h3> 1.983 -<p> 1.984 -$(gettext "A bootable DVD image of all available packages for \ 1.985 -the $version version is generated every day. It also contains a copy of \ 1.986 -the website and can be used without an internet connection. This image can be \ 1.987 -installed on a DVD or an USB key.") 1.988 -</p> 1.989 +<h3 id="dvd">$(gettext 'SliTaz packages DVD')</h3> 1.990 + 1.991 +<p>$(eval_gettext "A bootable DVD image of all available packages for the \ 1.992 +\$version version is generated every day. It also contains a copy of the \ 1.993 +website and can be used without an internet connection. This image can be \ 1.994 +installed on a DVD or an USB key.")</p> 1.995 + 1.996 <div> 1.997 <form method="post" action='$SCRIPT_NAME?admin&action=dvdimage#dvd'> 1.998 <p> 1.999 <a class="button" 1.1000 href='http://mirror.slitaz.org/iso/$version/packages-$version.iso'> 1.1001 - <img src="$IMAGES/tazpkg.png" />$(gettext "Download DVD image")</a> 1.1002 + <img src="$IMAGES/tazpkg.png" />$(gettext 'Download DVD image')</a> 1.1003 <a class="button" href='$SCRIPT_NAME?admin&action=dvdusbkey#dvd'> 1.1004 - <img src="$IMAGES/tazpkg.png" />$(gettext "Install from DVD/USB key")</a> 1.1005 + <img src="$IMAGES/tazpkg.png" />$(gettext 'Install from DVD/USB key')</a> 1.1006 </p> 1.1007 <div class="box"> 1.1008 - $(gettext "Install from ISO image: ") 1.1009 + $(gettext 'Install from ISO image:') 1.1010 <input type="text" name="dvdimage" size="40" value="/root/packages-$version.iso"> 1.1011 </div> 1.1012 </form> 1.1013 @@ -852,30 +945,32 @@ 1.1014 [ -n "$(GET block)" ] && tazpkg block $(GET block) 1.1015 [ -n "$(GET unblock)" ] && tazpkg unblock $(GET unblock) 1.1016 cat << EOT 1.1017 -<h2>`gettext "Summary"`</h2> 1.1018 +<h2>$(gettext 'Summary')</h2> 1.1019 + 1.1020 <div id="actions"> 1.1021 - <a class="button" href='$SCRIPT_NAME?list'> 1.1022 - <img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a> 1.1023 + <a class="button" href="$SCRIPT_NAME?list"> 1.1024 + <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.1025 EOT 1.1026 fslink=$(readlink $LOCALSTATE/fslink) 1.1027 [ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && 1.1028 cat << EOT 1.1029 - <a class="button" href='$SCRIPT_NAME?linkable'> 1.1030 - <img src="$IMAGES/tazpkg.png" />`gettext "Linkable packages"`</a> 1.1031 + <a class="button" href="$SCRIPT_NAME?linkable"> 1.1032 + <img src="$IMAGES/tazpkg.png" />$(gettext 'Linkable packages')</a> 1.1033 EOT 1.1034 cat << EOT 1.1035 - <a class="button" href='$SCRIPT_NAME?recharge'> 1.1036 - <img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a> 1.1037 - <a class="button" href='$SCRIPT_NAME?up'> 1.1038 - <img src="$IMAGES/update.png" />`gettext "Check upgrades"`</a> 1.1039 - <a class="button" href='$SCRIPT_NAME?admin'> 1.1040 - <img src="$IMAGES/edit.png" />`gettext "Administration"`</a> 1.1041 + <a class="button" href="$SCRIPT_NAME?recharge"> 1.1042 + <img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a> 1.1043 + <a class="button" href="$SCRIPT_NAME?up"> 1.1044 + <img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a> 1.1045 + <a class="button" href="$SCRIPT_NAME?admin"> 1.1046 + <img src="$IMAGES/edit.png" />$(gettext 'Administration')</a> 1.1047 </div> 1.1048 -<pre class="pre-main"> 1.1049 -`packages_summary` 1.1050 -</pre> 1.1051 1.1052 -<h3>`gettext "Latest log entries"`</h3> 1.1053 +$(packages_summary) 1.1054 + 1.1055 + 1.1056 +<h3>$(gettext 'Latest log entries')</h3> 1.1057 + 1.1058 <pre> 1.1059 `tail -n 5 /var/log/tazpkg.log | fgrep "-" | \ 1.1060 awk '{print $1, $2, $3, $4, $5, $6, $7}'`