.drone.yml

@@ -1,38 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-workspace:
-  path: /drone/nami
-
-steps:
-  - name: submodules
-    image: alpine/git
-    commands:
-      - git submodule update --init --recursive
-
-  - name: node
-    image: node:18.13.0-slim
-    commands:
-      - cd assets/vendor/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
-
-  - name: deploy
-    image: php:8.1.6
-    environment:
-      SSH_KEY:
-        from_secret: deploy_key
-    commands:
-      - apt-get update > /dev/null
-      - apt-get install -y openssh-client rsync
-      - mkdir $HOME/.ssh
-      - echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
-      - echo "StrictHostKeyChecking=no" >> $HOME/.ssh/config
-      - echo "$SSH_KEY" > $HOME/.ssh/id_rsa
-      - chmod 600 $HOME/.ssh/id_rsa
-      - rsync  --delete -avzze ssh /drone/nami/ dpsg-koeln@dpsg-koeln.de:httpdocs/plugins/silva/adrema
-
-trigger:
-  event:
-    - push
-  branch:
-    - master

lang/de.json

@@ -1,27 +1,15 @@
 {
     "setting_description": "App für DPSG-NaMi",
-    "settings.base_url_label": "Base-URL",
+    "base_url_label": "Base-URL",
-    "settings.base_url_comment": "Die Domain (app_url), auf der deine Adrema läuft",
+    "base_url_comment": "Die Domain (app_url), auf der deine Adrema läuft",
-    "settings.primary_color_label": "Primäre Farbe",
-    "settings.primary_color_comment": "Die primäre Farbe",
-    "settings.secondary_color_label": "Sekundäre Farbe",
-    "settings.secondary_color_comment": "Die sekundäre Farbe",
-    "settings.font_color_label": "Schriftfarbe",
-    "settings.font_color_comment": "Die Farbe von Schriften",
-    "settings.circle_color_label": "Kreisfarbe",
-    "settings.circle_color_comment": "Akzentfarbe für Kreise in Menüs",
     "properties.index_page_title": "Seite für Übersicht",
     "properties.single_page_title": "Seite für Einzelansicht",
     "properties.register_page_title": "Seite zum anmelden",
-    "properties.event_slug_title": "Veranstaltung slug",
     "event_index_component_name": "Veranstaltungs-Übersicht",
     "event_index_component_description": "Übersicht aller bevorstehenden Adrema-Veranstaltungen.",
     "event_register_component_name": "Veranstaltungs-Anmeldung",
     "event_register_component_description": "Für einzelne Veranstaltung anmelden.",
     "event_description_component_name": "Veranstaltungs-Einzelansicht",
     "event_description_component_description": "Einzelne Veranstaltung anzeigen",
-    "errors.not_all_pages_set": "Du hast nicht alle Seiten zugewiesen. Bite bearbeite deine Komponenten.",
+    "properties.event_slug_title": "Veranstaltung slug"
-    "errors.page_not_found": "Eine Seite kann nicht gefunden werden. Veranstaltungs-Komponente kann nicht gerendert werden.",
-    "errors.slug_not_found": "Du musst einen placeholder in den Seiten-URLs setzen (\":slug\")",
-    "errors.event_fetching_failed": "Fehler beim Abrufen von Veranstaltungen"
 }

lang/en.json

@@ -1,15 +1,7 @@
 {
     "setting_description": "App for DPSG-NaMi",
-    "settings.base_url_label": "Base-URL",
+    "base_url_label": "Base-URL",
-    "settings.base_url_comment": "The domain (APP_URL) of the Adrema application.",
+    "base_url_comment": "The domain (APP_URL) of the Adrema application.",
-    "settings.primary_color_label": "Primary color",
-    "settings.primary_color_comment": "The primary color",
-    "settings.secondary_color_label": "Secondary color",
-    "settings.secondary_color_comment": "The secondary color",
-    "settings.font_color_label": "Font color",
-    "settings.font_color_comment": "The color for fonts",
-    "settings.circle_color_label": "Circle color",
-    "settings.circle_color_comment": "Accent-color for circles in menus",
     "properties.index_page_title": "Page for overview",
     "properties.single_page_title": "Page for single view",
     "properties.register_page_title": "Page for registration",

models/settings/fields.yaml

@@ -4,25 +4,25 @@
 
 fields:
   base_url:
-    label: settings.base_url_label
+    label: base_url_label
-    comment: settings.base_url_comment
+    comment: base_url_comment
 
   primary_color:
-    label: settings.primary_color_label
+    label: primary_color_label
-    comment: settings.primary_color_comment
+    comment: primary_color_comment
     type: colorpicker
 
   secondary_color:
-    label: settings.secondary_color_label
+    label: secondary_color_label
-    comment: settings.secondary_color_comment
+    comment: secondary_color_comment
     type: colorpicker
 
   font_color:
-    label: settings.font_color_label
+    label: font_color_label
-    comment: settings.font_color_comment
+    comment: font_color_comment
     type: colorpicker
 
   circle_color:
-    label: settings.circle_color_label
+    label: circle_color_label
-    comment: settings.circle_color_comment
+    comment: circle_color_comment
     type: colorpicker