Changeset 101 for openweather

Timestamp:

19/04/07 04:42:02 (5 years ago)

Author:

nigel

Message:

Partial upgrade to 5.x API. Graphs still don't work.

File:

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

openweather/openweather.module

@@ -84 +84 @@
       'type' => MENU_SUGGESTED_ITEM);
 
+    $items[] = array('path' => 'admin/settings/openweather',
+          'title' => t('openweather'),
+          'callback' => 'drupal_get_form',
+          'callback arguments' => 'openweather_admin_settings',
+          'access' => user_access('administer site configuration'),
+          'type' => MENU_CALLBACK);
+ 
   }
   else {
@@ -108 +115 @@
           'weight' => 3,
           'type' => MENU_CALLBACK);
+
       }
     }
@@ -119 +127 @@
  */
 function openweather_node_info() {
-  return array('openweather' => array('name' => t("openweather"), 'base' => 'openweather'));
+  return array(
+    'openweather' => array(
+      'name' => t("openweather"), 
+      'base' => 'openweather',
+      'module' => 'openweather',
+      ));
 }
 
@@ -135 +148 @@
   if ($radarURL != null) $output .= "<img src='$radarURL'/>";
 
-  if (module_exist("weather")){
+  if (module_exists("weather")){
     $b = weather_block('view');
     $output .= $b['content'];
@@ -153 +166 @@
 }
 
-function openweather_settings() {
+function openweather_admin_settings() {
   $form['openweather_radar'] = array(
     '#type'=>'textfield',
@@ -250 +263 @@
  *   rendering of the poll.
  */
-function openweather_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
+function openweather_view($node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
   global $user;
 
@@ -265 +278 @@
   $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;
-  // 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->content['graphs'] = array(
+    '#value' => theme('openweather_graphs', $output),
+    '#weight' => 1,
+  );
+  return $node;
 }
 
@@ -314 +333 @@
       'openweather.addEntry',
       'openweather_add_entry',
-      array('boolean','string','string', 'string', 'struct')
+      array('boolean','string','string', 'string', 'struct'),
+      t('Add data entry from remote device'),
     ),
   );