nice looking. better saving. you get the file name when you press sav…

…e, it's in the console, along with the text to paste. also, took out the animated "oh no" to lighten the load. UI improvement: buttons below single voter ballot.
ncase · Aug 7, 2017 · 1b8f5d3 · 1b8f5d3
1 parent ab5332c
commit 1b8f5d3
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 29 deletions.
diff --git a/newer.html b/newer.html
@@ -233,7 +233,7 @@ <h2 class="ballot_title" style="margin-bottom: 0.15em;">Normalizing Voter</h2>
 		<h2 class="ballot_title" style="margin-bottom: 0.15em;">Strong Strategic Voter</h2>
 		<p class="ballot_caption">Almost like strategic approval.</p>
 
-		<iframe src="play/ballot8.html" width="900" height="276" scrolling="no"></iframe>
+		<iframe src="play/ballot8.html" width="655" height="380" scrolling="no"></iframe>
 
 	</div>
 	<div class="words">
@@ -250,7 +250,7 @@ <h2 class="ballot_title" style="margin-bottom: 0.15em;">Strong Strategic Voter</
 		<h2 class="ballot_title" style="margin-bottom: 0.15em;">Best Frontrunner</h2>
 		<p class="ballot_caption">And everybody you like better.</p>
 
-		<iframe src="play/ballot11.html" width="900" height="276" scrolling="no"></iframe>
+		<iframe src="play/ballot11.html" width="655" height="380" scrolling="no"></iframe>
 
 	</div>
 	<div class="words">	
@@ -263,7 +263,7 @@ <h2 class="ballot_title" style="margin-bottom: 0.15em;">Best Frontrunner</h2>
 		<h2 class="ballot_title" style="margin-bottom: 0.15em;">Not the Worst Frontrunner</h2>
 		<p class="ballot_caption">Just everybody you like better.</p>
 
-		<iframe src="play/ballot12.html" width="900" height="276" scrolling="no"></iframe>
+		<iframe src="play/ballot12.html" width="655" height="380" scrolling="no"></iframe>
 
 	</div>
 	<div class="words">
@@ -329,7 +329,7 @@ <h1>Star voting</h1>
 		<h2 class="ballot_title" style="margin-bottom: 0.15em;">Star Strong</h2>
 		<p class="ballot_caption">Keeps a space for the best.</p>
 
-		<iframe src="play/ballot9.html" width="900" height="276" scrolling="no"></iframe>
+		<iframe src="play/ballot9.html" width="655" height="380" scrolling="no"></iframe>
 
 	</div>
 	<div class="words">
@@ -361,7 +361,7 @@ <h1>3-2-1 voting</h1>
 		<h2 class="ballot_title" style="margin-bottom: 0.15em;">321 Strategic</h2>
 		<p class="ballot_caption">Approval with an extra level.</p>
 
-		<iframe src="play/ballot10.html" width="900" height="276" scrolling="no"></iframe>
+		<iframe src="play/ballot10.html" width="655" height="380" scrolling="no"></iframe>
 
 	</div>
 	<div class="words">

diff --git a/play/ballot10.html b/play/ballot10.html
@@ -25,7 +25,6 @@
 <script>main({
 	system: "Three",
 	strategy: "starnormfrontrunners",
-	frontrunnerSet: new Set(["square","hexagon"]),
-	showChoiceOfFrontrunners: true,
-	showChoiceOfStrategy: true
+	frontrunnerSet: new Set(["square","triangle"]),
+	showChoiceOfFrontrunners: true
 });</script>
diff --git a/play/ballot6.html b/play/ballot6.html
@@ -25,7 +25,7 @@
 <script>main({
 	system: "Score",
 	strategy: "best frontrunner",
-	frontrunnerSet: new Set(["square","hexagon"]),
+	frontrunnerSet: new Set(["square","triangle"]),
 	showChoiceOfFrontrunners: true,
 	showChoiceOfStrategy: true
 });</script>
diff --git a/play/ballot7.html b/play/ballot7.html
@@ -25,6 +25,5 @@
 <script>main({
 	system: "Score",
 	strategy: "threshold",
-	showChoiceOfFrontrunners: true,
-	showChoiceOfStrategy: true
+	showChoiceOfFrontrunners: true
 });</script>
diff --git a/play/ballot9.html b/play/ballot9.html
@@ -25,6 +25,6 @@
 <script>main({
 	system: "Score",
 	strategy: "starnormfrontrunners", // for now we are using an "off-menu" option.  We should make versions of each of hte strategies for star.
-	frontrunnerSet: new Set(["square","hexagon"]),
+	frontrunnerSet: new Set(["square","triangle"]),
 	showChoiceOfFrontrunners: true
 });</script>
diff --git a/play/css/ballot.css b/play/css/ballot.css
@@ -7,6 +7,7 @@ BALLOT DESIGN
 	width: 375px;
 	height: 250px;
 	margin-left: 20px;
+	margin-bottom: 10px;
 
 	overflow: hidden;
 	float:left;
@@ -18,9 +19,26 @@ BALLOT DESIGN
 	border: 2px solid #fff;
 
 	position: relative;
+
 
 }
 #ballot .ballot_sprite{
 	position: absolute;
 	background-size: 100% auto;
+}
+
+.button-group{
+	margin-left: 0px;
+	float:left;
+	clear:both;
+}
+
+#reset {
+	top: 270px;
+	left: 275px
+}
+
+.model {
+	height:260px;
+	margin-bottom: 10px;
 }
diff --git a/play/css/election.css b/play/css/election.css
@@ -13,9 +13,11 @@ Election/Sandbox design:
 #left{
 	width:220px;
 	padding-right: 20px;
+	height: 371px;
 }
 #center{
 	width:320px;
+	height: 370px;
 }
 #right{
 	width:220px;

diff --git a/play/js/main_ballot.js b/play/js/main_ballot.js
@@ -102,7 +102,7 @@ function main(config){
 
 			};
 			window.chooseFrun = new ButtonGroup({
-				label: "which candidates are the frontrunners?",
+				label: "who are the frontrunners?",
 				width: 42,
 				data: frun,
 				onChoose: onChooseFrun,
@@ -125,8 +125,6 @@ function main(config){
 		var resetDOM = document.createElement("div");
 		resetDOM.id = "reset";
 		resetDOM.innerHTML = "reset";
-		resetDOM.style.top = "240px";
-		resetDOM.style.left = "660px";
 		resetDOM.onclick = function(){
 
 			config = JSON.parse(JSON.stringify(initialConfig)); // RESTORE IT!

diff --git a/play/js/main_sandbox.js b/play/js/main_sandbox.js
@@ -736,6 +736,8 @@ function main(config){
 					logtext += i + ": " +JSON.stringify(config[i]) + ',\n'
 				}
 			}
+			var aloc = window.location.pathname.split('/')
+			logtext += "\n\npaste this JSON into" + aloc[aloc.length-2] + "/" + aloc[aloc.length-1]
 			console.log(logtext)
 			if (log==2) console.log(JSON.stringify(config))
 
@@ -770,8 +772,8 @@ function main(config){
 				resetDOM.style.top = "470px";
 				resetDOM.style.left = "235px";
 			} else {
-				resetDOM.style.top = "330px";
-				resetDOM.style.left = "235px";
+				resetDOM.style.top = "340px";
+				resetDOM.style.left = "245px";
 			}
 			// Create a "save" button
 			var saveDOM = document.createElement("div");
@@ -781,7 +783,7 @@ function main(config){
 				saveDOM.style.top = "470px";
 				saveDOM.style.left = "350px";
 			} else {
-				saveDOM.style.top = "330px";
+				saveDOM.style.top = "340px";
 				saveDOM.style.left = "350px";
 			}
 			saveDOM.onclick = function(){
@@ -801,8 +803,10 @@ function main(config){
 				//skip
 			} else {
 				linkText.style.position = "absolute";
-				linkText.style.top = "330px";
+				linkText.style.top = "340px";
 				linkText.style.left = "460px";
+				linkText.style.height = "30px";
+				linkText.style.width = "90px";
 			}
 			document.body.appendChild(linkText);
 
@@ -859,14 +863,4 @@ function main(config){
 
 	};
 
-	// FUNNY HACK.
-	setInterval(function(){
-		var ohno = document.getElementById("ohno");
-		if(!ohno) return;
-		var x = Math.round(Math.random()*10-5);
-		var y = Math.round(Math.random()*10)+10;
-		ohno.style.top = y+"px";
-		ohno.style.left = x+"px";
-	},10);
-
 };