Commit 6539308d authored by profix898's avatar profix898

- bugfix: broken breadcrumbs for dynamic albums (#207986)

- bugfix: bad ids for install table (#207843)
- bugfix: install still checks for gsitemap module (#208872)
parent 9f2d4ad5
......@@ -412,7 +412,7 @@ function gallery_page() {
);
$parent_title = str_replace('[/i]', '</i>', $parent_title);
// Still does not generate a clean url for /gallery (uses index.php?q=gallery)
$link = gallery_generate_url(array('itemId' => $parent['id']), FALSE);
$link = gallery_generate_url($parent['urlParams'], FALSE);
// TODO (#154507 + i18n-rewrite): $link = TRUE ? str_replace('?q=gallery', 'gallery', $link) : $link;
$breadcrumb[] = l($parent_title, $link);
}
......
......@@ -63,7 +63,7 @@ function _gallery_install_status_report($install_status) {
$row = array();
$row[] = array('data' => $status['title'], 'align' => 'left', 'width' => '20%');
$row[] = array('data' => theme('gallery_severity_message', $severity), 'align' => 'center');
$row[] = array('data' => isset($status['info'])? $status['info'] : '', 'class' => 'description', 'id' => $step);
$row[] = array('data' => isset($status['info'])? $status['info'] : '', 'class' => 'description', 'id' => 'gallery-install-status-'. $step);
$rows[] = $row;
}
......@@ -973,7 +973,7 @@ function _gallery_install_plugins(&$install_status, $title = NULL, $collapse = F
$row = array();
$row[] = array('data' => $module['title'], 'align' => 'left', 'width' => '15%');
$row[] = array('data' => theme('gallery_severity_status_message', $severity, $module['status']), 'align' => 'center');
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => $key);
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => 'gallery-install-plugin-'. $key);
$rows[] = $row;
if ($module['status'] != GALLERY_PLUGIN_ENABLED && $severity > $overall_plugin_severity) {
$overall_plugin_severity = $severity;
......@@ -1000,7 +1000,7 @@ function _gallery_install_plugins(&$install_status, $title = NULL, $collapse = F
$row = array();
$row[] = array('data' => $module['title'], 'align' => 'left', 'width' => '15%');
$row[] = array('data' => theme('gallery_severity_status_message', $severity, $module['status'], TRUE, TRUE), 'align' => 'center');
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => $key);
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => 'gallery-install-plugin-'. $key);
$rows[] = $row;
if ($module['status'] == GALLERY_PLUGIN_ENABLED && $severity > $overall_plugin_severity) {
$overall_plugin_severity = $severity;
......@@ -1026,7 +1026,7 @@ function _gallery_install_plugins(&$install_status, $title = NULL, $collapse = F
$row = array();
$row[] = array('data' => $module['title'], 'align' => 'left', 'width' => '15%');
$row[] = array('data' => theme('gallery_severity_status_message', $severity, $module['status']), 'align' => 'center');
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => $key);
$row[] = array('data' => $module['info'], 'class' => 'description', 'id' => 'gallery-install-plugin-'. $key);
$rows[] = $row;
if ($module['status'] != GALLERY_PLUGIN_ENABLED && $severity > $overall_plugin_severity) {
$overall_plugin_severity = $severity;
......
......@@ -110,15 +110,15 @@ function _gallery_settings_general() {
// Gallery2 Google Sitemap Settings
$gallery2_sitemap_status = gallery_single_plugin_status('sitemap');
$gallery2_sitemap_status_str = theme('gallery_plugin_status_message', $gallery2_sitemap_status);
$gsitemap_status = module_exists('xmlsitemap');
$gsitemap_status_str = theme('gallery_module_status_message', $gsitemap_status);
$gsitemap_available = $gsitemap_status && ($gallery2_sitemap_status == GALLERY_PLUGIN_ENABLED);
$xmlsitemap_status = module_exists('xmlsitemap');
$xmlsitemap_status_str = theme('gallery_module_status_message', $xmlsitemap_status);
$xmlsitemap_available = $xmlsitemap_status && ($gallery2_sitemap_status == GALLERY_PLUGIN_ENABLED);
$desc = t('Allows the Gallery2 sitemap to be merged with the Drupal one so that only one URL needs to
be supplied to search engines. Requires the Drupal XML Sitemap module (!gsitemap_status) and
be supplied to search engines. Requires the Drupal XML Sitemap module (!xmlsitemap_status) and
the Gallery2 sitemap module (!gallery2_sitemap_status) to be installed/activated.',
array(
'!gsitemap_status' => $gsitemap_status_str,
'!xmlsitemap_status' => $xmlsitemap_status_str,
'!gallery2_sitemap_status' => $gallery2_sitemap_status_str,
)
);
......@@ -134,8 +134,8 @@ function _gallery_settings_general() {
$form['sitemap']['gallery_enable_sitemap'] = array(
'#type' => 'checkbox',
'#title' => t('Enable merge of Gallery2 sitemap with Drupal sitemap'),
'#default_value' => $gsitemap_available ? variable_get('gallery_enable_sitemap', 1) : FALSE,
'#disabled' => !$gsitemap_available,
'#default_value' => $xmlsitemap_available ? variable_get('gallery_enable_sitemap', 1) : FALSE,
'#disabled' => !$xmlsitemap_available,
);
// Error logging / Debug Settings
......@@ -1092,12 +1092,12 @@ function gallery_gallery_plugin_info($type) {
);
case GALLERY_PLUGIN_DRUPAL:
return array(
'gsitemap' => array(
'title' => 'Google Sitemap',
'status' => module_exists('gsitemap'),
'xmlsitemap' => array(
'title' => 'XML Sitemap',
'status' => module_exists('xmlsitemap'),
'severity' => GALLERY_SEVERITY_ADVISE,
'info' => t('Allows the Drupal and Gallery2 Google Sitemaps to be merged which allows for
a single sitemap to be sent to Google (and other web search sites).'),
'info' => t('Enables the Drupal and Gallery2 sitemaps to be merged which allows for
a single sitemap to be sent to Google and other web search sites.'),
),
'profile' => array(
'title' => 'Profile',
......@@ -1127,7 +1127,7 @@ function gallery_plugin_set_status($plugin_names) {
$status[$plugin]['title'] = t('Gallery2 plugin \'@plugin\' is not available',
array('@plugin' => isset($plugin_info[$plugin]) ? $plugin_info[$plugin]['title'] : drupal_ucfirst($plugin)));
$status[$plugin]['severity'] = isset($plugin_info[$plugin]['severity']) ? $plugin_info[$plugin]['severity'] : GALLERY_SEVERITY_WARNING;
$status[$plugin]['url'] = url('admin/settings/gallery/install', NULL, $plugin);
$status[$plugin]['url'] = url('admin/settings/gallery/install', NULL, 'gallery-install-plugin-'. $plugin);
}
}
gallery_set_status($status);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment