Skip to content
GitLab
Commit eff4d145 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'prepare_production' into 'master' 

Prepare production

See merge request !53
parents f658a0f8 2f7d51cb
master
2 merge requests!86Mlab 436,!53Prepare production
Pipeline #959 passed with stage
in 16 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 459 deletions
+2 -459
img/help/publicplus.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/publicplus.png

36.9 KB

img/help/save_file.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/save_file.png

82.5 KB

img/help/select_contact.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/select_contact.png

21.8 KB

img/help/select_settings.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/select_settings.png

22 KB

img/help/settingmenublock.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/settingmenublock.png

93.3 KB

img/help/settings_logo.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/settings_logo.png

87.2 KB

img/help/settingsnewmenublock.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/settingsnewmenublock.png

87.9 KB

img/help/upload_logo.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/help/upload_logo.png

21.8 KB

img/signature/fb_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/fb_bw.png

27.4 KB

img/signature/hft_logo.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/hft_logo.png

32.1 KB

img/signature/inno_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/inno_bw.png

9.93 KB

img/signature/instagram_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/instagram_bw.png

49.1 KB

img/signature/snapchat_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/snapchat_bw.png

1.33 KB

img/signature/twitter_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/twitter_bw.png

42.2 KB

img/signature/youtube_bw.png 0 → 100644
+ 0
- 0
View file @ eff4d145
img/signature/youtube_bw.png

92.3 KB

includes/.DS_Store deleted 100755 → 0
+ 0
- 0
View file @ f658a0f8
File deleted
includes/footer.php deleted 100755 → 0
+ 0
- 106
View file @ f658a0f8
<!DOCTYPE php>
<html lang="en" dir="ltr">
<html>
<body>
<div id="homepage" class="last clear">
<hr>
<div class="flex-container">
<div class="col-md-4 footer-unten" style="flex-basis: 400px">
Hochschule für Technik Stuttgart
<div class="row">
<div class="col-md-4 footer-unten">
<a href="#">Kontakt</a>
</div>
<div class="col-md-4 footer-unten">
<a href="#">Impressum</a>
</div>
<div class="col-md-4 footer-unten">
<a href="#">Datenschutz</a>
</div>
</div>
</div>
<div class="col-md-4" style="flex-basis: 400px">
<div id="socialmediabuttons">
<a href="https://twitter.com/HFT_Presse"><i class="fab fa-twitter"></i></a>&nbsp;
<a href="https://www.facebook.com/HfTStuttgart/"><i class="fab fa-facebook-square"></i></a>&nbsp;
<a href="https://www.instagram.com/hft_stuttgart/"><i class="fab fa-instagram"></i></a>&nbsp;
<a href="https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/"><i class="fab fa-linkedin"></i></a>&nbsp;
<a href="https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA"><i class="fab fa-youtube"></i></a>&nbsp;
</div>
</div>
<div class="col-md-4" style="flex-basis: 400px">
<img src="images/demo/bbf_logo.png" width="100" height="50" alt="BMBF" />
<img src="images/demo/ihs_logo.jpg" width="100" height="50" alt="Innovative Hochschule" /></div>
</div>
</div>
<!-- alte Footer-Lösung
<div class="row align-items-end">
<div class="col-md-4 footer-unten">
Hochschule für Technik Stuttgart
<div class="row">
<div class="col-md-4 footer-unten">
<a href="#">Kontakt</a>
</div>
<div class="col-md-4 footer-unten">
<a href="#">Impressum</a>
</div>
<div class="col-md-4 footer-unten">
<a href="#">Datenschutz</a>
</div>
</div>
</div>
<div class="col-md-4">
<div id="socialmediabuttons">
<a href="https://twitter.com/HFT_Presse"><i class="fab fa-twitter"></i></a>&nbsp;
<a href="https://www.facebook.com/HfTStuttgart/"><i class="fab fa-facebook-square"></i></a>&nbsp;
<a href="https://www.instagram.com/hft_stuttgart/"><i class="fab fa-instagram"></i></a>&nbsp;
<a href="https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/"><i class="fab fa-linkedin"></i></a>&nbsp;
<a href="https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA"><i class="fab fa-youtube"></i></a>&nbsp;
</div>
</div>
<div class="col-md-4"><img src="images/demo/bbf_logo.png" width="150" height="90" alt="BMBF" />
<img src="images/demo/ihs_logo.jpg" width="150" height="90" alt="Innovative Hochschule" /></div>
</div>
</div>
-->
<!-- / content body -->
</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/bootstrap-collapse.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>-->
<!-- Footer -->
</body>
</html>
\ No newline at end of file
includes/header.php deleted 100755 → 0
+ 0
- 124
View file @ f658a0f8
<!DOCTYPE php>
<html lang="en" dir="ltr">
<head>
<title>Transferportal M4_LAB HFT STUTTGART</title>
<meta charset="UTF-8">
<link rel="stylesheet" href="css/bootstrap.css" type="text/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;}
</style>
</head>
<body>
<div class="wrapper row1">
<header id="header" class="clear">
<div class="alert alert-danger alert-dismissible fade show" style="text-align:center;>
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Disclaimer</strong> This website is under construction and in prototype-phase. It is not for public use.
</div>
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Titel und Schalter werden für eine bessere mobile Ansicht zusammengefasst -->
<div class="navbar-header">
<ul id="navelemente">
<li>
<a href="https://www.hft-stuttgart.de">
<img src="images/demo/hft_logo.jpg" alt="Logo der Hochschule für Technik Stuttgart">
</a>
<a href="https://www.hft-stuttgart.de/Forschung/M4-Lab/">
<img src="images/demo/m4lab_logo.jpg" alt="Logo Innovationslabor M4_LAB">
</a></li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Informationen
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="./project">Projekte</a>
<a class="dropdown-item" href="./index_Projektseite_M4_LAB.html">Über das M4_LAB</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Zusammenarbeit
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">…</a>
<a class="dropdown-item" href="#">…</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Events
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">…</a>
<a class="dropdown-item" href="#">…</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Bürgerbeteiligung
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">…</a>
<a class="dropdown-item" href="#">…</a>
</div>
</li>
<li class="">
<a class="nav-link" href="./user/login/" id="navbarDropdown" role="button">
Login
</a>
<!-- <div class="dropdown-menu">
<form class="px-4 py-3">
<div class="form-group">
<label for="exampleDropdownFormEmail1">Email address</label>
<input type="email" class="form-control" id="exampleDropdownFormEmail1" placeholder="email@example.com">
</div>
<div class="form-group">
<label for="exampleDropdownFormPassword1">Password</label>
<input type="password" class="form-control" id="exampleDropdownFormPassword1" placeholder="Password">
</div>
<div class="form-group">
<div class="form-check">
<input type="checkbox" class="form-check-input" id="dropdownCheck">
<label class="form-check-label" for="dropdownCheck">
Remember me
</label>
</div>
</div>
<button type="submit" class="btn btn-primary">Sign in</button>
</form>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">New around here? Sign up</a>
<a class="dropdown-item" href="#">Forgot password?</a>
</div> -->
</li>
<li class="nav-item"><input class="nav-item-suchfeld" type="text" value="Suche&hellip;" onFocus="this.value=(this.value=='search&hellip;')? '' : this.value ;">
<input type="image" src="images/Lupe_grau.png" id="sf_submit" value="search" width="25" height="25" alt="" >
</li>
</ul>
</nav>
</header>
</div>
\ No newline at end of file
includes/headfoot.html deleted 100644 → 0
+ 0
- 227
View file @ f658a0f8
<!-- RS
HTML representation of the header and footer in headfoot.js
!! FOR DEVELOPMENT AND TEST ONLY !!
-->
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<title>Transferportal HfT Stuttgart</title>
<link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/bootstrap.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>
<!-- navheader -->
<header id="header" class="clear">
<!-- alertdiv -->
<div class="alert alert-danger alert-dismissible fade show" style="text-align:center;">
<!-- alertbutton -->
<button type="button" class="close" data-dismiss="alert">
&times;
</button>
<strong>Disclaimer</strong> This website is under construction and in prototype-phase. It is not for public use.
</div>
<!-- navbar -->
<nav class="navbar navbar-expand-md navbar-light" style="background-color: #ffffff;">
<!-- navbarcontainer -->
<div class="container">
<!-- navbarheader -->
<div class="navbar-header">
<!-- link_m4lab -->
<a class="navbar-brand" href="/">
<img src="../img/header/Logozeile_Header.png" alt="Logo Innovationslabor M4_LAB">
</a>
</div>
<!-- togglebutton -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<!-- navelements -->
<ul id="navbarCollapse" class="collapse nav navbar-collapse navbar-nav justify-content-end">
<!-- headitem -->
<li class="nav-item dropdown">
<!-- headlink -->
<a href="#" id="navbarDropdown0" class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Informationen
</a>
<!-- combodiv -->
<div id="navbarDropdown0_par" class="dropdown-menu" aria-labelledby="navbarDropdown0">
<!-- combolink -->
<a class="dropdown-item" href="/project">
Projekte
</a>
<!-- combolink -->
<a class="dropdown-item" href="/projectoverview?projectID=1">
Über das M4_LAB
</a>
<!-- combolink -->
<a class="dropdown-item" href="/account/contact">
Kontakt
</a>
</div>
</li>
<!-- headitem -->
<li class="nav-item dropdown">
<!-- headlink -->
<a href="#" id="navbarDropdown1" class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Zusammenarbeit
</a>
<!-- combodiv -->
<div id="navbarDropdown1_par" class="dropdown-menu" aria-labelledby="navbarDropdown1">
<!-- combolink -->
<a class="dropdown-item" href="/mailinglists">
Mailinglisten
</a>
<!-- combolink -->
<a class="dropdown-item" href="/videoconference.html">
Videokonferenzen
</a>
<!-- combolink -->
<a class="dropdown-item" href="/#">
...
</a>
</div>
</li>
<!-- headitem -->
<li class="nav-item dropdown">
<!-- headlink -->
<a href="#" id="navbarDropdown2" class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Events
</a>
<!-- combodiv -->
<div id="navbarDropdown2_par" class="dropdown-menu" aria-labelledby="navbarDropdown2">
<!-- combolink -->
<a class="dropdown-item" href="http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/">
Veranstaltungen der HfT
</a>
<!-- combolink -->
<a class="dropdown-item" href="https://www.hft-stuttgart.de/forschung/veranstaltungen">
Veranstaltungen der HfT Forschung
</a>
</div>
</li>
<!-- headitem -->
<li class="nav-item">
<!-- headlink -->
<a href="/account" id="navbarDropdown2" class="nav-link" role="button">
Benutzerkonto
</a>
</li>
</ul>
</div>
</nav>
</header>
<div class="container">
<p> test test test test</p>
<p> test test test test 123</p>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<hr>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<hr>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<p> test test test test</p>
<hr>
</div>
<!-- footerdiv -->
<div id="homepage" class="last clear">
<hr>
<!-- containerdiv -->
<div class="container">
<!-- containerdivrow -->
<div class="row">
<!-- bmbf-->
<div class="col-md-auto">
<img src="../img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" alt="Innovative Hochschule" style="height:90px"/>
</div>
<!-- m4labgrau-->
<div class="col-md-auto">
<!-- img -->
<img src="../img/footer/M4_LAB_LOGO_Graustufen.png" alt="M4_LAB" style="height:80px"/>
</div>
<!-- socialdiv-->
<div class="col-md-auto">
<!-- socialrow -->
<div id="socialmediabuttons">
<!-- sociallink-->
<a href="https://twitter.com/InnolabM4">
<!-- socialcontent -->
<i class="fab fa-twitter"></i>
</a>
<!-- sociallink-->
<a href="https://www.facebook.com/HfTStuttgart/">
<!-- socialcontent -->
<i class="fab fa-facebook-square"></i>
</a>
<!-- sociallink-->
<a href="https://www.instagram.com/m4_lab/">
<!-- socialcontent -->
<i class="fab fa-instagram"></i>
</a>
<!-- sociallink-->
<a href="https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/">
<!-- socialcontent -->
<i class="fab fa-linkedin"></i>
</a>
<!-- sociallink-->
<a href="https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA">
<!-- socialcontent -->
<i class="fab fa-youtube"></i>
</a>
</div>
</div>
<!-- contactdiv -->
<div class="col-md-auto footer-unten">
Hochschule für Technik Stuttgart
<!-- rowdiv -->
<div class="row">
<!-- hft_links coldiv -->
<div class="col footer-unten">
<!-- hft_links collink -->
<a href="https://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab" class="contact-lower">
Kontakt
</a>
</div>
<!-- hft_links coldiv -->
<div class="col footer-unten">
<!-- hft_links collink -->
<a href="https://www.hft-stuttgart.de/impressum" class="contact-lower">
Impressum
</a>
</div>
<!-- hft_links coldiv -->
<div class="col footer-unten">
<!-- hft_links collink -->
<a href="https://www.hft-stuttgart.de/datenschutz" class="contact-lower">
Datenschutz
</a>
</div>
</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>
</body>
</html>
\ No newline at end of file
index.html
+ 2
- 2
View file @ eff4d145
......@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<title>Transferportal HfT Stuttgart</title>
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap.css">
<link rel="stylesheet" href="/css/m4lab.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">
......@@ -64,7 +64,7 @@
<div class="col-md-4 col-lg-8">
<div style="background-color: #feffff;margin: 0px;padding: 60px;padding-top: 20px;padding-bottom: 20px;"><img class="d-flex d-lg-flex justify-content-center justify-content-lg-center align-items-lg-start mx-auto" src="/img/Logo_TV1.png" width="100px" style="padding-bottom: 35px;">
<h2 class="text-center" style="color: #708090;"><strong>Transferportal</strong></h2>
<p class="text-center">Das Transferportal entsteht in einem Teilprojekt der Innovativen <a href="www.hft-stuttgart.de"><strong>Hochschule für Technik Stuttgart</strong></a>. Im <a href="https://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab"><strong>Innovationslabor M4_LAB</strong></a> wird das Transferportal als eine Webpräsenz entwickelt, welches Wissen, Lösungen und Dienste für HFT-Mitglieder, externe Partner und die allgemeine Öffentlichkeit bereitstellt.<br><br>Es ergänzt die Informationen der allgemeinen
<p class="text-center">Das Transferportal entsteht in einem Teilprojekt der Innovativen <a href="https://www.hft-stuttgart.de"><strong>Hochschule für Technik Stuttgart</strong></a>. Im <a href="https://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab"><strong>Innovationslabor M4_LAB</strong></a> wird das Transferportal als eine Webpräsenz entwickelt, welches Wissen, Lösungen und Dienste für HFT-Mitglieder, externe Partner und die allgemeine Öffentlichkeit bereitstellt.<br><br>Es ergänzt die Informationen der allgemeinen
HFT-Webseite durch konkrete Ergebnisse aus Forschung und Entwicklung, verfügbar in verschiedenster Form wie beispielsweise Daten, Dokumentationen und Software-Code.<br><br>Zudem stellt es Kollaborationsmittel für Projektpartner
und später auch Partizipationsmöglichkeiten für die breite Öffentlichkeit bereit.</p>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal