converted publishing system to have buttons int the admin and reworked the config system

3 files changed, 23 insertions, 119 deletions

diff --git a/design/templates/archives/homepage.html b/design/templates/archives/homepage.html
index 11cbf4b..56b7f57 100644
--- a/design/templates/archives/homepage.html
+++ b/design/templates/archives/homepage.html
@@ -24,7 +24,7 @@
        </section>{%endcomment%}
    <section class="home harchive">
         <h1 class="sh">From the Archive</h1>
-        {% include 'includes/recent_entries.html' %}
+        {%comment%}        {% include 'includes/recent_entries.html' %}{%endcomment%}
    </section>
 {% endblock %}
 
diff --git a/design/templates/archives/map.html b/design/templates/archives/map.html
index effe150..3c644eb 100644
--- a/design/templates/archives/map.html
+++ b/design/templates/archives/map.html
@@ -2,7 +2,6 @@
 {% load typogrify %}
 {% load truncateletters  %}
 {% load slugify_under  %}
-
 {% block pagetitle %}Luxagraf | Map and Trips{% endblock %}
 {% block metadescription %}Browse luxagraf by map, see trip routes and discover essays and dispatches from around the world{% endblock %}
 
@@ -12,17 +11,13 @@ Google Maps code
 {% block extrahead %}
 
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/mainmap.min.js"></script>
 
 
 {% endblock %}
 {%block bodyid%}id="map" {%endblock%}
 {% block bodyevents %}onload="initialize()"{% endblock %}
 
-
-
-
-
 {% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
         <li><a href="/" itemprop="url" title="luxagraf homepage"><span itemprop="title">Home</span></a> &rarr;</li>
         <li>Map</li>
@@ -30,6 +25,26 @@ Google Maps code
     <section>
         <h1 class="hide">Browse luxagraf by map</h1>
         <div id="map-canvas"></div>
-        {% include 'includes/map_sidebar.html' %}
+        <div class="map-legend">
+            <h4>Trips</h4>
+            <ul>
+            {% for route in route_list %}
+                <li><a onclick="showRoute('{{route.template_var_name}}', {{route.zoom}}, '{{route.geometry.centroid.y}}','{{route.geometry.centroid.x}}');" href="#" title="show {{route.name}} on map">{{route.name}}</a></li>
+                {% endfor %}
+            </ul>
+            <h4>Regions</h4>
+            <ul>
+            {%for region in region_list %}
+                <li><a href="#{{region.slug}}" onclick="focusCountry({{region.lat}}, {{region.lon}}, {{region.zoom_level}});" title="See all writing from {{region.name|title}}">{{region.name}}</a></li>
+            {% endfor %}
+            </ul>
+            <h4>Countries</h4>
+            <ul>
+                <li><a onclick="focusCountry(19.311143,2.460938,2);" href="#" title="view all countries">All</a></li>
+                {%for country in country_list %}
+                <li><a href="#{{country.slug}}" onclick="focusCountry({{country.lat}}, {{country.lon}}, {{country.zoom_level}});" title="See all writing from {{country.name|title}}">{{country.name}}</a></li>
+            {% endfor %}
+            </ul>
+        </div>    
     </section>
 {% endblock %}
diff --git a/design/templates/bin/map_entry_list.html b/design/templates/bin/map_entry_list.html
deleted file mode 100644
index a58de05..0000000
--- a/design/templates/bin/map_entry_list.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% load typogrify %}
-{% load truncateletters  %}
-{% load slugify_under  %}
-
-    // center on a country
-    function focusCountry(latitude, longitude, zoom) {
-      map.setZoom(zoom);
-      map.panTo(new google.maps.LatLng(latitude, longitude));
-    };
-  
-    {% for route in route_list %}
-    var {{route.template_var_name}} = [
-    {% for point in route.geometry.coords%}
-        new google.maps.LatLng({{point.1}}, {{point.0}}){% if forloop.last%}{%else%},{%endif%}
-    {% endfor %}
-      ];
-    {% endfor %}
-    function showRoute(route, zoom, latitude, longitude) {
-        var routePath = new google.maps.Polyline({
-            path: eval(route),
-            strokeColor: "#FF0000",
-            strokeOpacity: 1.0,
-            strokeWeight: 2
-        });
-      map.setZoom(zoom);
-      map.panTo(new google.maps.LatLng(latitude, longitude));
-      routePath.setMap(map);  
-      return false;
-    };
-var map;
-function initialize() {
-
-    //custom marker    
-    var image = new google.maps.MarkerImage('http://luxagraf.net/media/img/marker-entry.png',
-        new google.maps.Size(15, 26),
-        new google.maps.Point(0, 0),
-        new google.maps.Point(7, 26)
-    );
-    //custom marker shadow
-    var shadow = new google.maps.MarkerImage('http://luxagraf.net/media/img/shadow.png',
-        new google.maps.Size(37, 34),
-        new google.maps.Point(0,0),
-        new google.maps.Point(8, 34)
-    );
-    
-    
-    //check for a permalink
-    var location = window.location.hash;
-    //find a centerpoint
-    var pts = new Array();
-    {%for c in country_list%}pts[{{forloop.counter0}}] = ["#{{c.slug}}", {{c.lat}},{{c.lon}},{{c.zoom_level}}];{% endfor %}
-    {%for c in region_list%}pts[pts.length] = ["#{{c.slug}}", {{c.lat}},{{c.lon}},{{c.zoom_level}}];{% endfor %}
-    if (location.length>1) {
-        for (i=0;i<pts.length;i++) {
-            if (location == pts[i][0]) {
-                centerCoord = new google.maps.LatLng(pts[i][1],pts[i][2]);
-                zoom = pts[i][3];
-                break;
-            } else {
-                centerCoord = new google.maps.LatLng(19.311143,2.460938);
-                zoom = 2;
-            }
-        }
-    } else {
-        centerCoord = new google.maps.LatLng(19.311143,2.460938);
-        zoom = 2;
-    }
-    //set up map options
-    var mapOptions = {
-        zoom: zoom,
-        center: centerCoord,
-        mapTypeId: google.maps.MapTypeId.TERRAIN,
-        disableDefaultUI: true,
-        navigationControl: true,
-        navigationControlOptions: {style: google.maps.NavigationControlStyle.SMALL}
-    };
-    //create map
-    map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions);
-   
-    
-    //loop through and set up markers/info windows
-
-    {% for entry in object_list %}
-    var marker_{{entry.title|truncatewords:2|slugify_under}} = new google.maps.Marker({
-        position: new google.maps.LatLng({{entry.latitude}}, {{entry.longitude}}),
-        map: map,
-        shadow: shadow,
-        icon: image
-    });      
-          
-    var c_{{entry.title|truncatewords:2|slugify_under}} = '<div class="infowin"><h4>{{entry.title}}<\/h4><span class="date blok">{{entry.pub_date|date:"F j, Y"}} ({% if entry.location.state.country.name == "United States" %}{{entry.location.name|smartypants|safe}}, {{entry.location.state.name}}){%else%}{{entry.location.name|smartypants|safe}}, {{entry.location.state.country.name}}){%endif%}<\/span><p><img src="{{entry.get_thumbnail_url}}" height="100" alt="{{ entry.title }}"  style="float: left; border: #000 10px solid; margin-right: 8px; margin-bottom: 4px; height: 100px;" \/>{{entry.dek|escapejs}} <a href="{{entry.get_absolute_url}}">Read it &raquo;<\/a><\/p><\/div>';
-    
-    google.maps.event.addListener(marker_{{entry.title|truncatewords:2|slugify_under}}, 'click', function() {
-    openWin(c_{{entry.title|truncatewords:2|slugify_under}},marker_{{entry.title|truncatewords:2|slugify_under}});
-    });
-
-    {% endfor %}
-    // create an empty info window instance, set max width
-    var infowindow = new google.maps.InfoWindow({
-        content: ' ',
-        maxWidth: 400
-    }); 
-    //function to handle click event and display single info window
-    function openWin(content, marker) {
-        infowindow.close();
-        infowindow.setContent(content);
-        infowindow.open(map,marker);
-    };
-    
-    
-}