mirror of
https://github.com/flextype/flextype.git
synced 2025-08-23 05:16:03 +02:00
Merge branch 'dev' into #218
This commit is contained in:
Awilum
@@ -6,5 +6,5 @@ Flextype is an open source project and community contributions are essential to
|
||||
* Create a new theme.
|
||||
* Find and [report issues.](https://github.com/flextype/flextype/issues)
|
||||
* Link back to [Flextype](http://flextype.org).
|
||||
* [Donate to keep Flextype free.](http://flextype.org/about)
|
||||
* [Donate to keep Flextype free.](http://flextype.org/en/about)
|
||||
* [Join Flextype International Translator Team](https://crowdin.com/project/flextype/invite)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2019 Flextype
|
||||
Copyright (c) 2018-2019 Sergey Romanenko
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -3,5 +3,6 @@
|
||||
|
||||
Admin Plugin for Flextype.
|
||||
|
||||
## License
|
||||
See [LICENSE](https://github.com/flextype/flextype/blob/master/LICENSE)
|
||||
## LICENSE
|
||||
[The MIT License (MIT)](https://github.com/flextype/flextype/blob/master/LICENSE.txt)
|
||||
Copyright (c) 2018-2019 [Sergey Romanenko](https://github.com/Awilum)
|
||||
|
||||
@@ -64,71 +64,71 @@
|
||||
<body {% if not is_logged %} class="content-full-size" {% endif %}>
|
||||
<div class="wrapper">
|
||||
|
||||
{% if is_logged %}
|
||||
<div class="sidebar">
|
||||
<div class="sidebar-wrapper">
|
||||
<div class="flextype-logo">
|
||||
<a href="{{ path_for('admin.entries.index') }}">
|
||||
FLEXTYPE
|
||||
</a>
|
||||
<a href="{{ base_url() }}" class="view-site-link" target="_blank">
|
||||
<i class="fas fa-external-link-alt"></i>
|
||||
</a>
|
||||
</div>
|
||||
{% if is_logged %}
|
||||
<div class="sidebar">
|
||||
<div class="sidebar-wrapper">
|
||||
<div class="flextype-logo">
|
||||
<a href="{{ path_for('admin.entries.index') }}">
|
||||
FLEXTYPE
|
||||
</a>
|
||||
<a href="{{ base_url() }}" class="view-site-link" target="_blank">
|
||||
<i class="fas fa-external-link-alt"></i>
|
||||
</a>
|
||||
</div>
|
||||
<ul class="nav">
|
||||
{% for key, item in registry.admin_navigation.content %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.extends %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.settings %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.help %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="flextype-user">
|
||||
<ul class="nav">
|
||||
{% for key, item in registry.admin_navigation.content %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.extends %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.settings %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ base_url() }}{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% for key, item in registry.admin_navigation.help %}
|
||||
<li class="nav-item {% if key == menu_item %} active {% endif %}">
|
||||
<a href="{{ item.link|raw }}"
|
||||
{% for key, attribute in item.attributes %}
|
||||
{{ key }} = {{ attribute }}
|
||||
{% endfor %}
|
||||
>{{ item.title|raw }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="flextype-user">
|
||||
<ul class="nav">
|
||||
<li class="nav-item {% if item.item == menu_item %} active {% endif %}">
|
||||
<a class="nav-link" href="{{ path_for('admin.users.profile') }}">
|
||||
<i class="fas fa-user-circle"></i>
|
||||
<p>
|
||||
{{ username }}
|
||||
</p>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="nav-item {% if item.item == menu_item %} active {% endif %}">
|
||||
<a class="nav-link" href="{{ path_for('admin.users.profile') }}">
|
||||
<i class="fas fa-user-circle"></i>
|
||||
<p>
|
||||
{{ username }}
|
||||
</p>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sidebar-off-canvas"></div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="sidebar-off-canvas"></div>
|
||||
{% endif %}
|
||||
|
||||
<div class="main-panel {% if not is_logged %}width-full{% endif %}">
|
||||
|
||||
@@ -225,9 +225,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{{ emitter.emit('onAdminThemeFooter') }}
|
||||
|
||||
{% if registry.settings.locale == 'en_US' %}
|
||||
{% set locale = 'en' %}
|
||||
{% else %}
|
||||
@@ -247,14 +248,14 @@
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
{% include "plugins/admin/views/partials/form-validator.html" %}
|
||||
{% include "plugins/admin/views/partials/messenger.html" %}
|
||||
{% include "plugins/admin/views/partials/clipboard.html" %}
|
||||
{% include "plugins/admin/views/partials/custom-file-input.html" %}
|
||||
{% include "plugins/admin/views/partials/trumbowyg.html" %}
|
||||
{% include "plugins/admin/views/partials/codemirror.html" %}
|
||||
{% include "plugins/admin/views/partials/forms-save.html" %}
|
||||
{% include "plugins/admin/views/partials/form-validator.html" %}
|
||||
{% include "plugins/admin/views/partials/messenger.html" %}
|
||||
{% include "plugins/admin/views/partials/clipboard.html" %}
|
||||
{% include "plugins/admin/views/partials/custom-file-input.html" %}
|
||||
{% include "plugins/admin/views/partials/trumbowyg.html" %}
|
||||
{% include "plugins/admin/views/partials/codemirror.html" %}
|
||||
{% include "plugins/admin/views/partials/forms-save.html" %}
|
||||
|
||||
{% block tail %}{% endblock %}
|
||||
{% block tail %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user