From c4546b18cd0555ed9c9ac45a2081f69b4d24cba0 Mon Sep 17 00:00:00 2001
From: HouTeng Chan <ht-chen21@mails.tsinghua.edu.cn>
Date: Mon, 30 Sep 2024 07:49:09 +0000
Subject: [PATCH] Update 2 files
- /wiki/menu.html
- /wiki/pages/human-practices.html
---
wiki/menu.html | 2 +-
wiki/pages/human-practices.html | 49 +++++++++++++++++++++++++++------
2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/wiki/menu.html b/wiki/menu.html
index 5ea3d874..d420860b 100644
--- a/wiki/menu.html
+++ b/wiki/menu.html
@@ -155,7 +155,7 @@
<li onmouseover="over(this)" onmouseleave="leave(this)">
<a href="#" style="cursor:default;">Human Practices</a>
<ul class="son">
- <li><a href="{{ url_for('pages', page='human-practices') }}">Overview</a></li>
+ <li><a href="{{ url_for('pages', page='human-practices') }}">Details</a></li>
<li><a href="{{ url_for('pages', page='education') }}">Education</a></li>
<li><a href="{{ url_for('pages', page='inclusivity') }}">Inclusivity</a></li>
</ul>
diff --git a/wiki/pages/human-practices.html b/wiki/pages/human-practices.html
index 71a9d55e..eb6e3627 100644
--- a/wiki/pages/human-practices.html
+++ b/wiki/pages/human-practices.html
@@ -31,18 +31,18 @@
<body>
{% extends "layout.html" %}
- {% block title %}Human Practices Overview{% endblock %}
+ {% block title %}Human Practices Details{% endblock %}
{% block page_content %}
- <!--<div class="sidebar">
+<div class="sidebar">
<ul>
- <li><a href="#topic1">Topic1</a></li>
- <li><a href="#topic2">Topic2</a></li>
- <li><a href="#topic3">Topic3</a></li>
- <li><a href="#topic4">Topic4</a></li>
+ <li><a href="#Overview">Overview</a></li>
+ <li><a href="#Engineering">Engineering</a></li>
+ <li><a href="#Society/Politics">Society/Politics</a></li>
+ <li><a href="#Imaginary">Imaginary</a></li>
</ul>
</div>
--->
+
<div class="progress-container">
<svg class="progress-bar-circle" width="60" height="60">
<circle class="progress-circle" cx="30" cy="30" r="25" stroke-width="5" fill="transparent"></circle>
@@ -50,6 +50,14 @@
<div class="progress-text">0%</div>
</div>
+ <div class="row mt-4">
+ <div class="col-lg-12">
+ <h2 id="Overview">
+ <h2>Overview</h2>
+ <hr>
+ </div>
+ </div>
+
<div class="row mt-4">
<div class="col-lg-12">
<p>Our integrated human practice embodies a journey of identifying social needs and challenges, devising appropriate solutions, engaging with a diverse range of stakeholders, and continuously refining our project in response to their insights and feedback. This transformative approach guides our project from a theoretical idea within the confines of the lab to a solution that is both effective for real-world issues and ethically sound.</p>
@@ -80,11 +88,36 @@
<div class="row mt-4">
<div class="col-lg-12">
- <h3>Conclusion</h3>
<p>A significant number of people have participated in our process of engineering, economy, society/politics and imaginary. We can categorize them into four types: Expert, Entrepreneur, Partner, User.</p>
<p>Intriguingly, when we initially were brainstorming, we started from the imaginary and social need-the traditional culture of burning incense and its miraculous effects, and a call for long-term, non-invasive, patient-friendly drug administration. We designed our synthetic system based on our goal. And when we were implementing our project, going from engineering to economy, society/politics and imaginary, we kept reflecting on our engineering design and improving it through the information we collected, finally resulting in a product that integrated lab concept and social reality. Also, by deploying the onion method, we can have an organized view of how we integrated knowledge from different fields into our project, ensuring a true understanding of the project and its interaction with real world from a comprehensive perspective.</p>
</div>
</div>
+
+ <div class="row mt-4">
+ <div class="col-lg-12">
+ <h2 id="Overview">
+ <h2>Overview</h2>
+ <hr>
+ </div>
+ </div>
+
+ <div class="row mt-4">
+ <div class="col-lg-12">
+ <h2 id="Overview">
+ <h2>Overview</h2>
+ <hr>
+ </div>
+ </div>
+
+ <div class="row mt-4">
+ <div class="col-lg-12">
+ <h2 id="Overview">
+ <h2>Overview</h2>
+ <hr>
+ </div>
+ </div>
+
+
</body>
</html>
{% endblock %}
\ No newline at end of file
--
GitLab