Author: kake Date: 2012-04-17 13:30:02 +0100 (Tue, 17 Apr 2012) New Revision: 1347

Modified: trunk/static/openguides-base.css trunk/templates/map_index_leaflet.tt trunk/templates/site_index.tt Log: Style/design tweaks.

Modified: trunk/static/openguides-base.css =================================================================== --- trunk/static/openguides-base.css 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/static/openguides-base.css 2012-04-17 12:30:02 UTC (rev 1347) @@ -1,12 +1,51 @@ +body { + background-color: #bfabd3; +} + +div#body_wrapper { + background: #ebc0fb; + margin-left: 5%; + margin-right: 5%; + margin-top: 1.5em; + border: thin solid black; +} + +div#banner { + padding: 0.1em 1em 0.1em 1em; + border-bottom: thin solid black; +} + +div#banner a { + text-decoration: none; + color: #000000; +} + +div#summary { + display: none; +} + +div#maincontent { + float: left; + width: 77%; +} + +div#content { + padding-left: 1em; +} + +div#recent_changes_feeds, div#site_index_feeds { + clear: both; +} + div#map_index_node_list { - height: 400px; + height: 450px; overflow: auto; float: right; - width: 30%; + width: 20%; }

div#map_index_canvas { - width: 60%; + width: 75%; height: 450px; }

@@ -14,4 +53,22 @@ float: right; width: 300px; height: 200px; + border: thin solid black; + margin-top: 1em; } + +div#navbar { + border-left: thin solid black; + border-bottom: thin solid black; + padding: 1em; + float: right; + width: 18%; +} + +div.navbar_site_name { + display: none; +} + +.hidden { + display: none; +}

Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/templates/map_index_leaflet.tt 2012-04-17 12:30:02 UTC (rev 1347) @@ -1,11 +1,13 @@ [% page_title = "Map of $criteria_title - $site_name" %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] + +[%# NOTE: the "content" div is closed off in footer.tt %] <div id="content">

- <div id="maincontent"> + <div id="maincontent_no_navbar">

- <h2>Map of + <h2>Map of [% IF criteria %] [% links = [] %] [% FOREACH criterion = criteria %] @@ -15,7 +17,7 @@ [% ELSE %] all nodes [% END %] - </h2> + </h2>

<div id="map_index_node_list"> <ul> @@ -76,6 +78,5 @@ </div>

</div> -</div>

[% INCLUDE footer.tt %]

Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/templates/site_index.tt 2012-04-17 12:30:02 UTC (rev 1347) @@ -20,16 +20,17 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h2>Node List +<h2>Index of [% IF criteria %] [% links = [] %] [% FOREACH criterion = criteria %] [% links.push( '<a href="' _ cgi_url _ '?' _ criterion.param _ '">' _ criterion.name _ '</a>' ) %] [% END %] - - [% links.join( ' and ' ) %] - [% END %] - [%- IF origin -%] - - Things within [%- limit -%] of <a href="[% cgi_url %]?[%- origin_param -%]">[%- origin -%]</a> + [% links.join( ' and ' ) %] + [% ELSIF origin -%] + things within [%- limit -%] of <a href="[% cgi_url %]?[%- origin_param -%]">[%- origin -%]</a> + [% ELSE %] + everything on this guide [%- END -%] </h2> <ol> @@ -41,14 +42,16 @@ </ol> </div>

-[%# my_feed_base is set at the top of this file %] -<p> - This list is available as - <a href="[% my_feed_base %];format=rdf">rdf</a>, - or as a - <a href="[% my_feed_base %];format=rss">rss feed</a>, - or as an - <a href="[% my_feed_base %];format=atom">atom feed</a>. -</p> +<div id="site_index_feeds"> + [%# my_feed_base is set at the top of this file %] + <p> + This list is available as + <a href="[% my_feed_base %];format=rdf">rdf</a>, + or as a + <a href="[% my_feed_base %];format=rss">rss feed</a>, + or as an + <a href="[% my_feed_base %];format=atom">atom feed</a>. + </p> +</div>

[% INCLUDE footer.tt %]