Ticket #18: rt15051.patch

Build.PL

@@ -75 +75 @@
    install_directory template_path custom_template_path script_url
    custom_lib_path use_plucene indexing_directory enable_page_deletion
    admin_pass stylesheet_url site_name navbar_on_home_page home_name
-   site_desc default_city default_country contact_email default_language
+   site_desc default_town default_city default_county default_state 
+   default_country contact_email default_language
    formatting_rules_node backlinks_in_title
   ) ) {
     my $q_method = $var . "__qu";

lib/OpenGuides/Config.pm

@@ -8 +8 @@
    dbtype dbname dbuser dbpass dbhost script_name install_directory script_url
    custom_lib_path use_plucene indexing_directory enable_page_deletion
    admin_pass stylesheet_url site_name navbar_on_home_page home_name
-   site_desc default_city default_country contact_email default_language
-   formatting_rules_node formatting_rules_link backlinks_in_title template_path custom_template_path
-   geo_handler ellipsoid
+   site_desc default_town default_city default_county default_state default_country 
+   contact_email default_language formatting_rules_node formatting_rules_link 
+   backlinks_in_title template_path custom_template_path geo_handler ellipsoid
 );
 my @questions = map { $_ . "__qu" } @variables;
 OpenGuides::Config->mk_accessors( @variables );
@@ -69 +69 @@
                      navbar_on_home_page => 1,
                      home_name => "Home",
                      site_desc => "A default configuration of OpenGuides",
+                     default_town => "",
                      default_city => "",
+                     default_county => "",
+                     default_state => "",
                      default_country => "",
                      default_language => "en",
                      formatting_rules_node => "Text Formatting Examples",
@@ -126 +129 @@
         navbar_on_home_page => "Do you want the navigation bar included on the home page?",
         home_name => "What should the home page of the wiki be called?",
         site_desc => "How would you describe the site?",
-        default_city => "What city is the site based in?",
-        default_country => "What country is the site based in?",
+        default_town => "The following 5 questions about the location of your guide will take the responses: NONE - not applicable for this guide, blank - users can enter metadata for individual pages, A value e.g. London to force the same value for the whole guide. Town: ",
+        default_city => "City: ",
+        default_county => "County: ",
+        default_state => "State: ",
+        default_country => "Country: ",
         contact_email => "Contact email address for the site administrator?",
         default_language => "What language will the site be in? (Please give an ISO language code.)",
         formatting_rules_node => "What's the name of the node or page to use for the text formatting rules link (this is by default an external document, but if you make formatting_rules_link empty, it will be a wiki node instead",

lib/OpenGuides/RDF.pm

@@ -47 +47 @@
         $node_url;
       };  
     $self->{site_name}        = $config->site_name;
+    $self->{default_town}     = $config->default_town     || "";
     $self->{default_city}     = $config->default_city     || "";
+    $self->{default_county}   = $config->default_county   || "";
+    $self->{default_state}    = $config->default_state    || "";
     $self->{default_country}  = $config->default_country  || "";
     $self->{site_description} = $config->site_desc        || "";
-
+    $self->{site_version}     = OpenGuides->VERSION;
     $self;
 }
 
@@ -67 +70 @@
     my $opening_hours_text = $node_data{metadata}{opening_hours_text}[0] || '';
     my $address            = $node_data{metadata}{address}[0]            || '';
     my $postcode           = $node_data{metadata}{postcode}[0]           || '';
+    my $town               = $node_data{metadata}{town}[0]               || $self->{default_town};
     my $city               = $node_data{metadata}{city}[0]               || $self->{default_city};
+    my $county             = $node_data{metadata}{county}[0]             || $self->{default_county};
+    my $state              = $node_data{metadata}{state}[0]              || $self->{default_state};
     my $country            = $node_data{metadata}{country}[0]            || $self->{default_country};
     my $latitude           = $node_data{metadata}{latitude}[0]           || '';
     my $longitude          = $node_data{metadata}{longitude}[0]          || '';
     my $version            = $node_data{version};
+    my $site_version       = $self->{site_version};
     my $username           = $node_data{metadata}{username}[0]           || '';
     my $os_x               = $node_data{metadata}{os_x}[0]               || '';
     my $os_y               = $node_data{metadata}{os_y}[0]               || '';
@@ -81 +88 @@
 
     # replace any errant characters in data to prevent illegal XML
     foreach ($phone, $fax, $website, $opening_hours_text, $address, $postcode, 
-             $city, $country, $latitude, $longitude, $version, $os_x, $os_y, 
-             @categories, @locales, $summary)
+             $town, $city, $county, $state, $country, $latitude, $longitude, 
+             $version, $os_x, $os_y, @categories, @locales, $summary)
     {
       if ($_)
       {
@@ -150 +157 @@
     {
       $rdf .= "\n    <!-- address and geospatial data -->\n\n";
       $rdf .= "    <address>$address</address>\n"        if $address;
+      $rdf .= "    <town>$town</town>\n"                 if $town;
       $rdf .= "    <city>$city</city>\n"                 if $city;
+      $rdf .= "    <county>$county</county>\n"           if $county;
+      $rdf .= "    <state>$state</state>\n"              if $state;
       $rdf .= "    <postalCode>$postcode</postalCode>\n" if $postcode;
       $rdf .= "    <country>$country</country>\n"        if $country;
 

lib/OpenGuides/Template.pm

@@ -113 +113 @@
 
     my $script_name  = $config->script_name;
     my $script_url   = $config->script_url;
+    my $default_town = $config->default_town;
     my $default_city = $config->default_city;
+    my $default_county = $config->default_county;
+    my $default_state = $config->default_state;
+    my $default_country = $config->default_country;
     
     # Check cookie to see if we need to set the formatting_rules_link.
     my ($formatting_rules_link, $omit_help_links);
@@ -152 +156 @@
         openguides_version    => $OpenGuides::VERSION,
         enable_page_deletion  => $enable_page_deletion,
         language              => $config->default_language,
+        default_town          => $default_town,
         default_city          => $default_city,
+        default_county        => $default_county,
+        default_state         => $default_state,
+        default_country       => $default_country,
     };
 
     if ($args{node}) {

templates/display_metadata.tt

@@ -19 +19 @@
     [% IF address %]
       <li class="address">
         <span class="metadata_label">Address:</span>
-        [% CGI.escapeHTML(address) %]<!--, [% default_city %] --> [%# uncomment at left to show city %]
+        [% CGI.escapeHTML(address) %],
+        [% IF town %]
+          [% CGI.escapeHTML(town) %],
+        [% END %]
+        [% IF city %]
+          [% CGI.escapeHTML(city) %],
+        [% END %]
+        [% IF county %]
+          [% CGI.escapeHTML(county) %],
+        [% END %]
+        [% IF state %]
+          [% CGI.escapeHTML(state) %],
+        [% END %]
+        [% IF country %]
+          [% CGI.escapeHTML(country) %],
+        [% END %]
         [% IF map_link %]
           <a href="[% map_link %]">(map of this place)</a>
         [% END %]

templates/edit_conflict.tt

@@ -67 +67 @@
         <td>[% CGI.escapeHTML(new_hours_text) %]</td>
       </tr>
             <tr>
-        <td class="label"><label for="address">Address:</label></td>
+        <td class="label"><label for="address">Street:</label></td>
         <td><input type="text" size="50" id="address" name="address" value="[% stored_address %]"></td>
         <td>[% CGI.escapeHTML(new_address) %]</td>
       </tr>
             <tr>
+        <td class="label"><label for="town">Town:</label></td>
+        <td><input type="text" size="50" name="town" value="[% stored_town %]"></td>
+        <td>[% CGI.escapeHTML(new_town) %]</td>
+      </tr>
+            <tr>
+        <td class="label"><label for="city">City:</label></td>
+        <td><input type="text" size="50" name="city" value="[% stored_city %]"></td>
+        <td>[% CGI.escapeHTML(new_city) %]</td>
+      </tr>
+            <tr>
+        <td class="label"><label for="county">County:</label></td>
+        <td><input type="text" size="50" name="county" value="[% stored_county %]"></td>
+        <td>[% CGI.escapeHTML(new_county) %]</td>
+      </tr>
+            <tr>
+        <td class="label"><label for="state">State:</label></td>
+        <td><input type="text" size="50" name="state" value="[% stored_state %]"></td>
+        <td>[% CGI.escapeHTML(new_state) %]</td>
+      </tr>
+            <tr>
+        <td class="label"><label for="country">Country:</label></td>
+        <td><input type="text" size="50" name="country" value="[% stored_country %]"></td>
+        <td>[% CGI.escapeHTML(new_country) %]</td>
+      </tr>
+            <tr>
         <td class="label"><label for="postcode">Postcode:</label></td>
         <td><input type="text" size="50" id="postcode" name="postcode" value="[% stored_postcode %]"></td>
         <td>[% CGI.escapeHTML(new_postcode) %]</td>

templates/edit_form.tt

@@ +1 @@
+[% USE CGI %]
 [% INCLUDE header.tt page_title = "Edit $node_name - $site_name" %]
 <div id="content">
 
@@ -81 +82 @@
               <td><input type="text" size="50" id="hours" name="hours_text" value="[% hours_text %]" /></td>
             </tr>
             <tr>
-              <td class="label"><label for="address">Address:</label></td>
+              <td class="label"><label for="address">Street:</label></td>
               <td><input type="text" size="50" id="address" name="address" value="[% address %]" /></td>
             </tr>
+            [% IF default_town != "NONE" %]
+              <tr>
+                <td class="label"><label for="town">Town:</label></td>
+                [% IF default_town %]
+                  <td><input type="checkbox" name="town" value="[% default_town %]" checked />
+                  [% CGI.escapeHTML(default_town) %]</td>
+                [% ELSE %]
+                  <td><input type="text" size="50" name="town" value="[% town %]" /></td>
+                [% END %]
+              </tr>
+            [% END %]
+            [% IF default_city != "NONE" %]
+              <tr>
+                <td class="label"><label for="city">City:</label></td>
+                [% IF default_city %]
+                  <td><input type="checkbox" name="city" value="[% default_city %]" checked />
+                  [% CGI.escapeHTML(default_city) %]</td>
+                [% ELSE %]
+                  <td><input type="text" size="50" name="city" value="[% city %]" /></td>
+                [% END %]
+              </tr>
+            [% END %]
+            [% IF default_county != "NONE" %]
+              <tr>
+                <td class="label"><label for="county">County:</label></td>
+                [% IF default_county %]
+                  <td><input type="checkbox" name="county" value="[% default_county %]" checked />
+                  [% CGI.escapeHTML(default_county) %]</td>
+                [% ELSE %]
+                  <td><input type="text" size="50" name="county" value="[% county %]" /></td>
+                [% END %]
+              </tr>
+            [% END %]
+            [% IF default_state != "NONE" %]
+              <tr>
+                <td class="label"><label for="state">State:</label></td>
+                [% IF default_state %]
+                  <td><input type="checkbox" name="state" value="[% default_state %]" checked />
+                  [% CGI.escapeHTML(default_state) %]</td>
+                [% ELSE %]
+                  <td><input type="text" size="50" name="state" value="[% state %]" /></td>
+                [% END %]
+              </tr>
+            [% END %]
+            [% IF default_country != "NONE" %]
+              <tr>
+                <td class="label"><label for="country">Country:</label></td>
+                [% IF default_country %]
+                  <td><input type="checkbox" name="country" value="[% default_country %]" checked />
+                  [% CGI.escapeHTML(default_country) %]</td>
+                [% ELSE %]
+                  <td><input type="text" size="50" name="country" value="[% country %]" /></td>
+                [% END %]
+              </tr>
+            [% END %]
             <tr>
               <td class="label"><label for="postcode">Postcode:</label></td>
               <td><input type="text" size="50" id="postcode" name="postcode" value="[% postcode %]" /></td>