- Fix sidebar category overflow
This commit is contained in:
sonny 2020-06-16 21:04:49 +02:00
parent f2200754e8
commit 4abebc136c
4 changed files with 28 additions and 12 deletions

View file

@ -26,7 +26,7 @@ services:
build: build:
context: . context: .
dockerfile: ./docker/django dockerfile: ./docker/django
command: celery worker --app newsreader --loglevel INFO --beat --scheduler django --workdir /app/src/ command: celery worker -n worker1@%h -n worker2@%h --app newsreader --loglevel INFO --concurrency 2 --workdir /app/src/ --beat --scheduler django
environment: environment:
- DJANGO_SETTINGS_MODULE=newsreader.conf.docker - DJANGO_SETTINGS_MODULE=newsreader.conf.docker
depends_on: depends_on:

View file

@ -40,8 +40,8 @@ class CategoryItem extends React.Component {
</div> </div>
<div className="category__info" onClick={() => this.handleSelect()}> <div className="category__info" onClick={() => this.handleSelect()}>
<span>{this.props.category.name}</span> <span className="category__name">{this.props.category.name}</span>
<span className="badge">{this.props.category.unread}</span> <span className="badge category__badge">{this.props.category.unread}</span>
</div> </div>
</div> </div>

View file

@ -1,21 +1,35 @@
from django.contrib import admin from django.contrib import admin
from django.db import models
from django.forms import Textarea, TextInput, URLInput
from newsreader.news.core.models import Category, Post from newsreader.news.core.models import Category, Post
class PostAdmin(admin.ModelAdmin): class PostAdmin(admin.ModelAdmin):
list_display = ("publication_date", "author", "rule", "title") list_display = ("publication_date", "rule", "title")
list_display_links = ("title",) list_display_links = ("title",)
list_filter = ("rule",) list_filter = ("rule",)
ordering = ("-publication_date", "title") ordering = ("-publication_date", "title")
fields = ("title", "body", "author", "publication_date", "url") fields = (
"remote_identifier",
"rule",
"url",
"title",
"body",
"publication_date",
"author",
)
search_fields = ["title"] readonly_fields = ("remote_identifier", "rule")
search_fields = ("title", "author", "rule__name")
def rule(self, obj): formfield_overrides = {
return obj.rule models.CharField: {"widget": TextInput(attrs={"size": "100"})},
models.URLField: {"widget": URLInput(attrs={"size": "100"})},
models.TextField: {"widget": Textarea(attrs={"rows": 10, "cols": 100})},
}
class CategoryAdmin(admin.ModelAdmin): class CategoryAdmin(admin.ModelAdmin):

View file

@ -14,16 +14,18 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
& h4 {
overflow: hidden;
text-overflow: ellipsis;
}
&:hover { &:hover {
cursor: pointer; cursor: pointer;
} }
} }
&__name {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
&__menu { &__menu {
display: flex; display: flex;
align-items: center; align-items: center;