Skip to content

Commit

Permalink
adjust dashboard announcement for user survey
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinSchuhmacher
MartinSchuhmacher committed Oct 26, 2023
1 parent 80724de commit 175cf0d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions config/default.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
"type": "string",
"description": "comma separated list of roles which GLOBAL_ANNOUNCEMENT_TEXT is shown to"
},
"BETTERMARKS_ANNOUNCEMENT_ENABLED": {
"DASHBOARD_ANNOUNCEMENT_ENABLED": {
"type": "boolean",
"default": false,
"description": "enbale bettermarks announcement, shown to all user roles specified in BETTERMARKS_ANNOUNCEMENT_ROLES"
"description": "enbale announcement on dashboard, shown to all user roles specified in DASHBOARD_ANNOUNCEMENT_ROLES"
},
"BETTERMARKS_ANNOUNCEMENT_ROLES": {
"DASHBOARD_ANNOUNCEMENT_ROLES": {
"type": "string",
"description": "comma separated list of roles which bettermarks announcement is shown to"
"description": "comma separated list of roles which dashboard announcement is shown to"
},
"GLOBAL_LOGIN_ANNOUNCEMENT_TYPE": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions locales/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1249,15 +1249,15 @@
"toTask": "Zur Aufgabe"
},
"text": {
"announcement": "Nehmen Sie an unserer Zufriedenheitsumfrage teil und helfen Sie uns, die Cloud zu verbessern. <a target=\"_blank\" aria-label=\"Zufriedenheitsumfrage\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://befragungen.dataport.de/umfrage/1732110/47pve9/\">Hier</a> geht’s zur Befragung (ausschließlich in deutscher Sprache).",
"emptyHomeworksInfo": "Keine gestellten Aufgaben. Du findest alle Aufgaben im Aufgaben-Bereich.",
"emptyNewsInfo": "Bisher gibt es keine News.",
"graded": "Bewertet",
"handedIn": "Abgegeben",
"noDueDate": "Kein Abgabedatum festgelegt",
"noMaterialsYetLookAtOthers": "Sie haben noch keine eigenen Materialien erstellt. Sie können sich aber auch Inspiration in Materialien Ihrer Kolleg:innen holen. Schauen Sie doch im <a href=\"/my-material\">\"Meine Materialien\"-Abschnitt</a> vorbei.",
"noNews": "Keine Neuigkeiten",
"notFound": "Keine aktuellen Einträge vorhanden.",
"bettermarksAnnouncement": "Neues bei bettermarks: Jetzt auch <a target=\"_blank\" aria-label=\"Unterrichtseinheiten für Klasse 5 und 6 bei bettermarks\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/unterrichten/\">Unterrichtseinheiten</a> für Klasse 5 und 6 neben den <a target=\"_blank\" aria-label=\"Übungs- und Testaufgaben für Klasse 4 bis 13 bei bettermarks\"class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/ueben-testen/\">Übungs- und Testaufgaben</a> für Jahrgangsstufe 4 bis 13!"
"notFound": "Keine aktuellen Einträge vorhanden."
}
},
"dataprivacy": {
Expand Down
4 changes: 2 additions & 2 deletions locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1249,15 +1249,15 @@
"toTask": "To the task"
},
"text": {
"announcement": "Take part in our satisfaction survey and help us improve the cloud. Click <a target=\"_blank\" aria-label=\"satisfaction survey\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://befragungen.dataport.de/umfrage/1732110/47pve9/\">here</a> for the survey. (German language only).",
"emptyHomeworksInfo": "No assigned tasks. You can find all tasks in the tasks area.",
"emptyNewsInfo": "So far there is no news.",
"graded": "Graded",
"handedIn": "Submitted",
"noDueDate": "No submission date set",
"noMaterialsYetLookAtOthers": "You have not yet created your own materials. But you can also get inspiration from your colleagues' materials. Check out the <a href=\"/my-material\">\"My Materials\" section</a> .",
"noNews": "No news",
"notFound": "No active entries found.",
"bettermarksAnnouncement": "New at bettermarks: Now also <a target=\"_blank\" aria-label=\"Lessons for class 5 and 6 at bettermarks\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/unterrichten/\">teaching units</a> for grade 5 and 6 in addition to the <a target=\"_blank\" aria-label=\"Exercises and tests for grades 4 to 13 at bettermarks\"class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/ueben-testen/\">practice and test items</a> for grades 4 to 13!"
"notFound": "No active entries found."
}
},
"dataprivacy": {
Expand Down
4 changes: 2 additions & 2 deletions locales/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1249,15 +1249,15 @@
"toTask": "A la tarea"
},
"text": {
"announcement": "Participe en nuestra encuesta de satisfacción y ayúdenos a mejorar la nube. Haga clic <a target=\"_blank\" aria-label=\"encuesta de satisfacción\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://befragungen.dataport.de/umfrage/1732110/47pve9/\">aquí</a> para acceder a la encuesta (solo en alemán).",
"emptyHomeworksInfo": "No hay tareas asignadas. Puedes encontrarar todas las tareas en el área de tareas.",
"emptyNewsInfo": "Hasta el momento no hay noticias.",
"graded": "Calificado",
"handedIn": "Presentado",
"noDueDate": "No se ha fijado una fecha de envío",
"noMaterialsYetLookAtOthers": "Aún no has creado tus propios materiales. También puedes inspirarte en los materiales de tus compañeros. Consulta la <a href=\"/my-material\">sección \"Mis materiales\"</a>.",
"noNews": "No hay noticias",
"notFound": "No se han encontrado entradas activas.",
"bettermarksAnnouncement": "Novedad en bettermarks: ¡Ahora también <a target=\"_blank\" aria-label=\"Lecciones para las clases 5 y 6 en bettermarks\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/unterrichten/\">unidades didácticas</a> para 5º y 6º curso, además de las <a target=\"_blank\" aria-label=\"Ejercicios y tests para los cursos 4º a 13º en bettermarks\"class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/ueben-testen/\">tareas de práctica y examen</a> para 4º a 13º curso!"
"notFound": "No se han encontrado entradas activas."
}
},
"dataprivacy": {
Expand Down
4 changes: 2 additions & 2 deletions locales/uk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"welcome": "Вітаємо"
},
"text": {
"announcement": "Візьміть участь у нашому опитуванні та допоможіть нам покращити хмару. Натисніть <a target=\"_blank\" aria-label=\"опитуванні\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://befragungen.dataport.de/umfrage/1732110/47pve9/\">тут</a>, щоб отримати доступ до опитування (лише німецькою мовою).",
"notFound": "Активних записів не знайдено.",
"emptyHomeworksInfo": "Усі домашні завдання показуються в розділі домашніх завдань.",
"emptyNewsInfo": "Немає останніх новин. Перегляньте розділ новин, щоб бути в курсі.",
"noNews": "Немає новин",
"noDueDate": "Дата подання не встановлена",
"noMaterialsYetLookAtOthers": "Ви ще не створили власні матеріали. Але ви також можете черпати натхнення з матеріалів своїх колег. Перевірте <a href=\"/my-material\">Розділ «Мої матеріали»</a>.",
"graded": "Оцінено",
"handedIn": "Подані",
"bettermarksAnnouncement": "Нове на bettermarks: тепер також <a target=\"_blank\" aria-label=\"Уроки для 5 та 6 класів на кращі оцінки\" class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/unterrichten/\">навчальні блоки</a> для 5 та 6 класів на додаток до <a target=\"_blank\" aria-label=\"Вправи та тести для 4-13 класів на кращі оцінки\"class=\"alert-link\" rel=\"noopener noreferrer\" href=\"https://de.bettermarks.com/ueben-testen/\">практичних та тестових завдань</a> для 4-13 класів!"
"handedIn": "Подані"
},
"img_alt": {
"showAppointmentInTeam": "Показати призначення в команді",
Expand Down
4 changes: 2 additions & 2 deletions static/styles/dashboard/dashboard.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
}
}

.bettermarks-notification {
.dashboard-notification {
display: flex;
color: #424242;
border: solid $secondaryColor;
Expand All @@ -308,7 +308,7 @@
margin-top: 3rem;
padding: .75rem 1.25rem .75rem 0;

.bettermarks-notification-text {
.dashboard-notification-text {
margin: 0
}

Expand Down
14 changes: 7 additions & 7 deletions views/dashboard/dashboard.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@
</div>
{{/if}}

{{#hasConfig "BETTERMARKS_ANNOUNCEMENT_ENABLED"}}
{{#hasConfig "BETTERMARKS_ANNOUNCEMENT_ROLES"}}
{{#ifeq (getConfig "BETTERMARKS_ANNOUNCEMENT_ENABLED") true}}
{{#ifneq (getConfig "BETTERMARKS_ANNOUNCEMENT_ROLES") ""}}
{{#if (userHasRoleFromArray (getConfig "BETTERMARKS_ANNOUNCEMENT_ROLES") ../currentUser)}}
<div class="alert bettermarks-notification" role="alert">
<i class="fa fa-fw fa-lightbulb-o fa-lg" style="margin: 6px 0.5rem 0 0.5rem; color: #38677A" aria-hidden="true"></i><p class="bettermarks-notification-text">{{{$t "dashboard.text.bettermarksAnnouncement"}}}</p>
{{#hasConfig "DASHBOARD_ANNOUNCEMENT_ENABLED"}}
{{#hasConfig "DASHBOARD_ANNOUNCEMENT_ROLES"}}
{{#ifeq (getConfig "DASHBOARD_ANNOUNCEMENT_ENABLED") true}}
{{#ifneq (getConfig "DASHBOARD_ANNOUNCEMENT_ROLES") ""}}
{{#if (userHasRoleFromArray (getConfig "DASHBOARD_ANNOUNCEMENT_ROLES") ../currentUser)}}
<div class="alert dashboard-notification" role="alert">
<i class="fa fa-fw fa-lightbulb-o fa-lg" style="margin: 6px 0.5rem 0 0.5rem; color: #38677A" aria-hidden="true"></i><p class="dashboard-notification-text">{{{$t "dashboard.text.announcement"}}}</p>
</div>
{{/if}}
{{/ifneq}}
Expand Down

0 comments on commit 175cf0d

Please sign in to comment.