Merge V2 branch
This commit is contained in:
parent
5adaad5bf8
commit
138494c4b1
82 changed files with 8952 additions and 4985 deletions
|
|
@ -3,6 +3,8 @@ Configuration for the Django admin site
|
|||
"""
|
||||
|
||||
from django.contrib import admin
|
||||
from django.db import models
|
||||
from django.forms import TextInput, Textarea
|
||||
from three_d_viewer.models import Category, Sample, Question, Answer, Mineral, GlossaryEntry
|
||||
|
||||
admin.site.register(Category)
|
||||
|
|
@ -10,4 +12,12 @@ admin.site.register(Sample)
|
|||
admin.site.register(Question)
|
||||
admin.site.register(Answer)
|
||||
admin.site.register(Mineral)
|
||||
admin.site.register(GlossaryEntry)
|
||||
#admin.site.register(GlossaryEntry)
|
||||
|
||||
|
||||
class GlossaryEntryAdmin(admin.ModelAdmin):
|
||||
formfield_overrides = {
|
||||
models.TextField: {'widget': Textarea(attrs={'rows':4, 'cols':40})},
|
||||
}
|
||||
|
||||
admin.site.register(GlossaryEntry, GlossaryEntryAdmin)
|
||||
Loading…
Add table
Add a link
Reference in a new issue