From 2bfbb890134d855dcb6694e9e03353cecfc69b9d Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 00:52:23 +0300 Subject: [PATCH 1/4] feat(core): add new event onAdminThemeFooter #186 --- site/plugins/admin/views/partials/base.html | 143 ++++++++++---------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index 754864dd..dbc9921e 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -64,71 +64,71 @@
- {% if is_logged %} -
-
- + {% if is_logged %} +
+
+ +
    + {% for key, item in registry.admin_navigation.content %} +
  • + {{ item.title|raw }} +
    • + {% endfor %} + {% for key, item in registry.admin_navigation.extends %} +
  • + {{ item.title|raw }} +
    • + {% endfor %} + {% for key, item in registry.admin_navigation.settings %} +
  • + {{ item.title|raw }} +
    • + {% endfor %} + {% for key, item in registry.admin_navigation.help %} +
  • + {{ item.title|raw }} +
    • + {% endfor %} +
+
    - {% for key, item in registry.admin_navigation.content %} -
  • - {{ item.title|raw }} -
    • - {% endfor %} - {% for key, item in registry.admin_navigation.extends %} -
  • - {{ item.title|raw }} -
    • - {% endfor %} - {% for key, item in registry.admin_navigation.settings %} -
  • - {{ item.title|raw }} -
    • - {% endfor %} - {% for key, item in registry.admin_navigation.help %} -
  • - {{ item.title|raw }} -
    • - {% endfor %} -
-
- -
+
  • + + +

    + {{ username }} +

    +     +
    • +
    -
    - {% endif %} +
    +
    + {% endif %}
    @@ -225,9 +225,10 @@
    -
    + {{ 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 %} From 331f31ed12747b35a6f74185b084dac6b93a8573 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 01:06:22 +0300 Subject: [PATCH 2/4] docs: update contribution doc --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09d1811e..acd4fd61 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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) From 6f3fc28a004756255bd03b57a4530cbca855a9d3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 01:08:51 +0300 Subject: [PATCH 3/4] docs(admin-plugin): update readme doc --- site/plugins/admin/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/site/plugins/admin/README.md b/site/plugins/admin/README.md index 10257bb6..16871f1b 100755 --- a/site/plugins/admin/README.md +++ b/site/plugins/admin/README.md @@ -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) From a159b443efa088774b019ba39236d4439701d24c Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 01:09:02 +0300 Subject: [PATCH 4/4] docs(admin-plugin): update license doc --- site/plugins/admin/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/plugins/admin/LICENSE.txt b/site/plugins/admin/LICENSE.txt index 36ddbe3c..1a2b199f 100755 --- a/site/plugins/admin/LICENSE.txt +++ b/site/plugins/admin/LICENSE.txt @@ -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