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

Merge branch 'main' into 'develop'

Browse source 
# Conflicts:
#   public/css/bootstrap-toggle.min.css
#   public/js/bootstrap-toggle.min.js
#   templates/fediplan/about.html.twig
#   templates/fediplan/index.html.twig
#   templates/fediplan/schedule.html.twig
This commit is contained in:
Thomas 2024-05-18 17:43:10 +00:00
commit 2c773d7795
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/base.html.twig
View file

@ -42,18 +42,18 @@
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-md-4" style="text-align: center;">
<div class="col-4" style="text-align: center;">
<img src="{{ asset('img/FediPlan.png') }}" width="80" style=" border-radius: 5%;margin-top: 10px; margin-bottom: 10px; "><br/>
FediPlan -{{ "now"|date("Y") }}
</div>
<div class="col-md-4" style="margin-top: 10px; text-align: center;">
<div class="col-4" style="margin-top: 10px; text-align: center;">
{{ 'common.author'|trans }}: Thomas<br/>
Mastodon: <a href="https://toot.fedilab.app/@apps" target="_blank">@apps</a><br/>
Framagit: <a href="https://framagit.org/tom79/" target="_blank">@tom79</a><br/>
Codeberg: <a href="https://codeberg.org/tom79/" target="_blank">@tom79</a><br/>
Github: <a href="https://github.com/stom79/" target="_blank">@stom79</a><br/>
</div>
<div class="col-md-4" style="margin-top: 10px; text-align: center;">
<div class="col-4" style="margin-top: 10px; text-align: center;">
{{ 'common.license'|trans }}: <a href="https://www.gnu.org/licenses/gpl-3.0.fr.html" target="_blank">GPL 3</a><br/>
<a href="https://framagit.org/tom79/fediplan" target="_blank">{{ 'common.source_code'|trans}}</a>
</div>

2
templates/fediplan/Ajax/layout.html.twig
View file

@ -2,7 +2,7 @@
{% for status in statuses %}
<div class="row" id="message_container_{{ status.getId() }}" style="margin-bottom: 20px;">
<div class="col-md-8">
<div class="col-8">
<div class="card">
<div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
<div class="img-square-wrapper">

6
templates/fediplan/about.html.twig
View file

@ -13,20 +13,20 @@
</div>
<div class="row">
<div class="col-md-8 alert alert-primary" role="alert">
<div class="col-8 alert alert-primary" role="alert">
{{ 'page.about.data'|trans |raw}}
</div>
</div>
<div class="row">
<div class="col-md-8 alert alert-success" role="alert">
<div class="col-8 alert alert-success" role="alert">
{{ 'page.about.issues'|trans |raw}}
</div>
</div>
<div class="row">
<div class="col-md-8 alert alert-info" role="alert">
<div class="col-8 alert alert-info" role="alert">
You can help to translate the project into your language with <b>Crowdin</b> at <a title="Crowdin" target="_blank" href="https://crowdin.com/project/fediplan"><img src="https://badges.crowdin.net/fediplan/localized.svg"></a>
</div>
</div>

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

@ -31,7 +31,7 @@
</div>
{% elseif flow.getCurrentStepNumber() == 2 %}
<div class="row">
<div class="col-md-6">
<div class="col-6">
<div class="alert alert-warning">
{{ 'messages.login_authorization'|trans }}
</div>
@ -62,7 +62,7 @@
{% endif %}
{{ form_widget(form) }}
<div class="row">
<div class="col-md-2">
<div class="col-2">
<input type="submit" class="btn btn-primary btn-block btn-flat" value="{{ 'common.next'|trans }}"/>
</div>
</div>

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

@ -418,14 +418,14 @@
var message = "{{ 'common.delete'|trans }}";
var content;
content = ' <div class="row" id="media_container_'+data.id+'">\n' +
' <div class="col-md-4">\n' +
' <div class="col-4">\n' +
' <img src="'+data.preview_url+'" style="width:100%;max-width:200px;" id="media_preview_'+data.id+'"/>\n' +
' </div>\n' +
' <div class="col-md-6">\n' +
' <div class="col-6">\n' +
' <textarea name="media_description_'+data.id+'" class="form-control"></textarea>\n' +
' </div>\n' +
' <input type="hidden" name="media_id_'+data.id+'" value="'+data.id+'"/>\n' +
' <div class="col-md-2">\n' +
' <div class="col-2">\n' +
' <button type="button" class="btn btn-danger delete_media" data-id="'+data.id+'">\n' +
' <i class="glyphicon glyphicon-trash"></i>\n' +
' <span>'+message+'</span>\n' +