add homepage text how to (open-reblock/openreblock#12 (comment)) and …

…fix links (#54)
open-reblock · Nov 11, 2015 · 73781d2 · 73781d2
1 parent d192824
commit 73781d2
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/static/css/home.css b/static/css/home.css
@@ -40,15 +40,31 @@ p {
 #content {
   width: 75%;
   margin: 0 12.5%;
-  padding-top: 100px;
+  padding-top: 50px;
   color: #484848;
   font-weight: 300;
 }
+#content a {
+  color:#337ab7;
+}
 #content p {
   font-size: 24px;
   padding-left: 0;
   padding-right: 0;
 }
+#content p.intro {
+  font-size:16px;
+  max-width:600px;
+  margin:0 auto;
+}
+#content ol {
+  margin:10px auto;
+  padding-left:50px;
+  max-width:600px;
+}
+#content h2 {
+  margin-top:25px;
+}
 #header {
   width: 100%;
   margin-top: 100px;

diff --git a/static/css/home.less b/static/css/home.less
@@ -3,7 +3,7 @@
 body, select, input, textarea {	color: @text; }
 h1, h2, h3, h4, h5, h6 { font-weight: bold; }
 
-a, a:active, a:visited, { 
+a, a:active, a:visited, {
 	text-decoration: none;
 }
 
@@ -44,7 +44,13 @@ p {
 		font-size: 24px;
 		padding-left: 0;
 		padding-right: 0;
+
+		&.intro {
+		  font-size:16px;
+		}
 	}
+
+#content p
 }
 
 #header {

diff --git a/templates/reblock/recent.html b/templates/reblock/recent.html
@@ -7,10 +7,22 @@
 
 {% block content %}
     <div>
-    	<!--
-    	Remove this once upload is implemented,
-		in favor of <h2 class="with-dialog"> below.
-        -->
+    	<div class="">
+    		<p class="intro"><strong>OpenReblock Beta:</strong> Interested in running the OpenReblock algorithm on your own map? Great! Follow these steps to get going:</p>
+    		<ol>
+    			<li><a href="http://openreblock.org">View the examples</a> to see what your map will look like before and after.</li>
+    			<li>Create a shapefile where each parcel in a block is represented by a
+   polygon (try with a small section first).</li>
+    			<li>Upload the shapefile (you will need to create an account first).
+   Depending on the size of your block, the algorithm can take minutes to
+   hours.</li>
+    			<li>View the result in your profile. The tool will show where the
+   mathematically optimal paths are. These paths give access to each parcel
+   while minimizing the total length of new paths.</li>
+    		</ol>
+
+    		<p class="intro"><strong>Note:</strong> The OpenReblock user upload site is in beta. Please <a href="https://github.com/open-reblock/openreblock/issues/new">report an issue</a> on GitHub if you encounter an error. Thanks.</p>
+    	</div>
         <h2>Recent Uploads</h2>
 
         <!--
@@ -99,14 +111,14 @@ <h2>Upload Data Layers</h2>
 	}
 
 	function mapframe(index){
-		frame = '<a id="'+index+'" class="project-container">' +
+		frame = '<div id="'+index+'" class="project-container">' +
 					'<div id="map'+index+'" class="map"></div>' +
 					'<div id="prj'+index+'" class="project">' +
 						'<h2 class="project-title"></h2>' +
 						'<h3 class="project-location"></h3>' +
 						'<p class="project-description"></p>' +
 					'</div>' +
-				'</a>';
+				'</div>';
 		return frame;
 	}
 
@@ -122,8 +134,8 @@ <h2>Upload Data Layers</h2>
 			$("#update").append(mapframe(i));
 			addmap((i).toString(), testjson[i]);
 
-			a = document.getElementById(String(i));
-			a.setAttribute("href", test[i]);
+			//a = document.getElementById(String(i));
+			//a.setAttribute("href", test[i]);
 			var prjEl = document.getElementById("prj"+String(i));
 			prjEl.getElementsByTagName("h2")[0].innerHTML = testprj[i];
 			prjEl.getElementsByTagName("h3")[0].innerHTML = testloc[i];
@@ -138,8 +150,8 @@ <h2>Upload Data Layers</h2>
 			$("#update").append(mapframe(i));
 			addmap((i).toString(), testjson[i]);
 
-			a = document.getElementById(String(i));
-			a.setAttribute("href", test[i]);
+			//a = document.getElementById(String(i));
+			//a.setAttribute("href", test[i]);
 			var prjEl = document.getElementById("prj"+String(i));
 			prjEl.getElementsByTagName("h2")[0].innerHTML = testprj[i];
 			prjEl.getElementsByTagName("h3")[0].innerHTML = testloc[i];
@@ -172,8 +184,8 @@ <h2>Upload Data Layers</h2>
 					$("#update").append(mapframe(currentNum+i));
 					addmap((currentNum+i).toString(), jsondata[i]);
 
-					a = document.getElementById(String(currentNum+i));
-					a.setAttribute("href", links[i]);
+					//a = document.getElementById(String(currentNum+i));
+					//a.setAttribute("href", links[i]);
 					var prjEl = document.getElementById("prj"+String(currentNum+i));
 					prjEl.getElementsByTagName("h2")[0].innerHTML = prjnames[i];
 					prjEl.getElementsByTagName("h3")[0].innerHTML = locations[i];