wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some fixes/improvements

Browse source
This commit is contained in:
Thomas 2020-05-03 19:25:06 +02:00
parent 493f1966d9
commit 4abc42e094
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/emojionearea.js
View file

@ -270,7 +270,7 @@ document = window.document || {};
}, },
custom_emoji: { custom_emoji: {
icon: "yum", icon: "grinning",
title: "Custom emoji", title: "Custom emoji",
emoji: "", emoji: "",
}, },

2
templates/fediplan/index.html.twig
View file

@ -75,7 +75,7 @@
<blockquote class="blockquote text-center" style="margin-top: 50px;"> <blockquote class="blockquote text-center" style="margin-top: 50px;">
<p class="mb-0">{{ 'page.index.about'|trans |raw}}</p> <p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
<p>{{ 'page.index.data'|trans |raw}}</p> <p>{{ 'page.index.data'|trans |raw}}</p>
<footer class="blockquote-footer">FediPlan 1.1.0</footer> <footer class="blockquote-footer">FediPlan 1.1.1</footer>
</blockquote> </blockquote>
{{ form_end(form) }} {{ form_end(form) }}

17
templates/fediplan/schedule.html.twig
View file

@ -53,12 +53,12 @@
</div> </div>
<div class="row"> <div class="row">
<div class=" col-md-3" style="margin-top: 20px;"> <div class="col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback"> <div class="form-inline has-feedback">
<label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" class="form-control">0</span> <label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" class="form-control">0</span>
</div> </div>
</div> </div>
<div class=" col-md-4" style="margin-top: 20px;"> <div class=" col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback"> <div class="form-inline has-feedback">
{{ form_label(form.visibility) }}&nbsp;&nbsp; {{ form_label(form.visibility) }}&nbsp;&nbsp;
{{ form_widget(form.visibility, {'attr': {'class': 'form-control'}}) }} {{ form_widget(form.visibility, {'attr': {'class': 'form-control'}}) }}
@ -71,7 +71,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class=" col-md-4" style="margin-top: 20px;"> <div class=" col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback"> <div class="form-inline has-feedback">
{{ form_label(form.sensitive) }}&nbsp;&nbsp; {{ form_label(form.sensitive) }}&nbsp;&nbsp;
{{ form_widget(form.sensitive, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-on': 'common.yes'|trans , 'data-off':'common.no'|trans}}) }} {{ form_widget(form.sensitive, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-on': 'common.yes'|trans , 'data-off':'common.no'|trans}}) }}
@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<div class="row" style="margin-top: 20px;"> <div class="row" style="margin-top: 20px;">
<div class=" col-md-5"> <div class=" col-md-5 col-6">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
{{ form_label(form.scheduled_at) }} {{ form_label(form.scheduled_at) }}
{{ form_widget(form.scheduled_at, {'attr': {'class': 'form-control'}}) }} {{ form_widget(form.scheduled_at, {'attr': {'class': 'form-control'}}) }}
@ -99,7 +99,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class=" col-md-5"> <div class=" col-md-5 col-4">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
{{ form_label(form.timeZone) }} {{ form_label(form.timeZone) }}
{{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }} {{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }}
@ -112,7 +112,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2 col-2">
<label for="count">{{ 'common.poll'|trans }}</label>&nbsp;&nbsp; <label for="count">{{ 'common.poll'|trans }}</label>&nbsp;&nbsp;
<span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" > <i class="fa fa-tasks fa-fw"></i></span> <span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" > <i class="fa fa-tasks fa-fw"></i></span>
@ -431,7 +431,6 @@
$('#media_container').append($(content)); $('#media_container').append($(content));
}, },
url: 'https://{{ instance }}/api/v1/media',
acceptFileTypes: /(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i acceptFileTypes: /(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i
}); });
@ -519,12 +518,14 @@
attributes: { attributes: {
spellcheck : true, spellcheck : true,
autocomplete : "on", autocomplete : "on",
} },
search: false
}); });
$("#compose_content_warning").emojioneArea({ $("#compose_content_warning").emojioneArea({
pickerPosition: "bottom", pickerPosition: "bottom",
filtersPosition: "bottom", filtersPosition: "bottom",
searchPosition: "bottom", searchPosition: "bottom",
search: false
}); });
var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
$('#compose_timeZone').val(timezone); $('#compose_timeZone').val(timezone);