Author: kake Date: 2012-04-17 00:56:31 +0100 (Tue, 17 Apr 2012) New Revision: 1346

Added: trunk/static/openguides-base.css Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/templates/map_index_leaflet.tt trunk/templates/node.tt Log: Moved some styling into basic stylesheet.

Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/Build.PL 2012-04-16 23:56:31 UTC (rev 1346) @@ -432,6 +432,7 @@

$build->config_data( __static_files => [ "map-leaflet.js", + "openguides-base.css", ] );

# Finally write the build script.

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/Changes 2012-04-16 23:56:31 UTC (rev 1346) @@ -5,9 +5,11 @@

0.67 ? Switched from the Google Maps API to the Leaflet mapping library. - To make this work, set use_leaflet = 1 in your wiki.conf. Google - Maps support is retained for those who fear change, but is no longer - actively maintained. + To make this work, set use_leaflet = 1 in your wiki.conf, and ensure + that div#map_index_canvas is given a non-zero height in your + stylesheet (you may also want to style div#map_index_node_list and + div#node_map_canvas). Google Maps support is retained for those + who fear change, but is no longer actively maintained. Added support for indexing on category and locale at the same time. As part of this, action=index now uses a new form of parameters, so instead of e.g. @@ -19,6 +21,7 @@ Format params such as format=map work as before. Old-style URLs will automatically redirect to new-style ones. Added project metadata to Build.PL (#285). + Added a basic stylesheet, installed into the static_path directory.

0.66 12 April 2012 All templates now have access to the "username" TT variable.

Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/MANIFEST 2012-04-16 23:56:31 UTC (rev 1346) @@ -28,6 +28,7 @@ preferences.cgi search.cgi static/map-leaflet.js +static/openguides-base.js templates/admin_home.tt templates/admin_revert_user.tt templates/autocreate_content.tt

Added: trunk/static/openguides-base.css =================================================================== --- trunk/static/openguides-base.css (rev 0) +++ trunk/static/openguides-base.css 2012-04-16 23:56:31 UTC (rev 1346) @@ -0,0 +1,17 @@ +div#map_index_node_list { + height: 400px; + overflow: auto; + float: right; + width: 30%; +} + +div#map_index_canvas { + width: 60%; + height: 450px; +} + +div#node_map_canvas { + float: right; + width: 300px; + height: 200px; +}

Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/templates/map_index_leaflet.tt 2012-04-16 23:56:31 UTC (rev 1346) @@ -17,7 +17,7 @@ [% END %] </h2>

- <div id="map_index_node_list" style="height:400px; overflow:auto;float:right; width:30%"> + <div id="map_index_node_list"> <ul> [% IF no_nodes_on_map %] [% FOREACH node = nodes %] @@ -40,7 +40,7 @@ </ul> </div>

- <div id="map_index_canvas" style="width:60%; height:450px"> + <div id="map_index_canvas"> [% IF no_nodes_on_map %] <p class="no_nodes_on_map">No pages with geodata - nothing to display on map!</p>

Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/templates/node.tt 2012-04-16 23:56:31 UTC (rev 1346) @@ -18,7 +18,7 @@

[% IF wgs84_lat AND wgs84_long AND display_google_maps %] [% IF config.use_leaflet %] - <div id="node_map_canvas" style="float:right; width: 300px; height: 200px"></div> + <div id="node_map_canvas"></div> <script type="text/javascript"> map_div_id = 'node_map_canvas'; centre_lat = [% wgs84_lat %];