diff --git a/payment/uc_google_checkout/uc_google_checkout.admin.inc b/payment/uc_google_checkout/uc_google_checkout.admin.inc index 50574a1..2302742 100644 --- a/payment/uc_google_checkout/uc_google_checkout.admin.inc +++ b/payment/uc_google_checkout/uc_google_checkout.admin.inc @@ -64,10 +64,16 @@ function uc_google_checkout_settings($form, &$form_state) { $form['messages']['uc_google_checkout_order_cancel_reason'] = array( '#type' => 'textarea', '#title' => t('Reason for canceling order'), - '#description' => t('This message will be sent with the cancelation notice through Google Checkout. Any comment given when the order is canceled will be sent as a separate message. This message uses site, store, and order tokens.', array('!url' => 'admin/store/help/tokens')), + '#description' => t('This message will be sent with the cancelation notice through Google Checkout. Any comment given when the order is canceled will be sent as a separate message.'), '#default_value' => variable_get('uc_google_checkout_order_cancel_reason', t('Order canceled. See order comments at [uc_order:url] for more information.')), ); + if (module_exists('token')) { + $form['messages']['token_tree'] = array( + '#markup' => theme('token_tree', array('token_types' => array('uc_order', 'site', 'store'))), + ); + } + $form['button'] = array( '#type' => 'fieldset', '#title' => t('Button settings'), diff --git a/uc_cart/uc_cart.admin.inc b/uc_cart/uc_cart.admin.inc index c361f70..c312750 100644 --- a/uc_cart/uc_cart.admin.inc +++ b/uc_cart/uc_cart.admin.inc @@ -371,7 +371,6 @@ function uc_cart_checkout_settings_form($form, &$form_state) { $form['completion_messages'] = array( '#type' => 'fieldset', '#title' => t('Completion messages'), - '#description' => t('You may use order, store, and site tokens in these messages.', array('!url' => url('admin/store/help/tokens'))), '#group' => 'checkout-settings', ); $form['completion_messages']['uc_msg_order_submit'] = array( @@ -410,6 +409,12 @@ function uc_cart_checkout_settings_form($form, &$form_state) { '#rows' => 3, ); + if (module_exists('token')) { + $form['completion_messages']['token_tree'] = array( + '#markup' => theme('token_tree', array('token_types' => array('uc_order', 'site', 'store'))), + ); + } + return system_settings_form($form); } diff --git a/uc_stock/uc_stock.admin.inc b/uc_stock/uc_stock.admin.inc index 6b65a27..c7845aa 100644 --- a/uc_stock/uc_stock.admin.inc +++ b/uc_stock/uc_stock.admin.inc @@ -34,11 +34,17 @@ function uc_stock_settings_form($form, &$form_state) { '#type' => 'textarea', '#title' => t('Message text'), '#default_value' => variable_get('uc_stock_threshold_notification_message', uc_get_message('uc_stock_threshold_notification_message')), - '#description' => t('The message the user receives when the stock level reaches its threshold value (uses site, store, order, and stock tokens).', array('!token-help-page' => url('admin/store/help/tokens'))), + '#description' => t('The message the user receives when the stock level reaches its threshold value.'), '#text_format' => variable_get('uc_stock_threshold_notification_message_format', filter_default_format()), '#rows' => 10, ); + if (module_exists('token')) { + $form['token_tree'] = array( + '#markup' => theme('token_tree', array('token_types' => array('uc_order', 'site', 'store'))), + ); + } + return system_settings_form($form); } diff --git a/uc_store/uc_store.admin.inc b/uc_store/uc_store.admin.inc index 3e61921..d75161a 100644 --- a/uc_store/uc_store.admin.inc +++ b/uc_store/uc_store.admin.inc @@ -375,39 +375,6 @@ function uc_store_configuration_page() { } /** - * Displays store help page. - */ -function uc_store_ubercart_help() { - $build = array(); - $build['description'] = array( - '#markup' => '

' . t('Use the following links to find documentation and support:') . '

', - ); - - $items = array(); - $items[] = l(t("Ubercart User's Guide"), 'http://www.ubercart.org/docs/user'); - $items[] = l(t('Support Forums'), 'http://www.ubercart.org/forum'); - $items[] = l(t('Drupal Handbook'), 'http://drupal.org/node/258'); - $build['links'] = array( - '#theme' => 'item_list', - '#items' => $items, - ); - - return $build; -} - -/** - * Displays the tokens help page. - */ -function uc_store_ubercart_help_tokens() { - $build = array(); - $build['description'] = array( - '#markup' => '

' . t('Tokens are bracketed phrases you can use in certain text fields and boxes as placeholders for some other text. Tokens represent things like store variables, links to certain pages, order information, etc. Tokens are used by including the token listed below in a text field that uses them. The description for the textfields will alert you to which groups of tokens listed below may be used.') . '

', - ); - - return $build; -} - -/** * Imports settings from a country file. * * @see uc_country_import_form_submit() diff --git a/uc_store/uc_store.module b/uc_store/uc_store.module index 7fbf129..f10e9d7 100644 --- a/uc_store/uc_store.module +++ b/uc_store/uc_store.module @@ -113,21 +113,6 @@ function uc_store_menu() { 'weight' => 6, 'file' => 'uc_store.admin.inc', ); - $items['admin/store/help'] = array( - 'title' => 'Help', - 'description' => 'Links to get help!', - 'page callback' => 'uc_store_ubercart_help', - 'access arguments' => array('administer store'), - 'weight' => 10, - 'file' => 'uc_store.admin.inc', - ); - $items['admin/store/help/tokens'] = array( - 'title' => 'Using tokens', - 'description' => 'Understand what tokens are and how to use them.', - 'page callback' => 'uc_store_ubercart_help_tokens', - 'access arguments' => array('administer store'), - 'file' => 'uc_store.admin.inc', - ); $items['admin/store/settings/countries'] = array( 'title' => 'Country settings', 'description' => 'Configure countries and address formats.', @@ -462,6 +447,15 @@ function uc_store_theme() { */ function uc_store_help($path, $arg) { switch ($path) { + case 'admin/help#uc_store': + $output = '

' . t('Ubercart') . '

'; + $output .= '

' . t('Use the following links to find documentation and support:') . '

'; + $output .= ''; + return $output; + case 'admin/store/customers': return t('This table lists out all users on your site who have placed orders.'); case 'admin/store/customers/search':