website update

_layouts/core.html

@@ -20,7 +20,9 @@
    {% for scripts in page.scripts %}
       $script(['{{ scripts[1] }}'{% for s in scripts offset:2 %}, '{{ s }}'{% endfor %}], '{{ scripts[0] }}');
    {% endfor %}{% if page.jsplugins %}
-      $script(['{{ page.jsplugins[0] }}'{% for item in page.jsplugins offset:1 %}, '{{ item }}'{% endfor %}]);
+      {% for k in page.jsplugins %}
+      $script(['{{ k[1] }}'], '{{ k[0] }}');
+      {% endfor %}
    {% endif %}
    </script>
 {% endif %}

_layouts/default.html

@@ -28,27 +28,36 @@
 				</div>
 
 				{% if page.toc %}
-				<div class="toc">
-					<h3>{% if page.toctitle %}{{ page.toctitle }}{% else %}Table of Contents{% endif %}</h3>
+					{% if page.toc == true %}
+						<div class="toc">
+							<h3>Table of Contents</h3>
+						</div>
+					{% else %}
+						{% for tocinfo in page.toc %}
+						<div class="toc">
+							<h3>{{ tocinfo[0] }}</h3>
 
-					<ul>
-						{% for l in page.toc %}
-							{% if l[1]['_'] %}
-							<li><a href="{{ l[0] }}">{{ l[1]['_'] }}</a>
-								<ul>
-								{% for s in l[1] %}
-								{% if s[0] != '_' %}
-								<li><a href="{{ s[0] }}">{{ s[1] }}</a></li>
-								{% endif %}
+							<ul>
+								{% for l in tocinfo[1] %}
+									{% if l[1]['_'] %}
+									<li><a href="{{ l[0] }}">{{ l[1]['_'] }}</a>
+										<ul>
+										{% for s in l[1] %}
+										{% if s[0] != '_' %}
+										<li><a href="{{ s[0] }}">{{ s[1] }}</a></li>
+										{% endif %}
+										{% endfor %}
+										</ul>
+									</li>
+									{% else %}
+									{% capture longurl %}{{ l[0] | append:'/index.html' }}{% endcapture %}
+									<li{% if longurl == page.url %} class="active"{% endif %}><a href="{{ l[0] }}">{{ l[1] }}</a></li>
+									{% endif %}
 								{% endfor %}
-								</ul>
-							</li>
-							{% else %}
-							<li><a href="{{ l[0] }}">{{ l[1] }}</a></li>
-							{% endif %}
+							</ul>
+						</div>
 						{% endfor %}
-					</ul>
-				</div>
+					{% endif %}
 				{% endif %}
 
 

_layouts/showcase.html

@@ -1,56 +1,20 @@
 ---
-layout: core
-scripts: [[jquery, '/js/jquery.min.js'], [kartograph, '/js/raphael.min.js', '/js/kartograph.js', '/js/chroma.min.js']]
-showcases:
-- id: eastcoast
-  title: High-res vector mapping
-- id: italia
-  title: La Bella Italia
-- id: choropleth
-  title: Choropleth Maps
-- id: charts
-  title: Chart Maps
-- id: dotgrid
-  title: Dot-grid Maps
-- id: 3d
-  title: 3D-Projections
-- id: projections
-  title: Map Projections
+layout: default
+scripts: [[kartograph, '/js/jquery.min.js', '/js/raphael.min.js', '/js/kartograph.js', '/js/chroma.min.js']]
+toctitle: Showcases
+toc:
+    Showcases:
+        - ['/showcase/eastcoast', 'High-res vector mapping']
+        - ['/showcase/italia', 'La Bella Italia']
+        - ['/showcase/choropleth', 'Choropleth Maps']
+        - ['/showcase/charts', 'Chart Maps']
+        - ['/showcase/dotgrid', 'Dot-grid Maps']
+        - ['/showcase/3d', '3D-Projections']
+        - ['/showcase/projections', 'Map Projections']
 ---
 
-<div class="container">
-	<div class="row" style="margin-top:20px">
-		<div class="span3">
-			<a href="/#showcase"><img src="/img/logotype.png" style="position:relative;top:-10px;" alt="Kartograph" /></a>
-		</div>
-		<div class="span7 content">
+	<h1>{{ page.title }}</h1>
 
-			<h1>{{ page.title }}</h1>
-			<p>{{ page.about }}</p>
-		</div>
-		<div class="span2">
-			<label>Jump to another showcase:</label>
-			<select id="jump-nav" class="span2">
-				<option></option>
-				{% for s in page.showcases %}
-				<option value="{{ s.id }}">{{ s.title }}</option>
-				{% endfor %}
-			</select>
-			<script type="text/javascript">
-			$script.ready('jquery', function() {
-				$(function() {
-					$('#jump-nav').change(function() {
-						location.href = '/showcase/' + $('#jump-nav').get(0).value;
-					});
-				});
-			});
-			</script>
-		</div>
-	</div>
 	{{ content }}
-	<div class="row k-footer">
-		<div class="span12">
-
-		</div>
-	</div>
+
 </div>