diff options
Diffstat (limited to 'web/template')
-rw-r--r-- | web/template/actions_form.php | 25 | ||||
-rw-r--r-- | web/template/header.php | 4 | ||||
-rw-r--r-- | web/template/pkg_comment_form.php | 8 | ||||
-rw-r--r-- | web/template/pkg_comments.php | 14 | ||||
-rw-r--r-- | web/template/pkg_details.php | 17 | ||||
-rw-r--r-- | web/template/pkg_search_results.php | 10 | ||||
-rw-r--r-- | web/template/search_accounts_form.php | 130 | ||||
-rw-r--r-- | web/template/tu_details.php | 10 | ||||
-rw-r--r-- | web/template/tu_list.php | 4 |
9 files changed, 114 insertions, 108 deletions
diff --git a/web/template/actions_form.php b/web/template/actions_form.php index 5eab2340..45bc09bc 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -1,7 +1,8 @@ <div class="pgbox"> <form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post"> - <input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1'> - <input type='hidden' name='ID' value="<?php echo $row['ID'] ?>"> + <fieldset> + <input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1' /> + <input type='hidden' name='ID' value="<?php echo $row['ID'] ?>" /> <?php # Voting Button # @@ -9,10 +10,10 @@ $q.= " AND PackageID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { echo " <input type='submit' class='button' name='do_Vote'"; - echo " value='".__("Vote")."'> "; + echo " value='".__("Vote")."' /> "; } else { echo "<input type='submit' class='button' name='do_UnVote'"; - echo " value='".__("UnVote")."'> "; + echo " value='".__("UnVote")."' /> "; } # Comment Notify Button @@ -21,36 +22,36 @@ $q.= " AND PkgID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { echo "<input type='submit' class='button' name='do_Notify'"; - echo " value='".__("Notify")."' title='".__("New Comment Notification")."'> "; + echo " value='".__("Notify")."' title='".__("New Comment Notification")."' /> "; } else { echo "<input type='submit' class='button' name='do_UnNotify'"; - echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'> "; + echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."' /> "; } if ($row["OutOfDateTS"] === NULL) { echo "<input type='submit' class='button' name='do_Flag'"; - echo " value='".__("Flag Out-of-date")."'>\n"; + echo " value='".__("Flag Out-of-date")."' />\n"; } else { echo "<input type='submit' class='button' name='do_UnFlag'"; - echo " value='".__("UnFlag Out-of-date")."'>\n"; + echo " value='".__("UnFlag Out-of-date")."' />\n"; } if ($row["MaintainerUID"] === NULL) { echo "<input type='submit' class='button' name='do_Adopt'"; - echo " value='".__("Adopt Packages")."'>\n"; + echo " value='".__("Adopt Packages")."' />\n"; } else if ($uid == $row["MaintainerUID"] || $atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Disown'"; - echo " value='".__("Disown Packages")."'>\n"; + echo " value='".__("Disown Packages")."' />\n"; } if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; - echo " value='".__("Delete Packages")."'>\n"; + echo " value='".__("Delete Packages")."' />\n"; echo "<input type='checkbox' name='confirm_Delete' value='1' /> "; echo __("Confirm")."\n"; } ?> - + </fieldset> </form> </div> diff --git a/web/template/header.php b/web/template/header.php index 8169df17..4939b574 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -37,8 +37,8 @@ <li><a href="http://bugs.archlinux.org/index.php?tasks=all&project=2"><?php print __("Bugs"); ?></a></li> <li><a href="http://archlinux.org/mailman/listinfo/aur-general"><?php print __("Discussion"); ?></a></li> <?php if (isset($_COOKIE['AURSID'])): ?> - <?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a><?php endif; ?> - <li><a href="packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> + <?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a></li><?php endif; ?> + <li><a href="packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> <li><a href="pkgsubmit.php"><?php print __("Submit"); ?></a></li> <?php endif; ?> </ul> diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 368d49bf..346fb6a8 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -57,11 +57,11 @@ if (isset($_REQUEST['comment'])) { echo '<b>' . __('Comment has been added.') . '</b>'; } ?> - <input type='hidden' name='ID' value="<?php echo $_REQUEST['ID'] ?>"> + <input type='hidden' name='ID' value="<?php echo $_REQUEST['ID'] ?>" /> <?php echo __('Enter your comment below.') ?><br /> - <textarea name='comment' rows='10' style="width: 100%"></textarea><br /> - <input type='submit' value="<?php echo __("Submit") ?>"> - <input type='reset' value="<?php echo __("Reset") ?>"> + <textarea name='comment' cols='80' rows='10' style="width: 100%"></textarea><br /> + <input type='submit' value="<?php echo __("Submit") ?>" /> + <input type='reset' value="<?php echo __("Reset") ?>" /> </div> </form> </div> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index dce3a171..8e64e11a 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -8,15 +8,17 @@ while (list($indx, $carr) = each($comments)) { ?> $carr['UserName'] = "<a href=\"account.php?Action=AccountInfo&ID={$carr['UsersID']}\">{$carr['UserName']}</a>"; } - $commentHeader =__('Comment by: %s on %s', $carr['UserName'], gmdate('r', $carr['CommentTS'])); + $commentHeader = '<p style="display:inline;">' . __('Comment by: %s on %s', $carr['UserName'], gmdate('r', $carr['CommentTS'])) . '</p>'; if (canDeleteCommentArray($carr, $atype, $uid)) { - $durl = '<form method="POST" action="packages.php?ID='.$row['ID'].'">'; - $durl.= '<input type="hidden" name="action" value="do_DeleteComment">'; - $durl.= '<input type="hidden" name="comment_id" value="'.$carr['ID'].'">'; - $durl.= '<input type="image" src="images/x.png" border="0" '; + $durl = '<form method="post" action="packages.php?ID='.$row['ID'].'">'; + $durl.= '<fieldset style="display:inline;">'; + $durl.= '<input type="hidden" name="action" value="do_DeleteComment" />'; + $durl.= '<input type="hidden" name="comment_id" value="'.$carr['ID'].'" />'; + $durl.= '<input type="image" src="images/x.png" '; $durl.= ' alt="'.__("Delete comment").'" name="submit" value="1" '; - $durl.= ' width="19" height="18"> '; + $durl.= ' /> '; + $durl.= '</fieldset>'; $commentHeader = $durl.$commentHeader."</form>"; } diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 6a624e9c..3b96791f 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -5,23 +5,25 @@ 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.= "Category: "; + $edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n"; + $edit_cat.= "<p>"; + $edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />"; + $edit_cat.= "<span class='f3'>Category:</span> "; $edit_cat.= "<select name='category_id'>\n"; foreach ($catarr as $cid => $catname) { $edit_cat.= "<option value='$cid'"; if ($cid == $row["CategoryID"]) { - $edit_cat.="selected"; + $edit_cat.=" selected='selected'"; } $edit_cat.=">".$catname."</option>"; } - $edit_cat.= "</select> <input type='submit' value='Change category'>"; + $edit_cat.= "</select> <input type='submit' value='Change category' />"; + $edit_cat.= "</p>"; $edit_cat.= "</form>"; } else { - $edit_cat = "Category: ".$row['Category']; + $edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>"; } if ($row["SubmitterUID"]) { @@ -69,8 +71,9 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row[ <span class='f3'><?php echo htmlspecialchars($row['Description'], ENT_QUOTES); ?></span> </p> + <?php echo $edit_cat ?> + <p> - <span class='f3'><?php echo $edit_cat ?></span><br /> <span class='f3'><?php echo __('Submitter') .': ' . $submitter ?></span><br /> <span class='f3'><?php echo __('Maintainer') .': ' . $maintainer ?></span><br /> <span class='f3'><?php echo $votes ?></span> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index c8c29f2c..40ad029f 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -54,7 +54,7 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { ?> <tr> <?php if ($SID): ?> - <td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td> + <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["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> @@ -62,15 +62,15 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php if ($SID): ?> <td class='<?php print $c ?>'><span class='f5'><span class='blue'> <?php if (isset($row["Voted"])): ?> - <?php print __("Yes") ?></span></td> + <?php print __("Yes") ?></span></span></td> <?php else: ?> - </span></td> + </span></span></td> <?php endif; ?> <td class='<?php print $c ?>'><span class='f5'><span class='blue'> <?php if (isset($row["Notify"])): ?> - <?php print __("Yes") ?></span></td> + <?php print __("Yes") ?></span></span></td> <?php else: ?> - </span></td> + </span></span></td> <?php endif; ?> <?php endif; ?> <td class='<?php print $c ?>'><span class='f4'><span class='blue'> diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index 17be75ee..9d6c40d0 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -1,78 +1,76 @@ <br /> <form action='account.php' method='post'> - <input type='hidden' name='Action' value='SearchAccounts' /> - <center> - <table border='0' cellpadding='0' cellspacing='0' width='80%'> + <table border='0' cellpadding='0' cellspacing='0' width='80%' style="margin:0 auto;"> - <tr> - <td align='left'><?php print __("Username"); ?>:</td> - <td align='left'> - <input type='text' size='30' maxlength='64' name='U' /> - </td> - </tr> + <tr> + <td align='left'><?php print __("Username"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='64' name='U' /> + </td> + </tr> - <tr> - <td align='left'><?php print __("Account Type"); ?>:</td> - <td align='left'> - <select name=T> - <option value=''><?php print __("Any type"); ?></option> - <option value='u'><?php print __("Normal user"); ?></option> - <option value='t'><?php print __("Trusted user"); ?></option> - <option value='d'><?php print __("Developer"); ?></option> - </select> - </td> - </tr> + <tr> + <td align='left'><?php print __("Account Type"); ?>:</td> + <td align='left'> + <select name="T"> + <option value=''><?php print __("Any type"); ?></option> + <option value='u'><?php print __("Normal user"); ?></option> + <option value='t'><?php print __("Trusted user"); ?></option> + <option value='d'><?php print __("Developer"); ?></option> + </select> + </td> + </tr> - <tr> - <td align='left'><?php print __("Account Suspended"); ?>:</td> - <td align='left'> - <input type='checkbox' name='S' /> - </td> - </tr> + <tr> + <td align='left'><?php print __("Account Suspended"); ?>:</td> + <td align='left'> + <input type='checkbox' name='S' /> + </td> + </tr> - <tr> - <td align='left'><?php print __("Email Address"); ?>:</td> - <td align='left'> - <input type='text' size='30' maxlength='64'name='E' /> - </td> - </tr> + <tr> + <td align='left'><?php print __("Email Address"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='64' name='E' /> + </td> + </tr> - <tr> - <td align='left'><?php print __("Real Name"); ?>:</td> - <td align='left'> - <input type='text' size='30' maxlength='32' name='R' /> - </td> - </tr> + <tr> + <td align='left'><?php print __("Real Name"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='32' name='R' /> + </td> + </tr> - <tr> - <td align='left'><?php print __("IRC Nick"); ?>:</td> - <td align='left'> - <input type='text' size='30' maxlength='32' name='I' /> - </td> - </tr> + <tr> + <td align='left'><?php print __("IRC Nick"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='32' name='I' /> + </td> + </tr> - <tr> - <td align='left'><?php print __("Sort by"); ?>:</td> - <td align='left'> - <select name=SB> - <option value='u'><?php print __("Username"); ?></option> - <option value='t'><?php print __("Account Type"); ?></option> - <option value='r'><?php print __("Real Name"); ?></option> - <option value='i'><?php print __("IRC Nick"); ?></option> - <option value='v'><?php print __("Last vote"); ?></option> - </select> - </td> - </tr> + <tr> + <td align='left'><?php print __("Sort by"); ?>:</td> + <td align='left'> + <select name="SB"> + <option value='u'><?php print __("Username"); ?></option> + <option value='t'><?php print __("Account Type"); ?></option> + <option value='r'><?php print __("Real Name"); ?></option> + <option value='i'><?php print __("IRC Nick"); ?></option> + <option value='v'><?php print __("Last vote"); ?></option> + </select> + </td> + </tr> - <tr> - <td> </td> - <td align='left'> - <br /> - <input type='submit' class='button' value="<?php print __("Search"); ?>" /> - <input type='reset' class='button' value="<?php print __("Reset"); ?>" /> - </td> - </tr> + <tr> + <td> </td> + <td align='left'> + <br /> + <input type='hidden' name='Action' value='SearchAccounts' /> + <input type='submit' class='button' value="<?php print __("Search"); ?>" /> + <input type='reset' class='button' value="<?php print __("Reset"); ?>" /> + </td> + </tr> - </table> - </center> + </table> </form> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index 315e1b90..7d6c305d 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -65,10 +65,12 @@ if (!$isrunning) { ?> <div class='pgboxbody'> <?php if ($canvote == 1) { ?> <form action='tu.php?id=<?php print $row['ID'] ?>' method='post'> -<input type='submit' class='button' name='voteYes' value='<?php print __("Yes") ?>'> -<input type='submit' class='button' name='voteNo' value='<?php print __("No") ?>'> -<input type='submit' class='button' name='voteAbstain' value='<?php print __("Abstain") ?>'> -<input type='hidden' name='doVote' value='1'> +<fieldset> +<input type='submit' class='button' name='voteYes' value='<?php print __("Yes") ?>' /> +<input type='submit' class='button' name='voteNo' value='<?php print __("No") ?>' /> +<input type='submit' class='button' name='voteAbstain' value='<?php print __("Abstain") ?>' /> +<input type='hidden' name='doVote' value='1' /> +</fieldset> </form> <?php } else { ?> <?php print $errorvote ?> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index f64d3834..3a927d9a 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -1,5 +1,5 @@ <div class="pgbox"> - <div class="pgboxtitle" align="right"> + <div class="pgboxtitle" style="text-align:right;"> <span class='f3'><?php print $type ?></span> </div> <table width='100%' cellspacing='0' cellpadding='2'> @@ -29,7 +29,7 @@ <td class='<?php print $c ?>'><span class='f6'><span class='blue'> <?php if (!empty($row['User'])) { - print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>"; + print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>"; } else { print "N/A"; } |