cosmetic ui changes, readme text, about text

stefanw · Jun 10, 2010 · e3eda2b · e3eda2b
1 parent b6440c6
commit e3eda2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 177 deletions.
diff --git a/README.mkd b/README.mkd
@@ -1,14 +1,14 @@
 Mapnificent
-========
+===========
 
 Mapnificent is a framework for overlaying geographical data on Google Maps using Canvas and JavaScript. No Flash or Tile-Servers. A live example with the really cool "Urban Distance" layer (inspired by [http://mapumental.channel4.com](Mapumental)) and other small layers can be found on [http://www.mapnificent.de](Mapnificent.de).
 
-The framework is only known to work for small layers, e.g. the size of a not-so-small city like Berlin. Bigger layers might not work, because Mapnificent has many code parts which think the earth is actually flat.
-
 The framework is currently released under [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0). The license might get more free in the future.
 
 A documentation on how to write layers for Mapnificent is available at docs/index.html
 
 [A blog article how mapnificent was created and how it compares to mapumental](http://blog.stefanwehrmeyer.com/post/449810520/mapnificent)
 
-Mapnificent currently uses [ELabel by Mike Williams](http://econym.org.uk/gmap/elabel.htm) and jQuery/jQuery UI. It only works with Google Maps.
+[Slides of a talk given at JS User Group Berlin](http://stefanwehrmeyer.com/talks/slides/mapnificent_jsugberlin.pdf)
+
+Mapnificent currently uses jQuery/jQuery UI and only works with Google Maps. Looking forward to an OSM fork.
diff --git a/index.html b/index.html
@@ -21,6 +21,7 @@
     <body>
         <header class="sidenav">
             <h1 id="about-header"><img style="vertical-align:middle;margin:10px 0 0;" src="media/img/mapnificent.png" alt="Mapnificent"/></h1>
+            <h2 style="position:relative;top:-25px;left:100px">Berlin</h2>
             <nav class="nav">
                 <ul>
                     <li><a class="toggle" href="#about">About / Impressum</a></li>
@@ -30,7 +31,7 @@ <h1 id="about-header"><img style="vertical-align:middle;margin:10px 0 0;" src="m
         <section id="about" class="vcard contentoverlay">
             <a class="close toggle" href="#about">close</a>
             <h2 class="center">It's <img style="vertical-align:middle;margin:10px 0 0;" src="media/img/mapnificent.png" alt="Mapnificent"/></h2>
-            <p>Mapnificent shows you the area you can reach with public transport in a given time.</p>
+            <p>Mapnificent shows you the area you can reach with public transport from any point in a given time.</p>
             <p>It was inspired by <a href="http://mapumental.channel4.com">mapumental</a> and you can read the <a href="http://blog.stefanwehrmeyer.com/post/449810520/mapnificent">full story of Mapnificent on my blog</a>.</p>
             <p>Mapnificent is licensed under <a href="http://creativecommons.org/licenses/by-nc-sa/3.0">cc-by-nc-sa</a> and <a href="http://github.com/stefanw/Mapnificent">the code is on GitHub</a>.</p>
             <h2>Impressum</h2>
@@ -54,10 +55,10 @@ <h2>Impressum</h2>
         <div id="message" class="shortoverlay" style="display:none"></div>
         <script src="media/js/mapnificent.js" type="text/javascript" charset="utf-8"></script>
         <script type="text/javascript" charset="utf-8">
-            if($.cookie("seenVideo") == null){
-                $("#video").show();
-                $.cookie("seenVideo", "yes", { path: '/', expires: 28 });
-            }
+            // if($.cookie("seenVideo") == null){
+            //     $("#video").show();
+            //     $.cookie("seenVideo", "yes", { path: '/', expires: 28 });
+            // }
             var MAPNIFICENT_LAYER = {};
             var MAPNIFICENT_LAYERDATA = {};
             var mapnificent = Mapnificent();
@@ -75,19 +76,8 @@ <h2>Impressum</h2>
                 });
             });
         </script>
-<!--        <script src="media/js/elabel.js" type="text/javascript" charset="utf-8"></script> -->
         <script src="media/layers/urbandistance.json" type="text/javascript" charset="utf-8"></script>
         <script src="media/layers/urbandistance.js" type="text/javascript" charset="utf-8"></script>
-<!--        <script src="media/layers/trafficForecast.js" type="text/javascript" charset="utf-8"></script> -->
-<!--        <script src="media/layers/konjunkturmap.json" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/konjunkturmap.js" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/apartmentprices.json" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/apartmentprices.js" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/residentialareas.js" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/crimezones.json" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/crimezones.js" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/webmapservice.json" type="text/javascript" charset="utf-8"></script>
-        <script src="media/layers/webmapservice.js" type="text/javascript" charset="utf-8"></script> -->
         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
         document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

diff --git a/media/js/elabel.js b/media/js/elabel.js
diff --git a/media/layers/urbandistance.js b/media/layers/urbandistance.js
@@ -153,29 +153,17 @@ MAPNIFICENT_LAYER.urbanDistance = (function (mapnificent){
                 '<div id="'+that.idname+'-positionContainer"></div>'+
             '');
         var inter = "";
-        if(mapnificent.hasCompositing){
-            inter = '<label for="'+that.idname+'-intersection">Intersect: </label><input type="checkbox" id="'+that.idname+'-intersection"/>';
+        if(!mapnificent.hasCompositing){
+            inter = ' disabled="disabled"';
         }
         container.after(''+
             '<div class="controlsoverlay" style="right:inherit;width:100px;left:0px !important;bottom:50px;border-left: 0px;border-bottom: 5px solid rgb(213,213,213);border-right: 5px solid rgb(213,213,213);">'+
             '<label for="'+that.idname+'-colored">Colored: </label><input type="checkbox" id="'+that.idname+'-colored"/>'+
-            inter+
+            '<label for="'+that.idname+'-intersection">Intersect: </label><input'+inter+' type="checkbox" id="'+that.idname+'-intersection"/>'+
             '</div>'+
         '');
-//            '<span>Area reachable in max. '+
-//            '<strong id="'+that.idname+'-timeSpan"></strong> minutes <small>(no guarantee)</small> </span><span id="'+that.idname+'-hint" style="color:#0b0;">Click in the grey area to set a new position.</span>'+
-//           '<div id="'+that.idname+'-slider" class="slider"></div>'+
 
-/*        jQuery("#"+that.idname+'-slider').slider({ min: 0, max: 180,
-               slide: updateSlider,
-               stop: updateSlider, 
-               value: minuteValue
-            });
-        jQuery("#"+that.idname+'-slider').slider("disable");
-        jQuery("#"+that.idname+'-timeSpan').text(minuteValue);
-        jQuery('.'+that.idname+'-goby').change(updateGoby);
-        jQuery('#'+that.idname+'-gotime').change(updateGoby);*/
-        jQuery('#'+that.idname+'-intersection').change(function(e){
+        jQuery('#'+that.idname+'-intersection').click(function(e){
             if(!mapnificent.hasCompositing){
                 mapnificent.showMessage("Your browser does not support intersections, try Firefox or Opera!");
                 $(this).attr("checked", null);