Merge branch '1.9' of github.com:getgrav/grav-plugin-admin into 1.9

This commit is contained in:
Matias Griese
2019-03-04 23:14:15 +02:00
4 changed files with 27 additions and 39 deletions

View File

@@ -13,6 +13,5 @@ indent_style = space
indent_size = 4
# 2 space indentation
[*.yaml, *.yml]
indent_style = space
[*.{yaml,.yml}]
indent_size = 2

View File

@@ -769,6 +769,14 @@ PLUGIN_ADMIN:
SCHEDULER_POST_INSTRUCTIONS: "To enable the Scheduler's functionality, you must add the <b>Grav Scheduler</b> to your system's crontab file. Run the command above from the terminal to add it automatically. Once saved, refresh this page to see the status Ready."
SCHEDULER_JOBS: "Custom Scheduler Jobs"
SCHEDULER_STATUS: "Scheduler Status"
SCHEDULER_RUNAT: "Run At"
SCHEDULER_RUNAT_HELP: "Cron formatted 'at' syntax"
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"
SCHEDULER_OUTPUT_TYPE_HELP: "Either append to the same file each run, or overwrite the file with each run"
SCHEDULER_EMAIL: "Email"
SCHEDULER_EMAIL_HELP: "Email to send output to. NOTE: requires output file to be set"
SECURITY: "Security"
XSS_SECURITY: "XSS Security for Content"
XSS_WHITELIST_PERMISSIONS: "Whitelist Permissions"
@@ -789,5 +797,20 @@ PLUGIN_ADMIN:
LOGS: "Logs"
LOG_VIEWER_FILES: "Log Viewer Files"
LOG_VIEWER_FILES_HELP: "Files in /logs/ that will be available to view in Tools - Logs. e.g. 'grav' = /logs/grav.log"
BACKUPS_STORAGE_PURGE_TRIGGER: "Backup Storage Purge Trigger"
BACKUPS_MAX_COUNT: "Maximum Number of Backups"
BACKUPS_MAX_COUNT_HELP: "0 is unlimited"
BACKUPS_MAX_SPACE: "Maximum Backups Space"
BACKUPS_MAX_RETENTION_TIME: "Maximum Retention Time"
BACKUPS_MAX_RETENTION_TIME_APPEND: "in Days"
BACKUPS_PROFILE_NAME: "Backup Name"
BACKUPS_PROFILE_ROOT_FOLDER: "Root Folder"
BACKUPS_PROFILE_ROOT_FOLDER_HELP: "Can be an absolute path or a stream"
BACKUPS_PROFILE_EXCLUDE_PATHS: "Exclude Paths"
BACKUPS_PROFILE_EXCLUDE_PATHS_HELP: "Absolute paths to exclude, one per line"
BACKUPS_PROFILE_EXCLUDE_FILES: "Exclude Files"
BACKUPS_PROFILE_EXCLUDE_FILES_HELP: "Specific Files or Folders to exclude, one per line"
BACKUPS_PROFILE_SCHEDULE: "Enable Scheduled Job"
BACKUPS_PROFILE_SCHEDULE_AT: "Run Scheduled Job"
COMMAND: "Command"
EXTRA_ARGUMENTS: "Extra Arguments"

File diff suppressed because one or more lines are too long

View File

@@ -213,19 +213,6 @@ $preview-height: 150px;
}
}
//&:hover .dz-remove, .dz-unset:not(.file-thumbnail-remove), &:hover .dz-insert {
// display: block;
// position: absolute;
// left: 0;
// right: 0;
// bottom: 22px;
// width: 50%;
// text-align: center;
// cursor: pointer;
// font-size: 0.8rem;
//}
&:hover .dz-remove, &:hover .dz-unset {
&.file-thumbnail-remove {
display: block;
@@ -236,30 +223,9 @@ $preview-height: 150px;
}
}
//&:hover .dz-insert {
// right: inherit;
//}
//
//&.hide-backface:hover {
// .dz-remove, .dz-unset, .dz-insert {
// display: none;
// }
//}
&.dz-processing {
.dz-details {
overflow: hidden;
img {
//position: absolute;
//left: 50%;
//top: 50%;
//height: auto;
//width: 100%;
//-webkit-transform: translate(-50%,-50%);
//-ms-transform: translate(-50%,-50%);
//transform: translate(-50%,-50%);
}
}
}