diff options
Diffstat (limited to 'web/template')
| -rw-r--r-- | web/template/pkg_details.php | 22 | ||||
| -rw-r--r-- | web/template/pkg_search_form.php | 2 | ||||
| -rw-r--r-- | web/template/pkg_search_results.php | 4 |
3 files changed, 10 insertions, 18 deletions
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 8aba3afa..c1c3e96f 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,13 +1,13 @@ <?php $pkgid = intval($_REQUEST['ID']); -if ($row["Location"] == "unsupported" and ($uid == $row["MaintainerUID"] or - ($atype == "Developer" or $atype == "Trusted User"))) { +if ($uid == $row["MaintainerUID"] or + ($atype == "Developer" or $atype == "Trusted User")) { $catarr = pkgCategories(); $edit_cat = "<form method='POST' action='packages.php?ID=".$pkgid."'>\n"; $edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory'>"; - $edit_cat.= $row['Location']." :: "; + $edit_cat.= "Category: "; $edit_cat.= "<select name='category_id'>\n"; foreach ($catarr as $cid => $catname) { $edit_cat.= "<option value='$cid'"; @@ -21,7 +21,7 @@ if ($row["Location"] == "unsupported" and ($uid == $row["MaintainerUID"] or } else { - $edit_cat = $row['Location']." :: ".$row['Category']; + $edit_cat = "Category: ".$row['Category']; } if ($row["MaintainerUID"]) { @@ -76,11 +76,9 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row[ <p><span class='f3'> <?php - if ($row['LocationID'] == 2) { - $urlpath = URL_DIR . $row['Name']; - print "<a href='$urlpath/" . $row['Name'] . ".tar.gz'>".__("Tarball")."</a> :: "; - print "<a href='$urlpath/PKGBUILD'>".__("PKGBUILD")."</a></span>"; - } + $urlpath = URL_DIR . $row['Name']; + print "<a href='$urlpath/" . $row['Name'] . ".tar.gz'>".__("Tarball")."</a> :: "; + print "<a href='$urlpath/PKGBUILD'>".__("PKGBUILD")."</a></span>"; if ($row["OutOfDateTS"] !== NULL) { echo "<br /><span class='f6'>".__("This package has been flagged out of date.")." (${out_of_date_time})</span>"; @@ -172,10 +170,8 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row[ else { $src = $src[0]; # It is presumably an internal source - if ($row["LocationID"] == 2) { - echo "<span class='f8'>$src</span>"; - echo "<br />\n"; - } + echo "<span class='f8'>$src</span>"; + echo "<br />\n"; } } ?> diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index c616c7b4..fdeb01b8 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -56,7 +56,7 @@ <label><?php print __("Sort by"); ?></label> <select name='SB'> <?php - $sortby = array('n' => __('Name'), 'c' => __('Category'), 'l' => __('Location'), 'v' => __('Votes'), 'w' => __('Voted'), 'o' => __('Notify'), 'm' => __('Maintainer'), 'a' => __('Age')); + $sortby = array('n' => __('Name'), 'c' => __('Category'), 'v' => __('Votes'), 'w' => __('Voted'), 'o' => __('Notify'), 'm' => __('Maintainer'), 'a' => __('Age')); foreach ($sortby as $k => $v): if ($_REQUEST['SB'] == $k): ?> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index b8f2e14b..4830ca85 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -16,9 +16,6 @@ <?php endif; ?> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> - <a href='?<?php print mkurl('SB=l&SO=' . $SO_next) ?>'><?php print __("Location") ?></a> - </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> <a href='?<?php print mkurl('SB=c&SO=' . $SO_next) ?>'><?php print __("Category") ?></a> </span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom; text-align: center;'><span class='f2'> @@ -52,7 +49,6 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php if ($SID): ?> <td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td> <?php endif; ?> - <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Location"] ?></span></span></td> <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Category"] ?></span></span></td> <td class='<?php print $c ?>'><span class='f4'><a href='packages.php?ID=<?php print $row["ID"] ?>'><span class='black'><?php print $row["Name"] ?> <?php print $row["Version"] ?></span></a></span></td> <td class='<?php print $c ?>' style="text-align: right"><span class='f5'><span class='blue'><?php print $row["NumVotes"] ?></span></span></td> |