Author: dom Date: 2006-04-20 17:06:21 +0100 (Thu, 20 Apr 2006) New Revision: 776

Modified: trunk/Changes trunk/INSTALL trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm trunk/templates/footer.tt Log: Add licence variables (closes #56)

Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/Changes 2006-04-20 16:06:21 UTC (rev 776) @@ -12,6 +12,7 @@ #103 Fix empty Category/Locale list bug. #54 Fix RSS redirection for backwards compatibility. #79 Partial fix to help combat HTML spam + #56 Add licence config variables

0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you

Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/INSTALL 2006-04-20 16:06:21 UTC (rev 776) @@ -252,6 +252,23 @@ If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it will allow you to use the Google Maps support with the minimum of fuss.

+ "What licence will you use for the guide?" + +We strongly recommend that you think at the outset about the licence your +guide will use, for maximum usefulness. In particular for a guide that will +be on the OpenGuides network, we recommend the +"Creative Commons Attribution-ShareAlike 2.5" licence. + + "What is the URL to your licence?" + +If you used our recommendation above the URL you will want here is: +http://creativecommons.org/licenses/by-sa/2.5/ + + "What is the URL to your local page about your licensing policy?" + +You should probably include a page on your wiki about your local licensing +policy, but you can leave this blank for now if you don't have one yet. + * Dependency errors

If, after you have answered these questions, the build script complains

Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/lib/OpenGuides/Config.pm 2006-04-20 16:06:21 UTC (rev 776) @@ -12,6 +12,7 @@ formatting_rules_node formatting_rules_link backlinks_in_title template_path custom_template_path geo_handler ellipsoid gmaps_api_key centre_long centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 + licence_name licence_url licence_info_url ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); @@ -82,7 +83,10 @@ centre_lat => 0, default_gmaps_zoom => 5, default_gmaps_search_zoom => 3, - force_wgs84 => 0 + force_wgs84 => 0, + licence_name => "", + licence_url => "", + licence_info_url => "" );

# See if we already have some config variables set. @@ -145,7 +149,10 @@ centre_lat => "What is the latitude of the centre point of a map to draw for your guide? (This question can be ignored if you aren't using Google Maps)", default_gmaps_zoom => "What default zoom level shall we use for Google Maps? (This question can be ignored if you aren't using Google Maps)", default_gmaps_search_zoom => "What default zoom level shall we use for Google Maps in the search results? (This question can be ignored if you aren't using Google Maps)", - force_wgs84 => "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?" + force_wgs84 => "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?", + licence_name => "What licence will you use for the guide?", + licence_url => "What is the URL to your licence?", + licence_info_url => "What is the URL to your local page about your licensing policy?" );

foreach my $var ( keys %questions ) { @@ -246,6 +253,12 @@

=item * force_wgs84

+=item * licence_name + +=item * licence_url + +=item * licence_info_url + =back

=head1 AUTHOR

Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/lib/OpenGuides/Template.pm 2006-04-20 16:06:21 UTC (rev 776) @@ -88,6 +88,12 @@

=item * C<gmaps_api_key>

+=item * C<licence_name> + +=item * C<licence_url> + +=item * C<licence_info_url> + =back

=over @@ -155,7 +161,10 @@ enable_page_deletion => $enable_page_deletion, language => $config->default_language, default_city => $default_city, - gmaps_api_key => $config->gmaps_api_key + gmaps_api_key => $config->gmaps_api_key, + licence_name => $config->licence_name, + licence_url => $config->licence_url, + licence_info_url => $config->licence_info_url };

if ($args{node}) {

Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/templates/footer.tt 2006-04-20 16:06:21 UTC (rev 776) @@ -23,6 +23,21 @@ <p> Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. </p> + <p> + [% IF licence_name %] + This work is licensed under the + [% IF licence_url %] + <a href="[% licence_url %]"> + [% END %] + [% licence_name %] + [% IF licence_url %] + </a> + [% END %] + licence + [% IF licence_info_url %] + (<a href="[% licence_info_url %]">more info</a>) + [% END %] + [% END %] [% END %]

</div>