Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-09-02 02:06:56 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matias Griese
2021-09-14 18:00:11 +03:00
parent 1091e7ab26 60560387f2
commit 975849d77d
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -2,9 +2,11 @@
## mm/dd/2021
1. [](#improved)
* Improved `Admin:data()` and `Admin::getConfigurationData()` to be more strict
* Added a note about UTC times in scheduler AT syntax help
* Now using a monospaced text-based scheduler AT field in scheduler for simplicity
* Improved `Admin:data()` and `Admin::getConfigurationData()` to be more strict
2. [](#bugfix)
* Fixed configuration save location to point to existing config folder [#2176](https://github.com/getgrav/grav-plugin-admin/issues/2176)
* Fixed configuration save location to point to existing config folder [#2176](https://github.com/getgrav/grav-plugin-admin/issues/2176)
# v1.10.20
## 09/01/2021

2
languages/en.yaml
View File

@@ -771,7 +771,7 @@ PLUGIN_ADMIN:
SCHEDULER_JOBS: "Custom Scheduler Jobs"
SCHEDULER_STATUS: "Scheduler Status"
SCHEDULER_RUNAT: "Run At"
SCHEDULER_RUNAT_HELP: "Cron formatted 'at' syntax"
SCHEDULER_RUNAT_HELP: "Cron formatted 'at' syntax. NOTE: All times are UTC!"
SCHEDULER_OUTPUT: "Output File"
SCHEDULER_OUTPUT_HELP: "The path/filename of the output file (from the root of the Grav installation)"
SCHEDULER_OUTPUT_TYPE: "Output Type"

4
themes/grav/css-compiled/template.css vendored
View File

@@ -1512,6 +1512,10 @@ textarea.frontmatter {
display: flex;
align-items: center; }
.cron-selector input {
font-family: "Bitstream Vera Sans Mono", Consolas, Courier, monospace !important;
font-weight: bold !important; }
.cron-install {
margin: 1rem;
padding: 0;

2
themes/grav/css-compiled/template.css.map
View File

File diff suppressed because one or more lines are too long

8
themes/grav/scss/template/_forms.scss
View File

@@ -904,6 +904,14 @@ textarea.frontmatter {
align-items: center;
}
.cron-selector {
input {
font-family: $monospace !important;
font-weight: bold !important;
}
}
.cron-install {
margin: 1rem;

8
themes/grav/templates/partials/tools-scheduler.html.twig
View File

@@ -10,17 +10,17 @@
<i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SCHEDULER_INSTALLED_READY"|t }}
</div>
{% elseif cron_status == 2 %}
<div class="alert warning"> {{ "PLUGIN_ADMIN.SCHEDULER_CRON_NA"|t(user)|raw }}</div>
<div class="alert warning"> {{ "PLUGIN_ADMIN.SCHEDULER_CRON_NA"|t([user])|raw }}</div>
{% else %}
<div class="alert warning"> {{ "PLUGIN_ADMIN.SCHEDULER_NOT_ENABLED"|t(user)|raw }}</div>
<div class="alert warning"> {{ "PLUGIN_ADMIN.SCHEDULER_NOT_ENABLED"|t([user])|raw }}</div>
{% endif %}
<div class="alert notice"><i class="fa fa-exclamation-circle"></i> {{ "PLUGIN_ADMIN.SCHEDULER_WARNING"|t(user) }}</div>
<div class="alert notice"><i class="fa fa-exclamation-circle"></i> {{ "PLUGIN_ADMIN.SCHEDULER_WARNING"|t([user]) }}</div>
<div id="cron-install" class="form-border overlay {{ cron_status == 1 ? 'hide' : ''}}">
<pre><code>{{- grav.scheduler.getCronCommand()|trim -}}</code></pre>
<p>{{ "PLUGIN_ADMIN.SCHEDULER_POST_INSTRUCTIONS"|t(user)|raw }}</p>
<p>{{ "PLUGIN_ADMIN.SCHEDULER_POST_INSTRUCTIONS"|t([user])|raw }}</p>
</div>
{% include 'partials/blueprints.html.twig' with { blueprints: data.blueprints, data: data } %}