GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TEMPLATES] Minor refactoring, extending left was weird

This commit is contained in:
Diogo Peralta Cordeiro 2021-04-29 20:51:13 +01:00 committed by Hugo Sales
parent e9b2b18093
commit 110c2572a4
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
19 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Directory/templates/directory/actors.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
plugins/Directory/templates/directory/groups.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

3
templates/Poll/newpoll.html.twig
View File

@ -1,5 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/Poll/respondpoll.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/Poll/showpoll.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/attachments/show.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block stylesheets %}
{{ parent() }}

20
templates/base.html.twig
View File

@ -31,28 +31,16 @@
{% block header %}
<div id='header'>
<div id='top'>
{% block left %}
{% endblock left %}
{% block leftpanel %}
{% endblock leftpanel %}
<nav id='instance'>
<a href="{{ path('main_public') }}">
{{ icon('logo', 'icon icon-logo') | raw }}
<b> {{ config('site', 'name') }} </b>
</a>
</nav>
<div id="right-panel">
<input type="checkbox" id="toggle-right" class="larger">
<div class="arrow right">
<label for="toggle-right" id='right-panel'></label>
</div>
<div class='rss'>
<div> </div>
</div>
<div>
{% block right %}
{% endblock right %}
</div>
</div>
{% block rightpanel %}
{% endblock rightpanel %}
</div>
</div>
{% endblock header%}

2
templates/doc/base.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/network/actors.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/network/public.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/network/reversefavs.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/note/reply.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

2
templates/security/login.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block stylesheets %}
{{ parent() }}

2
templates/security/register.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block stylesheets %}
{{ parent() }}

2
templates/settings/base.html.twig
View File

@ -1,4 +1,4 @@
{% extends 'left/left.html.twig' %}
{% extends 'stdgrid.html.twig' %}
{% block meta %}
{{ parent() }}

12
templates/left/left.html.twig → templates/sidepanel/left/left.html.twig
View File

@ -1,13 +1,3 @@
{% extends '/base.html.twig' %}
{% block stylesheets %}
{{ parent() }}
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left.css') }}" media="screen and (min-width: 1300px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_mid.css') }}" media="screen and (max-width: 1300px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_small.css') }}" media="screen and (max-width: 750px)">
{% endblock %}
{% block left %}
{% if app.user %}
<div id='left-panel'>
<input type="checkbox" id="toggle" class="larger" autofocus>
@ -80,5 +70,3 @@
</div>
</div>
{% endif %}
{% endblock %}

3
templates/sidepanel/left/left_stylesheets.html.twig Normal file
View File

@ -0,0 +1,3 @@
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left.css') }}" media="screen and (min-width: 1300px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_mid.css') }}" media="screen and (max-width: 1300px)">
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_small.css') }}" media="screen and (max-width: 750px)">

13
templates/sidepanel/right/right.html.twig Normal file
View File

@ -0,0 +1,13 @@
<div id="right-panel">
<input type="checkbox" id="toggle-right" class="larger">
<div class="arrow right">
<label for="toggle-right" id='right-panel'></label>
</div>
<div class='rss'>
<div> </div>
</div>
<div>
{% block right %}
{% endblock right %}
</div>
</div>

11
templates/stdgrid.html.twig Normal file
View File

@ -0,0 +1,11 @@
{% extends '/base.html.twig' %}
{% block stylesheets %}
{{ parent() }}
{% include '/sidepanel/left/left_stylesheets.html.twig' %}
{% endblock %}
{% block leftpanel %}
{% include '/sidepanel/left/left.html.twig' %}
{% endblock %}
{% block rightpanel %}
{% include '/sidepanel/right/right.html.twig' %}
{% endblock %}