no blank lines
This commit is contained in:
Your Name
Henri Dickson
parent
6c9dd620f3
commit
dedab31fe0
4 changed files with 42 additions and 26 deletions
|
|
@ -42,56 +42,56 @@ class Performance(Item):
|
|||
)
|
||||
other_title = jsondata.ArrayField(
|
||||
verbose_name=_("其它标题"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=200),
|
||||
base_field=models.CharField(blank=False, default="", max_length=200),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
genre = jsondata.ArrayField(
|
||||
verbose_name=_("类型"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=200),
|
||||
base_field=models.CharField(blank=False, default="", max_length=200),
|
||||
null=False,
|
||||
blank=False,
|
||||
default=list,
|
||||
)
|
||||
language = jsondata.ArrayField(
|
||||
verbose_name=_("语言"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=200),
|
||||
base_field=models.CharField(blank=False, default="", max_length=200),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
director = jsondata.ArrayField(
|
||||
verbose_name=_("导演"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
playwright = jsondata.ArrayField(
|
||||
verbose_name=_("编剧"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
orig_creator = jsondata.ArrayField(
|
||||
verbose_name=_("原作者"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
composer = jsondata.ArrayField(
|
||||
verbose_name=_("作曲"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
choreographer = jsondata.ArrayField(
|
||||
verbose_name=_("编舞"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
|
|
@ -105,14 +105,14 @@ class Performance(Item):
|
|||
)
|
||||
performer = jsondata.ArrayField(
|
||||
verbose_name=_("表演者"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
troupe = jsondata.ArrayField(
|
||||
verbose_name=_("剧团"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
|
|
@ -126,16 +126,13 @@ class Performance(Item):
|
|||
)
|
||||
location = jsondata.ArrayField(
|
||||
verbose_name=_("剧场空间"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
opening_date = jsondata.CharField(
|
||||
verbose_name=_("首演日期"),
|
||||
max_length=100,
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("首演日期"), max_length=100, null=True, blank=True
|
||||
)
|
||||
closing_date = jsondata.CharField(
|
||||
verbose_name=_("结束日期"), max_length=100, null=True, blank=True
|
||||
|
|
@ -187,49 +184,49 @@ class PerformanceProduction(Item):
|
|||
)
|
||||
other_title = jsondata.ArrayField(
|
||||
verbose_name=_("其它标题"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=200),
|
||||
base_field=models.CharField(blank=False, default="", max_length=200),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
language = jsondata.ArrayField(
|
||||
verbose_name=_("语言"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=200),
|
||||
base_field=models.CharField(blank=False, default="", max_length=200),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
director = jsondata.ArrayField(
|
||||
verbose_name=_("导演"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
playwright = jsondata.ArrayField(
|
||||
verbose_name=_("编剧"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
orig_creator = jsondata.ArrayField(
|
||||
verbose_name=_("原作者"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
composer = jsondata.ArrayField(
|
||||
verbose_name=_("作曲"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
choreographer = jsondata.ArrayField(
|
||||
verbose_name=_("编舞"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
|
|
@ -243,14 +240,14 @@ class PerformanceProduction(Item):
|
|||
)
|
||||
performer = jsondata.ArrayField(
|
||||
verbose_name=_("表演者"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
)
|
||||
troupe = jsondata.ArrayField(
|
||||
verbose_name=_("剧团"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
|
|
@ -264,7 +261,7 @@ class PerformanceProduction(Item):
|
|||
)
|
||||
location = jsondata.ArrayField(
|
||||
verbose_name=_("剧场空间"),
|
||||
base_field=models.CharField(blank=True, default="", max_length=500),
|
||||
base_field=models.CharField(blank=False, default="", max_length=500),
|
||||
null=False,
|
||||
blank=True,
|
||||
default=list,
|
||||
|
|
|
|||
15
catalog/templates/_crew.html
Normal file
15
catalog/templates/_crew.html
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{% if people %}
|
||||
<span>
|
||||
{% if role %}{{ role }}：{% endif %}
|
||||
{% for p in people %}
|
||||
{% if forloop.counter <= max %}
|
||||
{% if not forloop.first %}、{% endif %}
|
||||
<span>{{ p.name }}
|
||||
{% if p.role.strip %}({{ p.role }}){% endif %}
|
||||
</span>
|
||||
{% elif forloop.last %}
|
||||
等
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
|
|
@ -38,7 +38,10 @@
|
|||
<div class="grid__main">
|
||||
{% if item.is_deleted %}<i>条目已被删除</i>{% endif %}
|
||||
{% if item.merged_to_item %}<i>条目已被合并</i>{% endif %}
|
||||
<form action="{{ submit_url }}" method="post" enctype="multipart/form-data">
|
||||
<form action="{{ submit_url }}"
|
||||
method="post"
|
||||
enctype="multipart/form-data"
|
||||
_=" init set .rjf-add-button's innerHTML to '➕' end">
|
||||
{% csrf_token %}
|
||||
{{ form.media }}
|
||||
{{ form }}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
color: var(--pico-secondary) !important;
|
||||
border: solid 1px var(--pico-secondary) !important;
|
||||
margin-left: 5px !important;
|
||||
padding: var(--pico-form-element-spacing-horizontal) !important;
|
||||
}
|
||||
|
||||
.rjf-form-row-controls {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue