[virtualcommons-svn] commit/irrigation: alllee: round configuration instruction fixes to include sp
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/irrigation: alllee: round configuration instruction fixes to include special instructions
|
From: <com...@bi...> - 2014-05-14 19:43:58
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/commits/f49c9b048e5c/ Changeset: f49c9b048e5c User: alllee Date: 2014-05-14 21:43:30 Summary: round configuration instruction fixes to include special instructions Affected #: 22 files diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2009/t2/round12.xml --- a/src/main/resources/configuration/asu/2009/t2/round12.xml +++ b/src/main/resources/configuration/asu/2009/t2/round12.xml @@ -20,7 +20,7 @@ infrastructure efficiency will be displayed and then the round will begin. If you have any questions, please ask them now. </p> - +{self.specialInstructions} ]]></entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2009/t2/round13.xml --- a/src/main/resources/configuration/asu/2009/t2/round13.xml +++ b/src/main/resources/configuration/asu/2009/t2/round13.xml @@ -5,13 +5,4 @@ <entry key='infrastructure-degradation-factor'>10</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round10.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round10.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round10.xml @@ -3,12 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 9 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round11.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round11.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round11.xml @@ -3,13 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 10 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round12.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round12.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round12.xml @@ -20,7 +20,7 @@ infrastructure efficiency will be displayed and then the round will begin. If you have any questions, please ask them now. </p> - +{self.specialInstructions} ]]></entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round13.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round13.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round13.xml @@ -4,14 +4,4 @@ <comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 12 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round14.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round14.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round14.xml @@ -5,13 +5,4 @@ <entry key='infrastructure-degradation-factor'>10</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 13 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round15.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round15.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round15.xml @@ -2,16 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - <entry key='infrastructure-degradation-factor'>80</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 14 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round16.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round16.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round16.xml @@ -3,15 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> - - -<entry key="instructions"> -<![CDATA[ -<h3>Round 15 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round17.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round17.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round17.xml @@ -3,13 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>5</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 16 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round18.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round18.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round18.xml @@ -3,14 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment><entry key='infrastructure-degradation-factor'>10</entry> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 17 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round19.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round19.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round19.xml @@ -5,13 +5,4 @@ <entry key='infrastructure-degradation-factor'>80</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 18 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round2.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round2.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round2.xml @@ -7,7 +7,7 @@ <entry key="instructions"><![CDATA[ -<h3>Round 1 Instructions</h3> +<h2>Round {self.roundNumber} Instructions</h2><p> This is the first actual round of the experiment. Before this round begins you will have the opportunity to text chat with the other participants in your @@ -16,6 +16,7 @@ determined you will begin the experiment and make decisions on when to open your irrigation gates and grow crops. </p> +{self.specialInstructions} ]]></entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round20.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round20.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round20.xml @@ -5,13 +5,4 @@ <entry key='infrastructure-degradation-factor'>10</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 19 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round21.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round21.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round21.xml @@ -5,12 +5,4 @@ <entry key='infrastructure-degradation-factor'>10</entry> -<entry key="instructions"> -<![CDATA[ -<h3>Round 20 Instructions</h3> -<p> -This is the final round. -</p> -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round3.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round3.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round3.xml @@ -3,13 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round4.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round4.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round4.xml @@ -3,12 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 3 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round5.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round5.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round5.xml @@ -3,12 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 4 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round6.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round6.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round6.xml @@ -2,14 +2,4 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 5 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round7.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round7.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round7.xml @@ -3,13 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 6 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round8.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round8.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round8.xml @@ -3,12 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 7 Instructions</h3> -<p> -This round is the same as the previous round. -</p> -]]> -</entry></properties> diff -r 69fe6de7e90a5e1cd7314721ddbbdd5f54f11abc -r f49c9b048e5c455f6ae8078ad5d9280cd9876b11 src/main/resources/configuration/asu/2014/stiglitz/round9.xml --- a/src/main/resources/configuration/asu/2014/stiglitz/round9.xml +++ b/src/main/resources/configuration/asu/2014/stiglitz/round9.xml @@ -3,13 +3,4 @@ <properties><comment>Irrigation experiment round configuration</comment> -<entry key="instructions"> -<![CDATA[ -<h3>Round 8 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
