diff --git a/favicon.png b/favicon.png new file mode 100644 index 0000000..88bd46c Binary files /dev/null and b/favicon.png differ diff --git a/index.html b/index.html index a95836e..e54c410 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,39 @@ + + The Evolution of Trust + + + + + + + + + + + + + + + + + + + + + + + + + + + +
loading...
diff --git a/js/slides/5_Slides_Distrust.js b/js/slides/5_Slides_Distrust.js index 522886e..1888bb1 100644 --- a/js/slides/5_Slides_Distrust.js +++ b/js/slides/5_Slides_Distrust.js @@ -152,8 +152,9 @@ SLIDES.push({ unlisten(_.misc); self.remove("roundsLabel"); self.remove("roundsSlider"); - self.remove("continueLabel"); - self.remove("continueButton"); + var o = self.objects; + if(o.continueLabel) self.remove("continueLabel"); + if(o.continueButton) self.remove("continueButton"); } }); @@ -264,8 +265,9 @@ SLIDES.push({ self.remove("payoffs"); self.remove("text2"); self.remove("note2"); - self.remove("continueLabel"); - self.remove("continueButton"); + var o = self.objects; + if(o.continueLabel) self.remove("continueLabel"); + if(o.continueButton) self.remove("continueButton"); } }); diff --git a/js/slides/6_Slides_Noise.js b/js/slides/6_Slides_Noise.js index 4732af1..2a63750 100644 --- a/js/slides/6_Slides_Noise.js +++ b/js/slides/6_Slides_Noise.js @@ -479,8 +479,9 @@ SLIDES.push({ unlisten(_.misc); self.remove("noiseLabel"); self.remove("noiseSlider"); - self.remove("continueLabel"); - self.remove("continueButton"); + var o = self.objects; + if(o.continueLabel) self.remove("continueLabel"); + if(o.continueButton) self.remove("continueButton"); self.remove("text"); } }); diff --git a/lang/en.html b/lang/en.html index ef37ddb..750b397 100644 --- a/lang/en.html +++ b/lang/en.html @@ -769,7 +769,7 @@ This is why "miscommunication" is such an interesting barrier to trust: a little bit of it leads to forgiveness, but too much and it leads to widespread distrust! I think our modern media technology, -as much as it's helped us increase communication... +as much as it's helped us increase communication... has increased our miscommunication much more.

At last, let's experiment with all the numbers, the knobs and sliders. @@ -878,7 +878,7 @@ but as game theory reminds us, we are each others' environment. In the short run, the game defines the players. But in the long run, it's us players who define the game.

-So, do what you can to create the conditions necessary to evolve trust. +So, do what you can do, to create the conditions necessary to evolve trust. Build relationships. Find win-wins. Communicate clearly. Maybe then, we can stop firing at each other, get out of our own trenches, cross No Man's Land to come together... diff --git a/social/thumbnail.png b/social/thumbnail.png new file mode 100644 index 0000000..da3ab30 Binary files /dev/null and b/social/thumbnail.png differ