aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Controllers/subscriptionController.php2
-rw-r--r--app/views/subscription/index.phtml2
-rw-r--r--p/themes/base-theme/frss.css16
-rw-r--r--p/themes/base-theme/frss.rtl.css16
4 files changed, 34 insertions, 2 deletions
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index cca41b004..eab45db26 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -19,7 +19,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
$catDAO->checkDefault();
$feedDAO->updateTTL();
- $this->view->categories = $catDAO->listSortedCategories(false, true, true);
+ $this->view->categories = $catDAO->listSortedCategories(false, true);
$this->view->default_category = $catDAO->getDefault();
$signalError = false;
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index f056214d2..71bf5b429 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -34,7 +34,7 @@
?>
<div class="box">
<div class="box-title">
- <a class="configure open-slider" href="<?= _url('subscription', 'category', 'id', $cat->id()) ?>"><?= _i('configure') ?></a>
+ <a class="configure open-slider" href="<?= _url('subscription', 'category', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributes('position') ?>"><?= _i('configure') ?></a>
<?= $cat->name() ?>
<?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo _i('opml-dyn'); } ?>
</div>
diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css
index 1f97f0483..9accd5fe8 100644
--- a/p/themes/base-theme/frss.css
+++ b/p/themes/base-theme/frss.css
@@ -1800,6 +1800,22 @@ input:checked + .slide-container .properties {
font-weight: initial;
}
+.box .box-title .configure:not([data-cat-position=""])::after {
+ margin: 0.5rem 0px 0px;
+ padding: 5px 10px;
+ min-width: 20px;
+ display: block;
+ content: attr(data-cat-position);
+ position: absolute;
+ top: 0px;
+ right: 10px;
+ text-align: center;
+ font-size: 0.75rem;
+ border-radius: 12px;
+ line-height: 1;
+ font-weight: initial;
+}
+
.feed .item-title:not([data-unread="0"])::after {
margin: 1em 0 0 0;
}
diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css
index 718b888d9..00eeba2cb 100644
--- a/p/themes/base-theme/frss.rtl.css
+++ b/p/themes/base-theme/frss.rtl.css
@@ -1800,6 +1800,22 @@ input:checked + .slide-container .properties {
font-weight: initial;
}
+.box .box-title .configure:not([data-cat-position=""])::after {
+ margin: 0.5rem 0px 0px;
+ padding: 5px 10px;
+ min-width: 20px;
+ display: block;
+ content: attr(data-cat-position);
+ position: absolute;
+ top: 0px;
+ left: 10px;
+ text-align: center;
+ font-size: 0.75rem;
+ border-radius: 12px;
+ line-height: 1;
+ font-weight: initial;
+}
+
.feed .item-title:not([data-unread="0"])::after {
margin: 1em 0 0 0;
}