Merge branch 'MLAB-367' into 'testing'

Mlab 367 See merge request !66

Merge branch 'MLAB-367' into 'testing'
Mlab 367 See merge request !66
6cb506d6 · Wolfgang Knopki · 40858c16 · 233f1987 · 6cb506d6 · 6cb506d6
Commit 6cb506d6 authored 4 years ago by Wolfgang Knopki
Show whitespace changes
Inline Side-by-side

Showing

with 87 additions and 1 deletion
+87 -1
--- a/confluence.html
+++ b/confluence.html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>Wissensaustausch</title>
+    <link rel="stylesheet" href="/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/css/m4lab.css">
+    <link rel="stylesheet" href="/fonts/font-awesome.min.css">
+    <link rel="stylesheet" href="/fonts/ionicons.min.css">
+    <link rel="stylesheet" href="/css/Testimonials.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
+</head>
+<body>
+    <div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12" style="margin-bottom: 40px;"><img class="mx-auto" src="/img/Wissensaustausch.jpg" width="100%"></div>
+            </div>
+        </div>
+    </div>
+    <div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12" style="margin-bottom: 30px;">
+                    <h4 class="text-center">Das Transferportal bietet eine Möglichkeit für kollaborativen Wissensaustausch an:</h4>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div>
+        <div id="Confluence Text" style="background-color: #dadada;margin-top: 40px;">
+            <div class="container">
+                <div class="row" style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
+                    <div class="col-lg-12" style="background-color: #feffff;">
+                        <h2 class="d-flex flex-column flex-shrink-1 order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Confluence</strong></h2>
+                    </div>
+                    <div class="col-auto col-md-4 col-lg-6 flex-row flex-grow-1 flex-fill order-1" style="background-color: #ffffff;">
+                        <p>Confluence ist ein Wiki-System der Firma Atlassian, welches an der Hochschule für Technik zum Einsatz kommt.</p>
+                        <p>Über das Transferportal bieten wir eine Instanz an, auf der Projekte Bereiche anlegen können, über die sie Informationen und Wissen innerhalb des Projektes vernetzen können.</p>
+                    </div>
+                    <div class="col-auto col-md-4 col-lg-6 text-center flex-row flex-grow-1 flex-fill justify-content-between flex-wrap order-2" style="background-color: #ffffff;">
+                        <div class="justify-content-between order-2" style="background-color: rgba(255,255,255,0);">
+                            <p class="text-left d-flex d-md-flex flex-row flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-start align-content-start align-self-start flex-wrap order-1 justify-content-md-left align-items-md-start justify-content-lg-start">
+                            Wichtige Features umfassen dabei:
+                                <ul class="text-left">
+                                    <li>kollaboratives Bearbeiten von Seiten </li>
+                                    <li>Team-Kalenderplugin zur besseren zeitlichen Vernetzung </li>
+                                    <li>Vernetzung mit unserem Werkzeug zum <a href="/jira.html">Aufgabenmanagement</a>
+                                </ul>
+                            </p>
+                        </div><a class="btn btn-primary text-center d-inline-flex d-lg-flex flex-column flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-baseline align-content-center align-self-baseline flex-wrap order-3 mb-auto justify-content-md-center align-items-md-end align-items-lg-center justify-content-xl-center mx-auto"
+                            role="button" style="background-color: #E0001B;" href="https://transfer.hft-stuttgart.de/confluence/"><strong>Zugang über das Transferportal</strong></a></div>
+                </div>
+            </div>
+        </div>
+        <div id="Access_Text" style="background-color: #dadada;margin-top: 0px;">
+            <div class="container">
+                <div class="row" style="margin-bottom: 0;padding-top: 20px;padding-bottom: 20px;">
+                    <div class="col-lg-12" style="background-color: #ffffff;">
+                        <h2 class="d-flex flex-column order-1 justify-content-lg-start text-center" style="padding-top: 15px;color: #708090;"><strong>Zugang</strong></h2>
+                    </div>
+                    <div class="col-md-4 col-lg-6" style="background-color: #ffffff;">
+                        <p>Um Zugang zu Confluence zu erhalten, benötigen Sie einen Account am Portal. Dieser muss zunächst noch freigeschalten werden, wenden Sie sich dazu bitte an den Administrator.</p>
+                    </div>
+                    <div class="col-md-4 col-lg-6 text-center" style="background-color: #ffffff;">
+                        <div class="order-2" style="background-color: rgba(255,255,255,0);">
+                            <p class="text-left d-flex d-md-flex flex-row flex-grow-1 flex-shrink-1 flex-fill justify-content-between align-items-start align-content-start align-self-start flex-wrap order-1 justify-content-md-center align-items-md-start justify-content-lg-start">Weitere Hilfe zur Benutzung von Confluence finden sich auf den <a href="https://confluence.atlassian.com/doc/confluence-data-center-and-server-documentation-135922.html">Seiten der Firma Atlassian</a></p>
+                        </div><a class="btn btn-primary text-center d-lg-flex justify-content-center align-items-center align-content-center align-self-center align-items-lg-end mx-auto" role="button" style="background-color: #E0001B;" href="mailto:support-transfer@hft-stuttgart.de"><strong>Zugang über Admin anfragen</strong></a></div>
+                </div>
+            </div>
+        </div>
+    </div>
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>-->
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+<script src="/js/headfoot.js"></script>
+</body>
+</html>
--- a/img/Wissensaustausch.jpg
+++ b/img/Wissensaustausch.jpg
--- a/js/headfoot.js
+++ b/js/headfoot.js
-var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'Infos zur Bürgerbeteiligung', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/account/'}];
+var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'},{'name':'Kontakt', 'link':'/account/contact'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},{'name':'Wissensaustausch', 'link':'/confluence.html'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'Infos zur Bürgerbeteiligung', 'link':'/info_partizipation.html'},{'name':'Zum M4_Lab Showcase', 'link':'/partizipation/'}], 'type':'dropdown', 'link':'#'},{'name':'<i class="fa fa-question-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/help/'},{'name':'<i class="fa fa-user-circle" aria-hidden="true"></i>', 'combos': [], 'type':'', 'link':'/account/'}];
 var hft_links = [{'url':'/account/contact', 'name':'Kontakt'},{'url':'https://www.hft-stuttgart.de/impressum', 'name':'Impressum'},{'url':'https://www.hft-stuttgart.de/datenschutz', 'name':'Datenschutz'}]