resolved merge-conflicts

e3d37172 · Wolfgang Knopki · 5db7787b · 2d496721 · 5db7787b · 5db7787b
Commit e3d37172 authored 4 years ago by Wolfgang Knopki
Show whitespace changes
Inline Side-by-side

Showing

with 0 additions and 178 deletions
+0 -178
--- a/views/EN/project/mailinglists.pug
+++ b/views/EN/project/mailinglists.pug
-html(lang="en")
-  head
-    title= "Mailinglisten"
-    meta(charset="UTF-8")
-    meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
-    link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
-    link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
-    style.
-        .collapse {
-            display: none;
-        }
-        .collapse.in {
-            display: block;
-        }
-        .collapsing {
-            position: relative;
-            height: 0;
-            overflow: hidden;
-            -webkit-transition-timing-function: ease;
-            -o-transition-timing-function: ease;
-            transition-timing-function: ease;
-            -webkit-transition-duration: .35s;
-            -o-transition-duration: .35s;
-            transition-duration: .35s;
-            -webkit-transition-property: height,visibility;
-            -o-transition-property: height,visibility;
-            transition-property: height,visibility;
-        }
-  body
-    <hr />
-    div()
-        h5(align="left") Aktive Mailinglisten
-        div(class="flex-container" style="align-items:flex-start")
-            div(class="table")
-                table(border="0" id="listtable" class="table table-striped")
-                    thead
-                        tr
-                            th Name
-                            th Link
-                            th zugeh. Projekt
-                    tbody
-                        for item in mailinglists
-                            if item.projectstatus == '1'
-                                tr
-                                    td #{item.name}
-                                    td <a href="#{item.src}">#{item.src}</a>
-                                    td <a href='projectoverview?projectID=#{item.id}'>#{item.project_title}</a>
-    <hr />
-    div()
-        h5(align="left") Eintragung in Mailingliste
-        p() Wenn Sie sich in eine Mailingliste eintragen wollen, folgen Sie folgender Anleitung:
-    // jQuery
-    script(src="https://code.jquery.com/jquery-3.3.1.min.js")
-    script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
-    // Bootstrap
-    script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
-    // Header
-    if isUserAuthenticated
-        script(src="/js/headfootLogout.js")
-    else
-        script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
--- a/views/EN/project/projects.pug
+++ b/views/EN/project/projects.pug
-doctype html
-html(lang="de")
-  head
-    title= "Project List"
-    meta(charset="UTF-8")
-    meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
-    link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
-    link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
-    style.
-        .collapse {
-            display: none;
-        }
-        .collapse.in {
-            display: block;
-        }
-        .collapsing {
-            position: relative;
-            height: 0;
-            overflow: hidden;
-            -webkit-transition-timing-function: ease;
-            -o-transition-timing-function: ease;
-            transition-timing-function: ease;
-            -webkit-transition-duration: .35s;
-            -o-transition-duration: .35s;
-            transition-duration: .35s;
-            -webkit-transition-property: height,visibility;
-            -o-transition-property: height,visibility;
-            transition-property: height,visibility;
-        }
-        .warning {
-            color: red;
-            font-size: 11px;
-        }
-  body
-    div(class="container-fluid")
-        if isUserAuthenticated
-            p Auf dieser Seite sehen Sie die Liste der über dieses Portal veröffentlichten Projekte.
-            a(href="/addprojectoverview" class="btn btn-primary" role="button" aria-pressed="true") Projekt anlegen
-        else
-            p Auf dieser Seite sehen Sie die Liste der über dieses Portal veröffentlichten Projekte.
-            p Möchten Sie ein neues Projekt anlegen, dann klicken Sie bitte auf #[a(href="/addprojectoverview") Anmelden und Projekt anlegen]
-        if successes
-            for success in successes
-                div.alert.alert-success.alert-dismissible #{ success }
-                    a(class="close", href="#", data-dismiss="alert", aria-label="close") &times;
-        // Active projects
-        h3(class="mb-3 font-weight-bold") Aktive Projekte
-        table(class="table table-striped")
-            thead
-                tr
-                    th Logo
-                    th Akronym
-                    th Title
-                    th Kernziel
-                    th Kategorie
-                    th Ansprechpartner
-                    th Projektinhalte
-            tbody
-                for item in active
-                    tr
-                        //td #{item.status}
-                        td
-                            img(src=item.logo, width="40", height="40")
-                        td #{item.akronym}
-                        td #{item.title}
-                        td #{item.summary}
-                        td #{item.category}
-                        td #[a(class="nav-link", href="mailto:"+ item.cp) #{item.cp}]
-                        td #[a(class="nav-link", href="https://m4lab.hft-stuttgart.de/projectoverview?projectID="+item.id) Zur Projektübersicht]
-                            if item.gitlab
-                                a(class="nav-link", href=item.gitlab+"/tree/master") Projektdateien
-                                a(class="nav-link", href=item.gitlab+"/wikis/home") Projektwiki
-                            else
-                                a(class="nav-link", href="#") Projektdateien
-                                a(class="nav-link", href="#") Projektwiki
-        br
-        // Non-active projects
-        h3(class="mb-3 font-weight-bold") Abgeschlossene Projekte
-        table(class="table table-striped")
-            thead
-                tr
-                    th Logo
-                    th Akronym
-                    th Title
-                    th Kernziel
-                    th Kategorie
-                    th Ansprechpartner
-                    th Projektinhalte
-            tbody
-                for item in nonActive
-                    tr
-                        //td #{item.status}
-                        td
-                            img(src=item.logo, width="40", height="40")
-                        td #{item.akronym}
-                        td #{item.title}
-                        td #{item.summary}
-                        td #{item.category}
-                        td #[a(class="nav-link", href="mailto:"+ item.cp) #{item.cp}]
-                        td #[a(class="nav-link", href="https://m4lab.hft-stuttgart.de/projectoverview?projectID="+item.id) Zur Projektübersicht]
-                            if item.gitlab
-                                a(class="nav-link", href="https://transfer.hft-stuttgart.de/gitlab/"+item.gitlab+"/tree/master") Projektdateien
-                                a(class="nav-link", href="https://transfer.hft-stuttgart.de/gitlab/"+item.gitlab+"/wikis/home") Projektwiki
-                            else
-                                a(class="nav-link", href="#") Projektdateien
-                                a(class="nav-link", href="#") Projektwiki
-
-    // jQuery
-    script(src="https://code.jquery.com/jquery-3.3.1.min.js")
-    script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
-    // Bootstrap
-    script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
-    // Header
-    if isUserAuthenticated
-        script(src="/js/headfootLogout.js")
-    else
-        script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file