Changeset 102

Timestamp:

19/04/07 04:58:10 (5 years ago)

Author:

nigel

Message:

Fixed view and graph

File:

• openweather/openweather.module (modified) (3 diffs)

openweather/openweather.module

@@ -96 +96 @@
       $node = node_load(arg(1));
       if ($node->type == 'openweather'){
-      $items[] = array('path' => 'node/'. arg(1),
-          'title' => t('view openweather'),
-          'access' => user_access('access content'),
-          'weight' => 6,
-          'type' => MENU_LOCAL_TASK);
-
-      $items[] = array('path' => 'node/'. arg(1) .'/csv_readings',
+        $items[] = array('path' => 'node/'. arg(1) .'/csv_readings',
           'title' => t('readings'),
           'callback' => 'openweather_csv_readings',
@@ -109 +103 @@
           'type' => MENU_LOCAL_TASK);
 
-      $items[] = array('path' => 'node/'. arg(1) .'/graph',
+        $items[] = array('path' => 'node/'. arg(1) .'/graph',
           'title' => t('graph'),
           'callback' => 'openweather_graph',
@@ -260 +254 @@
  *
  * @param $block
- *   An extra paraopenweather that adapts the hook to display a block-ready
- *   rendering of the poll.
  */
 function openweather_view($node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
   global $user;
-
-  $output = '';
-
-  $links = array();
-  $links[] = l(t('export readings'), 'node/'.$node->nid.'/csv_readings',array('title'=>'Export the openweather readings as CSV'));
-
-  $output .= openweather_summary($node->nid);
-
-  $output .= "<img src='?q=node/".$node->nid."/graph/temp_out' />";
-  $output .= "<img src='?q=node/".$node->nid."/graph/rel_hum_out' />";
-  $output .= "<img src='?q=node/".$node->nid."/graph/rel_pressure' />";
-  $output .= "<img src='?q=node/".$node->nid."/graph/windspeed' />";
-
-  // Only show the add readings form when in full view
-//  $node->teaser = $output;
-//  $node->body = $output; //$output.drupal_get_form('openweather_add_reading', $form);
-  $node = node_prepare($node, $teaser);
-  $node->links = $links;
-  $node->content['graphs'] = array(
-    '#value' => theme('openweather_graphs', $output),
-    '#weight' => 1,
-  );
+  $node->content['summary'] = array('#weight'=>0,
+    '#value'=>openweather_summary($node->nid));
+
+  $node->content['graphs'] =  array('#weight'=>1,
+    '#value'=>"<img src='?q=node/".$node->nid."/graph/temp_out' />".
+        "<img src='?q=node/".$node->nid."/graph/rel_hum_out' />".
+        "<img src='?q=node/".$node->nid."/graph/rel_pressure' />".
+        "<img src='?q=node/".$node->nid."/graph/windspeed' />");
+
   return $node;
 }