module\" id=\"block-$block->module-$block->delta\">\n";
if ($title) {
$output .= "
\n";
}
@@ -324,7 +453,6 @@ function theme_quicktabs_block($block, $
return $output;
}
-
/**
* Fetch the necessary CSS files for the tab styles.
*/
@@ -341,3 +469,63 @@ function quicktabs_add_css($tabstyle_css
drupal_add_css($tabstyle_css, 'module');
}
}
+
+/**
+ * Ajax callback for views tabpage.
+ */
+function quicktabs_ajax_views($vid, $display, $args = NULL) {
+ $tabpage = array(
+ 'type' => 'view',
+ 'view' => array(
+ 'vid' => $vid,
+ 'display' => $display,
+ 'args' => $args,
+ ),
+ );
+
+ $output = quicktabs_render_tabpage($tabpage);
+ print drupal_to_js(array('status' => TRUE, 'data' => $output));
+}
+
+/**
+ * Ajax callback for block tabpage.
+ */
+function quicktabs_ajax_block($bid, $hide_title) {
+ $tabpage = array(
+ 'type' => 'block',
+ 'block' => array(
+ 'bid' => $bid,
+ 'hide_title' => $hide_title,
+ ),
+ );
+
+ $output = quicktabs_render_tabpage($tabpage);
+ print drupal_to_js(array('status' => TRUE, 'data' => $output));
+}
+
+/**
+ * Load the quicktabs data.
+ */
+function quicktabs_load($qtid) {
+ $qtblock = db_fetch_object(db_query('SELECT title, tabs, ajax, style FROM {quicktabs} WHERE qtid = %d', $qtid));
+ if (!$qtblock) {
+ return FALSE;
+ }
+
+ $tabs = unserialize($qtblock->tabs);
+ foreach ($tabs as $key => $tab) {
+ $weight[$key] = $tab['weight'];
+ }
+ array_multisort($weight, SORT_ASC, $tabs);
+
+ $quicktabs = array(
+ 'qtid' => $qtid,
+ 'title' => $qtblock->title,
+ 'tabs' => $tabs,
+ 'ajax' => $qtblock->ajax,
+ 'style' => $qtblock->style,
+ );
+
+ return $quicktabs;
+}
+
Index: includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quicktabs/includes/Attic/admin.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 admin.inc
--- includes/admin.inc 26 Nov 2008 06:12:24 -0000 1.1.2.1
+++ includes/admin.inc 26 Nov 2008 17:54:26 -0000
@@ -1,13 +1,21 @@
t('Quick Tabs Block Name')),
+ array('data' => t('Operations'), 'colspan' => 2),
+ );
$rows = array();
while ($row = db_fetch_object($result)) {
$tablerow = array(
- array('data' => $row->title .' ('. l('edit', 'admin/build/quicktabs/edit/'. $row->qtid) .')'),
- array('data' => l(t('Delete'), 'admin/build/quicktabs/delete/'. $row->qtid)),
+ array('data' => $row->title),
+ array('data' => l('Edit', 'admin/build/quicktabs/edit/'. $row->qtid)),
+ array('data' => l('Delete', 'admin/build/quicktabs/delete/'. $row->qtid)),
);
$rows[] = $tablerow;
}
@@ -15,155 +23,104 @@ function quicktabs_list() {
return $output;
}
+/*
+ * The admin page to create or modify QT blocks.
+ */
+function quicktabs_form(&$form_state, array $quicktabs) {
+ // Add our JS file, which has some Drupal core JS overrides, and ensures ahah behaviours get re-attached
+ drupal_add_js(drupal_get_path('module', 'quicktabs') . '/js/quicktabs_ahah.js', 'module', 'footer');
+
+ $form = _qt_admin_main_form($form_state, $quicktabs);
-function quicktabs_new($ajax = FALSE) {
- drupal_add_js(drupal_get_path('module', 'quicktabs') .'/js/quicktabs_form.js');
- drupal_add_css(drupal_get_path('module', 'quicktabs') .'/quicktabs.css');
- if (!$ajax) {
- return drupal_get_form('quicktabs_form');
- } else {
- return drupal_get_form('quicktabs_aj_form');
+ if ($quicktabs['formtype'] == 'edit') {
+ $form['qtid'] = array(
+ '#type' => 'hidden',
+ '#value' => $quicktabs['qtid']
+ );
}
-}
-/**
- * build the Quick Tabs (normal) creation and edit form
- */
-function quicktabs_form($form_state = NULL, $quicktabs = NULL) {
- // Add our JS file, which has some Drupal core JS overrides, and ensures ahah behaviours get re-attached
- drupal_add_js(drupal_get_path('module', 'quicktabs') . '/js/quicktabs_ahah.js', 'footer');
-
- $form = _qt_admin_main_form($form_state, $quicktabs, FALSE);
-
- $formtype = $quicktabs['formtype'];
- if ($formtype == 'edit') {
-
- $form['qtid'] = array(
- '#type' => 'hidden',
- '#value' => $quicktabs['qtid']
- );
- }
-
- $tabcontent = $quicktabs['tabs'];
-
- if (isset($form_state['qt_count'])) {
- $qt_count = $form_state['qt_count'];
+ if (isset($quicktabs['tabs'])) {
+ $tabcontent = $quicktabs['tabs'];
}
else {
- $qt_count = max(2, empty($tabcontent) ? 2 : count($tabcontent));
+ $tabcontent = array();
}
- // Add the current tabs to the form.
- for ($delta = 0; $delta < $qt_count; $delta++) {
-
- $weight = isset($tabcontent[$delta]['tabweight']) ? $tabcontent[$delta]['tabweight'] : $delta-10;
- $title = isset($tabcontent[$delta]['tabtext']) ? $tabcontent[$delta]['tabtext'] : '';
- $type = isset($tabcontent[$delta]['tabtype']) ? $tabcontent[$delta]['tabtype'] : 'block';
- $bid = isset($tabcontent[$delta]['bid']) ? $tabcontent[$delta]['bid'] : NULL;
- $hide_title = isset($tabcontent[$delta]['hide_title']) ? $tabcontent[$delta]['hide_title'] : 1;
- $vid = isset($tabcontent[$delta]['vid']) ? $tabcontent[$delta]['vid'] : 'default';
- $args = isset($tabcontent[$delta]['args']) ? $tabcontent[$delta]['args'] : NULL;
- $display = isset($tabcontent[$delta]['display']) ? $tabcontent[$delta]['display'] : 'default';
- $details = array(
- 'delta' => $delta,
- 'weight' => $weight,
- 'title' => $title,
- 'type' => $type,
- 'bid' => $bid,
- 'hide_title' => $hide_title,
- 'vid' => $vid,
- 'args' => $args,
- 'display' => $display,
- );
- $form['qt_wrapper']['tabs'][$delta] = _quicktabs_form($details, FALSE);
- }
-
- return $form;
-}
-
-/**
- * build the Quick Tabs (ajax) creation and edit form
- */
-function quicktabs_aj_form($form_state = NULL, $quicktabs = NULL) {
- // Add our JS file, which has some Drupal core JS overrides, and ensures ahah behaviours get re-attached
- drupal_add_js(drupal_get_path('module', 'quicktabs') . '/js/quicktabs_ahah.js', 'footer');
-
- $form = _qt_admin_main_form($form_state, $quicktabs, TRUE);
-
- $formtype = $quicktabs['formtype'];
- if ($formtype == 'edit') {
-
- $form['qtid'] = array(
- '#type' => 'hidden',
- '#value' => $quicktabs['qtid']
- );
- }
-
- $tabcontent = $quicktabs['tabs'];
-
if (isset($form_state['qt_count'])) {
$qt_count = $form_state['qt_count'];
}
else {
- $qt_count = max(2, empty($tabcontent) ? 2 : count($tabcontent));
+ $qt_count = empty($tabcontent) ? 2 : count($tabcontent);
}
// Add the current tabs to the form.
for ($delta = 0; $delta < $qt_count; $delta++) {
-
- $weight = isset($tabcontent[$delta]['tabweight']) ? $tabcontent[$delta]['tabweight'] : $delta-10;
- $title = isset($tabcontent[$delta]['tabtext']) ? $tabcontent[$delta]['tabtext'] : '';
- $type = isset($tabcontent[$delta]['tabtype']) ? $tabcontent[$delta]['tabtype'] : 'node';
- $nid = isset($tabcontent[$delta]['nid']) ? $tabcontent[$delta]['nid'] : NULL;
- $vid = isset($tabcontent[$delta]['vid']) ? $tabcontent[$delta]['vid'] : 'default';
- $args = isset($tabcontent[$delta]['args']) ? $tabcontent[$delta]['args'] : NULL;
- $display = isset($tabcontent[$delta]['display']) ? $tabcontent[$delta]['display'] : 'default';
- $details = array(
- 'delta' => $delta,
- 'weight' => $weight,
- 'title' => $title,
- 'type' => $type,
- 'nid' => $nid,
- 'vid' => $vid,
- 'args' => $args,
- 'display' => $display,
- );
- $form['qt_wrapper']['tabs'][$delta] = _quicktabs_form($details, TRUE);
+ $details = isset($tabcontent[$delta]) ? $tabcontent[$delta] : array();
+ $details['delta'] = $delta;
+ $form['qt_wrapper']['tabs'][$delta] = _quicktabs_form($details);
}
+
return $form;
}
-function _qt_admin_main_form($form_state = NULL, &$quicktabs = NULL, $ajax = FALSE) {
- $form = array(
- '#cache' => TRUE,
- );
+/*
+ * The main section of admin page.
+ */
+function _qt_admin_main_form($form_state, array &$quicktabs) {
+ $form['#cache'] = TRUE;
+
// the contents of $quicktabs will either come from the db or from $form_state
if (isset($form_state['quicktabs'])) {
$quicktabs = $form_state['quicktabs'] + (array)$quicktabs;
}
-
+
$form['title'] = array(
- '#title' => t('Block Title'),
- '#type' => 'textfield',
- '#description' => t('The title of the whole block'),
- '#default_value' => ($quicktabs['title'] ? $quicktabs['title'] : ''),
- '#weight' => -5
- );
+ '#title' => t('Block Title'),
+ '#type' => 'textfield',
+ '#description' => t('The title of the whole block.'),
+ '#default_value' => isset($quicktabs['title']) ? $quicktabs['title'] : '',
+ '#weight' => -5,
+ );
+
+ $styles = module_invoke_all('quicktabs_tabstyles');
+ // The keys used for radios options must be valid html ids. Removing path to css files.
+ foreach ($styles as $style) {
+ $style_options[drupal_strtolower($style)] = $style;
+ }
+
+ $form['style'] = array(
+ '#type' => 'select',
+ '#title' => t('Tab Style'),
+ '#options' => array('default' => t('No style')) + $style_options,
+ '#default_value' => isset($quicktabs['style']) ? $quicktabs['style'] : variable_get('quicktabs_tabstyle', 'default'),
+ '#description' => t('Choose the tab style for your Quick Tabs blocks.'),
+ '#weight' => -4,
+ );
+
+ $form['ajax'] = array(
+ '#type' => 'radios',
+ '#title' => t('Ajax'),
+ '#options' => array(TRUE => t('Yes: Tabpages will be loaded at tab click'), FALSE => t('No: Tabpages will be loaded at page load')),
+ '#default_value' => isset($quicktabs['ajax']) ? $quicktabs['ajax'] : FALSE,
+ '#description' => t('Choose how the tabpages shoud be loaded.'),
+ '#weight' => -3,
+ );
// Add a wrapper for the tabs and Add Another Tab button.
$form['qt_wrapper'] = array(
'#tree' => FALSE,
- '#weight' => -4,
+ '#weight' => -2,
'#prefix' => '
',
);
$form['qt_wrapper']['tabs'] = array(
+ '#tree' => TRUE,
'#prefix' => '
',
- '#theme' => 'qt_tabs',
+ '#theme' => 'quicktabs_admin_form_tabs',
);
-
+
$form['qt_wrapper']['tabs_more'] = array(
'#type' => 'submit',
'#prefix' => '
',
@@ -194,171 +151,185 @@ function _qt_admin_main_form($form_state
'effect' => 'fade',
),
);
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#weight' => 10,
- '#value' => t('Save'),
+
+ $form['submit_form'] = array(
+ '#type' => 'submit',
+ '#weight' => 10,
+ '#value' => t('Save'),
);
-
+
return $form;
}
-/**
- * build the form elements for each tab
- */
-function _quicktabs_form($details, $ajax = FALSE) {
-
- $form = array(
- '#tree' => TRUE,
- );
+/*
+ * One row on the QT admin form.
+ */
+function _quicktabs_form(array $details) {
$delta = $details['delta'];
+ $weight = isset($details['weight']) ? $details['weight'] : $delta-10;
+ $title = isset($details['title']) ? $details['title'] : '';
+ $type = isset($details['type']) ? $details['type'] : '';
+
+ if ($type == 'block') {
+ $block_bid = $details['block']['bid'];
+ $block_hide_title = $details['block']['hide_title'];
+ }
+ else {
+ $block_bid = NULL;
+ $block_hide_title = 1;
+ }
+
+ if ($type == 'node') {
+ $node_nid = $details['node']['nid'];
+ $node_teaser = $details['node']['teaser'];
+ $node_hide_title = $details['node']['hide_title'];
+ }
+ else {
+ $node_nid = NULL;
+ $node_teaser = 0;
+ $node_hide_title = 1;
+ }
+
+ if ($type == 'view') {
+ $view_vid = $details['view']['vid'];
+ $view_args = $details['view']['args'];
+ $view_display = $details['view']['display'];
+ }
+ else {
+ $view_vid = 'default';
+ $view_args = NULL;
+ $view_display = 'default';
+ }
- // We'll manually set the #parents property of these fields so that
- // their values appear in the $form_state['values']['tabs'] array.
- $form['tabweight'] = array(
+ $form['#tree'] = TRUE;
+ $form['weight'] = array(
'#type' => 'weight',
- '#default_value' => $details['weight'],
- '#parents' => array('tabs', $delta, 'tabweight'),
+ '#default_value' => $weight,
);
-
- $form['tabtext'] = array(
+ $form['title'] = array(
'#type' => 'textfield',
'#size' => '10',
'#title' => t('Tab @n', array('@n' => ($delta + 1))),
- '#default_value' => $details['title'],
- '#parents' => array('tabs', $delta, 'tabtext'),
+ '#default_value' => $title,
+ );
+
+ $tabtypes = array(
+ 'block' => t('Block'),
+ 'node' => t('Content'),
);
if (module_exists('views')) {
$views = quicktabs_get_views();
- if (!$ajax) {
- $blocks = quicktabs_get_blocks();
-
- $form['type_options'] = array(
- '#type' => 'value',
- '#value' => array(
- 'block' => 'block',
- 'view' => 'view',
- )
- );
- }
- else {
- $nodes = quicktabs_get_nodes();
-
- $form['type_options'] = array(
- '#type' => 'value',
- '#value' => array(
- 'node' => 'node',
- 'view' => 'view',
- )
- );
- }
- $form['tabtype'] = array(
- '#type' => 'radios',
- '#options' => $form['type_options']['#value'],
- '#title' => t('Tab Content'),
- '#default_value' => $details['type'],
- '#parents' => array('tabs', $delta, 'tabtype'),
- );
+ $tabtypes['view'] = t('View');
$views_keys = array_keys($views);
- $selected_view = ($details['vid'] ? ($details['vid'] == 'default' ? $views_keys[0] : ($details['type'] != 'view' ? $views_keys[0] : $details['vid'])) : $views_keys[0]);
- $form['vid'] = array(
- '#type' => 'select',
- '#options' => $views,
- '#default_value' => $selected_view,
- '#title' => t('Select a view'),
- '#parents' => array('tabs', $delta, 'vid'),
- '#ahah' => array(
- 'path' => 'quicktabs/ahah/',
- 'wrapper' => 'quicktabs-tabs',
- 'method' => 'replace',
- 'event' => 'change',
+ $selected_view = ($view_vid ? ($view_vid == 'default' ? (isset($views_keys[0]) ? $views_keys[0] : '') : $view_vid) : $views_keys[0]);
+ $form['view']['vid'] = array(
+ '#type' => 'select',
+ '#options' => $views,
+ '#default_value' => $selected_view,
+ '#title' => t('Select a view'),
+ '#ahah' => array(
+ 'path' => 'quicktabs/ahah/',
+ 'wrapper' => 'quicktabs-tabs',
+ 'method' => 'replace',
+ 'event' => 'change',
),
);
- $form['args'] = array(
- '#type' => 'textfield',
- '#title' => 'arguments',
- '#size' => '10',
- '#required' => false,
- '#default_value' => $details['args'],
- '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
- '#parents' => array('tabs', $delta, 'args')
- );
-
- $form['display'] = array(
- '#type' => 'select',
- '#title' => 'display',
- '#options' => _quicktabs_get_views_displays($selected_view),
- '#default_value' => $details['display'],
- '#description' => t('Choose a display for your view.'),
- '#parents' => array('tabs', $delta, 'display')
- );
- $form['get_displays'] = array(
- '#type' => 'submit',
- '#value' => 'vdisp_'. $delta,
- '#parents' => array('tabs', $delta, 'get_displays'),
- '#submit' => array('qt_get_displays_submit'),
- );
- } else {
- $form['tabtype'] = array(
- '#type' => 'hidden',
- '#title' => t('Type for tab @n', array('@n' => ($delta + 1))),
- '#value' => $details['type'],
- '#parents' => array('tabs', $delta, 'tabtype'),
+ $form['view']['args'] = array(
+ '#type' => 'textfield',
+ '#title' => 'arguments',
+ '#size' => '20',
+ '#required' => FALSE,
+ '#default_value' => $view_args,
+ '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
);
- }
- if (!$ajax) {
- $form['bid'] = array(
+ $form['view']['display'] = array(
'#type' => 'select',
- '#options' => $blocks,
- '#default_value' => $details['bid'],
- '#title' => t('Select a block'),
- '#parents' => array('tabs', $delta, 'bid'),
- );
- $form['hide_title'] = array(
- '#type' => 'checkbox',
- '#title' => t('Hide the title of this block'),
- '#default_value' => $details['hide_title'],
- '#parents' => array('tabs', $delta, 'hide_title'),
+ '#title' => 'display',
+ '#options' => _quicktabs_get_views_displays($selected_view),
+ '#default_value' => $view_display,
+ '#description' => t('Choose a display for your view.'),
);
- }
- else {
- $form['nid'] = array(
- '#type' => 'select',
- '#options' => $nodes,
- '#default_value' => $details['nid'],
- '#title' => t('Select a node'),
- '#parents' => array('tabs', $delta, 'nid'),
+ $form['view']['get_displays'] = array(
+ '#type' => 'submit',
+ '#value' => 'vdisp_'. $delta,
+ '#submit' => array('qt_get_displays_submit'),
);
}
+
+ $form['node']['nid'] = array(
+ '#type' => 'textfield',
+ '#maxlength' => 5,
+ '#size' => 20,
+ '#default_value' => $node_nid,
+ '#title' => t('Node'),
+ '#description' => t('Insert the node ID.'),
+ );
+ $form['node']['teaser'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Teaser view'),
+ '#default_value' => $node_teaser,
+ );
+ $form['node']['hide_title'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Hide the title of this node'),
+ '#default_value' => $node_hide_title,
+ );
+
+ $form['block']['bid'] = array(
+ '#type' => 'select',
+ '#options' => quicktabs_get_blocks(),
+ '#default_value' => $block_bid,
+ '#title' => t('Select a block'),
+ );
+ $form['block']['hide_title'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Hide the title of this block'),
+ '#default_value' => $block_hide_title,
+ );
+
+ $form['type'] = array(
+ '#type' => 'radios',
+ '#options' => $tabtypes,
+ '#title' => t('Tab Content'),
+ '#default_value' => (!empty($type) ? $type : 'block'),
+ );
+
return $form;
}
-/**
- * theme the form elements for the tabs as draggable table rows
- */
-function theme_qt_tabs($form) {
+/**
+ * Theme function for quicktabs admin page.
+ *
+ * @ingroup themeable
+ */
+function theme_quicktabs_admin_form_tabs($form) {
+ // Change the button title to reflect the behavior when using JavaScript.
drupal_add_tabledrag('qt-tablist-table', 'order', 'sibling', 'qt-tabs-weight');
+
$rows = array();
$headers = array(
- t('Tab Title'),
- t('Weight'),
- module_exists('views') ? t('Tab type') : '',
- t('Content'),
+ array('data' => t('Tab Title')),
+ array('data' => t('Weight')),
+ array('data' => t('Tab type')),
+ array('data' => t('Tab content')),
);
foreach (element_children($form) as $key) {
// No need to print the field title every time.
- unset($form[$key]['tabtext']['#title'], $form[$key]['tabtype']['#title']);
- $form[$key]['tabweight']['#attributes']['class'] = 'qt-tabs-weight';
+ unset($form[$key]['title']['#title'], $form[$key]['type']['#title']);
+ $form[$key]['weight']['#attributes']['class'] = 'qt-tabs-weight';
// Build the table row.
$row = array(
'data' => array(
- array('data' => drupal_render($form[$key]['tabtext']), 'class' => 'qt-tab-title'),
- array('data' => drupal_render($form[$key]['tabweight']), 'class' => 'qt-tab-weight'),
- module_exists('views') ? array('data' => drupal_render($form[$key]['tabtype']), 'class' => 'qt-tab-type') : array('data' => '', 'class' => 'qt-tabtype-hidden'),
- array('data' => ($form[$key]['bid'] ? drupal_render($form[$key]['bid']) . drupal_render($form[$key]['hide_title']) : drupal_render($form[$key]['nid'])) . (module_exists('views') ? drupal_render($form[$key]['vid']) . drupal_render($form[$key]['args']) . drupal_render($form[$key]['limit']) . drupal_render($form[$key]['display']) . drupal_render($form[$key]['get_displays']) : ''), 'class' => 'qt-tab-bvid'),
+ array('data' => drupal_render($form[$key]['title']), 'class' => 'qt-tab-title'),
+ array('data' => drupal_render($form[$key]['weight']), 'class' => 'qt-tab-weight'),
+ array('data' => drupal_render($form[$key]['type']), 'class' => 'qt-tab-type'),
+ // tab content start (only 1 tab content (block, node or view) will be displayed. see: quicktabs_form.js)
+ array('data' => drupal_render($form[$key]['block']), 'class' => 'qt-tab-block-content'),
+ array('data' => (module_exists('views') ? drupal_render($form[$key]['view']) : ''), 'class' => 'qt-tab-view-content'),
+ array('data' => drupal_render($form[$key]['node']), 'class' => 'qt-tab-node-content'),
+ // tab content end
),
'class' => 'draggable',
);
@@ -375,11 +346,9 @@ function theme_qt_tabs($form) {
return $output;
}
-
-
-/**
- * submit handler for the "Add Tab" button
- */
+/**
+ * Submit handler for the "Add Tab" button.
+ */
function qt_more_tabs_submit($form, &$form_state) {
unset($form_state['submit_handlers']);
form_execute_handlers('submit', $form, $form_state);
@@ -387,29 +356,39 @@ function qt_more_tabs_submit($form, &$fo
$form_state['quicktabs'] = $quicktabs;
$form_state['rebuild'] = TRUE;
if ($form_state['values']['tabs_more']) {
- $form_state['qt_count'] = count($form_state['values']['tabs']) + 1;
+ if (isset($form_state['values']['tabs'])) {
+ $form_state['qt_count'] = count($form_state['values']['tabs']) + 1;
+ }
+ else {
+ $form_state['qt_count'] = 1;
+ }
}
return $quicktabs;
}
-/**
- * submit handler for the "Remove Tab" button
- */
+/**
+ * Submit handler for the "Remove Tab" button.
+ */
function qt_remove_tab_submit($form, &$form_state) {
unset($form_state['submit_handlers']);
form_execute_handlers('submit', $form, $form_state);
$quicktabs = $form_state['values'];
$form_state['quicktabs'] = $quicktabs;
$form_state['rebuild'] = TRUE;
- unset($form['qt_wrapper']['tabs'][0]);
- $form_state['values']['tabs'] = array_values($form_state['values']['tabs']);
- $form_state['qt_count'] = count($form_state['values']['tabs']) - 1;
+ //unset($form['qt_wrapper']['tabs'][0]);
+ if (isset($form_state['values']['tabs'])) {
+ $form_state['values']['tabs'] = array_values($form_state['values']['tabs']);
+ $form_state['qt_count'] = count($form_state['values']['tabs']) - 1;
+ }
+ else {
+ $form_state['qt_count'] = 0;
+ }
return $quicktabs;
}
-/**
- * submit handler for the Views drop down
- */
+/**
+ * Submit handler for the Views drop down.
+ */
function qt_get_displays_submit($form, &$form_state) {
unset($form_state['submit_handlers']);
form_execute_handlers('submit', $form, $form_state);
@@ -419,9 +398,9 @@ function qt_get_displays_submit($form, &
return $quicktabs;
}
-/**
- * ahah callback
- */
+/**
+ * AHAH callback.
+ */
function quicktabs_ahah() {
$form_state = array('storage' => NULL, 'submitted' => FALSE);
$form_build_id = $_POST['form_build_id'];
@@ -444,230 +423,183 @@ function quicktabs_ahah() {
));
}
+/**
+ * Validation handler for quicktabs admin page.
+ */
function quicktabs_form_validate($form, &$form_state) {
- // we don't want it to validate when we're just adding or removing tabs
- if ($form_state['values']['op'] == t('Save')) {
+ // We don't want it to validate when we're just adding or removing tabs.
+ if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
if (empty($form_state['values']['title'])) {
form_set_error('title', t('You must give your Quick Tabs block a title.'));
}
else {
+ if (!isset($form_state['values']['tabs'])) {
+ form_set_error('', t('At least one tab should be created.'));
+ }
foreach ($form_state['values']['tabs'] as $j => $tab) {
- if (empty($tab['tabtext'])) {
- form_set_error('tabs]['. $j .'][tabtext', t('You must give each tab a title.'));
+ if (empty($tab['title'])) {
+ form_set_error('tabs]['. $j .'][title', t('You must give each tab a title.'));
}
- }
+ }
}
}
}
-function quicktabs_form_submit($form, $form_state) {
- // we don't want it to submit when we're just adding or removing tabs
- if ($form_state['values']['op'] == t('Save')) {
+/**
+ * Submit handler for quicktabs admin page.
+ */
+function quicktabs_form_submit($form, &$form_state) {
+ // We don't want it to submit when we're just adding or removing tabs.
+ if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
$formvalues_tabs = array();
- foreach ($form_state['values']['tabs'] as $j => $tab) {
- $formvalues_tabs[] = array(
- 'title' => $form_state['values']['tabs'][$j]['tabtext'],
- 'type' => $form_state['values']['tabs'][$j]['tabtype'],
- 'bvid' => ($form_state['values']['tabs'][$j]['tabtype'] == 'block' ? $form_state['values']['tabs'][$j]['bid'] : $form_state['values']['tabs'][$j]['vid']),
- 'hide_title' => ($form_state['values']['tabs'][$j]['tabtype'] == 'block' ? $form_state['values']['tabs'][$j]['hide_title'] : 0),
- 'weight' => $form_state['values']['tabs'][$j]['tabweight'],
- 'args' => ($form_state['values']['tabs'][$j]['tabtype'] == 'block' ? '' : $form_state['values']['tabs'][$j]['args']),
- 'display' => ($form_state['values']['tabs'][$j]['tabtype'] == 'block' ? '' : $form_state['values']['tabs'][$j]['display']),
- );
- }
- $fullcontent = array(
- 'blocktitle' => $form_state['values']['title'],
- 'blockcontent' => $formvalues_tabs,
- );
-
- if ($form_state['values']['qtid']) {
- $qtid = $form_state['values']['qtid'];
- quicktabs_updateblock($qtid, $fullcontent);
- $msg = t('Your Quick Tabs block has been updated.');
- }
- else {
- quicktabs_createblock($fullcontent);
- $msg = t('Your Quick Tabs block has been created and can now be enabled.');
- }
- drupal_set_message($msg);
- drupal_goto('admin/build/quicktabs');
- }
-}
-
-function quicktabs_aj_form_validate($form, &$form_state) {
- // we don't want it to validate when we're just adding or removing tabs
- if ($form_state['values']['op'] == t('Save')) {
- if (empty($form_state['values']['title'])) {
- form_set_error('title', t('You must give your Quick Tabs block a title.'));
- }
- else {
- foreach ($form_state['values']['tabs'] as $j => $tab) {
- if (empty($tab['tabtext'])) {
- form_set_error('tabs]['. $j .'][tabtext', t('You must give each tab a title.'));
- }
- }
- }
- }
-}
-function quicktabs_aj_form_submit($form, $form_state) {
- // we don't want it to submit when we're just adding or removing tabs
- if ($form_state['values']['op'] == t('Save')) {
- $formvalues_tabs = array();
- foreach ($form_state['values']['tabs'] as $j => $tab) {
- $formvalues_tabs[] = array(
- 'title' => $form_state['values']['tabs'][$j]['tabtext'],
- 'type' => $form_state['values']['tabs'][$j]['tabtype'],
- 'bnid' => ($form_state['values']['tabs'][$j]['tabtype'] == 'node' ? $form_state['values']['tabs'][$j]['nid'] : $form_state['values']['tabs'][$j]['vid']),
- 'weight' => $form_state['values']['tabs'][$j]['tabweight'],
- 'args' => ($form_state['values']['tabs'][$j]['type'] == 'node' ? '' : $form_state['values']['tabs'][$j]['args']),
- 'display' => ($form_state['values']['tabs'][$j]['type'] == 'node' ? '' : $form_state['values']['tabs'][$j]['display']),
- );
+ foreach ($form_state['values']['tabs'] as $tab_num => $tab) {
+ $formvalues_tabs[$tab_num]['title'] = $tab['title'];
+ $formvalues_tabs[$tab_num]['weight'] = $tab['weight'];
+ $formvalues_tabs[$tab_num]['type'] = $tab['type'];
+
+ switch ($tab['type']) {
+ case 'block':
+ $formvalues_tabs[$tab_num]['block']['bid'] = $tab['block']['bid'];
+ $formvalues_tabs[$tab_num]['block']['hide_title'] = $tab['block']['hide_title'];
+ break;
+ case 'view':
+ $formvalues_tabs[$tab_num]['view']['vid'] = $tab['view']['vid'];
+ $formvalues_tabs[$tab_num]['view']['args'] = $tab['view']['args'];
+ $formvalues_tabs[$tab_num]['view']['display'] = $tab['view']['display'];
+ break;
+ case 'node':
+ $formvalues_tabs[$tab_num]['node']['nid'] = $tab['node']['nid'];
+ $formvalues_tabs[$tab_num]['node']['teaser'] = $tab['node']['teaser'];
+ $formvalues_tabs[$tab_num]['node']['hide_title'] = $tab['node']['hide_title'];
+ break;
+ };
}
$fullcontent = array(
- 'blocktitle' => $form_state['values']['title'],
- 'blockcontent' => $formvalues_tabs,
+ 'title' => $form_state['values']['title'],
+ 'style' => $form_state['values']['style'],
+ 'ajax' => $form_state['values']['ajax'],
+ 'tabs' => $formvalues_tabs,
);
-
- if ($form_state['values']['qtid']) {
+
+ if (isset($form_state['values']['qtid'])) {
$qtid = $form_state['values']['qtid'];
quicktabs_updateblock($qtid, $fullcontent);
- $msg = t('Your Quick Tabs block has been updated.');
+ $msg = t('Your Quick Tabs block has been updated.');
}
else {
- quicktabs_createblock($fullcontent, TRUE);
- $msg = t('Your Quick Tabs block has been created and can now be enabled.');
+ quicktabs_createblock($fullcontent);
+ $msg = t('Your Quick Tabs block has been created and can now be enabled.');
}
- drupal_set_message($msg);
- drupal_goto('admin/build/quicktabs');
+ drupal_set_message($msg);
+ $form_state['redirect'] = 'admin/build/quicktabs';
+ //drupal_goto('admin/build/quicktabs');
}
}
-function quicktabs_createblock($fullcontent, $ajax = FALSE) {
+/**
+ * Insert db record.
+ */
+function quicktabs_createblock($fullcontent) {
$qtid = db_last_insert_id('quicktabs', 'qtid');
- $title = $fullcontent['blocktitle'];
- $tabs = serialize($fullcontent['blockcontent']);
- if (!$ajax) {
- db_query('INSERT INTO {quicktabs} (qtid, title, tabs) VALUES(%d, "%s", "%s")', $qtid, $title, $tabs);
- } else {
- db_query('INSERT INTO {quicktabs} (qtid, ajax, title, tabs) VALUES(%d, 1, "%s", "%s")', $qtid, $title, $tabs);
- }
- return;
+ $title = $fullcontent['title'];
+ $style = $fullcontent['style'];
+ $ajax = $fullcontent['ajax'];
+ $tabs = serialize($fullcontent['tabs']);
+
+ db_query("INSERT INTO {quicktabs} (qtid, ajax, title, tabs, style) VALUES (%d, %d, '%s', '%s', '%s')", $qtid, $ajax, $title, $tabs, $style);
}
+/**
+ * Update db record.
+ */
function quicktabs_updateblock($qtid, $fullcontent) {
- $title = $fullcontent['blocktitle'];
- $tabs = serialize($fullcontent['blockcontent']);
- db_query("UPDATE {quicktabs} SET title='%s', tabs='%s' WHERE qtid=%d", $title, $tabs, $qtid);
- return;
-}
-
-function quicktabs_block_edit($qtid) {
- if ($qtblock = db_fetch_object(db_query('SELECT title, tabs, ajax FROM {quicktabs} WHERE qtid = %d', $qtid))) {
- $tabs = unserialize($qtblock->tabs);
- $formtabs = array();
- foreach ($tabs as $key => $tab) {
- $weight[$key] = $tab['weight'];
- $formtabs[] = array(
- 'tabweight' => $tab['weight'],
- 'tabtext' => $tab['title'],
- 'tabtype' => $tab['type'],
- 'bid' => ($qtblock->ajax == 0 ? ($tab['type'] == 'block' ? $tab['bvid'] : NULL) : NULL),
- 'hide_title' => ($qtblock->ajax == 0 ? ($tab['type'] == 'block' ? $tab['hide_title'] : NULL) : NULL),
- 'nid' => ($qtblock->ajax == 1 ? ($tab['type'] == 'node' ? $tab['bnid'] : NULL) : NULL),
- 'vid' => $tab['type'] == 'view' ? ($qtblock->ajax == 0 ? $tab['bvid'] : $tab['bnid']) : NULL,
- 'args' => $tab['type'] == 'view' ? $tab['args'] : NULL,
- 'display' => $tab['type'] == 'view' ? $tab['display'] : NULL,
- );
- }
- array_multisort($weight, SORT_ASC, $formtabs);
-
- $quicktabs = array(
- 'qtid' => $qtid,
- 'title' => $qtblock->title,
- 'tabs' => $formtabs,
- 'formtype' => 'edit',
- );
+ $title = $fullcontent['title'];
+ $style = $fullcontent['style'];
+ $ajax = $fullcontent['ajax'];
+ $tabs = serialize($fullcontent['tabs']);
- drupal_add_js(drupal_get_path('module', 'quicktabs') .'/js/quicktabs_form.js');
- drupal_add_css(drupal_get_path('module', 'quicktabs') .'/quicktabs.css');
- if ($qtblock->ajax == 0) {
- $output = drupal_get_form('quicktabs_form', $quicktabs);
- } else {
- $output = drupal_get_form('quicktabs_aj_form', $quicktabs);
- }
- return $output;
- }
- else {
- drupal_goto('admin/build/quicktabs');
- }
+ db_query("UPDATE {quicktabs} SET ajax=%d, title='%s', tabs='%s', style='%s' WHERE qtid = %d", $ajax, $title, $tabs, $style, $qtid);
+ return;
}
/**
- * Deletion of Quick Tabs blocks.
+ * Create or edit Quick Tabs block.
*/
+function quicktabs_block_edit($quicktabs, $formtype) {
+ $quicktabs['formtype'] = $formtype; // formtype = add or edit
+ drupal_add_js(drupal_get_path('module', 'quicktabs') .'/js/quicktabs_form.js');
+ drupal_add_css(drupal_get_path('module', 'quicktabs') .'/quicktabs.css');
-
-function quicktabs_block_get_name($qtid) {
- $result = db_result(db_query('SELECT title FROM {quicktabs} WHERE qtid=%d', $qtid));
- return $result;
+ return drupal_get_form('quicktabs_form', $quicktabs);
}
-function quicktabs_block_delete(&$form_state, $qtid = 0) {
- $qt_name = quicktabs_block_get_name($qtid);
- $form['qtid'] = array('#type' => 'hidden', '#value' => $qtid);
- $form['qt_name'] = array('#type' => 'hidden', '#value' => $qt_name);
- return confirm_form($form, t('Are you sure you want to delete the Quick Tabs block %name?', array('%name' => $qt_name)), 'admin/build/quicktabs', '', t('Delete'), t('Cancel'));
+/**
+ * Deletion of Quick Tabs blocks.
+ */
+function quicktabs_block_delete(&$form_state, $quicktabs) {
+ $form['qtid'] = array('#type' => 'hidden', '#value' => $quicktabs['qtid']);
+ $form['qt_name'] = array('#type' => 'hidden', '#value' => $quicktabs['title']);
+ return confirm_form($form, t('Are you sure you want to delete the Quick Tabs block %name?', array('%name' => $quicktabs['title'])), 'admin/build/quicktabs', '', t('Delete'), t('Cancel'));
}
-function quicktabs_block_delete_submit($form, $form_state) {
+/**
+ * Submit handler for Quick Tabs blocks deletion.
+ */
+function quicktabs_block_delete_submit($form, &$form_state) {
db_query('DELETE FROM {quicktabs} WHERE qtid = %d', $form_state['values']['qtid']);
drupal_set_message(t('The Quick Tabs block %name has been removed.', array('%name' => $form_state['values']['qt_name'])));
cache_clear_all();
- drupal_goto('admin/build/quicktabs');
+ $form_state['redirect'] = 'admin/build/quicktabs';
};
/**
* Callback function for admin/settings/quicktabs. Display the settings form.
*/
function quicktabs_settings() {
- $form = array();
+ $styles = module_invoke_all('quicktabs_tabstyles');
+ // The keys used for radios options must be valid html ids. Removing the path to css files.
+ foreach ($styles as $style) {
+ $options[drupal_strtolower($style)] = $style;
+ }
+
$form['quicktabs_tabstyle'] = array(
'#type' => 'radios',
'#title' => t('Tab Style'),
- '#options' => array('default' => t('Default (no style)')) + module_invoke_all('quicktabs_tabstyles'),
+ '#options' => array('default' => t('Default (no style)')) + $options,
'#default_value' => variable_get('quicktabs_tabstyle', 'default'),
- '#description' => t('Choose a tab style for your Quick Tabs blocks.'),
+ '#description' => t('Choose the default tab style for your Quick Tabs blocks.'),
'#attributes' => array('class' => 'quicktabs-tabstyles clear-block'),
);
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Submit'),
- );
+ '#type' => 'submit',
+ '#value' => t('Save'),
+ );
return $form;
}
-function quicktabs_settings_submit($form, $form_state) {
+/**
+ * Submit handler for QuickTabs settings.
+ */
+function quicktabs_settings_submit($form, &$form_state) {
variable_set('quicktabs_tabstyle', $form_state['values']['quicktabs_tabstyle']);
- variable_set('quicktabs_blocktitles', $form_state['values']['quicktabs_blocktitles']);
- //variable_set('quicktabs_viewbuild', $form_state['values']['quicktabs_viewbuild']);
}
+/**
+ * Theme function for quicktabs settings page.
+ *
+ * @ingroup themeable
+ */
function theme_quicktabs_settings($form) {
quicktabs_add_css();
+ drupal_add_js(drupal_get_path('module', 'quicktabs') .'/js/quicktabs.js');
drupal_set_title(t('Quick Tabs Settings'));
- // Default preview.
- $form['quicktabs_tabstyle']['default']['#description'] = 'Default '. t('Preview') .':
';
-
// Preview for each style.
- $tabstyle_number = 0;
- foreach (element_children($form['quicktabs_tabstyle']) as $tabstyle_key) {
- if ($tabstyle_key != 'default') {
- $form['quicktabs_tabstyle'][$tabstyle_key]['#description'] = $form['quicktabs_tabstyle'][$tabstyle_key]['#title'] .' '. t('Preview') .':
';
- $tabstyle_number++;
- }
-
+ foreach (element_children($form['quicktabs_tabstyle']) as $style) {
+ $style_title = $form['quicktabs_tabstyle'][$style]['#title'];
+ $preview = '
';
+ $form['quicktabs_tabstyle'][$style]['#description'] = $style_title .' '. t('Preview') .':
'. $preview;
}
return drupal_render($form);
}
@@ -675,21 +607,33 @@ function theme_quicktabs_settings($form)
/**
* Callback function for quicktabs/preview.
*/
-function quicktabs_preview_page($tabstyle_number = NULL) {
- $tabstyles = module_invoke_all('quicktabs_tabstyles');
- $css_files = array_keys($tabstyles);
- if (isset($css_files[$tabstyle_number])) {
- quicktabs_add_css($css_files[$tabstyle_number]);
- }
- else {
- quicktabs_add_css('default');
- }
- drupal_add_js(drupal_get_path('module', 'quicktabs') .'/js/quicktabs.js');
- print theme('quicktabs_preview_page');
+function quicktabs_preview_page($style) {
+ print theme('quicktabs_preview_page', $style);
exit;
}
-function theme_quicktabs_preview_page() {
+/**
+ * Theme function for quicktabs preview page.
+ *
+ * @ingroup themeable
+ */
+function theme_quicktabs_preview_page($style) {
+ $tabs['one'] = array(
+ 'title' => t('One'),
+ 'type' => 'freetext',
+ 'freetext' => array(
+ 'text' => t('First tabpage'),
+ ),
+ );
+ $tabs['two'] = array(
+ 'title' => t('Two'),
+ 'type' => 'freetext',
+ 'freetext' => array(
+ 'text' => t('Second tabpage'),
+ ),
+ );;
+
+ $rendered_tabs = quicktabs_render($tabs, $style);
$output = "\n";
$output .= '';
@@ -698,104 +642,35 @@ function theme_quicktabs_preview_page()
$output .= drupal_get_html_head();
$output .= drupal_get_css();
$output .= drupal_get_js();
- $output .= ' ';
- $output .= ' ';
- $output .= '
';
- $output .= '
';
- $output .= '
';
-
+ $output .= '';
+ $output .= '';
+ $output .= $rendered_tabs;
$output .= '