mirror of
https://framagit.org/tom79/fediplan.git
synced 2025-04-04 21:21:51 +02:00
Merge branch 'develop' into 'main'
Release 1.2.2 See merge request tom79/fediplan!86
This commit is contained in:
Thomas
commit
34976a0252
5 changed files with 55 additions and 53 deletions
2
public/css/bootstrap-toggle.min.css
vendored
2
public/css/bootstrap-toggle.min.css
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright Notice
|
||||
* bootstrap5-toggle v5.1.0
|
||||
* bootstrap5-toggle v5.1.1
|
||||
* https://palcarazm.github.io/bootstrap5-toggle/
|
||||
* @author 2011-2014 Min Hur (https://github.com/minhur)
|
||||
* @author 2018-2019 Brent Ely (https://github.com/gitbrent)
|
||||
|
|
|
|||
4
public/js/bootstrap-toggle.min.js
vendored
4
public/js/bootstrap-toggle.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,7 @@
|
|||
<h1>{{ 'common.about'|trans }}</h1>
|
||||
|
||||
<div class="row ">
|
||||
<div class="col-8 alert alert-secondary" role="alert">
|
||||
<div class="col-md-8 alert alert-secondary" role="alert">
|
||||
{{ 'page.about.scheduling'|trans |raw}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
{{ form_errors(form) }}
|
||||
{% if flow.getCurrentStepNumber() == 1 %}
|
||||
<div class="row">
|
||||
<div class=" col-4">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group has-feedback">
|
||||
{{ form_label(form.host) }}
|
||||
<div class="input-group mb-3">
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class=" col-md-4">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group has-feedback">
|
||||
{{ form_label(form.code) }}
|
||||
<div class="input-group mb-3">
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
<blockquote class="blockquote text-center" style="margin-top: 50px;">
|
||||
<p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
|
||||
<p>{{ 'page.index.data'|trans |raw}}</p>
|
||||
<footer class="blockquote-footer">FediPlan 1.2.1</footer>
|
||||
<footer class="blockquote-footer">FediPlan 1.2.2</footer>
|
||||
</blockquote>
|
||||
|
||||
{{ form_end(form) }}
|
||||
|
|
|
|||
|
|
@ -54,13 +54,13 @@
|
|||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-4 col-4" style="margin-top: 20px;">
|
||||
<div class="col-md-4" style="margin-top: 20px;">
|
||||
<div class="form-inline has-feedback">
|
||||
<label for="count">{{ 'common.counter'|trans }}</label> <span id="count" >0</span>
|
||||
/{{ instanceConfiguration.statuses.maxCharacters }}
|
||||
</div>
|
||||
</div>
|
||||
<div class=" col-md-4 col-4" style="margin-top: 20px;">
|
||||
<div class=" col-md-4" style="margin-top: 20px;">
|
||||
<div class="form-inline has-feedback">
|
||||
{{ form_label(form.visibility) }}
|
||||
{{ form_widget(form.visibility, {'attr': {'class': 'form-control'}}) }}
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class=" col-md-4 col-4" style="margin-top: 20px;">
|
||||
<div class=" col-md-4" style="margin-top: 20px;">
|
||||
<div class="form-inline has-feedback">
|
||||
{{ form_label(form.sensitive) }}
|
||||
{{ form_widget(form.sensitive, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="row" style="margin-top: 20px;">
|
||||
<div class=" col-md-5 col-6">
|
||||
<div class=" col-md-5">
|
||||
<div class="form-group has-feedback">
|
||||
{{ form_label(form.scheduled_at) }}
|
||||
{{ form_widget(form.scheduled_at, {'attr': {'class': 'form-control'}}) }}
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class=" col-md-5 col-4">
|
||||
<div class=" col-md-5">
|
||||
<div class="form-group has-feedback">
|
||||
{{ form_label(form.timeZone) }}
|
||||
{{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }}
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-2 col-2">
|
||||
<div class="col-md-2">
|
||||
<label for="count">{{ 'common.poll'|trans }}</label>
|
||||
<span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" > <i class="fa fa-tasks fa-fw"></i></span>
|
||||
|
||||
|
|
@ -122,51 +122,51 @@
|
|||
</div>
|
||||
|
||||
<div id="poll_container" class="d-none">
|
||||
<ul class="options"
|
||||
data-prototype="{{ form_widget(form.poll_options.vars.prototype)|e('html_attr') }}">
|
||||
{% for option in form.poll_options %}
|
||||
{{ form_widget(option) }}
|
||||
{% if not option.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in option.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="row">
|
||||
<div class=" col-md-12">
|
||||
<div class="row">
|
||||
<div class=" col-md-4">
|
||||
{{ form_label(form.poll_multiple) }}
|
||||
{{ form_widget(form.poll_multiple, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
|
||||
{% if not form.poll_multiple.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in form.poll_multiple.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class=" col-md-4">
|
||||
<div class="form-inline has-feedback">
|
||||
{{ form_label(form.poll_expires_at) }}
|
||||
{{ form_widget(form.poll_expires_at, {'attr': {'class': 'form-control'}}) }}
|
||||
{% if not form.poll_expires_at.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in form.poll_expires_at.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
<ul class="options"
|
||||
data-prototype="{{ form_widget(form.poll_options.vars.prototype)|e('html_attr') }}">
|
||||
{% for option in form.poll_options %}
|
||||
{{ form_widget(option) }}
|
||||
{% if not option.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in option.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="row">
|
||||
<div class=" col-md-12">
|
||||
<div class="row">
|
||||
<div class=" col-md-4">
|
||||
{{ form_label(form.poll_multiple) }}
|
||||
{{ form_widget(form.poll_multiple, {'attr': {'class': 'form-control ','data-toggle':'skip-toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
|
||||
{% if not form.poll_multiple.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in form.poll_multiple.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class=" col-md-4">
|
||||
<div class="form-inline has-feedback">
|
||||
{{ form_label(form.poll_expires_at) }}
|
||||
{{ form_widget(form.poll_expires_at, {'attr': {'class': 'form-control'}}) }}
|
||||
{% if not form.poll_expires_at.vars.errors is empty %}
|
||||
<span class="badge badge-danger">
|
||||
{% for errorItem in form.poll_expires_at.vars.errors %}
|
||||
{{ errorItem.message }}
|
||||
{% endfor %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -479,6 +479,8 @@
|
|||
if($('#poll_container').hasClass("d-none") ){
|
||||
$('#poll_container').removeClass("d-none");
|
||||
$('#compose_attach_poll').val(1);
|
||||
document.querySelector('#compose_poll_multiple').bootstrapToggle('destroy');
|
||||
document.querySelector('#compose_poll_multiple').bootstrapToggle();
|
||||
}else{
|
||||
$('#poll_container').addClass("d-none");
|
||||
$('#compose_attach_poll').val(0);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue