Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
La Quadrature du Net
rpteam
rp
Commits
b1372aa1
Commit
b1372aa1
authored
Jun 18, 2017
by
cynddl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Filter frontend by tags
parent
e1ec9aef
Pipeline
#1157
passed with stages
in 2 minutes and 37 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
12 deletions
+49
-12
apps/rp/templates/rp/article_list_public.html
apps/rp/templates/rp/article_list_public.html
+16
-6
apps/rp/urls.py
apps/rp/urls.py
+5
-0
apps/rp/views/articles.py
apps/rp/views/articles.py
+16
-5
static/src/components/card.css
static/src/components/card.css
+12
-1
No files found.
apps/rp/templates/rp/article_list_public.html
View file @
b1372aa1
...
@@ -63,7 +63,6 @@
...
@@ -63,7 +63,6 @@
</li>
</li>
{% endif %}
{% endif %}
<li
class=
"nav-item ml-auto"
>
<li
class=
"nav-item ml-auto"
>
<a
class=
"nav-link disabled"
href=
"#"
>
<a
class=
"nav-link disabled"
href=
"#"
>
<i
class=
"fa fa-search"
></i>
<i
class=
"fa fa-search"
></i>
...
@@ -72,7 +71,7 @@
...
@@ -72,7 +71,7 @@
</li>
</li>
<li
class=
"nav-item"
>
<li
class=
"nav-item"
>
<a
class=
"nav-link
disabled"
href=
"#
"
>
<a
class=
"nav-link
"
data-toggle=
"collapse"
href=
"#collapseTags"
aria-expanded=
"false"
aria-controls=
"collapseTags
"
>
<i
class=
"fa fa-tags"
></i>
<i
class=
"fa fa-tags"
></i>
Tags
Tags
</a>
</a>
...
@@ -93,13 +92,24 @@
...
@@ -93,13 +92,24 @@
</span>
</span>
</li>
</li>
{% endif %}
{% endif %}
</ul>
</ul>
<div
class=
"collapse"
id=
"collapseTags"
>
{% for t in tags %}
<a
class=
"badge badge-pill badge-primary"
href=
"{% url 'rp:public-article-list-tag' filter_tag=t.name %}"
>
{{t}} {{t.num_times}}
</a>
{% endfor %}
</div>
{% for article in object_list %}
{% for article in object_list %}
<
section
class=
"article-card d-flex"
>
<
article
class=
"article-card d-flex"
>
<div
class=
"article-card-img"
>
<div
class=
"article-card-img"
>
<p
class=
"article-card-meta"
>
<span
class=
"article-date"
>
{{ article.created_at|date:"d/m" }}
</span>
via
<span
class=
"article-source"
>
{{ article.website }}
</span>
</p>
{% thumbnail article.screenshot "800x400" crop="smart" as im %}
{% thumbnail article.screenshot "800x400" crop="smart" as im %}
<img
src=
"{{ im.url }}"
width=
"400"
height=
"200"
>
<img
src=
"{{ im.url }}"
width=
"400"
height=
"200"
>
{% endthumbnail %}
{% endthumbnail %}
...
@@ -108,7 +118,7 @@
...
@@ -108,7 +118,7 @@
<div
class=
"article-card-content"
>
<div
class=
"article-card-content"
>
<p
class=
"tags-list"
>
<p
class=
"tags-list"
>
{% for t in article.tags.all %}
{% for t in article.tags.all %}
<a
href=
"
#
"
class=
""
>
{{t}}
</a>
<a
href=
"
{% url 'rp:public-article-list-tag' filter_tag=t.name %}
"
class=
""
>
{{t}}
</a>
{% endfor %}
{% endfor %}
</p>
</p>
<h4><a
href=
"{{article.url}}"
>
{{article.title}}
</a></h4>
<h4><a
href=
"{{article.url}}"
>
{{article.title}}
</a></h4>
...
@@ -119,7 +129,7 @@
...
@@ -119,7 +129,7 @@
<p
class=
"read-more"
><a
href=
"#"
class=
"btn btn-secondary"
>
Read More
</a></p>
<p
class=
"read-more"
><a
href=
"#"
class=
"btn btn-secondary"
>
Read More
</a></p>
</div>
</div>
</div>
</div>
</
section
>
</
article
>
{% endfor %}
{% endfor %}
</div>
</div>
...
...
apps/rp/urls.py
View file @
b1372aa1
...
@@ -14,6 +14,11 @@ urlpatterns = [
...
@@ -14,6 +14,11 @@ urlpatterns = [
ArticleList
.
as_view
(
filter_lang
=
'EN'
),
ArticleList
.
as_view
(
filter_lang
=
'EN'
),
name
=
"public-article-list-international"
name
=
"public-article-list-international"
),
),
url
(
r
"^by-tag/(?P<filter_tag>.*)"
,
ArticleList
.
as_view
(),
name
=
"public-article-list-tag"
),
url
(
url
(
r
"^article/list/(?P<filter_view>\w+)"
,
r
"^article/list/(?P<filter_view>\w+)"
,
login_required
(
ArticleListFlux
.
as_view
()),
login_required
(
ArticleListFlux
.
as_view
()),
...
...
apps/rp/views/articles.py
View file @
b1372aa1
...
@@ -4,6 +4,7 @@ from django.views.generic.list import ListView
...
@@ -4,6 +4,7 @@ from django.views.generic.list import ListView
from
django.views.generic.edit
import
UpdateView
from
django.views.generic.edit
import
UpdateView
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.urls
import
reverse
,
reverse_lazy
from
django.urls
import
reverse
,
reverse_lazy
from
django.db.models
import
Count
from
django
import
forms
from
django
import
forms
from
django.contrib.auth.mixins
import
LoginRequiredMixin
,
PermissionRequiredMixin
from
django.contrib.auth.mixins
import
LoginRequiredMixin
,
PermissionRequiredMixin
...
@@ -25,18 +26,28 @@ class ArticleList(ListView):
...
@@ -25,18 +26,28 @@ class ArticleList(ListView):
template_name
=
"rp/article_list_public.html"
template_name
=
"rp/article_list_public.html"
filter_lang
=
None
filter_lang
=
None
filter_tag
=
None
def
get_queryset
(
self
):
def
get_queryset
(
self
):
if
self
.
filter_lang
in
[
"EN"
,
"FR"
]:
if
self
.
filter_lang
in
[
"EN"
,
"FR"
]:
qs
=
Article
.
objects
.
filter
(
lang
=
self
.
filter_lang
)
qs
=
Article
.
objects
.
filter
(
lang
=
self
.
filter_lang
)
else
:
else
:
qs
=
Article
.
objects
.
filter
()
qs
=
Article
.
objects
.
filter
()
filter_tag
=
self
.
kwargs
.
get
(
"filter_tag"
,
self
.
filter_tag
)
if
filter_tag
is
not
None
:
qs
=
qs
.
filter
(
tags__name__in
=
[
filter_tag
])
return
qs
.
order_by
(
'-created_at'
)
return
qs
.
order_by
(
'-created_at'
)
#
# def get_context_data(self, **kwargs):
def
get_context_data
(
self
,
**
kwargs
):
# context = super().get_context_data(**kwargs)
context
=
super
().
get_context_data
(
**
kwargs
)
# context["filter_lang"] = self.filter_lang
# return context
qs
=
Tag
.
objects
.
annotate
(
num_times
=
Count
(
'taggit_taggeditem_items'
)).
all
()
qs
=
qs
.
order_by
(
'-num_times'
)
context
[
"tags"
]
=
qs
return
context
class
ArticleListFlux
(
UDList
):
class
ArticleListFlux
(
UDList
):
...
...
static/src/components/card.css
View file @
b1372aa1
.article-card
{
.article-card
{
margin-bottom
:
2rem
;
margin-bottom
:
3rem
;
}
.article-card-meta
{
font-size
:
1.5rem
;
line-height
:
1.1rem
;
font-weight
:
100
;
position
:
absolute
;
top
:
0.5rem
;
background-color
:
var
(
--color-white
);
padding
:
0.5rem
0.2rem
;
}
}
.article-card-img
{
.article-card-img
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment