Skip to content
GitLab
Commit f6684dd2 authored by Joe T.S.'s avatar Joe T.S. :ping_pong:
Browse files

Merge branch 'thunyathep.santhanavanich-master-patch-19742' into 'master' 

Update public/settings.js, public/home/index.html files

See merge request !1
parents baaf8573 e0c779a0
master
1 merge request!1Update public/settings.js, public/home/index.html files
Pipeline #3882 passed with stages
in 20 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 132 additions and 104 deletions
+132 -104
public/home/index.html
+ 106
- 100
View file @ f6684dd2
...@@ -2,119 +2,125 @@ ...@@ -2,119 +2,125 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="GitLab Pages"> <meta name="generator" content="GitLab Pages">
<title>Buildicipate</title> <title>Buildicipate</title>
<link rel="stylesheet" href="../assets/css/style.css"> <link rel="stylesheet" href="../assets/css/style.css">
<link rel="stylesheet" href="../assets/css/mobile.css"> <link rel="stylesheet" href="../assets/css/mobile.css">
</head> </head>
<body> <body>
<header id="header"> <header id="header">
<div class="row"> <div class="row">
<div class="logo" id="logo"></div> <div class="logo" id="logo"></div>
<div class="hamburger"> <div class="hamburger">
<div class="line"></div> <div class="line"></div>
<div class="line"></div> <div class="line"></div>
<div class="line"></div> <div class="line"></div>
</div> </div>
<nav></nav> <nav></nav>
</div> </div>
<div id="projectlogo"></div> <div id="projectlogo"></div>
<div id="projectname"></div> <div id="projectname"></div>
</header> </header>
<div class="content"> <div class="content">
<h1>Here goes a title</h1> <h1>Buildicipate Project</h1>
<p> <p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque pellentesque diam ipsum, nec Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque pellentesque diam ipsum, nec
ultricies sem mollis et. Phasellus porttitor nec felis quis ultricies. In venenatis faucibus nisl ultricies sem mollis et. Phasellus porttitor nec felis quis ultricies. In venenatis faucibus nisl
sed facilisis. Cras sapien nibh, dignissim at eros quis, commodo lobortis eros. Sed a massa sed facilisis. Cras sapien nibh, dignissim at eros quis, commodo lobortis eros. Sed a massa
eleifend, dictum elit at, blandit magna. Nullam auctor enim nec orci luctus sagittis. Nunc blandit eleifend, dictum elit at, blandit magna. Nullam auctor enim nec orci luctus sagittis. Nunc blandit
quam nec laoreet egestas. Nulla feugiat nisl lacus, a viverra nisi hendrerit vitae. In nibh arcu, quam nec laoreet egestas. Nulla feugiat nisl lacus, a viverra nisi hendrerit vitae. In nibh arcu,
sodales in enim tincidunt, tempus imperdiet ex. Aliquam fermentum augue magna, vel accumsan augue sodales in enim tincidunt, tempus imperdiet ex. Aliquam fermentum augue magna, vel accumsan augue
consequat et. Vestibulum id interdum orci, a aliquam sapien. Vivamus eu ipsum sollicitudin, aliquet consequat et. Vestibulum id interdum orci, a aliquam sapien. Vivamus eu ipsum sollicitudin, aliquet
arcu ut, ornare massa. Suspendisse tincidunt lectus a odio ultrices interdum. Praesent vitae sodales arcu ut, ornare massa. Suspendisse tincidunt lectus a odio ultrices interdum. Praesent vitae sodales
urna, vitae sagittis ex. Vivamus tincidunt nisi ultrices lectus dapibus, at placerat nisl elementum. urna, vitae sagittis ex. Vivamus tincidunt nisi ultrices lectus dapibus, at placerat nisl elementum.
Fusce cursus, sapien in tincidunt pellentesque, mi erat mollis nibh, ut maximus tortor magna vitae Fusce cursus, sapien in tincidunt pellentesque, mi erat mollis nibh, ut maximus tortor magna vitae
nibh. nibh.
</p> </p>
<p> <p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque pellentesque diam ipsum, nec Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque pellentesque diam ipsum, nec
ultricies sem mollis et. Phasellus porttitor nec felis quis ultricies. In venenatis faucibus nisl ultricies sem mollis et. Phasellus porttitor nec felis quis ultricies. In venenatis faucibus nisl
sed facilisis. Cras sapien nibh, dignissim at eros quis, commodo lobortis eros. Sed a massa sed facilisis. Cras sapien nibh, dignissim at eros quis, commodo lobortis eros. Sed a massa
eleifend, dictum elit at, blandit magna. Nullam auctor enim nec orci luctus sagittis. Nunc blandit eleifend, dictum elit at, blandit magna. Nullam auctor enim nec orci luctus sagittis. Nunc blandit
quam nec laoreet egestas. Nulla feugiat nisl lacus, a viverra nisi hendrerit vitae. In nibh arcu, quam nec laoreet egestas. Nulla feugiat nisl lacus, a viverra nisi hendrerit vitae. In nibh arcu,
sodales in enim tincidunt, tempus imperdiet ex. Aliquam fermentum augue magna, vel accumsan augue sodales in enim tincidunt, tempus imperdiet ex. Aliquam fermentum augue magna, vel accumsan augue
consequat et. Vestibulum id interdum orci, a aliquam sapien. Vivamus eu ipsum sollicitudin, aliquet consequat et. Vestibulum id interdum orci, a aliquam sapien. Vivamus eu ipsum sollicitudin, aliquet
arcu ut, ornare massa. Suspendisse tincidunt lectus a odio ultrices interdum. Praesent vitae sodales arcu ut, ornare massa. Suspendisse tincidunt lectus a odio ultrices interdum. Praesent vitae sodales
urna, vitae sagittis ex. Vivamus tincidunt nisi ultrices lectus dapibus, at placerat nisl elementum. urna, vitae sagittis ex. Vivamus tincidunt nisi ultrices lectus dapibus, at placerat nisl elementum.
Fusce cursus, sapien in tincidunt pellentesque, mi erat mollis nibh, ut maximus tortor magna vitae Fusce cursus, sapien in tincidunt pellentesque, mi erat mollis nibh, ut maximus tortor magna vitae
nibh. nibh.
</p>
<h1>Here goes a title</h1>
<li>
A real world digital 3D platform (Digital Twin) of Stuttgart for citizens and government to build, play,
explore and engage in city development process.
</li>
<li>
Complimanting traditional citizen particiaption in city development process using visually rich digital city
environment and interaction.
</li>
<li>Enhancing the digital participation platform with game elements to bring out more creativity and sense of
there importance in the city development process.
</li>
<h1>Here goes a title</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua. Ornare massa eget egestas purus viverra.
Molestie nunc non blandit massa enim nec dui. Arcu ac tortor dignissim convallis aenean
et tortor at. Nisi quis eleifend quam adipiscing vitae. Eget nunc lobortis mattis aliquam.
Integer vitae justo eget magna. Sed risus pretium quam vulputate dignissim suspendisse.
Nunc scelerisque viverra mauris in aliquam sem fringilla ut morbi.
Venenatis lectus magna fringilla urna porttitor rhoncus. Lectus vestibulum mattis ullamcorper velit sed.
</p>
<h1>Figure demo</h1>
<p>
<img src="bau1.jpg">
</p> </p>
<h1>Here goes a title</h1> <h1>Audio demo</h1>
<p> <p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor <audio controls src="audio.mp3" type="audio/mp3"></audio>
incididunt ut labore et dolore magna aliqua. Ornare massa eget egestas purus viverra. </p>
Molestie nunc non blandit massa enim nec dui. Arcu ac tortor dignissim convallis aenean
et tortor at. Nisi quis eleifend quam adipiscing vitae. Eget nunc lobortis mattis aliquam.
Integer vitae justo eget magna. Sed risus pretium quam vulputate dignissim suspendisse.
Nunc scelerisque viverra mauris in aliquam sem fringilla ut morbi.
Venenatis lectus magna fringilla urna porttitor rhoncus. Lectus vestibulum mattis ullamcorper velit sed.
</p>
<h1>Here goes a title</h1> <h1>Embed Youtube video</h1>
<p> <p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor <div class="video-container">
incididunt ut labore et dolore magna aliqua. Ornare massa eget egestas purus viverra. <iframe width="560" height="315" src="https://www.youtube.com/embed/AZjduAZwm6w" frameborder="0"
Molestie nunc non blandit massa enim nec dui. Arcu ac tortor dignissim convallis aenean allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope"
et tortor at. Nisi quis eleifend quam adipiscing vitae. Eget nunc lobortis mattis aliquam. allowfullscreen></iframe>
Integer vitae justo eget magna. Sed risus pretium quam vulputate dignissim suspendisse. </div>
Nunc scelerisque viverra mauris in aliquam sem fringilla ut morbi. </p>
Venenatis lectus magna fringilla urna porttitor rhoncus. Lectus vestibulum mattis ullamcorper velit sed.
</p>
<h1>Figure demo</h1> <h1>List of external links</h1>
<p> <p>
<img src="bau1.jpg"> <ul>
</p> <li><a href="https://stadtlabor.podigee.io">HFT Stadtlabor</a></li>
<li><a
<h1>Audio demo</h1> href="https://stadtlabor.podigee.io/5-05-vergessen-in-der-stadt-wie-die-stadtplanung-menschen-mit-demenz-helfen-kann">Vergessen
in der Stadt</a></li>
<p> </ul>
<audio controls src="audio.mp3" type="audio/mp3"></audio> </p>
</p>
<h1>Embed Youtube video</h1>
<p>
<div class="video-container">
<iframe width="560" height="315" src="https://www.youtube.com/embed/AZjduAZwm6w" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope" allowfullscreen></iframe>
</div>
</p>
<h1>List of external links</h1>
<p>
<ul>
<li><a href="https://stadtlabor.podigee.io">HFT Stadtlabor</a></li>
<li><a href="https://stadtlabor.podigee.io/5-05-vergessen-in-der-stadt-wie-die-stadtplanung-menschen-mit-demenz-helfen-kann">Vergessen in der Stadt</a></li>
</ul>
</p>
</div> </div>
<div class="footer"></div> <div class="footer"></div>
<div class="legal"></div> <div class="legal"></div>
<script src="../settings.js"> </script> <script src="../settings.js"> </script>
<script src="../main.js"> </script> <script src="../main.js"> </script>
</body> </body>
</html> </html>
public/settings.js
+ 26
- 4
View file @ f6684dd2
...@@ -71,9 +71,9 @@ let settings = { ...@@ -71,9 +71,9 @@ let settings = {
participants: [ participants: [
{ {
name: "John Doe", name: "Patrick Wuerstle",
avatar: DEFAULT.avatar, avatar: DEFAULT.avatar,
email: "john.doe@lalaland.com", email: "patrick.Wuerstle@hft-stuttgart.de",
social: [ social: [
{ {
agent: "twitter", agent: "twitter",
...@@ -98,7 +98,7 @@ let settings = { ...@@ -98,7 +98,7 @@ let settings = {
] ]
}, },
{ {
name: "Charlotte Doe", name: "Rushi",
avatar: `${BASE_URL}/assets/images/charlotte.jpg`, avatar: `${BASE_URL}/assets/images/charlotte.jpg`,
email: "charlotte.doe@lalaland.com", email: "charlotte.doe@lalaland.com",
social: [ social: [
...@@ -118,6 +118,28 @@ let settings = { ...@@ -118,6 +118,28 @@ let settings = {
profile: DEFAULT.social.linkedin.profile profile: DEFAULT.social.linkedin.profile
} }
] ]
},
{
name: "Joe T.S.",
avatar: `https://www.hft-stuttgart.de/fileadmin/Dateien/Profilbilder/_processed_/9/b/csm_JoeSquare_89b2f100d1.jpg`,
email: "thunyathep.s@outlook.com",
social: [
{
agent: "twitter",
icon: DEFAULT.social.twitter.icon,
profile: DEFAULT.social.twitter.profile
},
{
agent: "facebook",
icon: DEFAULT.social.facebook.icon,
profile: DEFAULT.social.facebook.profile
},
{
agent: "linkedin",
icon: DEFAULT.social.linkedin.icon,
profile: DEFAULT.social.linkedin.profile
}
]
} }
], ],
...@@ -143,4 +165,4 @@ let settings = { ...@@ -143,4 +165,4 @@ let settings = {
title: "Die Gemeinsame Wissenschaftskonferenz" title: "Die Gemeinsame Wissenschaftskonferenz"
} }
] ]
}; };
\ No newline at end of file
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