From 92957c5046cb1d026847096049b2c7ac4265de91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mu=CC=88ller?= Date: Fri, 26 Jul 2019 15:32:33 +0200 Subject: [PATCH] Delete some left-overs --- develop.conf | 1 - src/main/resources/component-web.conf | 1 - .../templates/system/scripting.html.pasta | 163 --------------- .../default/templates/system/task.html.pasta | 196 ------------------ .../default/templates/system/tasks.html.pasta | 75 ------- src/main/resources/web_de.properties | 23 -- src/main/resources/web_en.properties | 23 -- 7 files changed, 482 deletions(-) delete mode 100644 src/main/resources/default/templates/system/scripting.html.pasta delete mode 100644 src/main/resources/default/templates/system/task.html.pasta delete mode 100644 src/main/resources/default/templates/system/tasks.html.pasta diff --git a/develop.conf b/develop.conf index 4c05cceb2..27825a75f 100644 --- a/develop.conf +++ b/develop.conf @@ -11,7 +11,6 @@ security { "permission-system-tags-state", "permission-system-state", "permission-tasks", - "permission-system-scripting", "permission-system-console", "permission-view-scope-default-config" ] } diff --git a/src/main/resources/component-web.conf b/src/main/resources/component-web.conf index be9b6de56..ff1e7aba7 100644 --- a/src/main/resources/component-web.conf +++ b/src/main/resources/component-web.conf @@ -462,7 +462,6 @@ security { permission-system-load : "Required to view the system load" permission-system-tags : "Required to view all known Tagliatelle Tags" permission-system-tags-state : "Required to view the state of Tagliatelle" - permission-system-scripting : "Required to execute ANY JavaScripts on the server(!)" permission-system-notify-state : "Required to receive a warning in wondergem, if the system state is not GREEN" permission-babelfish : "Required to view and export loaded translations" permission-view-scope-default-config : "Required to view the default config of scopes" diff --git a/src/main/resources/default/templates/system/scripting.html.pasta b/src/main/resources/default/templates/system/scripting.html.pasta deleted file mode 100644 index 7846b8d5f..000000000 --- a/src/main/resources/default/templates/system/scripting.html.pasta +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - -
  • @i18n("ManagedTaskController.scripting")
  • -
    - - - - task.log('Good Morning Dave'); - - - - - - -
    - - diff --git a/src/main/resources/default/templates/system/task.html.pasta b/src/main/resources/default/templates/system/task.html.pasta deleted file mode 100644 index 52559beca..000000000 --- a/src/main/resources/default/templates/system/task.html.pasta +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - -
  • @i18n("ManagedTask.plural")
  • -
  • @i18n("ManagedTask.title")
  • -
    - - - @i18n("ManagedTask.title") - @i18n("NLS.cancel") -
    -
    - -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - - - - - - - @i18n("ManagedTask.output") - @i18n("ManagedTask.cleanup") - - - - - - - - - - -
    @i18n("ManagedTask.timestamp")@i18n("ManagedTask.message")
    - - - -
    - diff --git a/src/main/resources/default/templates/system/tasks.html.pasta b/src/main/resources/default/templates/system/tasks.html.pasta deleted file mode 100644 index dc93836d2..000000000 --- a/src/main/resources/default/templates/system/tasks.html.pasta +++ /dev/null @@ -1,75 +0,0 @@ - - -
  • @i18n("ManagedTask.plural")
  • -
    - - - - - - - - - - - - - - - - -
    @i18n("ManagedTask.name")
    - @i18n("ManagedTask.message") -
    @i18n("ManagedTask.state")@i18n("ManagedTask.user")@i18n("ManagedTask.scheduled")
    @i18n("ManagedTask.started")
    - - - -
    \ No newline at end of file diff --git a/src/main/resources/web_de.properties b/src/main/resources/web_de.properties index e1947487c..c846e4fc1 100644 --- a/src/main/resources/web_de.properties +++ b/src/main/resources/web_de.properties @@ -20,29 +20,6 @@ MailService.invalidAddress = Die eMail-Adresse ${address} ist ungültig. MailService.invalidReceiver = Die Empfänger-Adresse ${address} ist ungültig. MailService.invalidReplyTo = Die Reply-To-Adresse ${address} is ungültig. MailService.invalidSender = Die Absender-Adresse ${address} ist ungültig. -ManagedTask.canceled = Die Verarbeitung wurde von ${user} abgebrochen. -ManagedTask.cleanup = Leeren -ManagedTask.counters = Leistungsindikatoren -ManagedTask.message = Nachricht -ManagedTask.name = Name -ManagedTask.output = Ausgabe -ManagedTask.plural = Aktive Tasks -ManagedTask.scheduled = Geplant -ManagedTask.started = Gestartet -ManagedTask.state = Zustand -ManagedTask.State.RUNNING = Aktiv -ManagedTask.State.SCHEDULED = Geplant -ManagedTask.State.TERMINATED = Beendet -ManagedTask.State.WARNINGS = Aktiv (Warnungen) -ManagedTask.timestamp = Zeitpunkt -ManagedTask.title = Aktiver Task -ManagedTask.user = Benutzer -ManagedTaskController.run = Ausführen -ManagedTaskController.scripting = System Scripting -ManagedTaskExecution.completed = Die Ausführung wurde abgeschlossen. -ManagedTaskExecution.scheduled = Ausführung geplant, warte auf freien Thread… -ManagedTaskExecution.started = Die Ausführung wurde begonnen. -ManagedTaskExecution.waitingForForkedTasks = Warte auf gestartete Hintergrundaufgaben. Page.noResults = keine Ergebnisse ScopeDefaultConfigController.config = Standard-Konfiguration ScopeDefaultConfigController.files = Datei diff --git a/src/main/resources/web_en.properties b/src/main/resources/web_en.properties index ca3c12ba9..dd470db55 100644 --- a/src/main/resources/web_en.properties +++ b/src/main/resources/web_en.properties @@ -18,29 +18,6 @@ MailService.invalidAddress = Invalid email address: ${address} MailService.invalidReceiver = Invalid receiver address: ${address} MailService.invalidReplyTo = Invalid reply-to address: ${address} MailService.invalidSender = Invalid sender address: ${address} -ManagedTask.canceled = Processing was aborted by ${user}. -ManagedTask.cleanup = Clean up -ManagedTask.counters = Performance indicators -ManagedTask.message = Message -ManagedTask.name = Name -ManagedTask.output = Output -ManagedTask.plural = Active tasks -ManagedTask.scheduled = Scheduled -ManagedTask.started = Started -ManagedTask.state = State -ManagedTask.State.RUNNING = Active -ManagedTask.State.SCHEDULED = Scheduled -ManagedTask.State.TERMINATED = Terminated -ManagedTask.State.WARNINGS = Active (warnings) -ManagedTask.timestamp = Time -ManagedTask.title = Active task -ManagedTask.user = User -ManagedTaskController.run = Run -ManagedTaskController.scripting = System Scripting -ManagedTaskExecution.completed = The execution has been completed. -ManagedTaskExecution.scheduled = Execution planned, waiting for free thread… -ManagedTaskExecution.started = The execution was started. -ManagedTaskExecution.waitingForForkedTasks = Wait for started background jobs. ScopeDefaultConfigController.config = Standard Configuration ScopeDefaultConfigController.files = File SMTPProtocol.SMTP = SMTP (unencrypted)