Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • m4lab_landing_page m4lab_landing_page
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Administrator
  • m4lab_landing_pagem4lab_landing_page
  • Merge requests
  • !32
An error occurred while fetching the assigned milestone of the selected merge_request.

Prepare production

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Wolfgang Knopki requested to merge prepare_production into master 5 years ago
  • Overview 0
  • Commits 108
  • Pipelines 0
  • Changes 3

Merge new landing page etc. to production

  • Wolfgang Knopki @knopkiwg added 2 commits 5 years ago

    added 2 commits

    • db4009d1 - 1 commit from branch master
    • 2cb49313 - Merge branch 'master' into 'prepare_production'

    Compare with previous version

  • Wolfgang Knopki @knopkiwg merged 5 years ago

    merged

  • Wolfgang Knopki @knopkiwg mentioned in commit 0e6166ed 5 years ago

    mentioned in commit 0e6166ed

  • Loading
  • Loading
  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Viewing commit e1f1e733
Prev Next
Show latest version
3 files
+ 7
- 7

    Preferences

    File browser
    Compare changes
image‎s/demo‎
Innovative_Hochschule_In‎itiative_BMBF_GWK_RGB.jpg‎ +0 -0
j‎s‎
headf‎oot.js‎ +6 -6
index‎.html‎ +1 -1
  • e1f1e733
    Wolfgang Knopki
    merged script changes · e1f1e733
    Wolfgang Knopki authored 5 years ago
images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg 0 → 100644
+ 0
- 0
  • View file @ e1f1e733

159.57 KiB

js/headfoot.js
+ 6
- 6
  • View file @ e1f1e733

  • Edit in single-file editor

  • Open in Web IDE


var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], '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':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/account/'}];
var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], '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':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'*/}/*,{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'}*/,{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/account/'}];
var hft_links = [{'url':'#', 'name':'Kontakt'},{'url':'#', 'name':'Impressum'},{'url':'#', 'name':'Datenschutz'}]
var hft_links = [{'url':'http://www.hft-stuttgart.de/Forschung/M4-Lab/Team/index.html/de', 'name':'Kontakt'},{'url':'http://www.hft-stuttgart.de/Hochschule/Impressum.html/de', 'name':'Impressum'},{'url':'http://www.hft-stuttgart.de/Einrichtungen/Datenschutz/Datenschutz-Homepage', 'name':'Datenschutz'}]
var socialmedias = [{'url':'https://twitter.com/HFT_Presse', 'name': 'fa-twitter'}, {'url':'https://www.facebook.com/HfTStuttgart/', 'name': 'fa-facebook-square'}, {'url':'https://www.instagram.com/hft_stuttgart/', 'name': 'fa-instagram'}, {'url':'https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/', 'name': 'fa-linkedin'}, {'url':'https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA', 'name': 'fa-youtube'}];
var socialmedias = [{'url':'https://twitter.com/InnolabM4', 'name': 'fa-twitter'}, {'url':'https://www.facebook.com/HfTStuttgart/', 'name': 'fa-facebook-square'}, {'url':'https://www.instagram.com/m4_lab/', 'name': 'fa-instagram'}, {'url':'https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/', 'name': 'fa-linkedin'}, {'url':'https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA', 'name': 'fa-youtube'}];
var footer_images = [{'src':'/images/demo/bbf_logo.png', 'alt':'BMBF'}, {'src':'/images/demo/ihs_logo.jpg', 'alt':'Innovative Hochschule'}]
var footer_images = [{'src':'/images/demo/bbf_logo.png', 'alt':'BMBF'}, {'src':'/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg', 'alt':'Innovative Hochschule'}]
function prependChild(parent,child){
function prependChild(parent,child){
parent.insertBefore(child, parent.childNodes[0]);
parent.insertBefore(child, parent.childNodes[0]);
@@ -136,7 +136,7 @@ function head(){
@@ -136,7 +136,7 @@ function head(){
headitem.appendChild(headlink);
headitem.appendChild(headlink);
navelements.appendChild(headitem);
navelements.appendChild(headitem);
}
}
let searchitem = document.createElement('li');
/* let searchitem = document.createElement('li');
searchitem.classList.add("nav-item");
searchitem.classList.add("nav-item");
let searchinput = document.createElement('input');
let searchinput = document.createElement('input');
searchinput.value='Suche...'
searchinput.value='Suche...'
@@ -159,7 +159,7 @@ function head(){
@@ -159,7 +159,7 @@ function head(){
navbar.appendChild(fluiddiv);
navbar.appendChild(fluiddiv);
navheader.appendChild(navbar);
navheader.appendChild(navbar);
headerdiv.appendChild(navheader);
headerdiv.appendChild(navheader);
prependChild(document.body, headerdiv);
prependChild(document.body, headerdiv); */
};
};
/* function foot()
/* function foot()
index.html
+ 1
- 1
  • View file @ e1f1e733

  • Edit in single-file editor

  • Open in Web IDE


@@ -37,7 +37,7 @@ Dabei verknüpfen wir unsere Expertise mit Partnern innerhalb und außerhalb der
@@ -37,7 +37,7 @@ Dabei verknüpfen wir unsere Expertise mit Partnern innerhalb und außerhalb der
<h2>Willst du dabei sein?</h2>
<h2>Willst du dabei sein?</h2>
Dann findest du unter <span onclick="event.stopPropagation();hint_navbar('0')" ><i class="fas fa-chevron-right"></i> Informationen</span> mehr über unsere Expertise, Projekte, Publikationen und Lösungen.<br>
Dann findest du unter <span onclick="event.stopPropagation();hint_navbar('0')" ><i class="fas fa-chevron-right"></i> Informationen</span> mehr über unsere Expertise, Projekte, Publikationen und Lösungen.<br>
Erfahre mehr über unsere <span onclick="event.stopPropagation();hint_navbar('2')" ><i class="fas fa-chevron-right"></i> Events</span> und über die Möglichkeiten zur <span onclick="event.stopPropagation();hint_navbar('1')" ><i class="fas fa-chevron-right"></i> Zusammenarbeit</span>. Oder mache direkt bei laufenden Projekten unter <span onclick="event.stopPropagation();hint_navbar('3')" ><i class="fas fa-chevron-right"></i> Bürgerbeteiligung</span> mit.
Erfahre mehr über unsere <span onclick="event.stopPropagation();hint_navbar('2')" ><i class="fas fa-chevron-right"></i> Events</span> und über die Möglichkeiten zur <span onclick="event.stopPropagation();hint_navbar('1')" ><i class="fas fa-chevron-right"></i> Zusammenarbeit</span>.
</p>
</p>
</div>
</div>
</div>
</div>
Assignee
Wolfgang Knopki's avatar
Wolfgang Knopki
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: prepare_production

Menu

Explore Projects Groups Snippets

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