summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2020-12-26 20:30:49 +0100
committerGravatar GitHub <noreply@github.com> 2020-12-26 20:30:49 +0100
commit2b0f93b01367cdd23c35bd6a3b906deda31f3b61 (patch)
tree8c6ef95c4842a769182832c1a713283752bbe8c8
parent4f742151992d3a56aea5780bbd062ba18fd8a14b (diff)
Layout add subscription (#3289)
* Category first I kept hitting the 'add' button for a category when adding a new feed * Blanks Mix of spaces
-rw-r--r--app/views/subscription/add.phtml56
1 files changed, 28 insertions, 28 deletions
diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml
index 391227e2d..989cac21a 100644
--- a/app/views/subscription/add.phtml
+++ b/app/views/subscription/add.phtml
@@ -1,10 +1,27 @@
<?php $this->partial('aside_subscription'); ?>
<div class="post drop-section">
- <a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
+ <a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
+
+ <h2><?= _t('sub.title.add_category') ?></h2>
+ <form action="<?= _url('category', 'create') ?>" method="post">
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+ <div class="form-group">
+ <label class="group-name" for="new-category"><?= _t('sub.category') ?></label>
+ <div class="group-controls">
+ <input id="new-category" name="new-category" type="text" autocomplete="off"/>
+ </div>
+ </div>
+
+ <div class="form-group form-actions">
+ <div class="group-controls">
+ <button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>
+ </div>
+ </div>
+ </form>
<h2><?= _t('sub.title.add_feed') ?></h2>
- <form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
+ <form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<div class="form-group">
@@ -17,17 +34,17 @@
<div class="form-group">
<label class="group-name" for="category"><?= _t('sub.category') ?></label>
<div class="group-controls">
- <select name="category" id="category">
- <?php foreach ($this->categories as $cat) { ?>
- <option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
- <?= $cat->name() ?>
- </option>
- <?php } ?>
- </select>
+ <select name="category" id="category">
+ <?php foreach ($this->categories as $cat) { ?>
+ <option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
+ <?= $cat->name() ?>
+ </option>
+ <?php } ?>
+ </select>
</div>
</div>
- <legend><?= _t('sub.feed.auth.configuration') ?></legend>
+ <legend><?= _t('sub.feed.auth.configuration') ?></legend>
<div class="form-group">
<label class="group-name" for="http_user"><?= _t('sub.feed.auth.username') ?></label>
<div class="group-controls">
@@ -36,7 +53,7 @@
</div>
<div class="form-group">
- <label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
+ <label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
<div class="group-controls">
<input id="http_pass" name="http_pass" type="text" value=" " autocomplete="new-password"/>
</div>
@@ -71,21 +88,4 @@
</div>
</div>
</form>
-
- <h2><?= _t('sub.title.add_category') ?></h2>
- <form action="<?= _url('category', 'create') ?>" method="post">
- <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
- <div class="form-group">
- <label class="group-name" for="new-category"><?= _t('sub.category') ?></label>
- <div class="group-controls">
- <input id="new-category" name="new-category" type="text" autocomplete="off"/>
- </div>
- </div>
-
- <div class="form-group form-actions">
- <div class="group-controls">
- <button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>
- </div>
- </div>
- </form>
</div>