summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2009-08-06 00:20:00 (GMT)
committer Earl Miles2009-08-06 00:20:00 (GMT)
commitc01f833fe17680039141caf24ca6b48ff7416dcc (patch)
tree523fa02e20ffee5312c6c8b59ce9cb5ed2ddd8d5
parentb6c2e4e784d454e9a2c8ce244db3b0394b21f497 (diff)
#535722: Fix incorrect "title" tag on categories in add content modal.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/display-edit.inc5
-rw-r--r--plugins/task_handlers/panel_context.inc2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 32e126a..47fbe1d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Panels 6.x-3.0-dev
#530104 by stella: Fix import problem with mini panels.
#535606: Mini panel deletion deleted all block config of all mini panels.
#539418 by esmerel: Remove reference to panel page from module description.
+#535722: Fix incorrect "title" tag on categories in add content modal.
Panels 6.x-3.0-rc1
==================
diff --git a/includes/display-edit.inc b/includes/display-edit.inc
index 19ca151..29e9ea4 100644
--- a/includes/display-edit.inc
+++ b/includes/display-edit.inc
@@ -453,7 +453,7 @@ function panels_show_pane($display, $pane, $skin = TRUE) {
'attributes' => array('class' => 'ctools-use-modal'),
);
}
-
+
$style = panels_get_style((!empty($pane->style['style'])) ? $pane->style['style'] : 'default');
$links[] = array(
@@ -721,7 +721,6 @@ function panels_add_content($cache, $panel_id, $key) {
$content_type = ctools_get_content_type($type_name);
foreach ($subtypes as $subtype_name => $subtype_info) {
$title = filter_xss_admin($subtype_info['title']);
- $description = isset($subtype_info['description']) ? $subtype_info['description'] : $title;
$icon = ctools_content_admin_icon($subtype_info);
@@ -784,7 +783,7 @@ function panels_add_content($cache, $panel_id, $key) {
}
$url = "panels/ajax/add-pane/$cache_key/$panel_id/$category";
- $selector .= ctools_ajax_text_button($name, $url, $description, $class);
+ $selector .= ctools_ajax_text_button($name, $url, '', $class);
}
$selector .= '</div>';
diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index 7830814..ed55a7e 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -476,7 +476,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s
$output .= '<div class="clear-block">';
if ($show_title) {
- $output .= '<div class="handler-title">';
+ $output .= '<div class="handler-title clear-block">';
$output .= '<div class="actions handler-actions">' . $rendered_operations['actions'] . '</div>';
$output .= '<span class="title-label">' . $title . '</span>';
}