=== modified file 'sites/all/modules/drupalorg/drupalorg/drupalorg.install'
--- sites/all/modules/drupalorg/drupalorg/drupalorg.install 2011-10-04 00:25:44 +0000
+++ sites/all/modules/drupalorg/drupalorg/drupalorg.install 2012-03-14 04:38:38 +0000
@@ -576,10 +576,6 @@
French
Hungarian
Dutch');
- variable_set('drupalorg_featured_install_profiles', '
Community Site
-
E-commerce
-
News Site
-
Wiki');
variable_set('google_admanager_account', 'ca-pub-8747679010629587');
variable_set('google_admanager_ad_slots', 'Redesign_home
@@ -818,6 +814,19 @@
}
/**
+ * Elements related to pushing distributions as a first-class thing.
+ */
+function drupalorg_update_6604() {
+ // Populate activity stats for new "distributions" count.
+ drupalorg_get_activity(TRUE);
+
+ // Remove old 'drupalorg_featured_install_profiles' variable.
+ variable_del('drupalorg_featured_install_profiles');
+
+ return array();
+}
+
+/**
* Utility function to add permissions to certain user roles.
*/
function _drupalorg_add_permissions($permissions) {
=== modified file 'sites/all/modules/drupalorg/drupalorg/drupalorg.module'
--- sites/all/modules/drupalorg/drupalorg/drupalorg.module 2012-03-09 18:06:21 +0000
+++ sites/all/modules/drupalorg/drupalorg/drupalorg.module 2012-03-14 04:35:31 +0000
@@ -66,7 +66,7 @@
// Temporary message about the Solr index being rebuilt.
if (variable_get('drupalorg_warn_search_index_rebuild', FALSE)) {
if (arg(0) == 'search' || arg(0) == 'download' || arg(0) == 'start' ||
- (arg(0) == 'project' && (arg(1) == 'modules' || arg(1) == 'themes' || arg(1) == 'installation profiles' || arg(1) == 'theme engines'))) {
+ (arg(0) == 'project' && (arg(1) == 'modules' || arg(1) == 'themes' || arg(1) == 'distributions' || arg(1) == 'theme engines'))) {
drupal_set_message(t('We are rebuilding the search index for the update to drupal.org. The search results may produce broken or out-of-date results until the index is fully rebuilt. We will remove this message when the indexing is complete. Do not report any search errors at this time.'));
}
}
@@ -313,11 +313,11 @@
$items = array();
$stats = drupalorg_get_activity();
$items[] = t('
@accounts people with Git accounts', array('@accounts' => $stats['number_of_git_accounts']));
- $items[] = t("
@commits Git commits this week", array('@commits' => $stats['number_of_git_commits']));
- $items[] = t("
@users users on drupal.org", array('@users' => $stats['number_of_users']));
- $items[] = t("
@sites sites running Drupal", array('@sites' => $stats['sites']));
- $items[] = t("
@docs Documentation team members", array('@docs' => $stats['docs']));
- $items[] = t("
@comments comments and issue followups", array('@comments' => $stats['comments']));
+ $items[] = t("
@commits Git commits this week", array('@commits' => $stats['number_of_git_commits']));
+ $items[] = t("
@users users on drupal.org", array('@users' => $stats['number_of_users']));
+ $items[] = t("
@sites sites running Drupal", array('@sites' => $stats['sites']));
+ $items[] = t("
@docs Documentation team members", array('@docs' => $stats['docs']));
+ $items[] = t("
@comments comments and issue followups", array('@comments' => $stats['comments']));
$output = theme('item_list', $items);
return $output;
@@ -358,6 +358,9 @@
//$themes = db_result(db_query("SELECT COUNT(distinct prn.pid) FROM node n INNER JOIN project_release_nodes prn ON n.nid = prn.nid INNER JOIN term_node tn on prn.pid = tn.nid WHERE tn.tid = 15 AND prn.version_api_tid IN (87, 103)"));
$stats['number_of_themes'] = number_format($themes);
+ // All Distributions.
+ $distributions = db_result(db_query("SELECT COUNT(distinct p.nid) FROM {project_projects} p INNER JOIN {term_node} tn ON p.nid = tn.nid WHERE tn.tid = 96"));
+ $stats['number_of_distributions'] = number_format($distributions);
// Users: Count them.
$stats['number_of_users'] = number_format(db_result(db_query('SELECT COUNT(*) FROM {users} WHERE uid > 0 AND status = 1 AND login > 0')));
@@ -585,7 +588,6 @@
$variables['core_download_button'] = drupalorg_download_drupal_link_button('Download Drupal');
$variables['drupalorg_featured_translations'] = variable_get('drupalorg_featured_translations', '');
- $variables['drupalorg_featured_install_profiles'] = variable_get('drupalorg_featured_install_profiles', '');
// Create and cache a solr query for use by block elements.
project_solr_run_project_query('project/modules', array(array(
@@ -614,7 +616,6 @@
function drupalorg_preprocess_drupalorg_download(&$variables) {
$variables['core_download_button'] = drupalorg_download_drupal_link_button('Download Drupal');
$variables['drupalorg_featured_translations'] = variable_get('drupalorg_featured_translations', '');
- $variables['drupalorg_featured_install_profiles'] = variable_get('drupalorg_featured_install_profiles', '');
// Create and cache a solr query for use by block elements.
project_solr_run_project_query('project/modules', array(array(
@@ -1237,13 +1238,6 @@
'#default_value' => variable_get('drupalorg_featured_translations', ''),
'#rows' => 5,
);
- $form['featured']['drupalorg_featured_install_profiles'] = array(
- '#type' => 'textarea',
- '#title' => t('Featured install profiles'),
- '#default_value' => variable_get('drupalorg_featured_install_profiles', ''),
- '#rows' => 5,
- );
-
$form['drupalcon'] = array(
'#type' => 'fieldset',
'#title' => t('DrupalCon'),
=== modified file 'sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module'
--- sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module 2012-03-08 18:13:21 +0000
+++ sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module 2012-03-14 04:28:55 +0000
@@ -100,7 +100,7 @@
'download-core' => array('href' => 'project/drupal', 'title' => t('Drupal Core'), '#site' => 'main', 'attributes' => array('title' => t('Download the latest version of the Drupal software'))),
'download-modules' => array('href' => 'project/modules', 'title' => t('Modules'), '#site' => 'main', 'attributes' => array('title' => t('Download add-on features and functionality'))),
'download-themes' => array('href' => 'project/themes', 'title' => t('Themes'), '#site' => 'main', 'attributes' => array('title' => t('Download pre-designed styles for Drupal'))),
- 'download-profiles' => array('href' => 'project/installation+profiles', 'title' => t('Installation Profiles'), '#site' => 'main', 'attributes' => array('title' => t('Download a pre-packaged Drupal site'))),
+ 'download-distributions' => array('href' => 'project/distributions', 'title' => t('Distributions'), '#site' => 'main', 'attributes' => array('title' => t('Download a pre-packaged Drupal site'))),
)), array());
$nav_footer['column_5']['#value'] = theme('links', drupalorg_crosssite_menu_absolute_links(array(
'about' => array('href' => 'about', 'title' => t('About'), '#site' => 'main'),
@@ -136,7 +136,7 @@
'modules' => array('href' => 'project/modules', 'title' => t('Modules'), '#site' => 'main', '#active' => drupalorg_crosssite_in_breadcrumb('main', 'project/modules', $vars) || drupalorg_crosssite_menu_path('main', '^project/modules')),
'themes' => array('href' => 'project/themes', 'title' => t('Themes'), '#site' => 'main', '#active' => drupalorg_crosssite_child_of('main', 'project/themes', $vars) || drupalorg_crosssite_child_of('main', 'project/theme engines', $vars)),
'translations' => array('href' => '
', 'title' => t('Translations'), '#site' => 'localize', '#active' => drupalorg_crosssite_is_site('localize') || drupalorg_crosssite_in_breadcrumb('main', 'project/translations', $vars)),
- 'install-profiles' => array('href' => 'project/installation+profiles', 'title' => t('Installation Profiles'), '#site' => 'main', '#active' => drupalorg_crosssite_menu_path('main', '^project/installation profiles') || drupalorg_crosssite_in_breadcrumb('main', 'project/installation profiles', $vars)),
+ 'distributions' => array('href' => 'project/distributions', 'title' => t('Distributions'), '#site' => 'main', '#active' => drupalorg_crosssite_menu_path('main', '^project/distributions') || drupalorg_crosssite_in_breadcrumb('main', 'project/distributions', $vars)),
);
break;
@@ -594,6 +594,7 @@
'documentation' => t('Documentation'),
'forum-issues' => t('Forums & Issues'),
'group' => t('Groups'),
+ 'distributions' => t('Distributions'),
);
}
=== modified file 'sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.install'
--- sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.install 2011-07-01 00:42:34 +0000
+++ sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.install 2012-03-14 04:29:39 +0000
@@ -117,3 +117,29 @@
drupalorg_project_issue_counts();
return array();
}
+
+/**
+ * Rename the 'Installation Profiles' project type to 'Distributions'.
+ */
+function drupalorg_project_update_6004() {
+ // Rename project type taxonomy term.
+ $term = taxonomy_get_term(96);
+ $term->name = t('Distributions');
+ $term->description = t('Distributions provide site features and functions for a specific type of site as a single download containing Drupal core, contributed modules, themes, and pre-defined configuration. They make it possible to quickly set up a complex, use-specific site in fewer steps than if installing and configuring elements individually.
');
+ // Cast $term to an array since taxonomy_save_term() wants form values.
+ $term = (array) $term;
+ taxonomy_save_term($term);
+
+ // Remove variable that holds hard-coded list of featured distributions.
+ variable_del('drupalorg_featured_install_profiles');
+
+ // Set up redirect from /project/installation+profiles to /project/distributions.
+ $redirect = array(
+ 'source' => 'project/installation+profiles',
+ 'redirect' => 'project/distributions',
+ );
+ path_redirect_save($redirect);
+
+ return array();
+}
+
=== modified file 'sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module'
--- sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module 2012-01-15 21:55:41 +0000
+++ sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module 2012-03-14 04:30:17 +0000
@@ -1059,7 +1059,7 @@
'15' => t('Theme'),
'32' => t('Theme engine'),
'29' => t('Translation'),
- '96' => t('Installation profile'),
+ '96' => t('Distribution'),
);
}
else {
@@ -1070,7 +1070,7 @@
'15' => t('Themes'),
'32' => t('Theme engines'),
'29' => t('Translations'),
- '96' => t('Installation profiles'),
+ '96' => t('Distributions'),
);
}
}