Changeset 776

Timestamp:

04/20/06 17:06:21 (3 years ago)

Author:

dom

Message:

Add licence variables (closes #56)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• INSTALL (modified) (1 diff)
• lib/OpenGuides/Config.pm (modified) (4 diffs)
• lib/OpenGuides/Template.pm (modified) (2 diffs)
• templates/footer.tt (modified) (1 diff)

trunk/Changes

@@ -13 +13 @@
         #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

trunk/INSTALL

@@ -252 +252 @@
 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

trunk/lib/OpenGuides/Config.pm

@@ -13 +13 @@
    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;
@@ -83 +84 @@
                      default_gmaps_zoom => 5,
                      default_gmaps_search_zoom => 3,
-                     force_wgs84 => 0
+                     force_wgs84 => 0,
+                     licence_name => "",
+                     licence_url => "",
+                     licence_info_url => ""
                    );
 
@@ -146 +150 @@
         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?"
     );
 
@@ -247 +254 @@
 =item * force_wgs84
 
+=item * licence_name
+
+=item * licence_url
+
+=item * licence_info_url
+
 =back
 

trunk/lib/OpenGuides/Template.pm

@@ -88 +88 @@
 
 =item * C<gmaps_api_key>
+
+=item * C<licence_name>
+
+=item * C<licence_url>
+
+=item * C<licence_info_url>
 
 =back
@@ -156 +162 @@
         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
     };
 

trunk/templates/footer.tt

@@ -24 +24 @@
       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 %]