Skip to content

Commit

Permalink
makes the revamp of the subscription form
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmegatelo committed Dec 3, 2024
1 parent 5cf657c commit 8ebdc2c
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 57 deletions.
1 change: 1 addition & 0 deletions feed/static/feed/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,7 @@ a:hover {
gap: calc(var(--grid-step) * 3);
max-height: 90vh;
overflow-y: auto;
width: calc(var(--grid-step) * 64)
}

.dialog-header {
Expand Down
6 changes: 3 additions & 3 deletions feed/templates/blocks/feed/parsing_done.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="feed-links-list">
{% for result_item in result %}
<div class="feed-description">
<h2 class="heading">
<h4 class="heading">
<a class="feed-links-list-item-link" href="{% url 'feed_subscription' slug=result_item.slug %}">
{{ result_item.title }}
</a>
</h2>
</h4>
{% if result_item.description %}
<p class="paragraph">{{ result_item.description }}</p>
<p class="paragraph feed-description__text">{{ result_item.description }}</p>
{% endif %}
<div class="flex-column-button-container sidebar-block-content">
<form id="feed-subscription"
Expand Down
11 changes: 1 addition & 10 deletions feed/templates/dialogs/base.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
<dialog id="{{ dialog_id }}" class="dialog dialog_{{ dialog_position }}">
<div class="dialog-content">
{# <header class="dialog-header">#}
{# <form class="dialog-close">#}
{# <button class="button button--ghost button--sm" formmethod="dialog">#}
{# {% include 'icons/close.svg' %}#}
{# </button>#}
{# </form>#}
{# </header>#}
<div>
{% block body %}{% endblock %}
</div>
{% block body %}{% endblock %}
</div>
</dialog>
19 changes: 1 addition & 18 deletions feed/templates/dialogs/feed/new.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
{% extends 'dialogs/base.html' %}
{% load i18n %}

{% block body %}
<div class="form-inline-row">
<form class="form flex-column-button-container"
method="post" action="{% url 'new_feed' %}"
hx-post="{% url 'new_feed' %}"
>
{% csrf_token %}
<div class="form-inline-row">
{{ form.as_div }}
<button class="button button--primary button--sm" type="submit">
{% translate 'Add feed' noop %}
</button>
</div>
</form>
<button class="button button--primary button--sm" type="submit">
Add feed
</button>
</div>
{% include 'forms/feed_new.html' %}
{% endblock %}
21 changes: 0 additions & 21 deletions feed/templates/feed/new.html

This file was deleted.

5 changes: 1 addition & 4 deletions feed/templates/feed/success.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{% extends 'feed/new.html' %}
{% load i18n %}
{% block title %}Success{% endblock %}

{% extends 'forms/feed_new.html' %}
{% block result %}
<form method="post"
hx-post="{% url 'api_feed_parsing_status' %}"
Expand Down
16 changes: 16 additions & 0 deletions feed/templates/forms/feed_new.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% load i18n %}

<form class="form flex-column-button-container"
method="post" action="{% url 'new_feed' %}"
hx-post="{% url 'new_feed' %}"
hx-swap="outerHTML"
>
{% csrf_token %}
<div class="form-inline-row">
{{ form.as_div }}
<button class="button button--primary button--sm" type="submit">
{% translate 'Add feed' noop %}
</button>
</div>
</form>
{% block result %}{% endblock %}
2 changes: 1 addition & 1 deletion feed/views/feed/feed_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class FeedCreate(FormView, PageMetaMixin, FeedContextMixin, FeedFiltersMixin):
form_class = FeedForm
template_name = 'feed/new.html'
template_name = 'forms/feed_new.html'
success_url = '/feed/new/success/?url={url}'
title = _('My feed')

Expand Down

0 comments on commit 8ebdc2c

Please sign in to comment.