summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Bergren2008-09-17 17:10:42 (GMT)
committer Brandon Bergren2008-09-17 17:10:42 (GMT)
commita80f1a10b582a0ae319424ed512b0a05c8a6f5bf (patch)
treeebafb4a5350ba19897e3e6418ede51a81db54386
parentd79aa53532e47586db59774a5c8b0518488c04d1 (diff)
Remove the rest of location.theme.
-rw-r--r--location.admin.inc49
-rw-r--r--location.module1
-rw-r--r--location.theme73
3 files changed, 49 insertions, 74 deletions
diff --git a/location.admin.inc b/location.admin.inc
index 691f347..ff8f7a0 100644
--- a/location.admin.inc
+++ b/location.admin.inc
@@ -256,3 +256,52 @@ function location_geocoding_options_form_submit($form_id, $form_values) {
variable_set('location_general_geocoders_in_use', $general_geocoders_in_use);
}
+
+function theme_location_map_link_options(&$form) {
+ $header = array(array('align' => 'center', 'data' => '<center>'. t('Country') .'</center>'), array('align' => 'center', 'data' => '<center>'. t('Options') .'</center>'));
+ $rows = array();
+ foreach (element_children($form['countries']) as $country_iso) {
+ $row = array();
+ $row[] = array(
+ 'data' => drupal_render($form['countries'][$country_iso]['label_'. $country_iso])
+ );
+ $row[] = array(
+ 'data' => drupal_render($form['countries'][$country_iso]['location_map_link_'. $country_iso])
+ );
+ $rows[] = $row;
+ }
+ $output = theme('table', $header, $rows);
+ foreach (element_children($form) as $key) {
+ $output .= drupal_render($form[$key]);
+ }
+ $output .= drupal_render($form);
+ return $output;
+}
+
+function theme_location_geocoding_options(&$form) {
+ $header = array(
+ array('align' => 'center', 'data' => '<center>'. t('Country') .'</center>'),
+ array('align' => 'center', 'data' => '<center>'. t('Options') .'</center>'),
+ array('align' => 'center', 'data' => '<center>'. t('Configure') .'</center>')
+ );
+ $rows = array();
+ foreach (element_children($form['countries']) as $country_iso) {
+ $row = array();
+ $row[] = array(
+ 'data' => drupal_render($form['countries'][$country_iso]['label_'. $country_iso])
+ );
+ $row[] = array(
+ 'data' => drupal_render($form['countries'][$country_iso]['location_geocode_'. $country_iso])
+ );
+ $row[] = array(
+ 'data' => drupal_render($form['countries'][$country_iso]['location_geocode_config_link_'. $country_iso])
+ );
+ $rows[] = $row;
+ }
+ $output = theme('table', $header, $rows);
+ foreach (element_children($form) as $key) {
+ $output .= drupal_render($form[$key]);
+ }
+ $output .= drupal_render($form);
+ return $output;
+}
diff --git a/location.module b/location.module
index 3e6a093..8fa8a5c 100644
--- a/location.module
+++ b/location.module
@@ -20,7 +20,6 @@ define('LOCATION_USER_DONT_COLLECT', 0);
define('LOCATION_USER_COLLECT', 1);
include_once LOCATION_PATH .'/location.inc';
-include_once LOCATION_PATH .'/location.theme';
/**
* Implementation of hook_menu().
diff --git a/location.theme b/location.theme
deleted file mode 100644
index c2ee347..0000000
--- a/location.theme
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-// $Id$
-
-/**
- * @file
- * Some theme functions.
- */
-
-function theme_location_map_link_options(&$form) {
- $header = array(array('align' => 'center', 'data' => '<center>'. t('Country') .'</center>'), array('align' => 'center', 'data' => '<center>'. t('Options') .'</center>'));
-
- $rows = array();
-
- foreach (element_children($form['countries']) as $country_iso) {
- $row = array();
-
- $row[] = array(
- 'data' => drupal_render($form['countries'][$country_iso]['label_'. $country_iso])
- );
-
- $row[] = array(
- 'data' => drupal_render($form['countries'][$country_iso]['location_map_link_'. $country_iso])
- );
-
- $rows[] = $row;
- }
-
- $output = theme('table', $header, $rows);
-
- foreach (element_children($form) as $key) {
- $output .= drupal_render($form[$key]);
- }
- $output .= drupal_render($form);
-
- return $output;
-}
-
-function theme_location_geocoding_options(&$form) {
- $header = array(
- array('align' => 'center', 'data' => '<center>'. t('Country') .'</center>'),
- array('align' => 'center', 'data' => '<center>'. t('Options') .'</center>'),
- array('align' => 'center', 'data' => '<center>'. t('Configure') .'</center>')
- );
-
- $rows = array();
-
- foreach (element_children($form['countries']) as $country_iso) {
- $row = array();
-
- $row[] = array(
- 'data' => drupal_render($form['countries'][$country_iso]['label_'. $country_iso])
- );
-
- $row[] = array(
- 'data' => drupal_render($form['countries'][$country_iso]['location_geocode_'. $country_iso])
- );
-
- $row[] = array(
- 'data' => drupal_render($form['countries'][$country_iso]['location_geocode_config_link_'. $country_iso])
- );
-
- $rows[] = $row;
- }
-
- $output = theme('table', $header, $rows);
-
- foreach (element_children($form) as $key) {
- $output .= drupal_render($form[$key]);
- }
- $output .= drupal_render($form);
-
- return $output;
-}