' . t('The taxonomy vocabulary %name is set as the product catalog.', array('!edit-url' => url('admin/structure/taxonomy/' . $catalog->machine_name), '%name' => $catalog->name)) . '
', ); - $form['catalog_vid']['#markup'] = $form['catalog_vid']['#summary']; } $vocabs = array(); @@ -43,137 +29,17 @@ function uc_catalog_settings_form($form, &$form_state) { $vocabs[$vid] = $vocabulary->name; } - // JTR - catalog-top-level sub-textfield - $form['catalog-top-level'] = array('#type' => 'fieldset', - '#title' => t('Catalog top level'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#summary callback' => 'uc_summarize_form', - '#attributes' => array('class' => array('catalog-top-level')), - ); - $form['catalog-top-level']['uc_catalog_vid'] = array('#type' => 'select', + $form['catalog-top-level']['uc_catalog_vid'] = array( + '#type' => 'select', '#title' => t('Catalog vocabulary'), - '#description' => t("The taxonomy vocabulary that will be considered the product catalog."), '#default_value' => variable_get('uc_catalog_vid', 0), - '#summary callback' => 'uc_summarize_null', '#options' => $vocabs, ); - $form['catalog-top-level']['uc_catalog_breadcrumb'] = array('#type' => 'checkbox', + $form['catalog-top-level']['uc_catalog_breadcrumb'] = array( + '#type' => 'checkbox', '#title' => t('Display the catalog breadcrumb'), - '#summary callback' => 'uc_summarize_checkbox', - '#summary arguments' => array( - t('Catalog breadcrumb is being displayed.'), - t('Catalog breadcrumb is hidden.'), - ), '#default_value' => variable_get('uc_catalog_breadcrumb', TRUE), ); - $form['catalog-top-level']['uc_catalog_breadcrumb_nodecount'] = array('#type' => 'checkbox', - '#title' => t('Display node counts in the catalog breadcrumb'), - '#summary callback' => 'uc_summarize_checkbox', - '#summary arguments' => array( - t('Node count is being displayed in the catalog breadcrumb.'), - t('Node count is not being displayed in the catalog breadcrumb.'), - ), - '#default_value' => variable_get('uc_catalog_breadcrumb_nodecount', FALSE), - ); - $form['catalog-top-level']['uc_catalog_show_subcategories'] = array('#type' => 'checkbox', - '#title' => t('Display subcategories in the catalog view'), - '#summary callback' => 'uc_summarize_checkbox', - '#summary arguments' => array( - t('The catalog view is displaying subcategories.'), - t('The catalog view is not displaying subcategories.'), - ), - '#default_value' => variable_get('uc_catalog_show_subcategories', TRUE), - ); - $form['catalog-top-level']['uc_catalog_category_columns'] = array('#type' => 'select', - '#title' => t('Number of columns in the grid of categories'), - '#default_value' => variable_get('uc_catalog_category_columns', 3), - '#summary' => t('Subcategories are being displayed in @columns columns.', array('@columns' => variable_get('uc_catalog_category_columns', 3))), - '#options' => drupal_map_assoc(range(1, 5)), - ); - - $form['catalog-products-list'] = array('#type' => 'fieldset', - '#title' => t('Catalog products list'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#summary callback' => 'uc_summarize_form', - '#attributes' => array('class' => array('catalog-products-list')), - ); - $form['catalog-products-list']['uc_product_nodes_per_page'] = array( - '#type' => 'textfield', - '#title' => t('Product nodes per page'), - '#summary' => t('There are @nodes product nodes displayed per page.', array('@nodes' => variable_get('uc_product_nodes_per_page', 12))), - '#default_value' => variable_get('uc_product_nodes_per_page', 12), - '#description' => t("Determines how many products will be listed on every catalog category. Notice that if you are using grid display it must be multiple of the grid width value, otherwise the last row will not match."), - '#size' => 2, - ); - - return system_settings_form($form); -} - -/** - * Settings forms for using a product grid instead of a table in the catalog. - * - * @ingroup forms - */ -function uc_catalog_grid_settings_form($form, &$form_state) { - $form['uc_catalog_grid_display'] = array( - '#type' => 'checkbox', - '#title' => t('Display products in the catalog in a grid.'), - '#summary callback' => 'uc_summarize_checkbox', - '#summary arguments' => array( - t('Products are displayed in a grid.'), - t('Products are displayed in a table list.'), - ), - '#default_value' => variable_get('uc_catalog_grid_display', FALSE), - '#description' => t('If unchecked, the default table display will be used and the settings on this form will be ignored.'), - ); - $form['uc_catalog_grid_display_width'] = array( - '#type' => 'select', - '#title' => t('Number of columns in the product grid'), - '#options' => drupal_map_assoc(range(1, 5)), - '#default_value' => variable_get('uc_catalog_grid_display_width', 3), - '#summary' => t('The grid will be displayed in @columns columns.', array('@columns' => variable_get('uc_catalog_grid_display_width', 3))), - ); - - $form['displayed_fields'] = array( - '#type' => 'fieldset', - '#title' => t('Displayed fields'), - '#description' => t('The checked fields will be included in the product grid for each product in your catalog.'), - ); - $form['displayed_fields']['uc_catalog_grid_display_title'] = array( - '#type' => 'checkbox', - '#title' => t('Product title'), - '#default_value' => variable_get('uc_catalog_grid_display_title', TRUE), - ); - $form['displayed_fields']['uc_catalog_grid_display_model'] = array( - '#type' => 'checkbox', - '#title' => t('Product SKU'), - '#default_value' => variable_get('uc_catalog_grid_display_model', TRUE), - ); - $form['displayed_fields']['uc_catalog_grid_display_image'] = array( - '#type' => 'checkbox', - '#title' => t('Default product image'), - '#description' => t('The image will always be included in the product grid.'), - '#default_value' => TRUE, - '#disabled' => TRUE, - ); - $form['displayed_fields']['uc_catalog_grid_display_sell_price'] = array( - '#type' => 'checkbox', - '#title' => t('Sell price'), - '#default_value' => variable_get('uc_catalog_grid_display_sell_price', TRUE), - ); - $form['displayed_fields']['uc_catalog_grid_display_add_to_cart'] = array( - '#type' => 'checkbox', - '#title' => t('Add to cart form'), - '#default_value' => variable_get('uc_catalog_grid_display_add_to_cart', TRUE), - ); - $form['displayed_fields']['uc_catalog_grid_display_attributes'] = array( - '#type' => 'checkbox', - '#title' => t('Attribute selection elements'), - '#description' => t('Adds any available attribute selection form elements to the add to cart form if displayed in the grid.'), - '#default_value' => variable_get('uc_catalog_grid_display_attributes', TRUE), - ); return system_settings_form($form); } diff --git a/uc_catalog/uc_catalog.install b/uc_catalog/uc_catalog.install index 7975b27..c3313a3 100644 --- a/uc_catalog/uc_catalog.install +++ b/uc_catalog/uc_catalog.install @@ -223,7 +223,7 @@ function uc_catalog_update_7001(&$sandbox) { } /** - * Sets Catalog vocbulary machine name. + * Sets Catalog vocabulary machine name. */ function uc_catalog_update_7002() { db_query("UPDATE {taxonomy_vocabulary} SET machine_name = :name WHERE vid = :vid", array(':name' => 'catalog', ':vid' => variable_get('uc_catalog_vid', 0))); @@ -272,3 +272,20 @@ function uc_catalog_update_7003() { function uc_catalog_update_7004() { variable_del('uc_catalog_description'); } + +/** + * Delete unused catalog settings. + */ +function uc_catalog_update_7005() { + variable_del('uc_catalog_show_subcategories'); + variable_del('uc_catalog_category_columns'); + variable_del('uc_product_nodes_per_page'); + variable_del('uc_catalog_grid_display'); + variable_del('uc_catalog_grid_display_width'); + variable_del('uc_catalog_grid_display_title'); + variable_del('uc_catalog_grid_display_model'); + variable_del('uc_catalog_grid_display_image'); + variable_del('uc_catalog_grid_display_sell_price'); + variable_del('uc_catalog_grid_display_add_to_cart'); + variable_del('uc_catalog_grid_display_attributes'); +} diff --git a/uc_catalog/uc_catalog.module b/uc_catalog/uc_catalog.module index c2db288..e153448 100644 --- a/uc_catalog/uc_catalog.module +++ b/uc_catalog/uc_catalog.module @@ -16,6 +16,19 @@ ******************************************************************************/ /** + * Implements hook_help(). + */ +function uc_catalog_help($path, $arg) { + switch ($path) { + case 'admin/store/settings/catalog': + if (!module_exists('views_ui')) { + return '' . t('Enable the Views UI module to edit the catalog display.', array('@modules' => url('admin/modules', array('fragment' => 'edit-modules-views')))) . '
'; + } + break; + } +} + +/** * Implements hook_menu(). */ function uc_catalog_menu() { @@ -32,42 +45,21 @@ function uc_catalog_menu() { $items['admin/store/settings/catalog'] = array( 'title' => 'Catalog settings', 'description' => 'Configure the catalog settings.', - 'page callback' => 'uc_catalog_settings_overview', - 'access arguments' => array('administer catalog'), - 'file' => 'uc_catalog.admin.inc', - ); - $items['admin/store/settings/catalog/overview'] = array( - 'title' => 'Overview', - 'access arguments' => array('administer catalog'), - 'weight' => -10, - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'uc_catalog.admin.inc', - ); - $items['admin/store/settings/catalog/edit'] = array( - 'title' => 'Edit', 'page callback' => 'drupal_get_form', 'page arguments' => array('uc_catalog_settings_form'), 'access arguments' => array('administer catalog'), - 'weight' => -5, - 'type' => MENU_LOCAL_TASK, - 'file' => 'uc_catalog.admin.inc', - ); - $items['admin/store/settings/catalog/edit/catalog'] = array( - 'title' => 'Catalog settings', - 'weight' => -10, - 'access arguments' => array('administer catalog'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'uc_catalog.admin.inc', - ); - $items['admin/store/settings/catalog/edit/grid'] = array( - 'title' => 'Product grid settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('uc_catalog_grid_settings_form'), - 'access arguments' => array('administer catalog'), - 'weight' => -5, - 'type' => MENU_LOCAL_TASK, 'file' => 'uc_catalog.admin.inc', ); + if (module_exists('views_ui')) { + $items['admin/store/settings/catalog/edit'] = array( + 'title' => 'Edit catalog display', + 'page callback' => 'drupal_goto', + 'page arguments' => array('admin/structure/views/edit/uc_catalog'), + 'access callback' => 'user_access', + 'access arguments' => array('administer views'), + 'type' => MENU_LOCAL_ACTION, + ); + } $items['admin/store/products/orphans'] = array( 'title' => 'Find orphaned products', 'description' => 'Find products that have not been categorized.', @@ -172,7 +164,7 @@ function uc_catalog_node_view($node, $view_mode) { $terms = $node->taxonomy_catalog[$node->language]; if (count($terms)) { - $crumbs[] = l(variable_get('uc_catalog_name', t('Catalog')), variable_get('uc_catalog_url', 'catalog')); + $crumbs[] = l(variable_get('uc_catalog_name', t('Catalog')), 'catalog'); $used_tids = array(); foreach ($terms as $term) { @@ -450,7 +442,7 @@ function uc_catalog_uc_store_status() { $statuses[] = array( 'status' => 'error', 'title' => t('Catalog vocabulary'), - 'desc' => t('No vocabulary has been recognized as the Ubercart catalog. Choose one on this page or add one on the taxonomy admin page first, if needed.', array('!admin_catalog' => url('admin/store/settings/catalog/edit'), '!admin_vocab' => url('admin/structure/taxonomy'))), + 'desc' => t('No vocabulary has been recognized as the Ubercart catalog. Choose one on this page or add one on the taxonomy admin page first, if needed.', array('!admin_catalog' => url('admin/store/settings/catalog'), '!admin_vocab' => url('admin/structure/taxonomy'))), ); } diff --git a/uc_catalog/views/uc_catalog.views_default.inc b/uc_catalog/views/uc_catalog.views_default.inc index 2b21402..fda47a4 100644 --- a/uc_catalog/views/uc_catalog.views_default.inc +++ b/uc_catalog/views/uc_catalog.views_default.inc @@ -71,7 +71,7 @@ function uc_catalog_views_default_views() { $handler->display->display_options['fields']['entity_id']['id'] = 'entity_id'; $handler->display->display_options['fields']['entity_id']['table'] = 'field_data_uc_product_image'; $handler->display->display_options['fields']['entity_id']['field'] = 'entity_id'; - $handler->display->display_options['fields']['entity_id']['label'] = 'Image'; + $handler->display->display_options['fields']['entity_id']['label'] = ''; $handler->display->display_options['fields']['entity_id']['alter']['alter_text'] = 0; $handler->display->display_options['fields']['entity_id']['alter']['make_link'] = 0; $handler->display->display_options['fields']['entity_id']['alter']['absolute'] = 0; @@ -138,6 +138,7 @@ function uc_catalog_views_default_views() { $handler->display->display_options['fields']['sell_price']['id'] = 'sell_price'; $handler->display->display_options['fields']['sell_price']['table'] = 'uc_products'; $handler->display->display_options['fields']['sell_price']['field'] = 'sell_price'; + $handler->display->display_options['fields']['sell_price']['label'] = 'Price'; $handler->display->display_options['fields']['sell_price']['alter']['alter_text'] = 0; $handler->display->display_options['fields']['sell_price']['alter']['make_link'] = 0; $handler->display->display_options['fields']['sell_price']['alter']['absolute'] = 0;