diff --git a/media/copy.js b/media/copy.js index 4d3f06cf..1d4aabd4 100644 --- a/media/copy.js +++ b/media/copy.js @@ -1,12 +1,5 @@ function copyToClipboard(button) { const text = button.getAttribute("data-text"); - navigator.clipboard.writeText(text).then(function() { - const alertBox = document.createElement("span"); - alertBox.className = "text-success ms-2"; - alertBox.innerText = "Copied!"; - - button.parentElement.appendChild(alertBox); - setTimeout(() => alertBox.remove(), 2000); - }).catch(err => console.error('Copy failed:', err)); + navigator.clipboard.writeText(text); } \ No newline at end of file diff --git a/media/custom.css b/media/custom.css deleted file mode 100644 index 889abbcc..00000000 --- a/media/custom.css +++ /dev/null @@ -1,233 +0,0 @@ -body { - font-family: 'Libre Franklin', Helvetica, Arial, sans-serif; - font-size: 15px; - line-height: 200%; - color: #444444; - overflow-y: scroll; - min-height: 100vh; - display: flex; - flex-direction: column; -} -body.cke_editable { - margin: 8px; -} -a:hover { - color: #111111; -} -footer { - background-color: #ecf0f1; - color: #7f8c8d; - margin-top: auto; -} -footer p { - line-height: 20px; - margin: 10px; -} -footer a { - color: #9aa4af; - font-weight: 700; -} -footer i { - padding-right: 10px; -} -footer .row { - padding: 10px 0; -} -.footer-column { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding: 0.5em 0; -} -.footer-group { - display: flex; - flex-direction: row; - justify-content: center; - margin: 0.5em 0; - text-align: center; -} -.footer-group + .footer-group:not(:last-child) { - margin: 0.5em 0; -} -@media(max-width: 470px) { -.footer-group { - flex-direction: column; -} -} -.right { - float: right; - margin-top: 25px; - margin-bottom: 25px; - margin-left: 25px; -} -.left { - float: left; - margin-top: 25px; - margin-bottom: 25px; - margin-right: 25px; -} -#header img { - height: 100px; - margin-top: 25px; - margin-bottom: 25px; -} -#content, -#sidebar { - margin-top: 35px; - margin-bottom: 50px -} -#sidebar { - font-size: 18px; - margin-top: 50px; -} -#content { - text-align: justify; -} -.navbar-logos { - padding: 0px; -} -.navbar-nav li a { - color: #f5f5f5; - font-size: 18px; -} -.navbar-nav li a:hover { - background-color: #777777; - background-color: rgba(0, 0, 0, .5); - color: #f5f5f5; -} -.breadcrumb { - background-color: inherit; - padding: 0; - text-align: left; -} -.breadcrumb>li{ - display: inline; -} -.language-chooser{ - margin-left: 10px; -} -.sidebar-active, -.sidebar-active:hover, -.sidebar-active:focus { - color: #ffffff; -} -.sidebar-active > a:hover, -.sidebar-active > a:focus { - color: #ffffff!important; -} -.sidebar-nav { - border-left: 5px solid #999999; -} -.sidebar-nav > li > a { - padding: 10px 15px 10px 0; -} -.sidebar-nav > li > a:focus { - background-color: transparent; -} -.sidebar-nav > li { - padding-left: 20px; - margin-left: -5px; - word-break: break-all; -} -.sidebar-nav > li:hover { - border-left: 5px solid #999999; - padding-left: 15px; - background-color: #eee; -} -li.sidebar-active { - padding-left: 15px; -} -.sidebar-nav a { - text-decoration: none; - display:block; -} -.sidebar-nav a:hover { - font-weight: bold; -} -.sidebar-active-link { - font-weight: bold; -} -.sidebar-active > a { - color: #ffffff!important; - text-decoration: none; -} -.sidebar-active > ul { - padding: 10px; - background-color: #cccccc; - background-color: rgba(255, 255, 255, .75); - margin-left: -15px; -} -.sidebar-active > ul li { - list-style-type: none; -} -@media (max-width: 522px) { - #responsivelogo { - display: none; - } -} -.header-navbar { - padding: 0; -} -.header-navbar-link { - line-height: 25px; - padding: 15px !important; -} -li.headline:hover { - background-color: transparent; -} -.rss-plugin { - margin-top: 50px; -} -.feed-entry-date { - text-align: right; -} -.feed-entry { - border-bottom: 2px solid #444444; - padding-bottom: 15px; - margin-top: 25px; -} -.navbar-toggler { - float: none; - border-color: #999999; -} -.navbar-toggler-icon { - color: #999999; -} -.navbar-collapse { - padding: 0; -} -.navbar { - border-radius: 0; - border: 0; - margin-bottom: 0; -} -.additionalMargin { - margin-bottom: 25px; -} -.menuIndent { - padding-left: 20px; -} -.announcement { - border-left: 3px solid #b90f22; - background-color: #f9d6d6; - margin-top: 25px; - padding: 20px 20px 10px 20px; -} -.announcement:empty { - display: none; -} -.navbar-default .navbar-nav > li > a:focus { - color: #ffffff; -} -h1,h2,h3,h4,h5 { - text-align:left; -} - -.table h1,h2,h3,h4,h5 { - margin-top:5px; -} - -.table .table { - margin-bottom:0; -} diff --git a/media/fonts/roboto-italic.woff2 b/media/fonts/roboto-italic.woff2 new file mode 100644 index 00000000..60409b2e Binary files /dev/null and b/media/fonts/roboto-italic.woff2 differ diff --git a/media/fonts/roboto-slab.woff2 b/media/fonts/roboto-slab.woff2 new file mode 100644 index 00000000..3fca26b8 Binary files /dev/null and b/media/fonts/roboto-slab.woff2 differ diff --git a/media/fonts/roboto.woff2 b/media/fonts/roboto.woff2 new file mode 100644 index 00000000..df33f805 Binary files /dev/null and b/media/fonts/roboto.woff2 differ diff --git a/media/header_functions.js b/media/header_functions.js new file mode 100644 index 00000000..11036aba --- /dev/null +++ b/media/header_functions.js @@ -0,0 +1,24 @@ +window.addEventListener('DOMContentLoaded', () => { + const btn = document.getElementById('theme-button'); + if (!btn) return; + + const root = document.documentElement; + + const applyTheme = (theme) => { + root.classList.remove('light', 'dark'); + root.classList.add(theme); + }; + + btn.addEventListener('click', () => { + const current = root.classList.contains('dark') ? 'dark' : 'light'; + const next = current === 'dark' ? 'light' : 'dark'; + + applyTheme(next); + localStorage.setItem('theme', next); + }); +}); + +document.querySelector('.dropdown-trigger').addEventListener('click', function(e) { + e.preventDefault(); + this.parentElement.querySelector('.dropdown-content').classList.toggle('show'); +}); \ No newline at end of file diff --git a/media/img/d120-breit-transparent-dunkel-pfad.svg b/media/img/d120-breit-transparent-dunkel-pfad.svg new file mode 100644 index 00000000..0f07b1e2 --- /dev/null +++ b/media/img/d120-breit-transparent-dunkel-pfad.svg @@ -0,0 +1,171 @@ + + + + diff --git a/media/img/d120-breit-transparent-hell-pfad.svg b/media/img/d120-breit-transparent-hell-pfad.svg new file mode 100644 index 00000000..d0dc897a --- /dev/null +++ b/media/img/d120-breit-transparent-hell-pfad.svg @@ -0,0 +1,176 @@ + + + + diff --git a/media/img/d120-schmal-dunkel-pfad.svg b/media/img/d120-schmal-dunkel-pfad.svg new file mode 100644 index 00000000..10020a52 --- /dev/null +++ b/media/img/d120-schmal-dunkel-pfad.svg @@ -0,0 +1,140 @@ + + + + diff --git a/media/img/d120-schmal-hell-pfad.svg b/media/img/d120-schmal-hell-pfad.svg new file mode 100644 index 00000000..13fd2ed4 --- /dev/null +++ b/media/img/d120-schmal-hell-pfad.svg @@ -0,0 +1,146 @@ + + + + diff --git a/media/img/d120_logo.png b/media/img/d120_logo.png deleted file mode 100644 index 6547630a..00000000 Binary files a/media/img/d120_logo.png and /dev/null differ diff --git a/media/img/tu_da_logo.png b/media/img/tu_da_logo.png deleted file mode 100644 index cb91b732..00000000 Binary files a/media/img/tu_da_logo.png and /dev/null differ diff --git a/media/img/tud.svg b/media/img/tud.svg new file mode 100644 index 00000000..14ee3d3e --- /dev/null +++ b/media/img/tud.svg @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/img/tud_small.svg b/media/img/tud_small.svg new file mode 100644 index 00000000..4d661de7 --- /dev/null +++ b/media/img/tud_small.svg @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/ranking.css b/media/ranking.css deleted file mode 100644 index 78bb6ab0..00000000 --- a/media/ranking.css +++ /dev/null @@ -1,176 +0,0 @@ -#Content { - width: 750px; -} - -#Content form textarea.fullwidth { - width: auto; -} - -.ranking_header { - clear: both; -} - - .ranking_header .label { - padding-left: 5px; - width: 370px; - height: 21px; - float: left; - border-bottom: 1px solid #666; - } - - .ranking_header .label.last { - width: 370px; - height: 21px; - border-bottom: none; - border-right: 1px solid #666; - } - - .ranking_header .label.selected { - /* background-color: #bbb; */ - font-weight: bold; - } - - .ranking_header .spacer { - float: left; - } - - .ranking_header .spacer.horizontal { - width: 30px; - height: 21px; - border-bottom: 1px solid #666; - } - - .ranking_header .spacer.vertical { - width: 30px; - height: 21px; - border-right: 1px solid #666; - } - -.ranking_table { - border-collapse: collapse; - padding: 0; -} - -.ranking_table a { - color: black; -} - -.ranking_row td { - border: none; - border-right: 1px solid #666; - border-bottom: 1px solid #666; -} - -.border td { - border-bottom: 1px solid black; -} - -.ranking_row.row1, .cycle.row1 { - background-color: #dadada; -} - -.ranking_row.row2, .cycle.row2 { -} - -.ranking_row .selected { - background-color: #bbb; -} - -.ranking_row .label { - width: 370px; - padding-left: 5px; - padding-right: 0; -} - -.ranking_row .data { - width: 30px; - padding-left: 0; - padding-right: 0; - text-align: center; -} - -.invalid { - color: #888; -} - -#ranking_details th { - padding-left: 5px; - padding-right: 5px; - text-align: left; -} - -#ranking_details td { - text-align: center; -} - -.clear { - clear: both; -} - -fieldset { - margin-bottom: 20px; -} - -legend { - font-weight: bold; -} - - -/* -Die folgenden Definitionen basieren auf dem Django-Quelltext. Lizenz: - -Copyright (c) Django Software Foundation and individual contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of Django nor the names of its contributors may be used - to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -ul.messagelist { - padding: 0 0 5px 0; - margin: 0; -} - -ul.messagelist li, ul.errorlist li { - font-size: 12px; - display: block; - padding: 4px 5px 4px 25px; - margin: 0 0 3px 0; - border-bottom: 1px solid #ddd; - color: #666; - background: #ffc 5px .3em no-repeat; -} - -ul.messagelist li.success{ - background-image: url(/feedback_admin_media/img/admin/icon_success.gif); -} - -ul.messagelist li.warning{ - background-image: url(/feedback_admin_media/img/admin/icon_alert.gif); -} - -ul.messagelist li.error, ul.errorlist li { - background-image: url(/feedback_admin_media/img/admin/icon_error.gif); -} diff --git a/media/style/color-font.css b/media/style/color-font.css new file mode 100644 index 00000000..b17f530b --- /dev/null +++ b/media/style/color-font.css @@ -0,0 +1,184 @@ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("../fonts/roboto.woff2") format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url("../fonts/roboto-italic.woff2") format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("../fonts/roboto-slab.woff2") format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + + +:root, .dark { + color-scheme: dark; + + /* Font Family Variables */ + --font-main: "Roboto", sans-serif; + --font-second: "Roboto Slab", serif; + + /* Color Variables */ + --main-theme-color: #e0e0e0; + --main-secondary-theme-color: #aaaaaa; + --main-background-color: #181818; + --main-secondary-bg-color: #2c2c2c; + --warning: #f00; + + --selection-bg: #00d061; + --selection-color: #181818; + + --header-link-highlight: #00d061; + --header-link-highlight-bg: #2c2c2c; + --header-dropdown-border: #bbb; + --header-dropdown-bg: #181818; + --header-dropdown-li-bg-highlight: #444; + --header-dropdown-li-side-border: #e0e0e0; + + --sidebar-link-color:#e0e0e0; + --sidebar-link-hover-bg-color: #2c2c2c; + + --form-required: #ffbcbc; + --form-highlight: #00d061; + --form-not-highlighted: #444; + + --form-progressbar-active: #a29bfe; + --form-progressbar-active-hover: #c4b5fd; + --form-progressbar-disabled-active: #774fc6; + + --progressbar-detail-color: #888; + --progressbar-start-color: #6c5ce7; + --progressbar-end-color: #a29bfe; + + --link-color:#a29bfe; + --link-hover: #c4b5fd; + --link-bottom: #444; + + --accent-color: #a29bfe; + --accent-color-hover: #c4b5fd; + --button-secondary-bg-hover: #222; + + --unattended-course: #7f7f14; + --mail-context-highlight: #00ffff; + + --ranking-selected: #a29bfe; + --ranking-invalid: #888; + + --footer-bg-color: #222; + + --msg-default-bg: #1a1c1e; + --msg-default-text: #e9ecef; + --msg-default-border: #373a3c; + + --msg-success-bg: #0f2d16; + --msg-success-text: #b7e4c7; + --msg-success-border: #1b4324; + + --msg-warning-bg: #332b00; + --msg-warning-text: #ffec99; + --msg-warning-border: #665200; + + --msg-error-bg: #2d0f0f; + --msg-error-text: #f8d7da; + --msg-error-border: #431b1b; + +} + +.light { + color-scheme: light; + + /* Font Family Variables */ + --font-main: "Roboto", sans-serif; + --font-second: "Roboto Slab", serif; + + /* Color Variables */ + --main-theme-color: #181818; + --main-secondary-theme-color: #303030; + --main-background-color: #fff; + --main-secondary-bg-color: #e3e3e3; + --warning: #f00; + + --selection-bg: #00d061; + --selection-color: #181818; + + --header-link-highlight: #00a84e; + --header-link-highlight-bg: #e3e3e3; + --header-dropdown-border: #181818; + --header-dropdown-bg: #fff; + --header-dropdown-li-bg-highlight: #e3e3e3; + --header-dropdown-li-side-border: #181818; + + --sidebar-link-color:#181818; + --sidebar-link-hover-bg-color: #e3e3e3; + + --form-required: #ff5f5f; + --form-highlight: #00a84e; + --form-not-highlighted: #d1d1d1; + + --form-progressbar-active: #5f27cd; + --form-progressbar-active-hover: #5323b4; + --form-progressbar-disabled-active: #774fc6; + + --progressbar-detail-color: #999; + --progressbar-start-color: #5f27cd; + --progressbar-end-color: #9c88ff; + + --link-color:#5f27cd; + --link-hover: #5323b4; + --link-bottom: #ccc; + + --accent-color: #5f27cd; + --accent-color-hover: #5323b4; + --button-secondary-bg-hover: #ddd; + + --unattended-course: #ffff00; + --mail-context-highlight: #0000ff; + + --ranking-selected: #5f27cd; + --ranking-invalid: #888; + + --footer-bg-color: #eee; + + --msg-default-bg: #f8f9fa; + --msg-default-text: #212529; + --msg-default-border: #dee2e6; + + --msg-success-bg: #d4edda; + --msg-success-text: #155724; + --msg-success-border: #c3e6cb; + + --msg-warning-bg: #fff3cd; + --msg-warning-text: #856404; + --msg-warning-border: #ffeeba; + + --msg-error-bg: #f8d7da; + --msg-error-text: #721c24; + --msg-error-border: #f5c6cb; +} + +.dark-only, .light-only { + display: none; +} + +html.dark .dark-only { + display: block; +} + +html.light .light-only { + display: block; +} diff --git a/media/style/custom.css b/media/style/custom.css new file mode 100644 index 00000000..d6845d1b --- /dev/null +++ b/media/style/custom.css @@ -0,0 +1,428 @@ +@import url('colors.css'); + +body { + font-family: var(--font-main); + font-size: 15px; + color: var(--main-theme-color); + background-color: var(--main-background-color); + line-height: 200%; + overflow-y: scroll; + min-height: 100vh; + display: flex; + flex-direction: column; +} + +::selection { + color: var(--selection-color); + background-color: var(--selection-bg); +} + +/* main page layout */ + +.main-area { + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 5%; + padding: 3%; +} + +.sidebar-area { + flex: 1; + padding-left: 0%; +} + +.content-area { + flex: 3.5; + min-width: 0; + text-align: justify; +} + +#backlink { + text-align: right; +} + +/* message list, errer list, breadcrumb, warning */ + +.messagelist li, +.errorlist, +blockquote, +.comment-box { + padding: 10px 12px; + margin: 15px 0; + border-radius: 4px; + box-sizing: border-box; +} + +.messagelist { + list-style: none; + padding: 0; + margin: 0; +} + +.messagelist li { + background-color: var(--msg-default-bg); + color: var(--msg-default-text); + border: 1px solid var(--msg-default-border); +} + +.messagelist li.success { + background-color: var(--msg-success-bg); + color: var(--msg-success-text); + border-color: var(--msg-success-border); +} + +.messagelist li.error { + background-color: var(--msg-error-bg); + color: var(--msg-error-text); + border-color: var(--msg-error-border); +} + +.messagelist li.warning { + background-color: var(--msg-warning-bg); + color: var(--msg-warning-text); + border-color: var(--msg-warning-border); +} + +.errorlist { + list-style: none; + background-color: var(--msg-error-bg); + color: var(--msg-error-text); + border: 1px solid var(--msg-error-border); + font-size: 0.85rem; +} + +.errorlist li { + margin-bottom: 5px; +} + +.errorlist li:last-child { + margin-bottom: 0; +} + +blockquote, .comment-box { + border: 1px solid transparent; + border-left: 4px solid var(--main-theme-color); + font-style: italic; + background-color: rgba(0, 0, 0, 0.02); +} + +.breadcrumb { + background: var(--main-background-color); + padding: 8px 12px; + border-radius: 4px; + margin-bottom: 20px; + font-size: 0.85rem; +} + +.warning { + color: var(--warning); +} + +/* === main general elements === */ + +/* anchor */ + +a { + color: var(--link-color); + text-decoration: none; + border-bottom: 2px solid var(--link-bottom); + transition: all 0.2s ease; +} + +a:hover { + color: var(--link-hover); + border-bottom-color: var(--link-hover); +} + +/* primary and secondary buttons */ + +button { + cursor: pointer; + text-decoration: none; + padding: 0.4rem 0.8rem; + font-size: 0.9rem; + line-height: 1.2; + border: 1px solid transparent; + border-radius: 4px; + transition: all 0.2s ease; +} + +button:disabled, +button[disabled] { + cursor: not-allowed; + opacity: 0.5; + filter: saturate(0.5); + pointer-events: none; +} + +button.primary { + color: var(--main-background-color); + background-color: var(--accent-color); +} + +button.primary:hover { + background-color: var(--accent-color-hover); +} + +button.secondary { + color: var(--accent-color); + background-color: transparent; + border-color: var(--accent-color); +} + +button.secondary:hover { + color: var(--accent-color-hover); + background-color: var(--button-secondary-bg-hover); + border-color: var(--accent-color-hover); +} + +button.secondary:disabled { + background-color: transparent; + border-color: var(--accent-color); +} + +button.small { + padding: 0.15rem 0.5rem; + font-size: 0.7rem; +} + +/* input file, text, email */ + +input[type="file"] { + color: var(--main-theme-color); + background-color: transparent; + border: 1px solid var(--form-not-highlighted); + border-radius: 4px; + padding: 0.4rem; + font-size: 0.9rem; + line-height: 1.2; + cursor: pointer; + transition: border-color 0.2s ease; +} + +input[type="file"]:hover { + border-color: var(--accent-color-hover); +} + +input[type="file"]::file-selector-button { + color: var(--main-background-color); + background-color: var(--accent-color); + border: none; + border-radius: 4px; + padding: 0.4rem 0.8rem; + font-size: 0.9rem; + line-height: 1.2; + margin-right: 12px; + cursor: pointer; + transition: background-color 0.2s ease; +} + +input[type="file"]::file-selector-button:hover { + background-color: var(--accent-color-hover); +} + +input[type="text"], input[type="email"] { + color: var(--main-theme-color); + background-color: transparent; + border: 1px solid var(--form-not-highlighted); + border-radius: 4px; + padding: 0.4rem 0.8rem; + font-size: 0.9rem; + line-height: 1.2; + outline: none; + transition: border-color 0.2s ease; + box-sizing: border-box; +} + +input[type="text"]:focus, +input[type="text"]:hover, +input[type="email"]:focus, +input[type="email"]:hover { + border-color: var(--accent-color-hover); +} + +input[type="text"]:disabled, +input[type="email"]:disabled { + color: var(--form-not-highlighted); + border-color: var(--form-not-highlighted); + cursor: not-allowed; + opacity: 0.6; +} + +input[type="radio"] { + appearance: none; + -webkit-appearance: none; + width: 1.05rem; + height: 1.05rem; + border: 1px solid var(--form-not-highlighted); + border-radius: 50%; + background-color: transparent; + cursor: pointer; + position: relative; + transition: border-color 0.2s ease; + vertical-align: middle; +} + +input[type="radio"]:checked { + border-color: var(--accent-color); +} + +/* Dot for checked state */ +input[type="radio"]:checked::after { + content: ""; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 0.5rem; + height: 0.5rem; + border-radius: 50%; + background-color: var(--accent-color); +} + +input[type="radio"]:hover { + border-color: var(--accent-color-hover); +} + +input[type="number"] { + color: var(--main-theme-color); + background-color: var(--main-background-color); + border: 1px solid var(--accent-color); + padding: 0.4rem 0.8rem; + font-size: 0.9rem; + line-height: 1.2; + -moz-appearance: textfield; + appearance: textfield; +} + +input[type="number"]:focus, +input[type="number"]:hover { + outline: none; + border-color: var(--accent-color-hover); +} + +input::-webkit-outer-spin-button, +input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; +} + +input[type="checkbox"] { + width: 1rem; + height: 1rem; + color: var(--main-theme-color); + accent-color: var(--accent-color); + border: none; + cursor: pointer; + vertical-align: middle; +} + +input[type="checkbox"]::before { + background-color: var(--main-background-color); +} + +input[type="checkbox"]:focus, +input[type="checkbox"]:hover { + border-color: var(--accent-color-hover); +} + +input[type="date"] { + color: var(--main-theme-color); + background-color: var(--main-background-color); + border: 1px solid var(--accent-color); + padding: 0.4rem 0.8rem; + font-size: 0.9rem; + line-height: 1.2; +} + +input[type="date"]:focus, +input[type="date"]:hover { + border-color: var(--accent-color-hover); + outline: none; +} + +label { + cursor: pointer; + font-size: 0.9rem; + color: var(--main-theme-color); +} + + +/* select, option, fieldset, textarea */ + +fieldset { + border: none; +} + +textarea { + color: var(--main-theme-color); + background-color: transparent; + border: 1px solid var(--form-not-highlighted); + border-radius: 4px; + padding: 6px 12px; + outline: none; + transition: border-color 0.2s ease; + box-sizing: border-box; + font-size: 0.9rem; +} + +textarea:focus, +textarea:hover { + border-color: var(--accent-color-hover); +} + +select { + font-size: 0.9rem; + padding: 0.4rem 1.8rem 0.4rem 0.8rem; + line-height: 1.2; + cursor: pointer; + + color: var(--accent-color); + background-color: var(--main-background-color); + border: 1px solid var(--main-secondary-bg-color); + border-radius: 4px; + + transition: all 0.2s ease; +} + +select:hover { + border-color: var(--accent-color-hover); +} + +select:focus { + outline: none; + border-color: var(--accent-color-hover); + box-shadow: 0 0 0 2px var(--header-dropdown-li-bg-highlight); +} + +.select-dynamic { + width: auto; + min-width: 110px; + max-width: 100%; + display: inline-block; +} + +h1,h2,h3,h4,h5 { + text-align:left; +} +/* +.table h1,h2,h3,h4,h5 { + margin-top:5px; +} + +.table .table { + margin-bottom:0; +} */ + +h1 { + color: var(--form-highlight); + font-weight: 800; + font-size: 1.4rem; + letter-spacing: -0.5px; + margin-bottom: 1.25rem; + margin-top: 1.25rem; + border-bottom: 3px solid var(--form-highlight); + display: inline-block; + padding-bottom: 5px; +} \ No newline at end of file diff --git a/media/style/d120/footer.css b/media/style/d120/footer.css new file mode 100644 index 00000000..f9648d56 --- /dev/null +++ b/media/style/d120/footer.css @@ -0,0 +1,48 @@ +@import url('../color-font.css'); + +footer { + background-color: var(--footer-bg-color); + color: var(--main-theme-color); + margin-top: auto; +} +footer p { + line-height: 20px; + margin: 10px; +} +footer a { + font-weight: 700; + color: inherit; +} +footer i { + padding-right: 10px; +} +footer .row { + padding: 10px 0; +} +.footer-column { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 0.5em 0; +} +.footer-group { + display: flex; + flex-direction: row; + justify-content: center; + margin: 0.5em 0; + text-align: center; +} + +#github-icon, #github-icon:hover { + border: 0; +} + +.footer-group + .footer-group:not(:last-child) { + margin: 0.5em 0; +} +@media(max-width: 470px) { +.footer-group { + flex-direction: column; +} +} \ No newline at end of file diff --git a/media/style/d120/header.css b/media/style/d120/header.css new file mode 100644 index 00000000..e419a65f --- /dev/null +++ b/media/style/d120/header.css @@ -0,0 +1,228 @@ +@import url('../color-font.css'); + +header { + font-family: var(--font-second); + background-color: var(--main-background-color); + color: var(--main-theme-color); + width: 100%; + position: sticky; + top: 0; + z-index: 2; + border-top: 14px solid var(--main-theme-color); + border-bottom: 1px solid var(--main-theme-color); +} + +/* navbar and container */ +.header-top-container-wrapper { + border-top: 3px solid var(--main-background-color); + width: 100%; +} + +.header-top-container { + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; + background-color: var(--main-background-color); + border-top: 1px solid var(--main-theme-color); + width: 100%; + min-height: 60px; +} + +.header-side-container { + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; + gap: calc(5px + 0.5vw); + max-width: 100%; +} + +.navigation { + display: flex; + flex-direction: row; +} + +/* general link and button */ + +.header-label { + display: none; +} + +@media (min-width: 576px) { + .header-label { + display: inline; + } +} + +.header-link { + text-decoration: none; + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: center; + gap: 8px; + color: var(--header-link-highlight); + padding: 0.8rem 1rem; + font-size: 1rem; + line-height: 1.2; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; +} + + +.header-button { + background-color: transparent; + color: var(--header-link-highlight); + border: none; + text-decoration: none; + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; + gap: 8px; + padding: 0.8rem 1rem; + font-size: 1rem; + font-weight: normal; + line-height: 1.2; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + border-radius: 0; +} + +@media (max-width: 991px) and (min-width: 576px) { + .header-link, .header-button { + flex-direction: column; + justify-content: center; + text-align: center; + gap: 2px; + padding: 0.5rem 0.8rem; + } + + .header-label { + display: inline; + font-size: 0.75rem; + } +} + +@media (min-width: 992px) { + .header-link, .header-button { + flex-direction: row; + padding: 1rem 1.5rem; + font-size: 1rem; + } + + .header-label { + font-size: 1rem; + } +} + +.header-link:hover, .header-button:hover { + color: var(--header-link-highlight); + text-decoration: none; + background-color: var(--header-link-highlight-bg); + border-top: 1px solid var(--main-theme-color); + border-bottom: 1px solid var(--main-theme-color); +} + +/* language dropdown menu */ + +.dropdown { + position: relative; + display: inline-block; +} + +.dropdown-content { + display: none; + position: absolute; + right: 0; + background-color: var(--header-dropdown-bg); + min-width: 160px; + z-index: 10; + list-style: none; + padding: 5px; + margin: 0; + border: 1px solid var(--header-dropdown-border); +} + +.dropdown:hover .dropdown-content { + display: block; +} + +.dropdown-item { + color: var(--main-theme-color); + text-decoration: none; + display: block; + font-size: 0.9rem; + padding: 5px 15px; + border-left: 4px solid transparent; + border-bottom: 2px solid var(--sidebar-link-hover-bg-color); +} + +.dropdown-item:hover { + color: var(--main-theme-color); + background-color: var(--header-dropdown-li-bg-highlight); + border-bottom: 2px solid var(--sidebar-link-hover-bg-color); + border-left: 4px solid var(--header-dropdown-li-side-border); +} + + +/* login stuff */ + +.auth-wrapper { + display: inline-block; +} + +.auth-form { + display: inline; + margin: 0; +} + +/* fachsschaft logo behaviour (also respnsive) */ + +.header-logo { + display: none; + width: 40px; + height: 40px; +} + +@media (min-width: 480px) { + .header-logo-small { + display: block; + width: 60px; + height: 60px; + } +} + +@media (min-width: 768px) { + .header-logo-small { + display: none; + } + .header-logo-big { + display: block; + width: 200px; + height: 80px; + } +} + + +@keyframes hue { + from { + filter: brightness(4) hue-rotate(0deg); + } + to { + filter: brightness(4) hue-rotate(360deg); + } +} + +#mainLogo { + animation: 16s linear 0s infinite normal both running hue; + background-color: transparent; + border: 0; + display: block; +} + +#mainLogo:hover { + background-color: transparent; + border: 0; +} diff --git a/media/style/d120/sidebar.css b/media/style/d120/sidebar.css new file mode 100644 index 00000000..83bb3d14 --- /dev/null +++ b/media/style/d120/sidebar.css @@ -0,0 +1,47 @@ +@import url('../color-font.css'); + +#sidebar { + font-family: var(--font-second); + font-size: 18px; + background-color: transparent; +} + +.sidebar-active { + display: flex; + flex-direction: column; + justify-content: space-evenly; +} + +.sidebar-active li { + list-style: none; + padding-left: 5%; + padding-right: 0; +} + +.sidebar-active li a { + color: var(--sidebar-link-color); + display: block; + + width: 90%; + max-width: 90%; + + padding: 5px 15px; + margin-right: 5px; + text-decoration: none; + border-left: 4px solid transparent; + border-bottom: 2px solid var(--sidebar-link-hover-bg-color); +} + +.sidebar-active li:hover a { + background-color: var(--sidebar-link-hover-bg-color); + text-decoration: underline; + border-left: 4px solid var(--main-theme-color); +} + +.sidebar-active-item:first-child { + padding-top: 10px; +} + +.sidebar-active-item:last-child { + padding-bottom: 10px; +} \ No newline at end of file diff --git a/media/style/formtools/base.css b/media/style/formtools/base.css new file mode 100644 index 00000000..3e5ca013 --- /dev/null +++ b/media/style/formtools/base.css @@ -0,0 +1,89 @@ +@import url("../colors.css"); + +/* other stuff */ + +.required-field { + color: var(--form-required); +} + +#veranstaltung-info { + font-size: 14px; +} + +#veranstaltung-name { + color: var(--form-highlight); +} + +/* Progressbar and container */ + +.progressbar_container { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + align-items: center; + overflow: hidden; + margin: 10px; +} + +.progress_bar_item { + all: unset; + + cursor: pointer; + text-decoration: none; + padding: 0.5rem 1rem; + font-size: 1rem; + line-height: 1.2; + transition: all 0.2s ease; + + color: var(--main-background-color); + background-color: var(--form-not-highlighted); + border: none; + border-right: 1px dashed var(--main-background-color); +} + +.progress_bar_item.item_active { + background-color: var(--form-progressbar-active); + cursor: pointer; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; +} + +.progress_bar_item.item_active:hover { + background-color: var(--form-progressbar-active-hover); +} + +.progressbar_container .progress_bar_item:last-child { + border-right: 0; + border-radius: 0 5px 5px 0; +} + +.progressbar_container .progress_bar_item:first-child { + border-radius: 5px 0 0 5px; +} + +.item_disabled_active { + background-color: var(--form-progressbar-disabled-active); + color: var(--main-theme-color); +} + + +/* form elements */ + +.form-main-header { + color: var(--form-highlight); + font-weight: 800; + font-size: 1.5rem; + letter-spacing: -0.5px; + margin-bottom: 1.5rem; + margin-top: 1.5rem; + border-bottom: 3px solid var(--form-highlight); + display: inline-block; + padding-bottom: 5px; +} + +.wizard_form_table label.required:after { + color: var(--form-not-highlighted); + content: '*' +} + diff --git a/media/style/formtools/basisdaten.css b/media/style/formtools/basisdaten.css new file mode 100644 index 00000000..dbe0cac9 --- /dev/null +++ b/media/style/formtools/basisdaten.css @@ -0,0 +1,27 @@ +@import url('../color-font.css'); + +#past-sem-data-table { + border-collapse: collapse; + border: 1px solid var(--form-not-highlighted); + width: auto; + margin: 10px 0 10px 0; +} + +#past-sem-data-table th, +#past-sem-data-table td { + border-left: 1px solid var(--form-not-highlighted); + border-right: 1px solid var(--form-not-highlighted); + padding: 5px 5px; +} + +#past-sem-data-table th { + border-bottom: 2px solid var(--form-not-highlighted); +} + +#past-sem-data-table td { + border-bottom: none; +} + +.table-text { + text-align: justify; +} \ No newline at end of file diff --git a/media/style/formtools/evaluation.css b/media/style/formtools/evaluation.css new file mode 100644 index 00000000..a65c31ad --- /dev/null +++ b/media/style/formtools/evaluation.css @@ -0,0 +1,14 @@ +@import url('../color-font.css'); + +#evaluation-warning { + border: 1px solid var(--warning); + padding: 10px; +} + +#datenschutz-p { + font-size: 1.3em; +} + +#vollerhebung-p { + text-align: justify; +} \ No newline at end of file diff --git a/media/style/formtools/zusammenfassung.css b/media/style/formtools/zusammenfassung.css new file mode 100644 index 00000000..df6b102b --- /dev/null +++ b/media/style/formtools/zusammenfassung.css @@ -0,0 +1,57 @@ +@import url('../color-font.css'); + +.summary_table { + border-collapse: collapse; + width: 100%; + max-width: 900px; + margin-bottom: 15px; + display: block; +} + +.summary_table tr { + border-bottom: 1px solid var(--form-not-highlighted); + display: flex; + flex-wrap: wrap; + width: 100%; +} + +.summary_table th, +.summary_table td { + text-align: left; + vertical-align: top; + padding: 10px 20px 10px 5px; +} + +.summary_table td { + flex: 1; + min-width: 250px; + word-break: break-word; +} + +.summary-label { + width: 200px; + flex-shrink: 0; +} + +.summary_table td p { + margin-bottom: 0px; +} + +.summary-label:first-letter { + text-transform: uppercase; +} + +.tutoren_title { + font-weight: bold; + font-size: 12px; + margin-left: 5px; + margin-bottom: 0px; +} + +#table_tutoren_csvview { + margin-bottom: 8px; +} + +#table_tutoren_csvview table { + border: 1px solid var(--form-not-highlighted); +} \ No newline at end of file diff --git a/media/style/intern/fragebogensprache.css b/media/style/intern/fragebogensprache.css new file mode 100644 index 00000000..4dcb98e9 --- /dev/null +++ b/media/style/intern/fragebogensprache.css @@ -0,0 +1,44 @@ +@import url('../color-font.css'); + +table.border { + border-collapse: collapse; + color: var(--main-theme-color); + background-color: var(--main-background-color); + margin: 1rem 0; +} + +table.border th { + font-family: var(--font-second); + background-color: var(--main-secondary-bg-color); + color: var(--main-theme-color); + text-align: left; + padding: 12px 15px; + font-weight: 600; + text-transform: uppercase; + font-size: 0.85rem; + letter-spacing: 0.05rem; + border-bottom: 2px solid var(--accent-color); +} + +table.border td { + padding: 12px 15px; + vertical-align: middle; +} + +table.border tr.row1 { + background-color: var(--main-background-color); +} + +table.border tr.row2 { + background-color: var(--main-secondary-bg-color); +} + +.status-box { + display: inline-block; + width: 18px; + height: 18px; + border: 1px solid var(--main-theme-color); + border-radius: 3px; + vertical-align: middle; +} + diff --git a/media/style/intern/import_vv_edit.css b/media/style/intern/import_vv_edit.css new file mode 100644 index 00000000..6564efeb --- /dev/null +++ b/media/style/intern/import_vv_edit.css @@ -0,0 +1,57 @@ +@import url('../color-font.css'); + + +.ui-accordion .ui-accordion-header { + margin-bottom: 0; + background: transparent; + color: var(--main-theme-color); + border: 1px solid var(--main-theme-color); + padding: 15px; + margin-top: 5px; + transition: all 0.3s ease; +} + +.ui-accordion .ui-accordion-header a, .ui-accordion .ui-accordion-content a { + color: var(--link-color); + text-decoration: none; + border-bottom: 2px solid var(--link-bottom); + transition: all 0.2s ease; +} + +.ui-accordion .ui-accordion-header a:hover, .ui-accordion .ui-accordion-content a:hover { + color: var(--link-hover); + border-bottom-color: var(--link-hover); +} + +.ui-accordion .ui-accordion-header-active { + color: var(--main-theme-color); + border-color: var(--accent-color); + background: transparent; + font-weight: bold; +} + +.ui-accordion .ui-accordion-content { + background: transparent; + color: var(--main-theme-color); + box-sizing: content-box; + border: 1px solid var(--accent-color); + border-top: none; + padding: 20px; + line-height: 1.6; +} + +.mark_unmark { + margin-bottom: 0.9em; + margin-top: -0.9em; + font-size: 80%; +} + +.unattended_course { + background-color: var(--unattended-course); +} + + + + + + diff --git a/media/style/intern/import_vv_edit_users_namecheck.css b/media/style/intern/import_vv_edit_users_namecheck.css new file mode 100644 index 00000000..47931e7d --- /dev/null +++ b/media/style/intern/import_vv_edit_users_namecheck.css @@ -0,0 +1,40 @@ +@import url('../color-font.css'); + +.comparison-container { + display: flex; + gap: 2rem; + margin-bottom: 2rem; + border-bottom: 1px solid var(--main-theme-color); + padding-bottom: 2rem; +} + +.comparison-column { + flex: 1; + min-width: 0; +} + +.section-title { + margin-top: 1.5rem; +} + +.semester-tag { + color: var(--main-secondary-theme-color); + font-style: italic; +} + +.action-form { + display: flex; + gap: 1rem; + margin-top: 1.5rem; +} + +.footer-navigation { + margin-top: 3rem; + padding-top: 1rem; +} + +@media (max-width: 768px) { + .comparison-container { + flex-direction: column; + } +} \ No newline at end of file diff --git a/media/style/intern/index.css b/media/style/intern/index.css new file mode 100644 index 00000000..a4f40975 --- /dev/null +++ b/media/style/intern/index.css @@ -0,0 +1,91 @@ +@import url("../colors.css"); + +/* overall structure */ + +.dashboard-wrapper { + display: flex; + gap: 60px; + align-items: flex-start; +} + +.dashboard-main { + flex: 1; + max-width: 600px; +} + +.dashboard-side { + flex: 1; + max-width: 600px; +} + +/* Links */ + +.dashboard-links li { + margin-bottom: 8px; + list-style: none; +} + +/* progressbar */ + +.dashboard-progressbar { + text-align: center; + padding: 0 5%; +} + +#progressbar-label { + margin-bottom: 10px; +} + +.label-detail { + font-size: 0.7em; + color: var(--progressbar-detail-color); +} + +.progress-track { + width: 100%; + height: 30px; + background-color: var(--main-background-color); + border-radius: 999px; + overflow: hidden; + border: 1px solid var(--progressbar-detail-color); + + position: relative; +} + +.progress-fill { + height: 100%; + width: 0%; + background: linear-gradient( + 90deg, + var(--progressbar-start-color), + var(--progressbar-end-color) + ); + transition: width 0.9s ease-out; +} + +.progress-inside { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + font-size: 0.75rem; + font-weight: 600; + color: var(--main-background-color); + pointer-events: none; +} + +.progress-detail { + font-size: 0.8em; + color: var(--progressbar-detail-color); + margin-top: 2px; +} + +.dashboard-progressbar::after { + content: ""; + display: block; + margin-top: 15px; + height: 1px; + background: var(--main-secondary-bg-color); +} + diff --git a/media/style/intern/sendmail.css b/media/style/intern/sendmail.css new file mode 100644 index 00000000..3ea11137 --- /dev/null +++ b/media/style/intern/sendmail.css @@ -0,0 +1,132 @@ +@import url('../color-font.css'); + +/* + to force chosen.min.css look similliar to other elements + !important is unfortunately necessary +*/ + +/* the main container / box area */ +.chosen-container-multi .chosen-choices { + color: var(--accent-color) !important; + background-color: var(--main-background-color) !important; + background-image: none !important; + border: 1px solid var(--main-secondary-bg-color) !important; + border-radius: 4px !important; + + font-size: 1rem !important; + padding: 0.25rem 0.5rem !important; + line-height: 1.2 !important; + cursor: pointer !important; + + transition: all 0.2s ease !important; + box-shadow: none !important; +} + +/* hover state */ +.chosen-container-multi:hover .chosen-choices { + border-color: var(--accent-color-hover) !important; +} + +/* focus state (when the input is active) */ +.chosen-container-active .chosen-choices { + border-color: var(--accent-color-hover) !important; + box-shadow: 0 0 0 2px var(--header-dropdown-li-bg-highlight) !important; + outline: none !important; +} + +/* styling the "tags" (selected items) */ +.chosen-container-multi .chosen-choices li.search-choice { + color: var(--accent-color) !important; + background-image: none !important; + background: transparent !important; + border: 1px solid var(--accent-color); + + padding: 3px 20px 3px 5px !important; + margin: 3px 5px 3px 0 !important; + + box-shadow: none !important; +} + +/* the dropdown list styling */ +.chosen-container .chosen-drop { + border: 1px solid var(--main-secondary-bg-color) !important; + background: var(--main-background-color) !important; + border-radius: 0 0 4px 4px !important; +} + +/* the default state of items in the dropdown (not hovered) */ +.chosen-container .chosen-results li { + color: var(--accent-color) !important; + line-height: 1.2 !important; + padding: 8px 12px !important; + transition: all 0.2s ease; +} + +/* items that are already selected (inside the dropdown list) */ +.chosen-container .chosen-results li.result-selected { + color: var(--main-secondary-bg-color) !important; + background-color: var(--main-background-color) !important; + cursor: default !important; + display: none; +} + +/* 'no results' text */ +.chosen-container .chosen-results li.no-results { + color: var(--accent-color) !important; + background: var(--main-background-color) !important; + font-size: 1rem !important; + padding: 8px 12px !important; +} + +/* highlighted result (hovering over options) */ +.chosen-container .chosen-results li.highlighted { + color: var(--accent-color) !important; + background-color: var(--header-dropdown-li-bg-highlight) !important; + background-image: none !important; +} + +/* resetting the search input text */ +.chosen-container-multi .chosen-choices li.search-field input[type="text"] { + color: var(--accent-color) !important; + font-family: var(--font-main) !important; +} + +/* 'X' container */ +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close { + background: none !important; + text-decoration: none !important; + border: none !important; + + top: 50% !important; + transform: translateY(-50%); + + display: flex; + align-items: center; + justify-content: center; + + width: 12px; + height: 12px; +} + +/* 'X' itself */ +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close::before { + /* \00d7 is the CSS escape for the multiplication symbol × */ + content: '\00d7' !important; + color: var(--main-theme-color) !important; + background-color: var(--main-background-color) !important; + + font-weight: bold; + font-family: var(--font-main) !important; + font-size: 16px !important; + line-height: 1 !important; + + text-decoration: none !important; + opacity: 0.6; + transition: all 0.2s ease; +} + +/* hover for 'X' */ +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover::before { + color: var(--accent-color-hover) !important; + opacity: 1; +} \ No newline at end of file diff --git a/media/style/intern/sendmail_preview.css b/media/style/intern/sendmail_preview.css new file mode 100644 index 00000000..ba347aa7 --- /dev/null +++ b/media/style/intern/sendmail_preview.css @@ -0,0 +1,5 @@ +@import url('../color-font.css'); + +.mail-context-highlight { + color: var(--mail-context-highlight); +} \ No newline at end of file diff --git a/media/style/intern/tans/process_tans_preview.css b/media/style/intern/tans/process_tans_preview.css new file mode 100644 index 00000000..f2f188ce --- /dev/null +++ b/media/style/intern/tans/process_tans_preview.css @@ -0,0 +1,57 @@ +@import url('../../color-font.css'); + +.preview-box { + padding: 2rem; + margin-bottom: 2rem; + border-radius: 4px; + border: 1px solid var(--accent-color); +} + +.preview-text { + padding: 15px; + border-radius: 4px; + overflow-x: auto; + white-space: pre-wrap; + font-family: monospace; +} + + +/* Badge Styling */ +.badge { + display: inline-block; + padding: 2px 8px; + font-size: 0.8rem; + border-radius: 10px; + margin-left: 5px; + border: 1px solid var(--accent-color); +} + +/* Collapse Logic */ +.collapse-content { + display: none; + margin-top: 15px; +} + +.collapse-content.show { + display: block; +} + +.card-inner { + padding: 15px; + border-radius: 4px; +} + +/* Form Layout (Replaces float-left/right) */ +.form-actions { + display: flex; + justify-content: space-between; + margin-top: 20px; +} + +.push-right { + margin-left: auto; +} + +.form-table { + width: 100%; +} \ No newline at end of file diff --git a/media/style/public/index.css b/media/style/public/index.css new file mode 100644 index 00000000..2db253c2 --- /dev/null +++ b/media/style/public/index.css @@ -0,0 +1,104 @@ +@import url('../color-font.css'); + +* { + box-sizing: border-box; +} + +.ranking_header { + clear: both; +} + +.ranking_header a { + color: var(--main-theme-color); + border-bottom: none; +} + +.ranking_header a:hover { + color: var(--link-hover); + +} + +.ranking_header .label { + padding-left: 5px; + width: 370px; + height: 21px; + float: left; + border-bottom: 1px solid var(--main-secondary-theme-color); +} + +.ranking_header .label.last { + width: 370px; + height: 21px; + border-bottom: none; + border-right: 1px solid var(--main-secondary-theme-color); +} + +.ranking_header .label.selected { + font-weight: bold; + font-style: italic; +} + +.ranking_header .spacer { + float: left; +} + +.ranking_header .spacer.horizontal { + width: 30px; + height: 21px; + border-bottom: 1px solid var(--main-secondary-theme-color); +} + +.ranking_header .spacer.vertical { + width: 30px; + height: 21px; + border-right: 1px solid var(--main-secondary-theme-color); +} + +.ranking_table { + border-collapse: collapse; + padding: 0; +} + +.ranking_row td { + border: none; + border-right: 1px solid var(--main-secondary-theme-color); + border-bottom: 1px solid var(--main-secondary-theme-color); +} + +.ranking_row.row1, .cycle.row1 { + background-color: var(--main-background-color); +} + +.ranking_row.row2, .cycle.row2 { + background-color: var(--main-secondary-bg-color); +} + +.ranking_row .selected { + background-color: var(--ranking-selected); + color: var(--main-background-color); +} + +.ranking_row .label { + width: 370px; + padding-left: 5px; + padding-right: 0; +} + +.ranking_row .data { + width: 30px; + padding-left: 0; + padding-right: 0; + text-align: center; +} + +.invalid { + color: var(--ranking-invalid); +} + +.clear { + clear: both; +} + +fieldset { + margin-bottom: 20px; +} diff --git a/media/style/public/veranstaltung.css b/media/style/public/veranstaltung.css new file mode 100644 index 00000000..833c59ed --- /dev/null +++ b/media/style/public/veranstaltung.css @@ -0,0 +1,22 @@ +@import url('../color-font.css'); + +#ranking_details th { + padding-left: 5px; + padding-right: 5px; + text-align: left; +} + +#ranking_details td { + text-align: center; +} + +#ranking_details a { + color: var(--main-theme-color); + white-space: nowrap; +} + +#ranking_details a:hover { + color: var(--main-theme-color); + border-color: var(--main-theme-color); + white-space: nowrap; +} \ No newline at end of file diff --git a/media/tutoren.css b/media/style/tutoren.css similarity index 100% rename from media/tutoren.css rename to media/style/tutoren.css diff --git a/media/style/veranstalter/dashboard.css b/media/style/veranstalter/dashboard.css new file mode 100644 index 00000000..aa973959 --- /dev/null +++ b/media/style/veranstalter/dashboard.css @@ -0,0 +1,86 @@ +@import url('../color-font.css'); + + +.header_veranst { + color: var(--accent-color); +} + +.status-badge { + display: inline-block; + color: var(--accent-color); + border: 1px solid var(--form-not-highlighted); + background-color: var(--main-secondary-bg-color); + padding: 4px 12px; + border-radius: 4px; + font-size: 0.9rem; +} + +/* Table Styling */ +.dashboardTable { + width: 75%; + border-collapse: collapse; + margin: 1rem 0; + font-size: 14px; + border: 1px solid var(--form-not-highlighted); +} + +.dashboardTable th, +.dashboardTable td { + padding: 12px; + text-align: left; + border-bottom: 1px solid var(--form-not-highlighted); +} + +.dashboardTable th { + background-color: var(--main-secondary-bg-color); + font-weight: 600; +} + +/* Nested Tutor Table */ +.tableTutoren { + width: 75%; + border-collapse: collapse; + font-size: 13px; + background-color: transparent; +} + +.main-order-table > tbody > tr > th, +.main-order-table > tr > th { + width: 30%; + white-space: nowrap; +} + +.tableTutoren th { + width: auto; + background-color: transparent; + border-bottom: 2px solid var(--form-not-highlighted); +} + +/* Layout Containers */ +.orderHeadContainer { + display: flex; + width: 75%; + align-items: center; + justify-content: space-between; + margin-top: 2rem; + border-bottom: 1px solid var(--form-not-highlighted); + padding-bottom: 0.5rem; +} + +.subHeaderDashboard { + margin: 0; +} + +.dashboardOrderContainer { + margin-top: 1rem; + overflow-x: auto; +} + +.empty-state { + width: 75%; + margin-top: 2rem; + padding: 2rem 0; + text-align: center; + border: 2px dashed var(--form-not-highlighted); + border-radius: 8px; +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f2c39ae6..3ed9f6f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,47 +7,12 @@ "name": "d120-pyfeedback", "license": "AGPL-3.0-only", "dependencies": { - "@fontsource/libre-franklin": "^5.0.5", - "bootstrap": "^5.3", "chosen-js": "^1.8.7", "font-awesome": "^4.7.0", "jquery": "^3.6.1", "jquery-ui": "^1.14.1" } }, - "node_modules/@fontsource/libre-franklin": { - "version": "5.0.18", - "resolved": "https://registry.npmjs.org/@fontsource/libre-franklin/-/libre-franklin-5.0.18.tgz", - "integrity": "sha512-zoQEGONGWZzE2e1PHdCSK+txMGhnJuQtVTVzSAEHtFJIMEgVwjuzgIEFKQ+vEYb1MrcpHkiySKweSNvQCiXBTA==" - }, - "node_modules/@popperjs/core": { - "version": "2.11.8", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", - "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, - "node_modules/bootstrap": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", - "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/twbs" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - } - ], - "peerDependencies": { - "@popperjs/core": "^2.11.8" - } - }, "node_modules/chosen-js": { "version": "1.8.7", "resolved": "https://registry.npmjs.org/chosen-js/-/chosen-js-1.8.7.tgz", diff --git a/package.json b/package.json index 723b89cb..bae407fe 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,6 @@ "license": "AGPL-3.0-only", "private": true, "dependencies": { - "@fontsource/libre-franklin": "^5.0.5", - "bootstrap": "^5.3", "chosen-js": "^1.8.7", "font-awesome": "^4.7.0", "jquery": "^3.6.1", diff --git a/src/feedback/tests/test_views_intern.py b/src/feedback/tests/test_views_intern.py index 10f26346..5f69ad9c 100644 --- a/src/feedback/tests/test_views_intern.py +++ b/src/feedback/tests/test_views_intern.py @@ -627,7 +627,7 @@ def test_post(self): self.assertTrue(response.context['vorschau']) # ----- Vorschau: Check if the replacements are highlighted ----- # - color_span = '{}' + color_span = '{}' self.assertEqual(color_span.format('Grundlagen der Agrarphilosophie I'), response.context['veranstaltung']) link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('feedback:veranstalter-login') link_suffix_format = '?vid=%d&token=%s' diff --git a/src/feedback/views/intern/__init__.py b/src/feedback/views/intern/__init__.py index 70128408..dbde5790 100644 --- a/src/feedback/views/intern/__init__.py +++ b/src/feedback/views/intern/__init__.py @@ -309,7 +309,7 @@ def get_demo_context(request): :param request: POST :return: RequestContext, String, String """ - color_span = '{}' + color_span = '{}' link_veranstalter = 'https://www.fachschaft.informatik.tu-darmstadt.de%s' % reverse('feedback:veranstalter-login') link_suffix_format = '?vid=%d&token=%s' demo_context = RequestContext(request, { diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 936f220b..55013109 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-04-19 23:31+0200\n" +"POT-Creation-Date: 2026-05-02 01:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -311,6 +311,7 @@ msgid "Bestellung wird verarbeitet" msgstr "" #: src/feedback/models/base.py:403 +#: src/templates/intern/fragebogensprache.html:21 msgid "Gedruckt" msgstr "" @@ -336,7 +337,7 @@ msgid "" msgstr "" #: src/feedback/models/base.py:438 src/feedback/views/veranstalter.py:54 -#: src/templates/intern/fragebogensprache.html:14 +#: src/templates/intern/fragebogensprache.html:20 msgid "Typ" msgstr "" @@ -363,12 +364,12 @@ msgid "" msgstr "" #: src/feedback/models/base.py:448 src/feedback/views/veranstalter.py:56 -#: src/templates/intern/fragebogensprache.html:12 +#: src/templates/intern/fragebogensprache.html:18 msgid "Sprache" msgstr "" #: src/feedback/models/base.py:449 src/feedback/views/veranstalter.py:94 -#: src/templates/intern/fragebogensprache.html:13 +#: src/templates/intern/fragebogensprache.html:19 msgid "Anzahl" msgstr "" @@ -477,8 +478,8 @@ msgid "Der Veranstalter Link wird erst nach dem Anlegen angezeigt" msgstr "" #: src/feedback/models/base.py:704 src/feedback/models/base.py:718 -#: src/templates/formtools/wizard/basisdaten.html:9 -#: src/templates/intern/fragebogensprache.html:11 +#: src/templates/formtools/wizard/basisdaten.html:14 +#: src/templates/intern/fragebogensprache.html:17 msgid "Veranstaltung" msgstr "" @@ -492,7 +493,7 @@ msgstr "" #: src/feedback/models/base.py:717 #: src/templates/formtools/wizard/email_zusammenfassung.html:74 -#: src/templates/veranstalter/dashboard.html:113 +#: src/templates/veranstalter/dashboard.html:77 msgid "Anmerkung" msgstr "" @@ -502,8 +503,8 @@ msgstr "" #: src/feedback/models/base.py:729 #: src/templates/formtools/wizard/email_zusammenfassung.html:66 -#: src/templates/formtools/wizard/zusammenfassung.html:61 -#: src/templates/veranstalter/dashboard.html:105 +#: src/templates/formtools/wizard/zusammenfassung.html:36 +#: src/templates/veranstalter/dashboard.html:68 msgid "Tutoren" msgstr "" @@ -718,7 +719,7 @@ msgstr "" #: src/templates/admin/keine_evaluation.html:13 #: src/templates/admin/status_aendern.html:13 -#: src/templates/intern/rechte_uebernehmen.html:18 +#: src/templates/intern/rechte_uebernehmen.html:21 msgid "Übernehmen" msgstr "" @@ -777,11 +778,11 @@ msgstr "Anmelden" msgid "Sign Up" msgstr "Registrieren" -#: src/templates/bestellung_base.html:10 +#: src/templates/bestellung_base.html:11 msgid "zurück zum internen Bereich" msgstr "" -#: src/templates/bestellung_base.html:12 +#: src/templates/bestellung_base.html:13 msgid "zurück zum Veranstalterbereich" msgstr "" @@ -801,54 +802,67 @@ msgstr "" msgid "Datenschutzerklärung" msgstr "" -#: src/templates/d120/header.html:19 +#: src/templates/d120/header.html:26 msgid "Webseite" msgstr "" -#: src/templates/d120/header.html:24 +#: src/templates/d120/header.html:32 msgid "Fachbereich" msgstr "" -#: src/templates/d120/sidebar.html:6 +#: src/templates/d120/header.html:47 +#: src/templates/formtools/wizard/bestellung_done.html:9 +msgid "Ausloggen" +msgstr "" + +#: src/templates/d120/header.html:52 +msgid "Einloggen" +msgstr "" + +#: src/templates/d120/header.html:58 +msgid "Stil" +msgstr "" + +#: src/templates/d120/sidebar.html:11 msgid "Feedback" msgstr "" -#: src/templates/d120/sidebar.html:9 +#: src/templates/d120/sidebar.html:14 msgid "FAQ" msgstr "" -#: src/templates/d120/sidebar.html:12 +#: src/templates/d120/sidebar.html:17 msgid "Hall of Fame" msgstr "" -#: src/templates/d120/sidebar.html:15 src/templates/public/index.html:3 +#: src/templates/d120/sidebar.html:20 src/templates/public/index.html:9 #: src/templates/public/keine_ergebnisse.html:4 #: src/templates/public/unauth.html:4 msgid "Ergebnisse" msgstr "" -#: src/templates/d120/sidebar.html:18 +#: src/templates/d120/sidebar.html:23 msgid "Webinterface" msgstr "" -#: src/templates/d120/sidebar.html:21 +#: src/templates/d120/sidebar.html:26 msgid "E-Mail ändern" msgstr "" -#: src/templates/d120_base.html:6 +#: src/templates/d120_base.html:9 msgid "Leere Seite" msgstr "" -#: src/templates/d120_base.html:6 +#: src/templates/d120_base.html:9 msgid " - Evaluation der Lehre" msgstr "" -#: src/templates/d120_base.html:40 +#: src/templates/d120_base.html:51 #, python-format msgid "Du nutzt momentan die Rechte der Veranstalter von %(veranstaltung)s." msgstr "" -#: src/templates/d120_base.html:40 +#: src/templates/d120_base.html:51 msgid "Zu meinem Account zurückkehren." msgstr "" @@ -883,7 +897,6 @@ msgid "%(veranstaltung.name)s (%(veranstaltung.semester.short)s)" msgstr "" #: src/templates/feedback/person_form.html:13 -#: src/templates/formtools/wizard/base.html:74 #: src/templates/veranstalter/index.html:15 msgid "ausloggen" msgstr "" @@ -893,7 +906,7 @@ msgid "Fragebogenbestellung Schritt 2 von 5" msgstr "" #: src/templates/feedback/person_form.html:19 -#: src/templates/intern/index.html:31 src/templates/veranstalter/index.html:33 +#: src/templates/intern/index.html:50 src/templates/veranstalter/index.html:33 msgid "Ablauf" msgstr "" @@ -925,49 +938,50 @@ msgstr "" msgid "Erfassung der Daten des Verantwortlichen: " msgstr "" -#: src/templates/formtools/wizard/base.html:69 +#: src/templates/formtools/wizard/base.html:14 msgid "Bestellprozess " msgstr "" -#: src/templates/formtools/wizard/base.html:80 -msgid "Bestellung für " +#: src/templates/formtools/wizard/base.html:21 +msgid "Bestellung für" msgstr "" -#: src/templates/formtools/wizard/base.html:107 +#: src/templates/formtools/wizard/base.html:52 msgid "Pflichtfeld" msgstr "" -#: src/templates/formtools/wizard/base.html:109 -#: src/templates/intern/import_vv_edit_users_update.html:26 -#: src/templates/intern/import_vv_edit_users_update.html:29 +#: src/templates/formtools/wizard/base.html:56 +#: src/templates/intern/fragebogensprache.html:22 +#: src/templates/intern/import_vv_edit_users_update.html:39 +#: src/templates/intern/import_vv_edit_users_update.html:43 #: src/templates/intern/tans/process_tans.html:21 -#: src/templates/intern/tans/process_tans_preview.html:63 +#: src/templates/intern/tans/process_tans_preview.html:66 msgid "Zurück" msgstr "" -#: src/templates/formtools/wizard/base.html:113 -#: src/templates/intern/import_vv_edit.html:87 +#: src/templates/formtools/wizard/base.html:62 +#: src/templates/intern/import_vv_edit.html:75 #: src/templates/intern/tans/process_tans.html:23 #: src/templates/veranstalter/index.html:75 msgid "Weiter" msgstr "" -#: src/templates/formtools/wizard/base.html:117 +#: src/templates/formtools/wizard/base.html:68 #: src/templates/veranstalter/index.html:102 msgid "Speichern" msgstr "" -#: src/templates/formtools/wizard/basisdaten.html:5 +#: src/templates/formtools/wizard/basisdaten.html:10 msgid "Erfassung der Basisdaten" msgstr "" -#: src/templates/formtools/wizard/basisdaten.html:10 +#: src/templates/formtools/wizard/basisdaten.html:15 #: src/templates/intern/lange_ohne_evaluation.html:26 #: src/templates/veranstalter/index.html:55 msgid "Bestellte Bögen" msgstr "" -#: src/templates/formtools/wizard/basisdaten.html:11 +#: src/templates/formtools/wizard/basisdaten.html:16 msgid "Rückläufe" msgstr "" @@ -975,12 +989,6 @@ msgstr "" msgid "Die Bestellung wurde entgegengenommen" msgstr "" -#: src/templates/formtools/wizard/bestellung_done.html:9 -#: src/templates/intern/index.html:20 -#: src/templates/veranstalter/dashboard.html:67 -msgid "Ausloggen" -msgstr "" - #: src/templates/formtools/wizard/email_zusammenfassung.html:6 msgid "Zusammenfassung der Bestelldaten" msgstr "" @@ -991,59 +999,59 @@ msgid "Zusammenfassung der Fragebogenbestellung für %(veranstaltung)s" msgstr "" #: src/templates/formtools/wizard/email_zusammenfassung.html:70 -#: src/templates/veranstalter/dashboard.html:109 +#: src/templates/veranstalter/dashboard.html:73 msgid "Num" msgstr "" #: src/templates/formtools/wizard/email_zusammenfassung.html:71 -#: src/templates/veranstalter/dashboard.html:110 +#: src/templates/veranstalter/dashboard.html:74 msgid "Vorname" msgstr "" #: src/templates/formtools/wizard/email_zusammenfassung.html:72 -#: src/templates/veranstalter/dashboard.html:111 +#: src/templates/veranstalter/dashboard.html:75 msgid "Nachname" msgstr "" #: src/templates/formtools/wizard/email_zusammenfassung.html:73 -#: src/templates/veranstalter/dashboard.html:112 +#: src/templates/veranstalter/dashboard.html:76 msgid "Email" msgstr "" -#: src/templates/formtools/wizard/evaluation.html:5 +#: src/templates/formtools/wizard/evaluation.html:11 msgid "Möchten Sie ihre Veranstaltung evaluieren?" msgstr "" -#: src/templates/formtools/wizard/evaluation.html:6 +#: src/templates/formtools/wizard/evaluation.html:13 msgid "Datenschutzrechtliche Einwilligungserklärung" msgstr "" -#: src/templates/formtools/wizard/evaluation.html:8 +#: src/templates/formtools/wizard/evaluation.html:15 msgid "" "Ich bin einverstanden, dass meine Daten im Zusammenhang mit der " "Lehrevaluation vom Fachbereich Informatik und der Fachschaft Informatik " "erhoben, verarbeitet und genutzt werden, und für\n" -"folgende Zwecke verwendet werden: interne Evaluation des Fachbereichs und " -"der Fachschaft, Rückmeldungen zur Evaluation (z.B. Vergabe von Lehrpreisen), " -"sowie Veröffentlichung der\n" -"numerischen Ergebnisse im Intranet der TU Darmstadt.\n" -"
\n" -"
\n" -"Die Erhebung, Verarbeitung und Nutzung meiner Daten erfolgt auf freiwilliger " -"Basis. Ich kann mein Einverständnis ohne für mich nachteilige Folgen " -"verweigern bzw. jederzeit mit Wirkung für\n" -"die Zukunft widerrufen. Meine Widerrufserklärung richte ich an das " -"Studiendekanat des Fachbereichs Informatik. Im Fall des Widerrufs werden mit " -"dem Zugang meiner Widerrufserklärung meine\n" -"Daten bei den entsprechenden Stellen gelöscht." -msgstr "" - -#: src/templates/formtools/wizard/evaluation.html:20 +" folgende Zwecke verwendet werden: interne Evaluation des " +"Fachbereichs und der Fachschaft, Rückmeldungen zur Evaluation (z.B. Vergabe " +"von Lehrpreisen), sowie Veröffentlichung der\n" +" numerischen Ergebnisse im Intranet der TU Darmstadt.\n" +"
\n" +"
\n" +" Die Erhebung, Verarbeitung und Nutzung meiner Daten erfolgt auf " +"freiwilliger Basis. Ich kann mein Einverständnis ohne für mich nachteilige " +"Folgen verweigern bzw. jederzeit mit Wirkung für\n" +" die Zukunft widerrufen. Meine Widerrufserklärung richte ich an " +"das Studiendekanat des Fachbereichs Informatik. Im Fall des Widerrufs werden " +"mit dem Zugang meiner Widerrufserklärung meine\n" +" Daten bei den entsprechenden Stellen gelöscht." +msgstr "" + +#: src/templates/formtools/wizard/evaluation.html:29 #: src/templates/veranstalter/index.html:20 msgid "Information zur Vollerhebung" msgstr "" -#: src/templates/formtools/wizard/evaluation.html:21 +#: src/templates/formtools/wizard/evaluation.html:30 msgid "" "\n" " In diesem Semester findet eine Vollerhebung aller " @@ -1067,11 +1075,11 @@ msgstr "" msgid "Erfassung der Freien Fragen" msgstr "" -#: src/templates/formtools/wizard/freiefragen.html:5 +#: src/templates/formtools/wizard/freiefragen.html:6 msgid "Freie Fragen Feld" msgstr "" -#: src/templates/formtools/wizard/freiefragen.html:6 +#: src/templates/formtools/wizard/freiefragen.html:7 msgid "" "\n" " Auf dem Fragebogen zu Ihrer Veranstaltung können Sie bis zu\n" @@ -1083,7 +1091,7 @@ msgid "" " " msgstr "" -#: src/templates/formtools/wizard/freiefragen.html:14 +#: src/templates/formtools/wizard/freiefragen.html:15 msgid "" "\n" " Bitte geben Sie hier Ihre freien Fragen ein. Falls Sie keine eigenen " @@ -1138,7 +1146,7 @@ msgstr "" msgid "Einverständniserklärung zur Veröffentlichung der Evaluationsergebnisse" msgstr "" -#: src/templates/formtools/wizard/veroeffentlichen.html:6 +#: src/templates/formtools/wizard/veroeffentlichen.html:7 msgid "" "Die Ergebnisse der Veranstaltungsevaluation werden auf der\n" "Fachschaftswebsite innerhalb des Universitätsnetzwerkes als\n" @@ -1151,12 +1159,12 @@ msgid "" "Sind Sie mit der Veröffentlichung einverstanden?" msgstr "" -#: src/templates/formtools/wizard/zusammenfassung.html:41 +#: src/templates/formtools/wizard/zusammenfassung.html:16 msgid "Zusammenfassung der Fragebogenbestellung" msgstr "" #: src/templates/includes/semesterauswahl.html:2 -#: src/templates/public/index.html:8 +#: src/templates/public/index.html:14 msgid "Semester:" msgstr "" @@ -1171,27 +1179,19 @@ msgid "" "enthaltende XML-Datei erzeugt werden, die in EvaSys importiert werden kann." msgstr "" -#: src/templates/intern/export_veranstaltungen.html:13 +#: src/templates/intern/export_veranstaltungen.html:18 msgid "XML für Veranstaltungen erzeugen" msgstr "" -#: src/templates/intern/export_veranstaltungen.html:14 +#: src/templates/intern/export_veranstaltungen.html:22 msgid "XML für Übungen erzeugen" msgstr "" -#: src/templates/intern/fragebogensprache.html:4 -#: src/templates/intern/fragebogensprache.html:7 +#: src/templates/intern/fragebogensprache.html:9 +#: src/templates/intern/fragebogensprache.html:12 msgid "Zuordnung Veranstaltungen zu Sprache des Fragebogens" msgstr "" -#: src/templates/intern/fragebogensprache.html:15 -msgid "gedruckt" -msgstr "" - -#: src/templates/intern/fragebogensprache.html:16 -msgid "zurück" -msgstr "" - #: src/templates/intern/free_questions.html:5 msgid "Freie Fragen Liste" msgstr "" @@ -1219,37 +1219,37 @@ msgid "" "beigefügt wird." msgstr "" -#: src/templates/intern/generate_letters.html:13 +#: src/templates/intern/generate_letters.html:16 msgid "Erhebungswoche:" msgstr "" -#: src/templates/intern/generate_letters.html:15 +#: src/templates/intern/generate_letters.html:22 msgid "Zu erzeugende Datei:" msgstr "" -#: src/templates/intern/generate_letters.html:17 +#: src/templates/intern/generate_letters.html:26 msgid "Anschreiben" msgstr "" -#: src/templates/intern/generate_letters.html:18 +#: src/templates/intern/generate_letters.html:29 msgid "Aufkleber" msgstr "" -#: src/templates/intern/generate_letters.html:19 +#: src/templates/intern/generate_letters.html:31 msgid "Mindestteilnehmerzahl" msgstr "" -#: src/templates/intern/generate_letters.html:22 +#: src/templates/intern/generate_letters.html:36 msgid "PDF erzeugen" msgstr "" -#: src/templates/intern/generate_letters.html:27 +#: src/templates/intern/generate_letters.html:42 msgid "Fehler bei der Ausführung von pdflatex" msgstr "" #: src/templates/intern/import_ergebnisse.html:4 #: src/templates/intern/import_ergebnisse.html:7 -#: src/templates/intern/index.html:43 +#: src/templates/intern/index.html:62 msgid "Ergebnisse aus EvaSys importieren" msgstr "" @@ -1259,68 +1259,77 @@ msgid "" "einer CSV-Datei (kann in EvaSys erstellt werden) hochgeladen werden." msgstr "" -#: src/templates/intern/import_ergebnisse.html:19 +#: src/templates/intern/import_ergebnisse.html:21 msgid "Vorlesung (2009-2020)" msgstr "" -#: src/templates/intern/import_ergebnisse.html:24 +#: src/templates/intern/import_ergebnisse.html:26 msgid "Übung (2016-2020)" msgstr "" -#: src/templates/intern/import_ergebnisse.html:27 -#: src/templates/intern/import_vv.html:14 +#: src/templates/intern/import_ergebnisse.html:30 +#: src/templates/intern/import_vv.html:18 msgid "Hochladen" msgstr "" -#: src/templates/intern/import_vv.html:4 src/templates/intern/import_vv.html:7 -#: src/templates/intern/import_vv_edit.html:34 -#: src/templates/intern/import_vv_edit.html:37 +#: src/templates/intern/import_vv.html:5 src/templates/intern/import_vv.html:9 +#: src/templates/intern/import_vv_edit.html:12 +#: src/templates/intern/import_vv_edit.html:16 msgid "Vorlesungsverzeichnis importieren" msgstr "" -#: src/templates/intern/import_vv.html:9 +#: src/templates/intern/import_vv.html:11 msgid "" "Das System erwartet eine XML-Datei, die aus TUCaN exportiert wurde und alle " "Veranstaltungen des Semesters enthält." msgstr "" -#: src/templates/intern/import_vv.html:10 +#: src/templates/intern/import_vv.html:12 msgid "" "Achtung: Upload und serverseitige Verarbeitung der Datei können aufgrund der " "großen Datenmenge etwas dauern." msgstr "" -#: src/templates/intern/import_vv.html:17 +#: src/templates/intern/import_vv.html:22 msgid "" -"Hinweis von Wolfgang Heenes, wie man mit Zugriff auf TUCaN (z.B. als " -"Mitarbeiter des Studienbüros) diese Daten im passenden Format erhält, falls " -"er mal nicht mehr dafür zuständig ist:
\n" -"\"Die Daten kommen aus dem Backend (Semesterangebot -> " +"\n" +" Hinweis von Wolfgang Heenes, wie man mit Zugriff auf TUCaN " +"(z.B. als Mitarbeiter des Studienbüros) diese Daten im passenden Format " +"erhält, falls er mal nicht mehr dafür zuständig ist:\n" +"
\n" +" \"Die Daten kommen aus dem Backend (Semesterangebot -> " "Vorlesungsverzeichnis erstellen). Es gibt auf dem Sharepoint KEINEN Report, " -"der das KOMPLETTE Vorlesungsverzeichnis enthält.\"" +"der das KOMPLETTE Vorlesungsverzeichnis enthält.\"\n" +" " msgstr "" -#: src/templates/intern/import_vv_edit.html:44 +#: src/templates/intern/import_vv_edit.html:20 +msgid "" +"Bitte JavaScript aktivieren, um bequemer durch das Verzeichnis navigieren " +"und Veranstaltungen auswählen zu können!" +msgstr "" + +#: src/templates/intern/import_vv_edit.html:24 msgid "" "Im Folgenden können die zu importierenden Veranstaltungen ausgewählt werden." msgstr "" -#: src/templates/intern/import_vv_edit.html:49 +#: src/templates/intern/import_vv_edit.html:32 msgid "" "Falls das Semester, für das Veranstaltungen importiert werden sollen, nicht " "in der Auswahlliste steht, muss es zunächst über die Datenbank-" "Administration hinzugefügt werden." msgstr "" -#: src/templates/intern/import_vv_edit.html:70 +#: src/templates/intern/import_vv_edit.html:54 msgid "Alle markieren" msgstr "" -#: src/templates/intern/import_vv_edit.html:70 +#: src/templates/intern/import_vv_edit.html:54 msgid "Markierungen aufheben" msgstr "" -#: src/templates/intern/import_vv_edit.html:88 +#: src/templates/intern/import_vv_edit.html:76 #: src/templates/veranstalter/index.html:76 #: src/templates/veranstalter/index.html:103 msgid "Zurücksetzen" @@ -1328,8 +1337,8 @@ msgstr "" #: src/templates/intern/import_vv_edit_users.html:3 #: src/templates/intern/import_vv_edit_users.html:6 -#: src/templates/intern/import_vv_edit_users_namecheck.html:3 -#: src/templates/intern/import_vv_edit_users_namecheck.html:5 +#: src/templates/intern/import_vv_edit_users_namecheck.html:9 +#: src/templates/intern/import_vv_edit_users_namecheck.html:12 #: src/templates/intern/import_vv_edit_users_update.html:4 #: src/templates/intern/import_vv_edit_users_update.html:7 msgid "Personendaten vervollständigen" @@ -1345,106 +1354,112 @@ msgid "" "Alle Veranstalter des aktuellen Semesters haben vollständige Personendaten." msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:11 +#: src/templates/intern/import_vv_edit_users_namecheck.html:20 msgid "Die ähnliche Person" msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:12 -#: src/templates/intern/import_vv_edit_users_namecheck.html:23 +#: src/templates/intern/import_vv_edit_users_namecheck.html:21 +#: src/templates/intern/import_vv_edit_users_namecheck.html:32 msgid "Name: " msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:13 -#: src/templates/intern/import_vv_edit_users_namecheck.html:24 +#: src/templates/intern/import_vv_edit_users_namecheck.html:22 +#: src/templates/intern/import_vv_edit_users_namecheck.html:33 msgid "E-Mail: " msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:15 -#: src/templates/intern/import_vv_edit_users_namecheck.html:26 +#: src/templates/intern/import_vv_edit_users_namecheck.html:24 +#: src/templates/intern/import_vv_edit_users_namecheck.html:35 msgid "Lehrveranstaltungen" msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:22 +#: src/templates/intern/import_vv_edit_users_namecheck.html:31 msgid "Die neue Person" msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:39 +#: src/templates/intern/import_vv_edit_users_namecheck.html:49 msgid "Zusammenführen" msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:42 +#: src/templates/intern/import_vv_edit_users_namecheck.html:54 msgid "Ignorieren" msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:46 -#: src/templates/intern/import_vv_edit_users_update.html:42 +#: src/templates/intern/import_vv_edit_users_namecheck.html:60 +#: src/templates/intern/import_vv_edit_users_update.html:64 msgid "zurück zu Personendaten" msgstr "" -#: src/templates/intern/import_vv_edit_users_update.html:11 +#: src/templates/intern/import_vv_edit_users_update.html:12 #, python-format msgid "" -"Es sind noch %(person.persons_to_edit.count)s Personendaten zu bearbeiten." +"\n" +" Es sind noch %(person.persons_to_edit.count)s Personendaten zu " +"bearbeiten.\n" +" " msgstr "" -#: src/templates/intern/import_vv_edit_users_update.html:14 +#: src/templates/intern/import_vv_edit_users_update.html:20 msgid "Auf Google suchen." msgstr "" -#: src/templates/intern/import_vv_edit_users_update.html:18 +#: src/templates/intern/import_vv_edit_users_update.html:27 msgid "Es existiert eine Person, die ähnlich zu dieser ist." msgstr "" -#: src/templates/intern/import_vv_edit_users_update.html:33 -#: src/templates/intern/import_vv_edit_users_update.html:36 +#: src/templates/intern/import_vv_edit_users_update.html:50 +#: src/templates/intern/import_vv_edit_users_update.html:54 msgid "Überspringen" msgstr "" -#: src/templates/intern/import_vv_edit_users_update.html:38 +#: src/templates/intern/import_vv_edit_users_update.html:59 msgid "Speichern & Weiter" msgstr "" -#: src/templates/intern/index.html:5 src/templates/intern/index.html:9 +#: src/templates/intern/index.html:10 src/templates/intern/index.html:15 #: src/templates/intern/status_final.html:5 msgid "Interner Bereich" msgstr "" -#: src/templates/intern/index.html:11 +#: src/templates/intern/index.html:22 +#: src/templates/veranstalter/dashboard.html:20 +#: src/templates/veranstalter/dashboard.html:31 +msgid "Status" +msgstr "" + +#: src/templates/intern/index.html:23 +msgid "der Rückmeldungen durch die Veranstalter" +msgstr "" + +#: src/templates/intern/index.html:37 +msgid "Allgemeines" +msgstr "" + +#: src/templates/intern/index.html:39 msgid "Verwaltung der Daten" msgstr "" -#: src/templates/intern/index.html:12 +#: src/templates/intern/index.html:40 msgid "zu Veranstalter-Account wechseln" msgstr "" -#: src/templates/intern/index.html:13 +#: src/templates/intern/index.html:41 msgid "Mail an Veranstalter verschicken" msgstr "" -#: src/templates/intern/index.html:14 +#: src/templates/intern/index.html:42 msgid "Zuordnung Veranstaltungen zu Fragebogensprache" msgstr "" -#: src/templates/intern/index.html:15 +#: src/templates/intern/index.html:43 msgid "Veranstaltungen die lange nicht mehr evaluiert wurden" msgstr "" -#: src/templates/intern/index.html:16 +#: src/templates/intern/index.html:44 msgid "Liste der Veranstaltungen mit freien Fragen" msgstr "" -#: src/templates/intern/index.html:24 -msgid "Status der Rückmeldungen durch die Veranstalter" -msgstr "" - -#: src/templates/intern/index.html:25 -#, python-format -msgid "" -"Aktuell haben wir %(ruck_veranst)s Rückmeldungen von %(all_veranst)s " -"Veranstaltungen." -msgstr "" - -#: src/templates/intern/index.html:32 +#: src/templates/intern/index.html:51 #, python-format msgid "" "Dies sind nicht alle nötigen Schritte; siehe Ablauf im bookstack." msgstr "" -#: src/templates/intern/index.html:35 +#: src/templates/intern/index.html:54 msgid "neues Semester anlegen" msgstr "" -#: src/templates/intern/index.html:35 +#: src/templates/intern/index.html:54 msgid "aktuell" msgstr "" -#: src/templates/intern/index.html:36 +#: src/templates/intern/index.html:55 msgid "nicht Vorhanden" msgstr "" -#: src/templates/intern/index.html:37 +#: src/templates/intern/index.html:56 msgid "Veranstaltungen aus VV importieren" msgstr "" -#: src/templates/intern/index.html:37 src/templates/intern/index.html:38 +#: src/templates/intern/index.html:56 src/templates/intern/index.html:57 msgid "vor Bestellphase" msgstr "" -#: src/templates/intern/index.html:38 +#: src/templates/intern/index.html:57 msgid "Fehlende Personendaten nachtragen" msgstr "" -#: src/templates/intern/index.html:39 src/templates/intern/status_final.html:9 +#: src/templates/intern/index.html:58 src/templates/intern/status_final.html:9 msgid "Bestellphase abschließen" msgstr "" -#: src/templates/intern/index.html:39 src/templates/intern/index.html:40 +#: src/templates/intern/index.html:58 src/templates/intern/index.html:59 msgid "nach Bestellphase" msgstr "" -#: src/templates/intern/index.html:40 +#: src/templates/intern/index.html:59 msgid "Anschreiben für Veranstalter erzeugen" msgstr "" -#: src/templates/intern/index.html:41 +#: src/templates/intern/index.html:60 msgid "Veranstaltungen für EvaSys exportieren" msgstr "" -#: src/templates/intern/index.html:42 +#: src/templates/intern/index.html:61 #: src/templates/intern/tans/process_tans.html:3 #: src/templates/intern/tans/process_tans.html:5 -#: src/templates/intern/tans/process_tans_preview.html:3 -#: src/templates/intern/tans/process_tans_preview.html:5 +#: src/templates/intern/tans/process_tans_preview.html:10 +#: src/templates/intern/tans/process_tans_preview.html:12 msgid "TANs verarbeiten" msgstr "" -#: src/templates/intern/index.html:42 +#: src/templates/intern/index.html:61 msgid "nach der Bestellphase" msgstr "" -#: src/templates/intern/index.html:44 +#: src/templates/intern/index.html:63 msgid "Rankings berechnen" msgstr "" -#: src/templates/intern/index.html:44 +#: src/templates/intern/index.html:63 msgid "nach dem Ergebnis-Import" msgstr "" -#: src/templates/intern/index.html:46 +#: src/templates/intern/index.html:65 msgid "Ergebnisse veröffentlichen" msgstr "" -#: src/templates/intern/index.html:46 +#: src/templates/intern/index.html:65 #, python-format msgid " (aktuell: sichtbar für %(cur_semester.get_sichtbarkeit_display)s)" msgstr "" @@ -1587,80 +1602,82 @@ msgid "" "zu deinem Account an." msgstr "" -#: src/templates/intern/sendmail.html:3 -#: src/templates/intern/sendmail_preview.html:4 +#: src/templates/intern/sendmail.html:5 +#: src/templates/intern/sendmail_preview.html:9 msgid "Mail versenden" msgstr "" -#: src/templates/intern/sendmail.html:10 -#: src/templates/intern/sendmail_preview.html:7 +#: src/templates/intern/sendmail.html:13 +#: src/templates/intern/sendmail_preview.html:12 msgid "Mail an Veranstalter versenden" msgstr "" -#: src/templates/intern/sendmail.html:16 +#: src/templates/intern/sendmail.html:19 msgid "Mail senden an Veranstalter der Veranstaltung mit Bestellstatus:" msgstr "" -#: src/templates/intern/sendmail.html:28 +#: src/templates/intern/sendmail.html:31 msgid "Mail auch an die Tutoren der jeweiligen Veranstaltungen schicken?" msgstr "" -#: src/templates/intern/sendmail.html:38 +#: src/templates/intern/sendmail.html:41 msgid "Vorlage:" msgstr "" -#: src/templates/intern/sendmail.html:45 +#: src/templates/intern/sendmail.html:48 msgid "Vorlage übernehmen" msgstr "" -#: src/templates/intern/sendmail.html:49 -#: src/templates/intern/sendmail_preview.html:26 +#: src/templates/intern/sendmail.html:52 +#: src/templates/intern/sendmail_preview.html:35 msgid "Betreff:" msgstr "" -#: src/templates/intern/sendmail.html:54 +#: src/templates/intern/sendmail.html:57 msgid "Mailtext:" msgstr "" -#: src/templates/intern/sendmail.html:59 -#: src/templates/intern/tans/process_tans_preview.html:6 +#: src/templates/intern/sendmail.html:62 +#: src/templates/intern/tans/process_tans_preview.html:13 msgid "Vorschau" msgstr "" -#: src/templates/intern/sendmail.html:63 +#: src/templates/intern/sendmail.html:66 msgid "Verfügbare Variablen" msgstr "" -#: src/templates/intern/sendmail.html:66 +#: src/templates/intern/sendmail.html:69 msgid "Name der Veranstaltung" msgstr "" -#: src/templates/intern/sendmail.html:67 +#: src/templates/intern/sendmail.html:70 msgid "Link zum Veranstalterbereich" msgstr "" -#: src/templates/intern/sendmail_preview.html:11 +#: src/templates/intern/sendmail_preview.html:17 msgid "" -"Vorschau (Ersetzte Begriffe sind blau markiert)" +"\n" +" Vorschau (Ersetzte Begriffe sind blau markiert)\n" +" " msgstr "" -#: src/templates/intern/sendmail_preview.html:13 +#: src/templates/intern/sendmail_preview.html:22 msgid "Absender:" msgstr "" -#: src/templates/intern/sendmail_preview.html:18 +#: src/templates/intern/sendmail_preview.html:27 #, python-format msgid "" "Empfänger:\n" " %(to)s aus dem %(semester_selected)s" msgstr "" -#: src/templates/intern/sendmail_preview.html:36 +#: src/templates/intern/sendmail_preview.html:45 msgid "Ändern" msgstr "" -#: src/templates/intern/sendmail_preview.html:37 +#: src/templates/intern/sendmail_preview.html:46 msgid "Mails senden" msgstr "" @@ -1669,13 +1686,13 @@ msgid "" "Sie sind dabei die Bestellphase zu beenden. Möchten Sie das wirklich tun?" msgstr "" -#: src/templates/intern/status_final.html:14 +#: src/templates/intern/status_final.html:15 msgid "Bestätigen" msgstr "" #: src/templates/intern/sync_ergebnisse.html:4 #: src/templates/intern/sync_ergebnisse.html:7 -#: src/templates/intern/sync_ergebnisse.html:13 +#: src/templates/intern/sync_ergebnisse.html:16 msgid "Ranking berechnen" msgstr "" @@ -1685,20 +1702,20 @@ msgid "" "diesen Punkt das Ranking berechnet werden." msgstr "" -#: src/templates/intern/tans/process_tans_preview.html:10 +#: src/templates/intern/tans/process_tans_preview.html:17 msgid "Losungsmail Vorschau" msgstr "" -#: src/templates/intern/tans/process_tans_preview.html:18 -#: src/templates/intern/tans/process_tans_preview.html:38 +#: src/templates/intern/tans/process_tans_preview.html:23 +#: src/templates/intern/tans/process_tans_preview.html:41 msgid "Empfänger" msgstr "" -#: src/templates/intern/tans/process_tans_preview.html:30 +#: src/templates/intern/tans/process_tans_preview.html:35 msgid "TANmail Vorschau" msgstr "" -#: src/templates/intern/tans/process_tans_preview.html:65 +#: src/templates/intern/tans/process_tans_preview.html:68 msgid "Absenden" msgstr "" @@ -1709,7 +1726,7 @@ msgstr "" msgid "Email Ändern" msgstr "" -#: src/templates/public/email_change.html:11 +#: src/templates/public/email_change.html:10 msgid "" "\n" " Geben Sie unten Ihre neue E-Mail-Adresse ein. Sie erhalten ein " @@ -1717,24 +1734,24 @@ msgid "" " " msgstr "" -#: src/templates/public/email_change.html:18 +#: src/templates/public/email_change.html:17 msgid "OTP Anfordern" msgstr "" -#: src/templates/public/email_change_complete.html:11 +#: src/templates/public/email_change_complete.html:10 #, python-format msgid "" "\n" " Sie haben Ihre E-Mail-Adresse erfolgreich geändert. Ihre neue E-Mail-" -"Adresse ist : %(new_email)s\n" +"Adresse ist : [ %(new_email)s ]\n" " " msgstr "" -#: src/templates/public/email_change_request.html:11 +#: src/templates/public/email_change_request.html:10 msgid "" "\n" " Geben Sie unten Ihre alte E-Mail-Adresse ein. Sie erhalten einen " -"Link, um Ihre E-Mail zu ändern. \n" +"Link, um Ihre E-Mail zu ändern.\n" " Sollten Sie keinen Zugriff mehr auf Ihre alte E-Mail-Adresse haben, " "melden Sie sich bitte beim Feedback-" @@ -1742,7 +1759,7 @@ msgid "" " " msgstr "" -#: src/templates/public/email_change_request.html:19 +#: src/templates/public/email_change_request.html:18 msgid "Änderung anfordern" msgstr "" @@ -1750,11 +1767,11 @@ msgstr "" msgid "E-Mail Ändern" msgstr "" -#: src/templates/public/email_change_send_confirmation.html:11 +#: src/templates/public/email_change_send_confirmation.html:10 #, python-format msgid "" "\n" -" Wenn [%(old_email)s] bei der Website registriert ist, " +" Wenn [ %(old_email)s ] bei der Website registriert ist, " "erhalten Sie eine E-Mail, um Ihre E-Mail-Adresse zu ändern. \n" " Falls Sie keinen Zugriff mehr auf diese E-Mail-Adresse haben, melden " "Sie sich bitte beim VPN einwählen." msgstr "" -#: src/templates/public/veranstaltung.html:7 +#: src/templates/public/veranstaltung.html:14 msgid "zurück zur Übersicht" msgstr "" -#: src/templates/public/veranstaltung.html:13 +#: src/templates/public/veranstaltung.html:20 msgid "Details" msgstr "" -#: src/templates/public/veranstaltung.html:17 +#: src/templates/public/veranstaltung.html:24 msgid "Note" msgstr "" -#: src/templates/public/veranstaltung.html:18 +#: src/templates/public/veranstaltung.html:25 msgid "Antworten" msgstr "" -#: src/templates/public/veranstaltung.html:34 +#: src/templates/public/veranstaltung.html:41 #, python-format msgid "Insgesamt abgegebene Fragebögen: %(ergebnis.anzahl)s" msgstr "" -#: src/templates/public/veranstaltung.html:35 +#: src/templates/public/veranstaltung.html:42 #, python-format msgid "" "Die ausführlichen Ergebnisse zu dieser Veranstaltung hat " "%(v.verantwortlich.full_name)s per E-Mail erhalten." msgstr "" -#: src/templates/public/veranstaltung.html:37 +#: src/templates/public/veranstaltung.html:44 msgid "Legende" msgstr "" -#: src/templates/public/veranstaltung.html:39 +#: src/templates/public/veranstaltung.html:46 msgid "" "Note: Durchschnittsnote, gemittelt über alle abgegebenen " "Antworten" msgstr "" -#: src/templates/public/veranstaltung.html:40 +#: src/templates/public/veranstaltung.html:47 msgid "Antworten: Anzahl der abgegebenen Antworten" msgstr "" -#: src/templates/public/veranstaltung.html:42 +#: src/templates/public/veranstaltung.html:49 msgid "" "Die Fragen, die in die einzelnen Noten einfließen, werden nach einem Klick " "auf die jeweilige Kategorie angezeigt." msgstr "" -#: src/templates/public/veranstaltung.html:44 +#: src/templates/public/veranstaltung.html:51 msgid "Kommentar der Veranstalter zum Ergebnis" msgstr "" -#: src/templates/public/veranstaltung.html:48 +#: src/templates/public/veranstaltung.html:55 msgid "Es wurde kein Kommentar hinterlegt." msgstr "" @@ -2055,32 +2072,27 @@ msgstr "" msgid "Or use a third-party" msgstr "Oder verwenden Sie einen Dritten" -#: src/templates/veranstalter/dashboard.html:62 +#: src/templates/veranstalter/dashboard.html:16 msgid "Dashboard" msgstr "" -#: src/templates/veranstalter/dashboard.html:70 -#: src/templates/veranstalter/dashboard.html:77 -msgid "Status" -msgstr "" - -#: src/templates/veranstalter/dashboard.html:73 +#: src/templates/veranstalter/dashboard.html:25 msgid "Log" msgstr "" -#: src/templates/veranstalter/dashboard.html:76 +#: src/templates/veranstalter/dashboard.html:30 msgid "Datum" msgstr "" -#: src/templates/veranstalter/dashboard.html:89 +#: src/templates/veranstalter/dashboard.html:49 msgid "Aktuelle Bestellung" msgstr "" -#: src/templates/veranstalter/dashboard.html:91 +#: src/templates/veranstalter/dashboard.html:52 msgid "Bestellung ändern" msgstr "" -#: src/templates/veranstalter/dashboard.html:132 +#: src/templates/veranstalter/dashboard.html:102 msgid "Bestellung durchführen" msgstr "" @@ -2203,9 +2215,5 @@ msgid "" msgstr "" #: src/templates/veranstalter/not_authenticated.html:21 -msgid "zum Admin-Login" -msgstr "" - -#: src/templates/veranstalter/not_authenticated.html:24 msgid "zum E-Mail ändern" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.mo b/src/locale/en/LC_MESSAGES/django.mo index fbe24ad2..5e2bf8d3 100644 Binary files a/src/locale/en/LC_MESSAGES/django.mo and b/src/locale/en/LC_MESSAGES/django.mo differ diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 93c8356e..6745ccc2 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/src/locale/en/LC_MESSAGES/django.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-04-19 23:31+0200\n" +"POT-Creation-Date: 2026-05-02 01:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -329,6 +328,7 @@ msgid "Bestellung wird verarbeitet" msgstr "Order being processed" #: src/feedback/models/base.py:403 +#: src/templates/intern/fragebogensprache.html:21 msgid "Gedruckt" msgstr "Printed" @@ -354,7 +354,7 @@ msgid "" msgstr "If your lecture does not have exercise, please choose Lecture" #: src/feedback/models/base.py:438 src/feedback/views/veranstalter.py:54 -#: src/templates/intern/fragebogensprache.html:14 +#: src/templates/intern/fragebogensprache.html:20 msgid "Typ" msgstr "Type" @@ -383,12 +383,12 @@ msgstr "" "questionnaires" #: src/feedback/models/base.py:448 src/feedback/views/veranstalter.py:56 -#: src/templates/intern/fragebogensprache.html:12 +#: src/templates/intern/fragebogensprache.html:18 msgid "Sprache" msgstr "Language" #: src/feedback/models/base.py:449 src/feedback/views/veranstalter.py:94 -#: src/templates/intern/fragebogensprache.html:13 +#: src/templates/intern/fragebogensprache.html:19 msgid "Anzahl" msgstr "Count" @@ -508,8 +508,8 @@ msgid "Der Veranstalter Link wird erst nach dem Anlegen angezeigt" msgstr "The organizer link is only displayed after it has been created" #: src/feedback/models/base.py:704 src/feedback/models/base.py:718 -#: src/templates/formtools/wizard/basisdaten.html:9 -#: src/templates/intern/fragebogensprache.html:11 +#: src/templates/formtools/wizard/basisdaten.html:14 +#: src/templates/intern/fragebogensprache.html:17 msgid "Veranstaltung" msgstr "Course" @@ -523,7 +523,7 @@ msgstr "" #: src/feedback/models/base.py:717 #: src/templates/formtools/wizard/email_zusammenfassung.html:74 -#: src/templates/veranstalter/dashboard.html:113 +#: src/templates/veranstalter/dashboard.html:77 msgid "Anmerkung" msgstr "Note" @@ -533,8 +533,8 @@ msgstr "" #: src/feedback/models/base.py:729 #: src/templates/formtools/wizard/email_zusammenfassung.html:66 -#: src/templates/formtools/wizard/zusammenfassung.html:61 -#: src/templates/veranstalter/dashboard.html:105 +#: src/templates/formtools/wizard/zusammenfassung.html:36 +#: src/templates/veranstalter/dashboard.html:68 msgid "Tutoren" msgstr "Tutors" @@ -751,7 +751,7 @@ msgstr "The status of the following courses is changed to no evaluation:" #: src/templates/admin/keine_evaluation.html:13 #: src/templates/admin/status_aendern.html:13 -#: src/templates/intern/rechte_uebernehmen.html:18 +#: src/templates/intern/rechte_uebernehmen.html:21 msgid "Übernehmen" msgstr "Accept" @@ -810,11 +810,11 @@ msgstr "" msgid "Sign Up" msgstr "" -#: src/templates/bestellung_base.html:10 +#: src/templates/bestellung_base.html:11 msgid "zurück zum internen Bereich" msgstr "back to the internal area" -#: src/templates/bestellung_base.html:12 +#: src/templates/bestellung_base.html:13 msgid "zurück zum Veranstalterbereich" msgstr "back to the organizer area" @@ -834,55 +834,68 @@ msgstr "Legal notice" msgid "Datenschutzerklärung" msgstr "Privacy policy" -#: src/templates/d120/header.html:19 +#: src/templates/d120/header.html:26 msgid "Webseite" msgstr "" -#: src/templates/d120/header.html:24 +#: src/templates/d120/header.html:32 msgid "Fachbereich" msgstr "Department" -#: src/templates/d120/sidebar.html:6 +#: src/templates/d120/header.html:47 +#: src/templates/formtools/wizard/bestellung_done.html:9 +msgid "Ausloggen" +msgstr "Log out" + +#: src/templates/d120/header.html:52 +msgid "Einloggen" +msgstr "Login" + +#: src/templates/d120/header.html:58 +msgid "Stil" +msgstr "Style" + +#: src/templates/d120/sidebar.html:11 msgid "Feedback" msgstr "" -#: src/templates/d120/sidebar.html:9 +#: src/templates/d120/sidebar.html:14 msgid "FAQ" msgstr "" -#: src/templates/d120/sidebar.html:12 +#: src/templates/d120/sidebar.html:17 msgid "Hall of Fame" msgstr "" -#: src/templates/d120/sidebar.html:15 src/templates/public/index.html:3 +#: src/templates/d120/sidebar.html:20 src/templates/public/index.html:9 #: src/templates/public/keine_ergebnisse.html:4 #: src/templates/public/unauth.html:4 msgid "Ergebnisse" msgstr "Results" -#: src/templates/d120/sidebar.html:18 +#: src/templates/d120/sidebar.html:23 msgid "Webinterface" msgstr "Web interface" -#: src/templates/d120/sidebar.html:21 +#: src/templates/d120/sidebar.html:26 msgid "E-Mail ändern" msgstr "Change E-Mail" -#: src/templates/d120_base.html:6 +#: src/templates/d120_base.html:9 msgid "Leere Seite" msgstr "Blank page" -#: src/templates/d120_base.html:6 +#: src/templates/d120_base.html:9 msgid " - Evaluation der Lehre" msgstr " - Evaluation of teaching" -#: src/templates/d120_base.html:40 +#: src/templates/d120_base.html:51 #, python-format msgid "Du nutzt momentan die Rechte der Veranstalter von %(veranstaltung)s." msgstr "" "You are currently using the rights of the organizers of %(veranstaltung)s." -#: src/templates/d120_base.html:40 +#: src/templates/d120_base.html:51 msgid "Zu meinem Account zurückkehren." msgstr "Return to my account." @@ -919,7 +932,6 @@ msgid "%(veranstaltung.name)s (%(veranstaltung.semester.short)s)" msgstr "" #: src/templates/feedback/person_form.html:13 -#: src/templates/formtools/wizard/base.html:74 #: src/templates/veranstalter/index.html:15 msgid "ausloggen" msgstr "logout" @@ -929,7 +941,7 @@ msgid "Fragebogenbestellung Schritt 2 von 5" msgstr "Ordering a questionnaire Step 2 of 5" #: src/templates/feedback/person_form.html:19 -#: src/templates/intern/index.html:31 src/templates/veranstalter/index.html:33 +#: src/templates/intern/index.html:50 src/templates/veranstalter/index.html:33 msgid "Ablauf" msgstr "Procedure" @@ -961,49 +973,50 @@ msgstr "continue" msgid "Erfassung der Daten des Verantwortlichen: " msgstr "Recording the data of the person responsible:" -#: src/templates/formtools/wizard/base.html:69 +#: src/templates/formtools/wizard/base.html:14 msgid "Bestellprozess " msgstr "Order process " -#: src/templates/formtools/wizard/base.html:80 -msgid "Bestellung für " +#: src/templates/formtools/wizard/base.html:21 +msgid "Bestellung für" msgstr "Order for " -#: src/templates/formtools/wizard/base.html:107 +#: src/templates/formtools/wizard/base.html:52 msgid "Pflichtfeld" msgstr "Required field" -#: src/templates/formtools/wizard/base.html:109 -#: src/templates/intern/import_vv_edit_users_update.html:26 -#: src/templates/intern/import_vv_edit_users_update.html:29 +#: src/templates/formtools/wizard/base.html:56 +#: src/templates/intern/fragebogensprache.html:22 +#: src/templates/intern/import_vv_edit_users_update.html:39 +#: src/templates/intern/import_vv_edit_users_update.html:43 #: src/templates/intern/tans/process_tans.html:21 -#: src/templates/intern/tans/process_tans_preview.html:63 +#: src/templates/intern/tans/process_tans_preview.html:66 msgid "Zurück" msgstr "Back" -#: src/templates/formtools/wizard/base.html:113 -#: src/templates/intern/import_vv_edit.html:87 +#: src/templates/formtools/wizard/base.html:62 +#: src/templates/intern/import_vv_edit.html:75 #: src/templates/intern/tans/process_tans.html:23 #: src/templates/veranstalter/index.html:75 msgid "Weiter" msgstr "Continue" -#: src/templates/formtools/wizard/base.html:117 +#: src/templates/formtools/wizard/base.html:68 #: src/templates/veranstalter/index.html:102 msgid "Speichern" msgstr "Save" -#: src/templates/formtools/wizard/basisdaten.html:5 +#: src/templates/formtools/wizard/basisdaten.html:10 msgid "Erfassung der Basisdaten" msgstr "Collecting basic data" -#: src/templates/formtools/wizard/basisdaten.html:10 +#: src/templates/formtools/wizard/basisdaten.html:15 #: src/templates/intern/lange_ohne_evaluation.html:26 #: src/templates/veranstalter/index.html:55 msgid "Bestellte Bögen" msgstr "Ordered forms" -#: src/templates/formtools/wizard/basisdaten.html:11 +#: src/templates/formtools/wizard/basisdaten.html:16 msgid "Rückläufe" msgstr "Responses" @@ -1011,12 +1024,6 @@ msgstr "Responses" msgid "Die Bestellung wurde entgegengenommen" msgstr "The order has been accepted" -#: src/templates/formtools/wizard/bestellung_done.html:9 -#: src/templates/intern/index.html:20 -#: src/templates/veranstalter/dashboard.html:67 -msgid "Ausloggen" -msgstr "Log out" - #: src/templates/formtools/wizard/email_zusammenfassung.html:6 msgid "Zusammenfassung der Bestelldaten" msgstr "Summary of order data" @@ -1027,51 +1034,51 @@ msgid "Zusammenfassung der Fragebogenbestellung für %(veranstaltung)s" msgstr "Summary of the questionnaire order for %(veranstaltung)s" #: src/templates/formtools/wizard/email_zusammenfassung.html:70 -#: src/templates/veranstalter/dashboard.html:109 +#: src/templates/veranstalter/dashboard.html:73 msgid "Num" msgstr "" #: src/templates/formtools/wizard/email_zusammenfassung.html:71 -#: src/templates/veranstalter/dashboard.html:110 +#: src/templates/veranstalter/dashboard.html:74 msgid "Vorname" msgstr "First name" #: src/templates/formtools/wizard/email_zusammenfassung.html:72 -#: src/templates/veranstalter/dashboard.html:111 +#: src/templates/veranstalter/dashboard.html:75 msgid "Nachname" msgstr "Last name" #: src/templates/formtools/wizard/email_zusammenfassung.html:73 -#: src/templates/veranstalter/dashboard.html:112 +#: src/templates/veranstalter/dashboard.html:76 msgid "Email" msgstr "" -#: src/templates/formtools/wizard/evaluation.html:5 +#: src/templates/formtools/wizard/evaluation.html:11 msgid "Möchten Sie ihre Veranstaltung evaluieren?" msgstr "Would you like to evaluate your course?" -#: src/templates/formtools/wizard/evaluation.html:6 +#: src/templates/formtools/wizard/evaluation.html:13 msgid "Datenschutzrechtliche Einwilligungserklärung" msgstr "Declaration of consent under data protection law" -#: src/templates/formtools/wizard/evaluation.html:8 +#: src/templates/formtools/wizard/evaluation.html:15 msgid "" "Ich bin einverstanden, dass meine Daten im Zusammenhang mit der " "Lehrevaluation vom Fachbereich Informatik und der Fachschaft Informatik " "erhoben, verarbeitet und genutzt werden, und für\n" -"folgende Zwecke verwendet werden: interne Evaluation des Fachbereichs und " -"der Fachschaft, Rückmeldungen zur Evaluation (z.B. Vergabe von Lehrpreisen), " -"sowie Veröffentlichung der\n" -"numerischen Ergebnisse im Intranet der TU Darmstadt.\n" -"
\n" -"
\n" -"Die Erhebung, Verarbeitung und Nutzung meiner Daten erfolgt auf freiwilliger " -"Basis. Ich kann mein Einverständnis ohne für mich nachteilige Folgen " -"verweigern bzw. jederzeit mit Wirkung für\n" -"die Zukunft widerrufen. Meine Widerrufserklärung richte ich an das " -"Studiendekanat des Fachbereichs Informatik. Im Fall des Widerrufs werden mit " -"dem Zugang meiner Widerrufserklärung meine\n" -"Daten bei den entsprechenden Stellen gelöscht." +" folgende Zwecke verwendet werden: interne Evaluation des " +"Fachbereichs und der Fachschaft, Rückmeldungen zur Evaluation (z.B. Vergabe " +"von Lehrpreisen), sowie Veröffentlichung der\n" +" numerischen Ergebnisse im Intranet der TU Darmstadt.\n" +"
\n" +"
\n" +" Die Erhebung, Verarbeitung und Nutzung meiner Daten erfolgt auf " +"freiwilliger Basis. Ich kann mein Einverständnis ohne für mich nachteilige " +"Folgen verweigern bzw. jederzeit mit Wirkung für\n" +" die Zukunft widerrufen. Meine Widerrufserklärung richte ich an " +"das Studiendekanat des Fachbereichs Informatik. Im Fall des Widerrufs werden " +"mit dem Zugang meiner Widerrufserklärung meine\n" +" Daten bei den entsprechenden Stellen gelöscht." msgstr "" "I agree that my data may be collected, processed and used by the Department " "of Computer Science and the Computer Science Student Council in connection " @@ -1090,12 +1097,12 @@ msgstr "" " data will be deleted from the relevant offices upon receipt of my " "declaration of revocation." -#: src/templates/formtools/wizard/evaluation.html:20 +#: src/templates/formtools/wizard/evaluation.html:29 #: src/templates/veranstalter/index.html:20 msgid "Information zur Vollerhebung" msgstr "Information on the full survey" -#: src/templates/formtools/wizard/evaluation.html:21 +#: src/templates/formtools/wizard/evaluation.html:30 msgid "" "\n" " In diesem Semester findet eine Vollerhebung aller " @@ -1135,11 +1142,11 @@ msgstr "" msgid "Erfassung der Freien Fragen" msgstr "Entering the free questions" -#: src/templates/formtools/wizard/freiefragen.html:5 +#: src/templates/formtools/wizard/freiefragen.html:6 msgid "Freie Fragen Feld" msgstr "Free questions field" -#: src/templates/formtools/wizard/freiefragen.html:6 +#: src/templates/formtools/wizard/freiefragen.html:7 msgid "" "\n" " Auf dem Fragebogen zu Ihrer Veranstaltung können Sie bis zu\n" @@ -1159,7 +1166,7 @@ msgstr "" "i>“.\n" " " -#: src/templates/formtools/wizard/freiefragen.html:14 +#: src/templates/formtools/wizard/freiefragen.html:15 msgid "" "\n" " Bitte geben Sie hier Ihre freien Fragen ein. Falls Sie keine eigenen " @@ -1227,7 +1234,7 @@ msgstr "Check" msgid "Einverständniserklärung zur Veröffentlichung der Evaluationsergebnisse" msgstr "Declaration of consent to the publication of the evaluation results" -#: src/templates/formtools/wizard/veroeffentlichen.html:6 +#: src/templates/formtools/wizard/veroeffentlichen.html:7 msgid "" "Die Ergebnisse der Veranstaltungsevaluation werden auf der\n" "Fachschaftswebsite innerhalb des Universitätsnetzwerkes als\n" @@ -1248,12 +1255,12 @@ msgstr "" "the publication of the results is necessary. Do you agree with the " "publication?" -#: src/templates/formtools/wizard/zusammenfassung.html:41 +#: src/templates/formtools/wizard/zusammenfassung.html:16 msgid "Zusammenfassung der Fragebogenbestellung" msgstr "Summary of the questionnaire order" #: src/templates/includes/semesterauswahl.html:2 -#: src/templates/public/index.html:8 +#: src/templates/public/index.html:14 msgid "Semester:" msgstr "" @@ -1270,27 +1277,19 @@ msgstr "" "Here you can generate an XML file containing all evaluated courses of the " "selected semester, which can be imported into EvaSys." -#: src/templates/intern/export_veranstaltungen.html:13 +#: src/templates/intern/export_veranstaltungen.html:18 msgid "XML für Veranstaltungen erzeugen" msgstr "Create XML for courses" -#: src/templates/intern/export_veranstaltungen.html:14 +#: src/templates/intern/export_veranstaltungen.html:22 msgid "XML für Übungen erzeugen" msgstr "Create XML for exercises" -#: src/templates/intern/fragebogensprache.html:4 -#: src/templates/intern/fragebogensprache.html:7 +#: src/templates/intern/fragebogensprache.html:9 +#: src/templates/intern/fragebogensprache.html:12 msgid "Zuordnung Veranstaltungen zu Sprache des Fragebogens" msgstr "Mapping of courses to the language of the questionnaire" -#: src/templates/intern/fragebogensprache.html:15 -msgid "gedruckt" -msgstr "printed" - -#: src/templates/intern/fragebogensprache.html:16 -msgid "zurück" -msgstr "back" - #: src/templates/intern/free_questions.html:5 msgid "Freie Fragen Liste" msgstr "Free Questions List" @@ -1320,37 +1319,37 @@ msgstr "" "The cover letter is a letter to the organizers that is attached to the " "questionnaires." -#: src/templates/intern/generate_letters.html:13 +#: src/templates/intern/generate_letters.html:16 msgid "Erhebungswoche:" msgstr "Collection week:" -#: src/templates/intern/generate_letters.html:15 +#: src/templates/intern/generate_letters.html:22 msgid "Zu erzeugende Datei:" msgstr "File to be generated:" -#: src/templates/intern/generate_letters.html:17 +#: src/templates/intern/generate_letters.html:26 msgid "Anschreiben" msgstr "Cover letter" -#: src/templates/intern/generate_letters.html:18 +#: src/templates/intern/generate_letters.html:29 msgid "Aufkleber" msgstr "Sticker" -#: src/templates/intern/generate_letters.html:19 +#: src/templates/intern/generate_letters.html:31 msgid "Mindestteilnehmerzahl" msgstr "Minimum number of participants" -#: src/templates/intern/generate_letters.html:22 +#: src/templates/intern/generate_letters.html:36 msgid "PDF erzeugen" msgstr "Create PDF" -#: src/templates/intern/generate_letters.html:27 +#: src/templates/intern/generate_letters.html:42 msgid "Fehler bei der Ausführung von pdflatex" msgstr "Error during the execution of pdflatex" #: src/templates/intern/import_ergebnisse.html:4 #: src/templates/intern/import_ergebnisse.html:7 -#: src/templates/intern/index.html:43 +#: src/templates/intern/index.html:62 msgid "Ergebnisse aus EvaSys importieren" msgstr "Import results from EvaSys" @@ -1362,26 +1361,26 @@ msgstr "" "The questionnaires scanned and read by EvaSys can be uploaded here in the " "form of a CSV file (can be created in EvaSys)." -#: src/templates/intern/import_ergebnisse.html:19 +#: src/templates/intern/import_ergebnisse.html:21 msgid "Vorlesung (2009-2020)" msgstr "Lecture (2009-2020)" -#: src/templates/intern/import_ergebnisse.html:24 +#: src/templates/intern/import_ergebnisse.html:26 msgid "Übung (2016-2020)" msgstr "Exercise (2016-2020)" -#: src/templates/intern/import_ergebnisse.html:27 -#: src/templates/intern/import_vv.html:14 +#: src/templates/intern/import_ergebnisse.html:30 +#: src/templates/intern/import_vv.html:18 msgid "Hochladen" msgstr "Upload" -#: src/templates/intern/import_vv.html:4 src/templates/intern/import_vv.html:7 -#: src/templates/intern/import_vv_edit.html:34 -#: src/templates/intern/import_vv_edit.html:37 +#: src/templates/intern/import_vv.html:5 src/templates/intern/import_vv.html:9 +#: src/templates/intern/import_vv_edit.html:12 +#: src/templates/intern/import_vv_edit.html:16 msgid "Vorlesungsverzeichnis importieren" msgstr "Import course catalog" -#: src/templates/intern/import_vv.html:9 +#: src/templates/intern/import_vv.html:11 msgid "" "Das System erwartet eine XML-Datei, die aus TUCaN exportiert wurde und alle " "Veranstaltungen des Semesters enthält." @@ -1389,7 +1388,7 @@ msgstr "" "The system expects an XML file that has been exported from TUCaN and " "contains all courses of the semester." -#: src/templates/intern/import_vv.html:10 +#: src/templates/intern/import_vv.html:12 msgid "" "Achtung: Upload und serverseitige Verarbeitung der Datei können aufgrund der " "großen Datenmenge etwas dauern." @@ -1397,15 +1396,19 @@ msgstr "" "Attention: Upload and server-side processing of the file may take some time " "due to the large amount of data." -#: src/templates/intern/import_vv.html:17 +#: src/templates/intern/import_vv.html:22 msgid "" -"Hinweis von Wolfgang Heenes, wie man mit Zugriff auf TUCaN (z.B. als " -"Mitarbeiter des Studienbüros) diese Daten im passenden Format erhält, falls " -"er mal nicht mehr dafür zuständig ist:
\n" -"\"Die Daten kommen aus dem Backend (Semesterangebot -> " +"\n" +" Hinweis von Wolfgang Heenes, wie man mit Zugriff auf TUCaN " +"(z.B. als Mitarbeiter des Studienbüros) diese Daten im passenden Format " +"erhält, falls er mal nicht mehr dafür zuständig ist:\n" +"
\n" +" \"Die Daten kommen aus dem Backend (Semesterangebot -> " "Vorlesungsverzeichnis erstellen). Es gibt auf dem Sharepoint KEINEN Report, " -"der das KOMPLETTE Vorlesungsverzeichnis enthält.\"" +"der das KOMPLETTE Vorlesungsverzeichnis enthält.\"\n" +" " msgstr "" +"\n" "Notice of Wolfgang Heenes, how to access TUCaN (e.g. as an employee " "of the Office of Student Affairs) to obtain this data in the appropriate " "format in case they are no longer responsible for it:
\n" @@ -1413,12 +1416,18 @@ msgstr "" "catalog). There is NO report on the sharepoint that contains the COMPLETE " "course catalog.\"" -#: src/templates/intern/import_vv_edit.html:44 +#: src/templates/intern/import_vv_edit.html:20 +msgid "" +"Bitte JavaScript aktivieren, um bequemer durch das Verzeichnis navigieren " +"und Veranstaltungen auswählen zu können!" +msgstr "" + +#: src/templates/intern/import_vv_edit.html:24 msgid "" "Im Folgenden können die zu importierenden Veranstaltungen ausgewählt werden." msgstr "The courses to be imported can be selected below." -#: src/templates/intern/import_vv_edit.html:49 +#: src/templates/intern/import_vv_edit.html:32 msgid "" "Falls das Semester, für das Veranstaltungen importiert werden sollen, nicht " "in der Auswahlliste steht, muss es zunächst über die Datenbank-" @@ -1427,15 +1436,15 @@ msgstr "" "If the semester for which courses are to be imported is not in the selection " "list, it must first be added via the database administration." -#: src/templates/intern/import_vv_edit.html:70 +#: src/templates/intern/import_vv_edit.html:54 msgid "Alle markieren" msgstr "Mark all" -#: src/templates/intern/import_vv_edit.html:70 +#: src/templates/intern/import_vv_edit.html:54 msgid "Markierungen aufheben" msgstr "Cancel markings" -#: src/templates/intern/import_vv_edit.html:88 +#: src/templates/intern/import_vv_edit.html:76 #: src/templates/veranstalter/index.html:76 #: src/templates/veranstalter/index.html:103 msgid "Zurücksetzen" @@ -1443,8 +1452,8 @@ msgstr "Reset" #: src/templates/intern/import_vv_edit_users.html:3 #: src/templates/intern/import_vv_edit_users.html:6 -#: src/templates/intern/import_vv_edit_users_namecheck.html:3 -#: src/templates/intern/import_vv_edit_users_namecheck.html:5 +#: src/templates/intern/import_vv_edit_users_namecheck.html:9 +#: src/templates/intern/import_vv_edit_users_namecheck.html:12 #: src/templates/intern/import_vv_edit_users_update.html:4 #: src/templates/intern/import_vv_edit_users_update.html:7 msgid "Personendaten vervollständigen" @@ -1460,109 +1469,115 @@ msgid "" "Alle Veranstalter des aktuellen Semesters haben vollständige Personendaten." msgstr "All organizers of the current semester have complete personal data." -#: src/templates/intern/import_vv_edit_users_namecheck.html:11 +#: src/templates/intern/import_vv_edit_users_namecheck.html:20 msgid "Die ähnliche Person" msgstr "The similar person" -#: src/templates/intern/import_vv_edit_users_namecheck.html:12 -#: src/templates/intern/import_vv_edit_users_namecheck.html:23 +#: src/templates/intern/import_vv_edit_users_namecheck.html:21 +#: src/templates/intern/import_vv_edit_users_namecheck.html:32 msgid "Name: " msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:13 -#: src/templates/intern/import_vv_edit_users_namecheck.html:24 +#: src/templates/intern/import_vv_edit_users_namecheck.html:22 +#: src/templates/intern/import_vv_edit_users_namecheck.html:33 msgid "E-Mail: " msgstr "" -#: src/templates/intern/import_vv_edit_users_namecheck.html:15 -#: src/templates/intern/import_vv_edit_users_namecheck.html:26 +#: src/templates/intern/import_vv_edit_users_namecheck.html:24 +#: src/templates/intern/import_vv_edit_users_namecheck.html:35 msgid "Lehrveranstaltungen" msgstr "Courses" -#: src/templates/intern/import_vv_edit_users_namecheck.html:22 +#: src/templates/intern/import_vv_edit_users_namecheck.html:31 msgid "Die neue Person" msgstr "The new person" -#: src/templates/intern/import_vv_edit_users_namecheck.html:39 +#: src/templates/intern/import_vv_edit_users_namecheck.html:49 msgid "Zusammenführen" msgstr "Combine" -#: src/templates/intern/import_vv_edit_users_namecheck.html:42 +#: src/templates/intern/import_vv_edit_users_namecheck.html:54 msgid "Ignorieren" msgstr "Ignore" -#: src/templates/intern/import_vv_edit_users_namecheck.html:46 -#: src/templates/intern/import_vv_edit_users_update.html:42 +#: src/templates/intern/import_vv_edit_users_namecheck.html:60 +#: src/templates/intern/import_vv_edit_users_update.html:64 msgid "zurück zu Personendaten" msgstr "back to person data" -#: src/templates/intern/import_vv_edit_users_update.html:11 +#: src/templates/intern/import_vv_edit_users_update.html:12 #, python-format msgid "" -"Es sind noch %(person.persons_to_edit.count)s Personendaten zu bearbeiten." +"\n" +" Es sind noch %(person.persons_to_edit.count)s Personendaten zu " +"bearbeiten.\n" +" " msgstr "" +"\n" "There are still %(person.persons_to_edit.count)s personal data to be " "processed." -#: src/templates/intern/import_vv_edit_users_update.html:14 +#: src/templates/intern/import_vv_edit_users_update.html:20 msgid "Auf Google suchen." msgstr "Search on Google." -#: src/templates/intern/import_vv_edit_users_update.html:18 +#: src/templates/intern/import_vv_edit_users_update.html:27 msgid "Es existiert eine Person, die ähnlich zu dieser ist." msgstr "There is a person who is similar to this one." -#: src/templates/intern/import_vv_edit_users_update.html:33 -#: src/templates/intern/import_vv_edit_users_update.html:36 +#: src/templates/intern/import_vv_edit_users_update.html:50 +#: src/templates/intern/import_vv_edit_users_update.html:54 msgid "Überspringen" msgstr "Skip" -#: src/templates/intern/import_vv_edit_users_update.html:38 +#: src/templates/intern/import_vv_edit_users_update.html:59 msgid "Speichern & Weiter" msgstr "Save & continue" -#: src/templates/intern/index.html:5 src/templates/intern/index.html:9 +#: src/templates/intern/index.html:10 src/templates/intern/index.html:15 #: src/templates/intern/status_final.html:5 msgid "Interner Bereich" msgstr "Internal section" -#: src/templates/intern/index.html:11 +#: src/templates/intern/index.html:22 +#: src/templates/veranstalter/dashboard.html:20 +#: src/templates/veranstalter/dashboard.html:31 +msgid "Status" +msgstr "" + +#: src/templates/intern/index.html:23 +msgid "der Rückmeldungen durch die Veranstalter" +msgstr "of feedback from the organizers" + +#: src/templates/intern/index.html:37 +msgid "Allgemeines" +msgstr "" + +#: src/templates/intern/index.html:39 msgid "Verwaltung der Daten" msgstr "Data management" -#: src/templates/intern/index.html:12 +#: src/templates/intern/index.html:40 msgid "zu Veranstalter-Account wechseln" msgstr "Switch to organizer account" -#: src/templates/intern/index.html:13 +#: src/templates/intern/index.html:41 msgid "Mail an Veranstalter verschicken" msgstr "Send mail to organizer" -#: src/templates/intern/index.html:14 +#: src/templates/intern/index.html:42 msgid "Zuordnung Veranstaltungen zu Fragebogensprache" msgstr "Assignment of courses to questionnaire language" -#: src/templates/intern/index.html:15 +#: src/templates/intern/index.html:43 msgid "Veranstaltungen die lange nicht mehr evaluiert wurden" msgstr "Courses that have not been evaluated for a long time" -#: src/templates/intern/index.html:16 +#: src/templates/intern/index.html:44 msgid "Liste der Veranstaltungen mit freien Fragen" msgstr "List of courses with free questions" -#: src/templates/intern/index.html:24 -msgid "Status der Rückmeldungen durch die Veranstalter" -msgstr "Status of feedback from the organizers" - -#: src/templates/intern/index.html:25 -#, python-format -msgid "" -"Aktuell haben wir %(ruck_veranst)s Rückmeldungen von %(all_veranst)s " -"Veranstaltungen." -msgstr "" -"We currently have %(ruck_veranst)s feedback from %(all_veranst)s courses." - -#: src/templates/intern/index.html:32 +#: src/templates/intern/index.html:51 #, python-format msgid "" "Dies sind nicht alle nötigen Schritte; siehe Process in the bookstack." -#: src/templates/intern/index.html:35 +#: src/templates/intern/index.html:54 msgid "neues Semester anlegen" msgstr "create new semester" -#: src/templates/intern/index.html:35 +#: src/templates/intern/index.html:54 msgid "aktuell" msgstr "current" -#: src/templates/intern/index.html:36 +#: src/templates/intern/index.html:55 msgid "nicht Vorhanden" msgstr "not present" -#: src/templates/intern/index.html:37 +#: src/templates/intern/index.html:56 msgid "Veranstaltungen aus VV importieren" msgstr "Import courses from VV" -#: src/templates/intern/index.html:37 src/templates/intern/index.html:38 +#: src/templates/intern/index.html:56 src/templates/intern/index.html:57 msgid "vor Bestellphase" msgstr "before ordering phase" -#: src/templates/intern/index.html:38 +#: src/templates/intern/index.html:57 msgid "Fehlende Personendaten nachtragen" msgstr "Add missing personal data" -#: src/templates/intern/index.html:39 src/templates/intern/status_final.html:9 +#: src/templates/intern/index.html:58 src/templates/intern/status_final.html:9 msgid "Bestellphase abschließen" msgstr "Complete the ordering phase" -#: src/templates/intern/index.html:39 src/templates/intern/index.html:40 +#: src/templates/intern/index.html:58 src/templates/intern/index.html:59 msgid "nach Bestellphase" msgstr "after ordering phase" -#: src/templates/intern/index.html:40 +#: src/templates/intern/index.html:59 msgid "Anschreiben für Veranstalter erzeugen" msgstr "Create cover letter for organizers" -#: src/templates/intern/index.html:41 +#: src/templates/intern/index.html:60 msgid "Veranstaltungen für EvaSys exportieren" msgstr "Exporting courses for EvaSys" -#: src/templates/intern/index.html:42 +#: src/templates/intern/index.html:61 #: src/templates/intern/tans/process_tans.html:3 #: src/templates/intern/tans/process_tans.html:5 -#: src/templates/intern/tans/process_tans_preview.html:3 -#: src/templates/intern/tans/process_tans_preview.html:5 +#: src/templates/intern/tans/process_tans_preview.html:10 +#: src/templates/intern/tans/process_tans_preview.html:12 msgid "TANs verarbeiten" msgstr "Process TANs" -#: src/templates/intern/index.html:42 +#: src/templates/intern/index.html:61 msgid "nach der Bestellphase" msgstr "after the order phase" -#: src/templates/intern/index.html:44 +#: src/templates/intern/index.html:63 msgid "Rankings berechnen" msgstr "" -#: src/templates/intern/index.html:44 +#: src/templates/intern/index.html:63 msgid "nach dem Ergebnis-Import" msgstr "calculate rankings" -#: src/templates/intern/index.html:46 +#: src/templates/intern/index.html:65 msgid "Ergebnisse veröffentlichen" msgstr "Publish results" -#: src/templates/intern/index.html:46 +#: src/templates/intern/index.html:65 #, python-format msgid " (aktuell: sichtbar für %(cur_semester.get_sichtbarkeit_display)s)" msgstr " (current: visible for %(cur_semester.get_sichtbarkeit_display)s)" @@ -1721,71 +1736,74 @@ msgstr "" "The system offers you the option to return to your account on every page " "after the rights have been transferred." -#: src/templates/intern/sendmail.html:3 -#: src/templates/intern/sendmail_preview.html:4 +#: src/templates/intern/sendmail.html:5 +#: src/templates/intern/sendmail_preview.html:9 msgid "Mail versenden" msgstr "Send mail" -#: src/templates/intern/sendmail.html:10 -#: src/templates/intern/sendmail_preview.html:7 +#: src/templates/intern/sendmail.html:13 +#: src/templates/intern/sendmail_preview.html:12 msgid "Mail an Veranstalter versenden" msgstr "Send mail to organizer" -#: src/templates/intern/sendmail.html:16 +#: src/templates/intern/sendmail.html:19 msgid "Mail senden an Veranstalter der Veranstaltung mit Bestellstatus:" msgstr "Send an e-mail to the organizer of the course with the order status:" -#: src/templates/intern/sendmail.html:28 +#: src/templates/intern/sendmail.html:31 msgid "Mail auch an die Tutoren der jeweiligen Veranstaltungen schicken?" msgstr "Send an e-mail to the tutors of the respective courses?" -#: src/templates/intern/sendmail.html:38 +#: src/templates/intern/sendmail.html:41 msgid "Vorlage:" msgstr "Template:" -#: src/templates/intern/sendmail.html:45 +#: src/templates/intern/sendmail.html:48 msgid "Vorlage übernehmen" msgstr "Apply template" -#: src/templates/intern/sendmail.html:49 -#: src/templates/intern/sendmail_preview.html:26 +#: src/templates/intern/sendmail.html:52 +#: src/templates/intern/sendmail_preview.html:35 msgid "Betreff:" msgstr "Subject:" -#: src/templates/intern/sendmail.html:54 +#: src/templates/intern/sendmail.html:57 msgid "Mailtext:" msgstr "Mail text:" -#: src/templates/intern/sendmail.html:59 -#: src/templates/intern/tans/process_tans_preview.html:6 +#: src/templates/intern/sendmail.html:62 +#: src/templates/intern/tans/process_tans_preview.html:13 msgid "Vorschau" msgstr "Preview" -#: src/templates/intern/sendmail.html:63 +#: src/templates/intern/sendmail.html:66 msgid "Verfügbare Variablen" msgstr "Available variables" -#: src/templates/intern/sendmail.html:66 +#: src/templates/intern/sendmail.html:69 msgid "Name der Veranstaltung" msgstr "Name of the course" -#: src/templates/intern/sendmail.html:67 +#: src/templates/intern/sendmail.html:70 msgid "Link zum Veranstalterbereich" msgstr "Link to the organizer area" -#: src/templates/intern/sendmail_preview.html:11 +#: src/templates/intern/sendmail_preview.html:17 msgid "" -"Vorschau (Ersetzte Begriffe sind blau markiert)" +"\n" +" Vorschau (Ersetzte Begriffe sind blau markiert)\n" +" " msgstr "" -"Preview (Replaced terms are marked in bluemarked in blue)" -#: src/templates/intern/sendmail_preview.html:13 +#: src/templates/intern/sendmail_preview.html:22 msgid "Absender:" msgstr "Sender" -#: src/templates/intern/sendmail_preview.html:18 +#: src/templates/intern/sendmail_preview.html:27 #, python-format msgid "" "Empfänger:\n" @@ -1794,11 +1812,11 @@ msgstr "" "Receiver:\n" " %(to)s from %(semester_selected)s" -#: src/templates/intern/sendmail_preview.html:36 +#: src/templates/intern/sendmail_preview.html:45 msgid "Ändern" msgstr "Change" -#: src/templates/intern/sendmail_preview.html:37 +#: src/templates/intern/sendmail_preview.html:46 msgid "Mails senden" msgstr "Send mails" @@ -1808,13 +1826,13 @@ msgid "" msgstr "" "You are about to end the order phase. Are you sure you want to do this?" -#: src/templates/intern/status_final.html:14 +#: src/templates/intern/status_final.html:15 msgid "Bestätigen" msgstr "Confirm" #: src/templates/intern/sync_ergebnisse.html:4 #: src/templates/intern/sync_ergebnisse.html:7 -#: src/templates/intern/sync_ergebnisse.html:13 +#: src/templates/intern/sync_ergebnisse.html:16 msgid "Ranking berechnen" msgstr "Calculate ranking" @@ -1826,20 +1844,20 @@ msgstr "" "After the results have been imported in the form of raw data, the ranking " "can be calculated via this point." -#: src/templates/intern/tans/process_tans_preview.html:10 +#: src/templates/intern/tans/process_tans_preview.html:17 msgid "Losungsmail Vorschau" msgstr "Solution mail preview" -#: src/templates/intern/tans/process_tans_preview.html:18 -#: src/templates/intern/tans/process_tans_preview.html:38 +#: src/templates/intern/tans/process_tans_preview.html:23 +#: src/templates/intern/tans/process_tans_preview.html:41 msgid "Empfänger" msgstr "Receiver" -#: src/templates/intern/tans/process_tans_preview.html:30 +#: src/templates/intern/tans/process_tans_preview.html:35 msgid "TANmail Vorschau" msgstr "TAN mail preview" -#: src/templates/intern/tans/process_tans_preview.html:65 +#: src/templates/intern/tans/process_tans_preview.html:68 msgid "Absenden" msgstr "Send" @@ -1850,7 +1868,7 @@ msgstr "Send" msgid "Email Ändern" msgstr "Change E-Mail" -#: src/templates/public/email_change.html:11 +#: src/templates/public/email_change.html:10 msgid "" "\n" " Geben Sie unten Ihre neue E-Mail-Adresse ein. Sie erhalten ein " @@ -1862,28 +1880,28 @@ msgstr "" "password (OTP) to confirm your new email address.\n" " " -#: src/templates/public/email_change.html:18 +#: src/templates/public/email_change.html:17 msgid "OTP Anfordern" msgstr "Request OTP" -#: src/templates/public/email_change_complete.html:11 +#: src/templates/public/email_change_complete.html:10 #, python-format msgid "" "\n" " Sie haben Ihre E-Mail-Adresse erfolgreich geändert. Ihre neue E-Mail-" -"Adresse ist : %(new_email)s\n" +"Adresse ist : [ %(new_email)s ]\n" " " msgstr "" "\n" " You have successfully changed your email address. Your new email " -"address is: %(new_email)s\n" +"address is: [ %(new_email)s ]\n" " " -#: src/templates/public/email_change_request.html:11 +#: src/templates/public/email_change_request.html:10 msgid "" "\n" " Geben Sie unten Ihre alte E-Mail-Adresse ein. Sie erhalten einen " -"Link, um Ihre E-Mail zu ändern. \n" +"Link, um Ihre E-Mail zu ändern.\n" " Sollten Sie keinen Zugriff mehr auf Ihre alte E-Mail-Adresse haben, " "melden Sie sich bitte beim Feedback-" @@ -1897,7 +1915,7 @@ msgstr "" "darmstadt.de\">Feedback-Team.\n" " " -#: src/templates/public/email_change_request.html:19 +#: src/templates/public/email_change_request.html:18 msgid "Änderung anfordern" msgstr "Request Change" @@ -1905,11 +1923,11 @@ msgstr "Request Change" msgid "E-Mail Ändern" msgstr "Change E-Mail" -#: src/templates/public/email_change_send_confirmation.html:11 +#: src/templates/public/email_change_send_confirmation.html:10 #, python-format msgid "" "\n" -" Wenn [%(old_email)s] bei der Website registriert ist, " +" Wenn [ %(old_email)s ] bei der Website registriert ist, " "erhalten Sie eine E-Mail, um Ihre E-Mail-Adresse zu ändern. \n" " Falls Sie keinen Zugriff mehr auf diese E-Mail-Adresse haben, melden " "Sie sich bitte beim %(old_email)s] is registered with the website, you will " +" If [ %(old_email)s ] is registered with the website, you will " "receive an email to change your email address. \n" " If you no longer have access to this email address, please contact the Feedback-" "Team.\n" " " -#: src/templates/public/email_change_validate.html:11 +#: src/templates/public/email_change_validate.html:10 msgid "" "\n" " Geben Sie unten das Einmalpassword (OTP) ein, um die Änderung " @@ -1934,35 +1952,35 @@ msgstr "" "\n" "Enter the one-time password (OTP) below to complete the change. " -#: src/templates/public/email_change_validate.html:18 +#: src/templates/public/email_change_validate.html:17 msgid "Verifizieren" msgstr "Verify" -#: src/templates/public/index.html:4 +#: src/templates/public/index.html:10 #, python-format msgid "Feedback-Ergebnisse (%(semester)s)" msgstr "Feedback-results (%(semester)s)" -#: src/templates/public/index.html:20 -#: src/templates/public/veranstaltung.html:10 +#: src/templates/public/index.html:26 +#: src/templates/public/veranstaltung.html:17 msgid "" "Hinweis: Diese Ergebnisse sind momentan noch nicht öffentlich verfügbar." msgstr "Note: These results are not yet publicly available." -#: src/templates/public/index.html:22 +#: src/templates/public/index.html:28 msgid "" "Hinweis: Die Spalten zum Feedbackpreis sind nur für Administratoren sichtbar." msgstr "Note: The feedback price columns are only visible to administrators." -#: src/templates/public/index.html:27 +#: src/templates/public/index.html:33 msgid "alphabetisch" msgstr "alphabetical" -#: src/templates/public/index.html:76 +#: src/templates/public/index.html:82 msgid "Darstellung der Noten" msgstr "Presentation of the notes" -#: src/templates/public/index.html:78 +#: src/templates/public/index.html:84 #, python-format msgid "" "Durchschnittsnoten werden entsprechend marked accordingly, if " "less than %(thresh_valid)s answers were included." -#: src/templates/public/index.html:79 +#: src/templates/public/index.html:85 #, python-format msgid "" "Bei weniger als %(thresh_show)s Antworten wird die zugehörige Note gar nicht " @@ -1981,11 +1999,11 @@ msgstr "" "If there are less than %(thresh_show)s answers, the corresponding grade is " "not displayed at all." -#: src/templates/public/index.html:82 +#: src/templates/public/index.html:88 msgid "Aufschlüsselung der Kategorien" msgstr "Breakdown of the categories" -#: src/templates/public/index.html:83 +#: src/templates/public/index.html:89 msgid "" "Hier sind die Fragen aufgelistet, die in die einzelnen Noten einfließen." msgstr "Here are the questions that are included in the individual grades." @@ -2012,28 +2030,28 @@ msgstr "" "all members of the university can connect via VPN" -#: src/templates/public/veranstaltung.html:7 +#: src/templates/public/veranstaltung.html:14 msgid "zurück zur Übersicht" msgstr "back to overview" -#: src/templates/public/veranstaltung.html:13 +#: src/templates/public/veranstaltung.html:20 msgid "Details" msgstr "" -#: src/templates/public/veranstaltung.html:17 +#: src/templates/public/veranstaltung.html:24 msgid "Note" msgstr "" -#: src/templates/public/veranstaltung.html:18 +#: src/templates/public/veranstaltung.html:25 msgid "Antworten" msgstr "Answers" -#: src/templates/public/veranstaltung.html:34 +#: src/templates/public/veranstaltung.html:41 #, python-format msgid "Insgesamt abgegebene Fragebögen: %(ergebnis.anzahl)s" msgstr "Total number of questionnaires submitted : %(ergebnis.anzahl)s" -#: src/templates/public/veranstaltung.html:35 +#: src/templates/public/veranstaltung.html:42 #, python-format msgid "" "Die ausführlichen Ergebnisse zu dieser Veranstaltung hat " @@ -2042,21 +2060,21 @@ msgstr "" "%(v.verantwortlich.full_name)s has received the detailed results of " "this course by email" -#: src/templates/public/veranstaltung.html:37 +#: src/templates/public/veranstaltung.html:44 msgid "Legende" msgstr "Legend" -#: src/templates/public/veranstaltung.html:39 +#: src/templates/public/veranstaltung.html:46 msgid "" "Note: Durchschnittsnote, gemittelt über alle abgegebenen " "Antworten" msgstr "Note: Average score, averaged over all answers given" -#: src/templates/public/veranstaltung.html:40 +#: src/templates/public/veranstaltung.html:47 msgid "Antworten: Anzahl der abgegebenen Antworten" msgstr "Answers: Count of submitted answers" -#: src/templates/public/veranstaltung.html:42 +#: src/templates/public/veranstaltung.html:49 msgid "" "Die Fragen, die in die einzelnen Noten einfließen, werden nach einem Klick " "auf die jeweilige Kategorie angezeigt." @@ -2064,11 +2082,11 @@ msgstr "" "The questions that are included in the individual grades are displayed after " "clicking on the respective category." -#: src/templates/public/veranstaltung.html:44 +#: src/templates/public/veranstaltung.html:51 msgid "Kommentar der Veranstalter zum Ergebnis" msgstr "Organizer's comment on the result" -#: src/templates/public/veranstaltung.html:48 +#: src/templates/public/veranstaltung.html:55 msgid "Es wurde kein Kommentar hinterlegt." msgstr "No comment was entered." @@ -2215,32 +2233,27 @@ msgstr "" msgid "Or use a third-party" msgstr "" -#: src/templates/veranstalter/dashboard.html:62 +#: src/templates/veranstalter/dashboard.html:16 msgid "Dashboard" msgstr "" -#: src/templates/veranstalter/dashboard.html:70 -#: src/templates/veranstalter/dashboard.html:77 -msgid "Status" -msgstr "" - -#: src/templates/veranstalter/dashboard.html:73 +#: src/templates/veranstalter/dashboard.html:25 msgid "Log" msgstr "" -#: src/templates/veranstalter/dashboard.html:76 +#: src/templates/veranstalter/dashboard.html:30 msgid "Datum" msgstr "Date" -#: src/templates/veranstalter/dashboard.html:89 +#: src/templates/veranstalter/dashboard.html:49 msgid "Aktuelle Bestellung" msgstr "Current order" -#: src/templates/veranstalter/dashboard.html:91 +#: src/templates/veranstalter/dashboard.html:52 msgid "Bestellung ändern" msgstr "Change order" -#: src/templates/veranstalter/dashboard.html:132 +#: src/templates/veranstalter/dashboard.html:102 msgid "Bestellung durchführen" msgstr "Execute order" @@ -2407,13 +2420,25 @@ msgstr "" " " #: src/templates/veranstalter/not_authenticated.html:21 -msgid "zum Admin-Login" -msgstr "to the admin-login" - -#: src/templates/veranstalter/not_authenticated.html:24 msgid "zum E-Mail ändern" msgstr "Change E-Mail" +#~ msgid "gedruckt" +#~ msgstr "printed" + +#~ msgid "zurück" +#~ msgstr "back" + +#, python-format +#~ msgid "" +#~ "Aktuell haben wir %(ruck_veranst)s Rückmeldungen von %(all_veranst)s " +#~ "Veranstaltungen." +#~ msgstr "" +#~ "We currently have %(ruck_veranst)s feedback from %(all_veranst)s courses." + +#~ msgid "zum Admin-Login" +#~ msgstr "to the admin-login" + #~ msgid "E-Mail-Änderungsanfrage" #~ msgstr "Email change request" diff --git a/src/templates/bestellung_base.html b/src/templates/bestellung_base.html index 5c611aaf..235fddcb 100644 --- a/src/templates/bestellung_base.html +++ b/src/templates/bestellung_base.html @@ -6,9 +6,11 @@ {% endblock %} {% block backlink %} - {% if request.user.is_superuser %} -

{% translate "zurück zum internen Bereich" %}

- {% else %} -

{% translate "zurück zum Veranstalterbereich" %}

+ {% if request.user.is_authenticated %} + {% if request.user.is_superuser %} +

{% translate "zurück zum internen Bereich" %}

+ {% else %} +

{% translate "zurück zum Veranstalterbereich" %}

+ {% endif %} {% endif %} {% endblock %} diff --git a/src/templates/d120/footer.html b/src/templates/d120/footer.html index ff4fc251..84d79b27 100644 --- a/src/templates/d120/footer.html +++ b/src/templates/d120/footer.html @@ -1,19 +1,19 @@ {% load i18n %}