Fix merge fail
This commit is contained in:
parent
f0ae726c9d
commit
4e5e257f24
@ -16,11 +16,11 @@
|
|||||||
} else {
|
} else {
|
||||||
<span class="open">Inscriptions ouvertes.</span>
|
<span class="open">Inscriptions ouvertes.</span>
|
||||||
}
|
}
|
||||||
} else{
|
} else {
|
||||||
<span class="closed">Inscriptions fermées.</span>
|
<span class="closed">Inscriptions fermées.</span>
|
||||||
}
|
}
|
||||||
</p>
|
</p>
|
||||||
@if !instance.description.trim().is_empty() || contact.is_some() {
|
@if !instance.description.trim().is_empty() || contact.is_some() {
|
||||||
<div class="instance-info">
|
<div class="instance-info">
|
||||||
@if !instance.description.trim().is_empty() {
|
@if !instance.description.trim().is_empty() {
|
||||||
<h5 class="instance-description">Description:</h5>
|
<h5 class="instance-description">Description:</h5>
|
||||||
@ -30,14 +30,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@if let Some(contact) = contact {
|
|
||||||
<h5 class="instance-admin">Administré par:</h5>
|
|
||||||
@:admin(contact, base)
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
@if let Some(contact) = contact {
|
@if let Some(contact) = contact {
|
||||||
<h5 class="instance-admin">@instance.title's admin:</h5>
|
<h5 class="instance-admin">Administré par:</h5>
|
||||||
@:admin(contact, base)
|
@:admin(contact, base)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</section>
|
</section>
|
||||||
|
Loading…
Reference in New Issue
Block a user