Changeset 937

Timestamp:

03/14/07 23:30:34 (21 months ago)

Author:

kake

Message:

Let people add name of copyright holder, licence URL, and info page URL for node images (ticket #179).

Location:

trunk

Files:

• Build.PL (modified) (1 diff)
• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• README.CSS (modified) (1 diff)
• lib/OpenGuides/Template.pm (modified) (1 diff)
• lib/OpenGuides/Test.pm (modified) (2 diffs)
• templates/display_metadata.tt (modified) (2 diffs)
• templates/edit_form.tt (modified) (1 diff)
• templates/node_image_fields.tt (added)

trunk/Build.PL

@@ -340 +340 @@
                       "node.tt",
                       "node_history.tt",
+                      "node_image_fields.tt",
                       "node_photo_notes.tt",
                       "openguides_information_boxes.tt",

trunk/Changes

@@ -11 +11 @@
         Add some extra test utilities to OpenGuides::Test
         Allow Guide admins to control the content of autocreated nodes (#47).
+        Let people add name of copyright holder, licence URL, and info page
+          URL for node images (#179).
         Write tests for and fix:
           #48 (Edit conflict page erroneously converts lat/lon to os_x, os_y).

trunk/MANIFEST

@@ -53 +53 @@
 templates/node.tt
 templates/node_history.tt
+templates/node_image_fields.tt
 templates/node_photo_notes.tt
 templates/openguides_information_boxes.tt

trunk/README.CSS

@@ -157 +157 @@
     Used in: display_metadata.tt
     Purpose: To display the image for a node
+div#node_image_copyright
+    Used in: display_metadata.tt
+    Purpose: To display the name of the copyright holder of a node image, and
+             optionally a link to the licence we're using it under.
 
 div#common_navigation

trunk/lib/OpenGuides/Template.pm

@@ -326 +326 @@
     );
 
-    my $node_image = $args{metadata} ? $metadata{node_image}[0]
-                                     : $q->param("node_image");
-    if ($config->enable_node_image && $node_image) {
-        $vars{node_image} = $node_image;
+    if ($config->enable_node_image ) {
+        foreach my $key ( qw( node_image node_image_licence node_image_url
+                              node_image_copyright ) ) {
+            my $value = $args{metadata} ? $metadata{$key}[0]
+                                        : $q->param( $key );
+            $vars{$key} = $value if $value;
+        }
     }
 

trunk/lib/OpenGuides/Test.pm

@@ -168 +168 @@
 You can supply values for the following keys: C<content>,
 C<categories>, C<locales>, C<os_x>, C<os_y>, C<osie_x>, C<osie_y>,
-C<latitude>, C<longitude>, C<summary>.  You should supply them exactly as they
-would come from a CGI form, eg lines in a textarea are separated by C<\r\n>.
+C<latitude>, C<longitude>, C<summary>, C<node_image>, C<node_image_licence>,
+C<node_image_copyright>, C<node_image_url>.  You should supply them exactly
+as they would come from a CGI form, eg lines in a textarea are separated
+by C<\r\n>.
 
 =cut
@@ -182 +184 @@
     $q->param( -name => "categories", -value => $args{categories} || "" );
     $q->param( -name => "locales", -value => $args{locales} || "" );
+    $q->param( -name => "node_image", -value => $args{node_image} || "" );
+    $q->param( -name => "node_image_licence",
+               -value => $args{node_image_licence} || "" );
+    $q->param( -name => "node_image_copyright",
+               -value => $args{node_image_copyright} || "" );
+    $q->param( -name => "node_image_url",
+               -value => $args{node_image_url} || "" );
     $q->param( -name => "phone", -value => "" );
     $q->param( -name => "fax", -value => "" );

trunk/templates/display_metadata.tt

@@ -7 +7 @@
 [% IF node_image %]
   <div id="node_image_box">
-    [% IF website %]<a href="[% website %]">[% END %]
-      <img id="node_image" src="[% node_image %]" alt="Picture of [% node_name %]" />
-    [% IF website %]</a>[% END %]
+    [% IF node_image_url %]<a href="[% node_image_url %]">[% END %]
+    <img id="node_image" src="[% node_image %]"
+         alt="Picture of [% node_name %]" />
+    [% IF node_image_url %]</a>[% END %]
+    [% IF node_image_copyright %]
+      <div id="node_image_copyright">
+        [% IF node_image_licence %]
+          <a href="[% node_image_licence %]">&copy;
+            [% node_image_copyright %]</a>
+        [% ELSE %]
+          &copy; [% node_image_copyright %]
+        [% END %]
+      </div>
+    [% END %]
   </div>
 [% ELSE %]
@@ -15 +26 @@
 [% END %]
 
-  <!--- For the vcard --->
+  <!-- For the vcard -->
   <span class="fn" style="display:none">[% node_name %]</span>
 [% IF phone OR fax OR address OR postcode OR formatted_website_text

trunk/templates/edit_form.tt

@@ -89 +89 @@
           <legend>Metadata (optional)</legend>
           <table summary="Form for entering metadata about the subject of this node">
-[% IF config.enable_node_image %]
-            <tr>
-              <td class="label"><label for="node_image">URL to node Image:</label></td>
-              <td>
-                <input type="text" size="50" id="node_image" name="node_image" value="[% node_image %]" />
-                [% INCLUDE node_photo_notes.tt %]
-              </td>
-              [% IF conflict %]
-                <td>[% CGI.escapeHTML(new_node_image) %]</td>
-              [% END %]
-            </tr>
-[% END %]
+            [% IF config.enable_node_image %]
+              [% INCLUDE node_image_fields.tt %]
+            [% END %]
+
             <tr>
               <td class="label"><label for="phone">Phone:</label></td>