Signed-off-by: Lukas Fleischer <[email protected]>
---
web/html/pkgreq.php | 57 +-------------------------------------------
web/template/pkgreq_form.php | 52 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 56 deletions(-)
create mode 100644 web/template/pkgreq_form.php
diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php
index d7a4354..5d708fc 100644
--- a/web/html/pkgreq.php
+++ b/web/html/pkgreq.php
@@ -70,62 +70,7 @@ if (!isset($base_id)) {
$SID = $_COOKIE['AURSID'];
include('pkgreq_results.php');
} else {
-?>
-
-<div class="box">
- <h2><?= __('File Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
- <p>
- <?= __('Use this form to file a request against package base
%s%s%s which includes the following packages:',
- '<strong>', htmlspecialchars($pkgbase_name),
'</strong>'); ?>
- </p>
- <ul>
- <?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?>
- <li><?= htmlspecialchars($pkgname) ?></li>
- <?php endforeach; ?>
- </ul>
- <form action="<?= get_uri('/pkgbase/'); ?>" method="post">
- <fieldset>
- <input type="hidden" name="IDs[<?= $base_id ?>]"
value="1" />
- <input type="hidden" name="ID" value="<?= $base_id ?>"
/>
- <input type="hidden" name="token" value="<?=
htmlspecialchars($_COOKIE['AURSID']) ?>" />
- <p>
- <label for="id_type"><?= __("Request type")
?>:</label>
- <select name="type" id="id_type"
onchange="showHideMergeSection()">
- <option value="deletion"><?=
__('Deletion') ?></option>
- <option value="merge"><?= __('Merge')
?></option>
- <option value="orphan"><?= __('Orphan')
?></option>
- </select>
- </p>
- <script type="text/javascript"
src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js";></script>
- <script type="text/javascript">
- function showHideMergeSection() {
- if ($('#id_type').val() == 'merge') {
- $('#merge_section').show();
- } else {
- $('#merge_section').hide();
- }
- }
-
- $(document).ready(function() {
- showHideMergeSection();
- });
- </script>
- <p id="merge_section">
- <label for="id_merge_into"><?= __("Merge into")
?>:</label>
- <input type="text" name="merge_into"
id="id_merge_into" />
- </p>
- <p>
- <label for="id_comments"><?= __("Comments")
?>:</label>
- <textarea name="comments" id="id_comments"
rows="5" cols="50"></textarea>
- </p>
- <p>
- <input type="submit" class="button"
name="do_FileRequest" value="<?= __("File Request") ?>" />
- </p>
- </fieldset>
- </form>
-</div>
-
-<?php
+ include('pkgreq_form.php');
}
html_footer(AUR_VERSION);
diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
new file mode 100644
index 0000000..cc45f29
--- /dev/null
+++ b/web/template/pkgreq_form.php
@@ -0,0 +1,52 @@
+<div class="box">
+ <h2><?= __('File Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+ <p>
+ <?= __('Use this form to file a request against package base
%s%s%s which includes the following packages:',
+ '<strong>', htmlspecialchars($pkgbase_name),
'</strong>'); ?>
+ </p>
+ <ul>
+ <?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?>
+ <li><?= htmlspecialchars($pkgname) ?></li>
+ <?php endforeach; ?>
+ </ul>
+ <form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+ <fieldset>
+ <input type="hidden" name="IDs[<?= $base_id ?>]"
value="1" />
+ <input type="hidden" name="ID" value="<?= $base_id ?>"
/>
+ <input type="hidden" name="token" value="<?=
htmlspecialchars($_COOKIE['AURSID']) ?>" />
+ <p>
+ <label for="id_type"><?= __("Request type")
?>:</label>
+ <select name="type" id="id_type"
onchange="showHideMergeSection()">
+ <option value="deletion"><?=
__('Deletion') ?></option>
+ <option value="merge"><?= __('Merge')
?></option>
+ <option value="orphan"><?= __('Orphan')
?></option>
+ </select>
+ </p>
+ <script type="text/javascript"
src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js";></script>
+ <script type="text/javascript">
+ function showHideMergeSection() {
+ if ($('#id_type').val() == 'merge') {
+ $('#merge_section').show();
+ } else {
+ $('#merge_section').hide();
+ }
+ }
+
+ $(document).ready(function() {
+ showHideMergeSection();
+ });
+ </script>
+ <p id="merge_section">
+ <label for="id_merge_into"><?= __("Merge into")
?>:</label>
+ <input type="text" name="merge_into"
id="id_merge_into" />
+ </p>
+ <p>
+ <label for="id_comments"><?= __("Comments")
?>:</label>
+ <textarea name="comments" id="id_comments"
rows="5" cols="50"></textarea>
+ </p>
+ <p>
+ <input type="submit" class="button"
name="do_FileRequest" value="<?= __("File Request") ?>" />
+ </p>
+ </fieldset>
+ </form>
+</div>
--
2.0.0
