42

qindiandefence · qindiandefence · commit 6467de4cf494 · 2014-09-20T11:31:49.000-04:00
diff --git a/faq.html b/faq.html
@@ -46,7 +46,7 @@
 			</div>
 			 
 			<div class="faq-question">Q: I have a special project I want to work on.</div>
-			<div class="faq-answer"> A: That's great! You can come as early as 10:00. </div>  
+			<div class="faq-answer"> A: That's great! You can come as early as 10:30. </div>  
 			
 			<div class="faq-question">Q: Will you answer this question with "no"?</div>
 			<div class="faq-answer">A: Maybe.</div>
diff --git a/htmleditor.html b/htmleditor.html
@@ -1,39 +1,60 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 	<head>
-	<title>Test ace editor</title>
-	<link rel="stylesheet" href="app.css"/>
-	<style type="text/css" media="screen">
-		#header {
-			background-color: #60ff60;
-			/*width: 100%;*/
-			height: 70px;
-			margin: 5px 15% 5px 15%;
-			padding: 5px;
-			text-align: center;
-			font-family: sans-serif;
-		}
-		/*#header * {
-			float: center
-		}*/
-		#editor { 
-			/*position: absolute;
-			left: 50px;
-			bottom: 50px;
-			top: 100px;*/
-			width: 500px;
-			height: 500px;
-			display: inline-block;
-		}
-		#result {
-			width: 640px;
-			height: 480px;
-			/*display: inline-block;*/
-		}
-	</style>
+		<title>HTML Sandbox</title>
+		<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"/>
+		<link rel="stylesheet" href="app.css"/>
+		<style type="text/css" media="screen">
+			#sandbox-header {
+				background-color: #60ff60;
+				/*width: 100%;*/
+				height: 70px;
+				margin: 5px 15% 5px 15%;
+				padding: 5px;
+				text-align: center;
+				font-family: sans-serif;
+			}
+			/*#header * {
+				float: center
+			}*/
+			#editor { 
+				/*position: absolute;
+				left: 50px;
+				bottom: 50px;
+				top: 100px;*/
+				width: 500px;
+				height: 500px;
+				display: inline-block;
+			}
+			#result {
+				width: 640px;
+				height: 480px;
+				/*display: inline-block;*/
+			}
+		</style>
 	</head>
 	<body>
-		<div id="header">
+		<header class="navbar navbar-inverse" role="banner">
+			<div class="container">
+				<div class="navbar-header">
+				<a href="index.html" class="navbar-brand">Coder Dojo Indy</a>
+				</div>
+				<nav class="collapse navbar-collapse" role="navigation">
+				  	<ul class="nav navbar-nav">
+						<li>
+							<a href="about.html">About</a>
+						</li>
+						<li>
+					  		<a href="programs.html">Programs</a>
+						</li>
+						<li>
+					  		<a href="faq.html">FAQ</a>
+						</li>
+					</ul>
+				</nav>
+			</div>
+		</header>
+		<div id="sandbox-header">
 			<h3 style="padding: 0; margin: 5px;">HTML Sandbox</h3>
 			This HTML sandbox uses Ace editor. In order to save your code you must allow cookies. <strong>&downarrow;</strong>
 		</div>
@@ -42,7 +63,6 @@ <h3 style="padding: 0; margin: 5px;">HTML Sandbox</h3>
 			<div id="editor"></div>
 			<div id="result-wrapper" style="display: inline-block">
 				<iframe id="result">
-				<div></div>
 				</iframe>
 				<br/>
 				<button onclick="updateCode()">Run HTML</button>
@@ -56,9 +76,11 @@ <h3 style="padding: 0; margin: 5px;">HTML Sandbox</h3>
 			var editor = ace.edit("editor");
 			editor.setTheme("ace/theme/monokai");
 			editor.getSession().setMode("ace/mode/html");
-			
+			editor.getSession().setUseWrapMode(true);
+			editor.setValue("<!DOCTYPE html>\n<html>\n    <head><\/head>\n    <body><\/body>\n<\/html>");
 			function updateCode() {
-				$("result").html(editor.getValue());
+				//$("#result").srcdoc = (editor.getValue());
+				alert("Not functional right now!");
 			}
 		</script>
 	</body>
diff --git a/programs.html b/programs.html
@@ -95,13 +95,13 @@ <h2>Car Race 2 on Scratch</h2><br/>
 				</div>
 			</div>
 			
-			<!--
+			
 			<div id="html-stuff">
 				<h1>HTML</h1>
 				<p> If you are learning HTML you can show your cool stuff. It has to fit inside of a 640x480 rectangle in order not to take up space. [Experimental] </p>
-				
+				<p>Example:</p>
+				<div style="width: 100px;"></div>
 			</div>
-			-->
 			
     	
 			<br/><br/>
