fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d2be5a
)
More banners admin.
author
Radek Czajka
<rczajka@rczajka.pl>
Mon, 18 Mar 2019 12:51:27 +0000
(13:51 +0100)
committer
Radek Czajka
<rczajka@rczajka.pl>
Mon, 18 Mar 2019 12:51:27 +0000
(13:51 +0100)
src/social/admin.py
patch
|
blob
|
history
src/social/locale/pl/LC_MESSAGES/django.mo
patch
|
blob
|
history
src/social/locale/pl/LC_MESSAGES/django.po
patch
|
blob
|
history
src/social/models.py
patch
|
blob
|
history
src/wolnelektury/templates/admin/base_site.html
patch
|
blob
|
history
diff --git
a/src/social/admin.py
b/src/social/admin.py
index
258e522
..
0a634ed
100755
(executable)
--- a/
src/social/admin.py
+++ b/
src/social/admin.py
@@
-10,8
+10,9
@@
from social.models import Cite, BannerGroup, Carousel, CarouselItem
class CiteAdmin(admin.ModelAdmin):
list_display = ['nonempty_text', 'created_at', 'sticky', 'vip', 'small', 'has_image']
list_filter = ['group']
class CiteAdmin(admin.ModelAdmin):
list_display = ['nonempty_text', 'created_at', 'sticky', 'vip', 'small', 'has_image']
list_filter = ['group']
+ readonly_fields = ['created_at']
fieldsets = (
fieldsets = (
- (None, {'fields': ('group', 'sticky')}),
+ (None, {'fields': ('group', 'sticky'
, 'created_at'
)}),
(_('Content'), {'fields': ('book', 'text', 'small', 'vip', 'link', 'video', 'picture', 'banner')}),
(
_('Background'),
(_('Content'), {'fields': ('book', 'text', 'small', 'vip', 'link', 'video', 'picture', 'banner')}),
(
_('Background'),
@@
-35,7
+36,13
@@
class CiteAdmin(admin.ModelAdmin):
admin.site.register(Cite, CiteAdmin)
admin.site.register(Cite, CiteAdmin)
-admin.site.register(BannerGroup)
+
+class BannerGroupAdmin(admin.ModelAdmin):
+ list_display = ['name', 'created_at']
+ fields = ['name', 'created_at']
+ readonly_fields = ['created_at']
+
+admin.site.register(BannerGroup, BannerGroupAdmin)
class CarouselItemInline(OrderableAdmin, admin.TabularInline):
class CarouselItemInline(OrderableAdmin, admin.TabularInline):
diff --git
a/src/social/locale/pl/LC_MESSAGES/django.mo
b/src/social/locale/pl/LC_MESSAGES/django.mo
index
1279853
..
c470ca1
100644
(file)
Binary files a/src/social/locale/pl/LC_MESSAGES/django.mo and b/src/social/locale/pl/LC_MESSAGES/django.mo differ
diff --git
a/src/social/locale/pl/LC_MESSAGES/django.po
b/src/social/locale/pl/LC_MESSAGES/django.po
index
5217cf9
..
d65d691
100644
(file)
--- a/
src/social/locale/pl/LC_MESSAGES/django.po
+++ b/
src/social/locale/pl/LC_MESSAGES/django.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-18 13:
3
8+0100\n"
+"POT-Creation-Date: 2019-03-18 13:
4
8+0100\n"
"PO-Revision-Date: 2014-01-24 10:06+0100\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: 2014-01-24 10:06+0100\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-19,19
+19,19
@@
msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.5.4\n"
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.5.4\n"
-#: admin.py:1
5
+#: admin.py:1
6
msgid "Content"
msgstr "Zawartość"
msgid "Content"
msgstr "Zawartość"
-#: admin.py:1
7
+#: admin.py:1
8
msgid "Background"
msgstr "Obraz tła"
msgid "Background"
msgstr "Obraz tła"
-#: admin.py:2
8
models.py:32
+#: admin.py:2
9
models.py:32
msgid "text"
msgstr "tekst"
msgid "text"
msgstr "tekst"
-#: admin.py:3
2
models.py:44
+#: admin.py:3
3
models.py:44
msgid "image"
msgstr "obraz"
msgid "image"
msgstr "obraz"
@@
-95,7
+95,7
@@
msgstr "przyklejony"
msgid "Sticky cites will take precedense."
msgstr "Przyklejone cytaty mają pierwszeństwo."
msgid "Sticky cites will take precedense."
msgstr "Przyklejone cytaty mają pierwszeństwo."
-#: models.py:41 models.py:100
+#: models.py:41 models.py:
60 models.py:
100
msgid "banner"
msgstr "banner"
msgid "banner"
msgstr "banner"
@@
-138,13
+138,9
@@
msgstr "adres licencji"
msgid "group"
msgstr "grupa"
msgid "group"
msgstr "grupa"
-#: models.py:60
-msgid "cite"
-msgstr "cytat"
-
#: models.py:61
#: models.py:61
-msgid "
cite
s"
-msgstr "
cytat
y"
+msgid "
banner
s"
+msgstr "
banner
y"
#: models.py:87
msgid "slug"
#: models.py:87
msgid "slug"
@@
-194,3
+190,9
@@
msgstr ""
#: templates/social/sets_form.html:8
msgid "Remove from my shelf"
msgstr "Usuń z mojej półki"
#: templates/social/sets_form.html:8
msgid "Remove from my shelf"
msgstr "Usuń z mojej półki"
+
+#~ msgid "cite"
+#~ msgstr "cytat"
+
+#~ msgid "cites"
+#~ msgstr "cytaty"
diff --git
a/src/social/models.py
b/src/social/models.py
index
58f5511
..
588b2eb
100644
(file)
--- a/
src/social/models.py
+++ b/
src/social/models.py
@@
-57,8
+57,8
@@
class Cite(models.Model):
class Meta:
ordering = ('vip', 'text')
class Meta:
ordering = ('vip', 'text')
- verbose_name = _('
cite
')
- verbose_name_plural = _('
cite
s')
+ verbose_name = _('
banner
')
+ verbose_name_plural = _('
banner
s')
def __str__(self):
return u"%s: %s…" % (self.vip, self.text[:60])
def __str__(self):
return u"%s: %s…" % (self.vip, self.text[:60])
diff --git
a/src/wolnelektury/templates/admin/base_site.html
b/src/wolnelektury/templates/admin/base_site.html
index
9bd250c
..
71a4be5
100644
(file)
--- a/
src/wolnelektury/templates/admin/base_site.html
+++ b/
src/wolnelektury/templates/admin/base_site.html
@@
-7,7
+7,7
@@
<h1 id="site-name">{% trans "Site administration" %} - WolneLektury.pl</h1>
<p style="font-size: 11px;margin-top:-6px;">
<a href="/admin/chunks/chunk/promo/">promobox</a> |
<h1 id="site-name">{% trans "Site administration" %} - WolneLektury.pl</h1>
<p style="font-size: 11px;margin-top:-6px;">
<a href="/admin/chunks/chunk/promo/">promobox</a> |
- <a href="/admin/social/cite">
cytat
y</a> |
+ <a href="/admin/social/cite">
banner
y</a> |
<a href="/admin/infopages/infopage/">info</a> |
<a href="/admin/catalogue/book/">książki</a> |
<a href="/admin/catalogue/tag/">tagi</a> |
<a href="/admin/infopages/infopage/">info</a> |
<a href="/admin/catalogue/book/">książki</a> |
<a href="/admin/catalogue/tag/">tagi</a> |