From be27438ceb93b3f3187755d17343dad29f9db275 Mon Sep 17 00:00:00 2001
From: Tianyi Liang <tianyi@igem.org>
Date: Mon, 27 May 2024 23:13:32 +0000
Subject: [PATCH] fix: quick fix
---
.gitlab-ci.yml | 19 ++++++++++++++-----
wiki/pages/attributions.html | 19 +++++++++++++++----
wiki/pages/education.html | 2 +-
wiki/pages/engineering.html | 2 +-
wiki/pages/entrepreneurship.html | 2 +-
wiki/pages/hardware.html | 2 +-
wiki/pages/home.html | 4 ++--
wiki/pages/human-practices.html | 2 +-
wiki/pages/inclusivity.html | 2 +-
wiki/pages/measurement.html | 4 ++--
wiki/pages/model.html | 4 ++--
wiki/pages/plant.html | 4 ++--
wiki/pages/results.html | 2 +-
wiki/pages/software.html | 4 ++--
wiki/pages/sustainable.html | 2 +-
15 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5b0064..b147665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,21 @@
image: python:3.6
+build:
+ stage: build
+ script:
+ - pip install --no-cache-dir -r dependencies.txt
+ - FLASK_APP=app.py flask freeze
+ rules:
+ - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+
+
pages:
stage: build
script:
- - pip install --no-cache-dir -r dependencies.txt
- - FLASK_APP=app.py flask freeze
+ - pip install --no-cache-dir -r dependencies.txt
+ - FLASK_APP=app.py flask freeze
artifacts:
paths:
- - public
- only:
- - main
+ - public
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/wiki/pages/attributions.html b/wiki/pages/attributions.html
index 33c76a5..3629f10 100644
--- a/wiki/pages/attributions.html
+++ b/wiki/pages/attributions.html
@@ -1,5 +1,5 @@
{% extends "layout.html" %}
-
+
{% block title %}Attributions{% endblock %}
{% block lead %}This page must show the attribution form of your project. This includes the work done by each of the student members on your team and any work that was done by people outside of your team, including the host labs, advisors, instructors, and individuals not on the team roster. This requirement is not about literature references - these can and should be displayed throughout your wiki.{% endblock %}
@@ -7,13 +7,24 @@
<div class="row mt-4">
<div class="col">
+ <div class="bd-callout bd-callout-info">
+ <p>
+ In the iGEM Competition, we celebrate student effort and achievement. The Attributions form helps the judges
+ differentiate between what students accomplished from how their external collaborators supported them.
+ Therefore, teams must clearly explain on the standard Project Attributions form what work they have
+ conducted by themselves and what has been done by others.
+ </p>
+ <p>
+ Teams must use the standard Attributions form. To meet the attributions requirement, you must display the
+ standard form on your Wiki by following the instructions here:
+ <a href="https://competition.igem.org/deliverables/project-attribution">Project Attribution page</a>.
+ </p>
+ </div>
<div class="bd-callout bd-callout-info">
<h4>Bronze Medal Criterion #2</h4>
<p>Describe what work your team members did and what other people did for your project.</p>
- <p>The form that bas been embded in an iframe in this page shows your team's Project Attribution form. This page must keep the form as it is.</p>
+ <p>The form that has been embedded in an iframe in this page shows your team's Project Attribution form. This page must keep the form as it is.</p>
<p>If you use a different website framework, make sure to embed the right URL for your team's form.</p>
- <hr>
- <p>Please see the <a href="https://competition.igem.org/deliverables/project-attribution">Project Attribution page</a> for more information.</p>
</div>
</div>
</div>
diff --git a/wiki/pages/education.html b/wiki/pages/education.html
index de50d13..419424c 100644
--- a/wiki/pages/education.html
+++ b/wiki/pages/education.html
@@ -10,7 +10,7 @@
<div class="bd-callout bd-callout-info">
<h4>Best Education</h4>
<p>How have you developed new opportunities to include more people in shaping synthetic biology? Innovative educational tools and outreach activities have the ability to establish a two-way dialogue with new communities by discussing public values and the science behind synthetic biology. Document your approach and what was learned by everyone involved to compete for this award.</p>
- <p>To compete for the Best Education prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>To compete for the Best Education prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/engineering.html b/wiki/pages/engineering.html
index ea4c4b8..69c97be 100644
--- a/wiki/pages/engineering.html
+++ b/wiki/pages/engineering.html
@@ -1,7 +1,7 @@
{% extends "layout.html" %}
{% block title %}Engineering Success{% endblock %}
-{% block lead %}Demonstrate engineering success in a part of your project by going through at least one iteration of the engineering design cycle.{% endblock %}
+{% block lead %}Demonstrate engineering success in a technical aspect of your project by going through at least one iteration of the engineering design cycle. This achievement should be distinct from your Contribution for Bronze.{% endblock %}
{% block page_content %}
diff --git a/wiki/pages/entrepreneurship.html b/wiki/pages/entrepreneurship.html
index fc67d43..e4b3b6f 100644
--- a/wiki/pages/entrepreneurship.html
+++ b/wiki/pages/entrepreneurship.html
@@ -10,7 +10,7 @@
<div class="bd-callout bd-callout-info">
<h4>Best Supporting Entrepreneurship</h4>
<p>The Best Supporting Entrepreneurship award recognizes exceptional effort to build a business case and commercialize an iGEM project. This award is open to all teams to show that entrepreneurship is something all teams can aspire to do with their project. This award can go to an new project, or to a previous project that a team aimed to commercialize. Have you filed a provisional patent on your project/device/process? Have you raised money to build and ship products? Have you pitched your idea to investors and received money? As always in iGEM, the aim is to impress the judges!</p>
- <p>To compete for the Best Supporting Entrepreneurship prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>To compete for the Best Supporting Entrepreneurship prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/hardware.html b/wiki/pages/hardware.html
index 5de5210..e2aff76 100644
--- a/wiki/pages/hardware.html
+++ b/wiki/pages/hardware.html
@@ -10,7 +10,7 @@
<div class="bd-callout bd-callout-info">
<h4>Best Hardware</h4>
<p>This is a prize for the team that has developed a piece of hardware for synthetic biology. Hardware in iGEM should make synthetic biology based on standard parts easier, faster, better or more accessible to our community. Did your team make a sensor to help teams characterize parts? Did you make a robot that can help teams perform experiments or do cloning more easily? Tell us what your team did for this award!</p>
- <p>To compete for the Best Hardware prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>To compete for the Best Hardware prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/home.html b/wiki/pages/home.html
index 2254df7..d661e64 100644
--- a/wiki/pages/home.html
+++ b/wiki/pages/home.html
@@ -21,8 +21,8 @@
<h2>Styling your wiki</h2>
<hr>
<p>Feel free to customize the page styling according to your preferences, or you can simply leave the style as it is. It's wise to focus on a clear content first, and on a clean design later.</p>
- <p>Be cautious with the size of the assets like images, videos, and more into your wiki. Large file sizes can hinder the presentation of wikis due to slow internet connections. Remember to compress large files before uploading them to iGEM servers.</p>
- <p>This default wiki meets the requirements, enhances navigability, and provides a user-friendly experience for visitors. You should not feel obliged to go beyond the provided styling.</p>
+ <p>Be cautious with the size of the assets like images, videos, and more, that you put in your wiki. Large file sizes can hinder the presentation of wikis due to slow internet connections. Remember to compress large files before uploading them to iGEM servers.</p>
+ <p>This default wiki meets the requirements, enhances navigability, and provides a user-friendly experience for visitors. You should not feel obligated to go beyond the provided styling.</p>
</div>
</div>
<div class="row mt-4">
diff --git a/wiki/pages/human-practices.html b/wiki/pages/human-practices.html
index aaa6fc0..6b710ca 100644
--- a/wiki/pages/human-practices.html
+++ b/wiki/pages/human-practices.html
@@ -16,8 +16,8 @@
<div class="bd-callout bd-callout-info">
<h4>Best Integrated Human Practices</h4>
- <p>To compete for the Best Integrated Human Practices prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
<p>How does your project affect society and how does society influence the direction of your project? How might ethical considerations and stakeholder input guide your project purpose and design and the experiments you conduct in the lab? How does this feedback enter into the process of your work all through the iGEM competition? Document a thoughtful and creative approach to exploring these questions and how your project evolved in the process to compete for this award!</p>
+ <p>To compete for the Best Integrated Human Practices prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/inclusivity.html b/wiki/pages/inclusivity.html
index da5ca04..dd6fa09 100644
--- a/wiki/pages/inclusivity.html
+++ b/wiki/pages/inclusivity.html
@@ -10,7 +10,7 @@
<div class="bd-callout bd-callout-info">
<h4>Inclusivity Award</h4>
<p>The Inclusivity Award recognizes exceptional efforts to include people with diverse identities in scientific research. Who is allowed to have a voice in iGEM, synthetic biology, and science more broadly? How have you developed new opportunities to eliminate barriers and allow more people to contribute to, participate in, and/or be represented by these communities? To compete for this prize, activities do not have to be directly related to your team’s project. Document your approach, how you improved inclusivity, and what was learned.</p>
- <p>To compete for the Inclusivity award, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>To compete for the Inclusivity award, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/measurement.html b/wiki/pages/measurement.html
index 0c92f9e..aa6013e 100644
--- a/wiki/pages/measurement.html
+++ b/wiki/pages/measurement.html
@@ -9,8 +9,8 @@
<div class="col">
<div class="bd-callout bd-callout-info">
<h4>Best Measurement</h4>
- <p>There are a lot of exciting Parts in the Registry, but many Parts have still not been characterized. Designing great measurement approaches for characterizing new parts, or developing and implementing an efficient new method for characterizing thousands of parts are good examples.</p>
- <p>To compete for the Best Measurement prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>Measurements are critical to scientific communication and advancement. Well-reported measurements are the only way to show whether hardware is functioning correctly, whether data are reliable, and whether a result is actually important. There is a high value in identifying appropriate targets for measurement, collecting precise measurements, and reporting results clearly and with appropriate units. Document your careful measurement efforts and you could win this award!</p>
+ <p>To compete for the Best Measurement prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/model.html b/wiki/pages/model.html
index 00c6eaa..fe5453f 100644
--- a/wiki/pages/model.html
+++ b/wiki/pages/model.html
@@ -9,8 +9,8 @@
<div class="col">
<div class="bd-callout bd-callout-info">
<h4>Best Model</h4>
- <p>Models and computer simulations provide a great way to describe the functioning and operation of BioBrick Parts and Devices. Synthetic biology is an engineering discipline and part of engineering is simulation and modeling to determine system behavior before building your design. Designing and simulating can be iterated many times in a computer before moving to the lab. This award is for teams who build a model of their system and use it to inform system design or simulate expected behavior before or in conjunction with experiments in the wetlab.</p>
- <p>To compete for the Best Model prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>Models and computer simulations can help us understand the function and operation of BioBrick Parts and Devices. Simulation and modeling are critical engineering skills that can contribute to project design or provide a better understanding of the modeled process. These processes are even more useful and/or informative when real world data are included in the model. This award is for teams who build a model of their system and use it to inform system design or simulate expected behavior before, or in conjunction with, experiments in the wetlab.</p>
+ <p>To compete for the Best Model prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/plant.html b/wiki/pages/plant.html
index eaf8c4c..87f2141 100644
--- a/wiki/pages/plant.html
+++ b/wiki/pages/plant.html
@@ -9,8 +9,8 @@
<div class="col">
<div class="bd-callout bd-callout-info">
<h4>Best Plant Synthetic Biology</h4>
- <p>This award is designed to celebrate exemplary work done in plant synthetic biology. Did you build a project in a plant chassis? Did you submit plant parts to the Registry? This award could also be given to a team working with algae or another photosynthetic chassis. Show us what you made and remember to adhere to iGEM safety guidelines!</p>
- <p>To compete for the Best Plant Synthetic Biology prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>This award is designed to celebrate exemplary work done in plant synthetic biology. Did you build a project in a plant chassis? Did you submit plant parts to the Registry? This award could also be given to a team working with algae or another photosynthetic eukaryotic chassis. Show us what you made and remember to adhere to iGEM safety guidelines!</p>
+ <p>To compete for the Best Plant Synthetic Biology prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/results.html b/wiki/pages/results.html
index fae8f05..d69a9ac 100644
--- a/wiki/pages/results.html
+++ b/wiki/pages/results.html
@@ -33,7 +33,7 @@
<p>You can also include a list of bullet points (and links) of the successes and failures you have had over your summer. It is a quick reference page for the judges to see what you achieved during your summer.</p>
<ul>
<li>A list of linked bullet points of the successful results during your project</li>
- <li>A list of linked bullet points of the unsuccessful results during your project. This is about being scientifically honest. If you worked on an area for a long time with no success, tell us so we know where you put your effort.</li>
+ <li>A list of linked bullet points of the unsuccessful results during your project and what you learned from them. This is about being scientifically honest. If you worked on an area for a long time with no success, tell us so we know where you put your effort. Furthermore, you can still impress the judges by thoughtfully discussing what went wrong and how you might change things. </li>
</ul>
</div>
<div class="col-lg-4">
diff --git a/wiki/pages/software.html b/wiki/pages/software.html
index 80ec395..d573f0d 100644
--- a/wiki/pages/software.html
+++ b/wiki/pages/software.html
@@ -9,8 +9,8 @@
<div class="col">
<div class="bd-callout bd-callout-info">
<h4>Best Software Tool</h4>
- <p>Regardless what's the topic, iGEM projects often create or adapt computational tools to move the bigger project forward. Because they are born out of a direct practical need, these software tools (or new computational methods) can even prove surprisingly useful for others. Without necessarily being big or complex, they can make the crucial difference to a project's success. This award tries to find and honor such "nuggets" of computational work. To be eligible, your software has to be documented and made available under an OSI-approved open source license. Teams nominating themselves for this prize must host the source code of their software on the dedicated repository on iGEM's GitLab.</p>
- <p>To compete for the Best Software Tool prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>Regardless what's the topic, iGEM projects often create or adapt computational tools to move the bigger project forward. Because they are born out of a direct practical need, these software tools (or new computational methods) can even prove surprisingly useful for others. Without necessarily being big or complex, they can make the crucial difference to a project's success. This award tries to find and honor such "nuggets" of computational work. To be eligible, your software has to be documented and made available under an OSI-approved open source license. Teams nominating themselves for this prize must host the source code of their software on the dedicated repository on <a href="https://gitlab.igem.org/2024/software-tools/">iGEM's GitLab</a>.</p>
+ <p>To compete for the Best Software Tool prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>, host your software on <a href="https://gitlab.igem.org/2024/software-tools/">iGEM's GitLab</a>, and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
diff --git a/wiki/pages/sustainable.html b/wiki/pages/sustainable.html
index a4454b9..90c6735 100644
--- a/wiki/pages/sustainable.html
+++ b/wiki/pages/sustainable.html
@@ -10,7 +10,7 @@
<div class="bd-callout bd-callout-info">
<h4>Best Sustainable Development</h4>
<p>The Sustainable Development Goals (SDGs) are a call to action to integrally address global environmental, social, and economic challenges. As the future leaders of synthetic biology research and innovation, it’s your responsibility to participate in the global conversations to help develop solutions towards meeting the SDGs. We encourage you to demonstrate how you have evaluated your project ideas against one or more of the SDGs, how you’ve consulted with SDG stakeholders, and how you’ve begun to form collaborations with other iGEM teams around the SDGs. You’re encouraged to look back at previous iGEM projects to evaluate them against the SDGs and build upon them.</p>
- <p>To compete for the Best Sustainable Development prize, please describe your work on this page and also fill out the description on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a>.</p>
+ <p>To compete for the Best Sustainable Development prize, select the prize on the <a href="https://competition.igem.org/deliverables/judging-form">judging form</a> and describe your work on this page.</p>
<hr>
<p>Please see the <a href="https://competition.igem.org/judging/awards">2024 Awards Page</a> for more information.</p>
</div>
--
GitLab