Index: monument.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/monument/monument.module,v
retrieving revision 1.2
diff -u -p -r1.2 monument.module
--- monument.module 20 Oct 2006 22:45:20 -0000 1.2
+++ monument.module 21 Oct 2006 22:36:01 -0000
@@ -200,6 +200,9 @@ function monument_get_latest($count = 1,
*/
function monument_delete(&$node) {
db_query('DELETE FROM {monument} WHERE nid = %d', $node->nid);
+ //Suspect the following is wrong and that we should be getting
+ //the relevant modules to do the work via various hook_delete() functions.
+ //see comment_delete() for example
db_query('DELETE FROM {file_revisions} WHERE nid = %d', $node->nid);
db_query('DELETE FROM {node_comment_statistics} WHERE nid = %d', $node->nid);
db_query('DELETE FROM {node_revisions_table} WHERE nid = %d', $node->nid);
@@ -703,15 +706,19 @@ function theme_monument_advanced_view($n
$output .= "
$node->title
";
//now start outputting the ring-arrangements ONLY (no key_image or ad_hoc etc)
- //the magic numbers are the ring radii in order of inner,
+ //the magic numbers in the image src are the ring radii in order of inner,
//medium and outer resp. (pixels)
- $output .= "
";
+ $radii = array (1=> 133, 266, 399);
+ $imlink = "
";
+ $output .= t($imlink, array ( '%r1' => $radii[1],
+ '%r2' => $radii[2],
+ '%r3' => $radii[3]));
$imglocs = _monument_image_img_locations();
for ($iloc=1;$iloc<=3;$iloc++) { //we only want ring1, ring2 and ring3
$imgloc = $imglocs[$iloc];
- $output .= t( "From %imgloc location
",
+ $output .= t( "From %imgloc location
",
array ('%imgloc' => $imgloc));
// enter a loop through each image found in current location
if (_ASCENT_SOFTWARE_LIMITED_DEBUG_BROCH_MODULE) {print_r($images[$iloc]);echo"end images $iloc
";}
@@ -727,8 +734,13 @@ function theme_monument_advanced_view($n
//are ring co-ordinate centres, 5th and 6th
//args are the maximum image width and height
$style = _yield_image_position_style( 'future_imp', $bearing,
- 400, 400, 350, 100,100);
- $output .= "
";
+ 400, 400, $radii[$iloc], 100,100);
+ $imlink = "
";
+ $output .= t($imlink, array ( '%fn' => $fn,
+ '%style' => $style,
+ '%bearing' => $bearing));
}
}
}