diff --git a/taxonomy_nco.info b/taxonomy_nco.info
index e45c42d..2807ba1 100755
--- a/taxonomy_nco.info
+++ b/taxonomy_nco.info
@@ -2,4 +2,4 @@ name = Taxonomy NCO
description = Taxonomy freetagging relationship system. Normally uses data produced by Taxonomy NCO Analysis.
core = 7.x
dependencies[] = taxonomy
-
+configure = admin/config/content/taxonomy_nco
diff --git a/taxonomy_nco.module b/taxonomy_nco.module
index 2ad1521..84d0c79 100755
--- a/taxonomy_nco.module
+++ b/taxonomy_nco.module
@@ -62,7 +62,7 @@ function taxonomy_nco_menu() {
$items = array();
- $items['admin/config/taxonomy_nco'] = array(
+ $items['admin/config/content/taxonomy_nco'] = array(
'title' => 'Taxonomy NCO',
'description' => 'Taxonomy NCO config',
'page callback' => 'drupal_get_form',
diff --git a/taxonomy_nco_analysis.info b/taxonomy_nco_analysis.info
index 9cbcb9c..c24f7fc 100755
--- a/taxonomy_nco_analysis.info
+++ b/taxonomy_nco_analysis.info
@@ -1,4 +1,5 @@
name = Taxonomy NCO Analysis
description = Taxonomy Normalized Co-ocurrence Analysis.
core = 7.x
-dependencies[] = taxonomy
\ No newline at end of file
+dependencies[] = taxonomy
+configure = admin/config/content/taxonomy_nco_analysis
diff --git a/taxonomy_nco_analysis.module b/taxonomy_nco_analysis.module
index acda64d..adf34a6 100755
--- a/taxonomy_nco_analysis.module
+++ b/taxonomy_nco_analysis.module
@@ -58,14 +58,14 @@ function taxonomy_nco_analysis_menu() {
$items = array();
- $items['admin/config/taxonomy_nco_analysis'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis'] = array(
'title' => 'Taxonomy NCO Analysis',
'description' => 'Taxonomy NCO analysis config',
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_nco_analysis_admin_form'),
'access arguments' => array('access administration pages'),
);
- $items['admin/config/taxonomy_nco_analysis/confirm'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/confirm'] = array(
'title' => 'Confirm Start NCO Analysis',
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_nco_analysis_start_confirm', 'foo'),
@@ -76,20 +76,20 @@ function taxonomy_nco_analysis_menu() {
if (module_exists('taxonomy_nco_clustering')) {
//================ Clusters
// note: clustering is in porting from D5 > D6
- $items['admin/config/taxonomy_nco_analysis/force'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/force'] = array(
'title' => 'Enforced NCO',
'description' => 'Enforced term equivalences',
'page callback' => 'taxonomy_nco_force',
'access arguments' => array('administer taxonomy nco'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/taxonomy_nco_analysis/force_root'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/force_root'] = array(
'title' => 'Enforced cluster root',
'page callback' => 'taxonomy_nco_force_root',
'access arguments' => array('administer taxonomy nco'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/taxonomy_nco_analysis/browse'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/browse'] = array(
'title' => 'Browse clusters',
'description' => 'Clusters',
'page callback' => 'taxonomy_nco_browse',
@@ -101,14 +101,14 @@ function taxonomy_nco_analysis_menu() {
// rather specific to the setup there and may not be useful
// in contrib releases.
/*
- $items['admin/config/taxonomy_nco_analysis/cluster'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/cluster'] = array(
'title' => 'Walk term cluster',
'description' => 'Cluster walk',
'page callback' => 'taxonomy_nco_cluster_test',
'access arguments' => array('administer taxonomy nco'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/taxonomy_nco_analysis/size'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/size'] = array(
'title' => 'Cluster sizes',
'description' => 'Actual nodes in a cluster',
'page callback' => 'taxonomy_nco_cluster_size',
@@ -117,14 +117,14 @@ function taxonomy_nco_analysis_menu() {
);
*/
// .......
- $items['admin/config/taxonomy_nco_analysis/rebuild'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/rebuild'] = array(
'title' => 'Rebuild clusters',
'description' => 'Rebuild all the clustering',
'page callback' => 'taxonomy_nco_cluster_rebuild',
'access arguments' => array('administer taxonomy nco'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/config/taxonomy_nco_analysis/tree'] = array(
+ $items['admin/config/content/taxonomy_nco_analysis/tree'] = array(
'title' => 'Cluster build tree',
'description' => 'Display the full build tree',
'page callback' => 'taxonomy_nco_cluster_tree',
@@ -252,8 +252,8 @@ function taxonomy_nco_analysis_admin_form_validate($form, &$form_state) {
function taxonomy_nco_analysis_start_analysis() {
watchdog('taxonomy nco', 'Initial analysis start button trigger');
//drupal_set_message('start button trigger');
- //$form_state['redirect'] = 'admin/config/taxonomy_nco_analysis/confirm';
- drupal_goto('admin/config/taxonomy_nco_analysis/confirm');
+ //$form_state['redirect'] = 'admin/config/content/taxonomy_nco_analysis/confirm';
+ drupal_goto('admin/config/content/taxonomy_nco_analysis/confirm');
}
/**
@@ -323,7 +323,7 @@ function taxonomy_nco_analysis_start_confirm($foo) {
function taxonomy_nco_analysis_start_confirm_submit($form, &$form_state) {
taxonomy_nco_analysis_initiate_global_analysis(0);
drupal_set_message(t('Taxonomy NCO initial processing run initiated.'));
- drupal_goto('admin/config/taxonomy_nco_analysis');
+ drupal_goto('admin/config/content/taxonomy_nco_analysis');
}
@@ -850,8 +850,8 @@ function taxonomy_nco_browse($tid_a = NULL, $limit = 100) {
$tablesql = tablesort_sql($header);
$result = pager_query($sql . $tablesql, $limit);
while ($row = db_fetch_array($result)) {
- $row['tid_a'] = l($row['tid_a'], 'admin/config/taxonomy_nco_analysis/cluster/' . $row['tid_a']);
- $row['tid_b'] = l($row['tid_b'], 'admin/config/taxonomy_nco_analysis/cluster/' . $row['tid_b']);
+ $row['tid_a'] = l($row['tid_a'], 'admin/config/content/taxonomy_nco_analysis/cluster/' . $row['tid_a']);
+ $row['tid_b'] = l($row['tid_b'], 'admin/config/content/taxonomy_nco_analysis/cluster/' . $row['tid_b']);
$rows[] = $row;
}
if (!$rows) {
@@ -879,9 +879,9 @@ function taxonomy_nco_cluster_test($tid = NULL, $nco_local = TAXONOMY_NCO_CLUSTE
$row_nco = taxonomy_nco_get_relationship($tid, $row_tid);
$rows[] = array(
$row_tid,
- l( $row_term->name, 'admin/config/taxonomy_nco_analysis/cluster/' . $row_tid),
+ l( $row_term->name, 'admin/config/content/taxonomy_nco_analysis/cluster/' . $row_tid),
$row_nco['nco'],
- l('root', 'admin/config/taxonomy_nco_analysis/force_root/' . $row_tid),
+ l('root', 'admin/config/content/taxonomy_nco_analysis/force_root/' . $row_tid),
);
}
$output = '' . $term->name . '
';
@@ -899,7 +899,7 @@ function taxonomy_nco_cluster_test($tid = NULL, $nco_local = TAXONOMY_NCO_CLUSTE
else {
$top = soe_explore_top_subjects(25);
foreach ($top as $tid => $row) {
- $rows[] = array(l($row['name'], 'admin/config/taxonomy_nco_analysis/cluster/' . $tid ));
+ $rows[] = array(l($row['name'], 'admin/config/content/taxonomy_nco_analysis/cluster/' . $tid ));
}
$output = theme('table', array('header' => array('term'), 'rows' => $rows));
}
@@ -1021,11 +1021,11 @@ function taxonomy_nco_cluster_rebuild($go = FALSE, $nco_local = TAXONOMY_NCO_CLU
$count = taxonomy_nco_clustering_term_usage_count();
$clusters = taxomomy_nco_clustering_clusters_calculate_all($count, $nco_local, $power, $remote_power);
taxonomy_nco_clustering_clusters_insert($clusters, TRUE);
- $output .= l("View tree", "admin/config/taxonomy_nco_analysis/tree/$nco_local/$power/$remote_power");
+ $output .= l("View tree", "admin/config/content/taxonomy_nco_analysis/tree/$nco_local/$power/$remote_power");
return $output;
}
else {
- return l("Really rebuild the clusters", "admin/config/taxonomy_nco_analysis/rebuild/yes");
+ return l("Really rebuild the clusters", "admin/config/content/taxonomy_nco_analysis/rebuild/yes");
}
}
@@ -1050,9 +1050,9 @@ function theme_taxonomy_nco_analysis_block_force_relationship() {
$output .= ' (forced root)';
}
else {
- $output .= ' (' . l('force root', 'admin/config/taxonomy_nco_analysis/force_root/' . $tid) . ')';
+ $output .= ' (' . l('force root', 'admin/config/content/taxonomy_nco_analysis/force_root/' . $tid) . ')';
}
- $output .= ' [ ' . l('cluster admin', 'admin/config/taxonomy_nco_analysis') . ' ]';
+ $output .= ' [ ' . l('cluster admin', 'admin/config/content/taxonomy_nco_analysis') . ' ]';
if (is_array($cluster_info['clusters'])) {
$output .= '';
$output .= '
Clusters
';
@@ -1167,7 +1167,7 @@ function taxonomy_nco_cluster_tree( $nco_local = TAXONOMY_NCO_CLUSTERING_NCO_LOC
$clusters = taxomomy_nco_clustering_clusters_calculate_all($count, $nco_local, $power, $remote_power);
$output .= 'LOCAL NCO: ' . $nco_local . ' POWER: ' . $power . ' REMOTE POWER: ' . $remote_power;
$output .= taxonomy_nco_cluster_tree_walk($clusters['path']);
- $output .= l("rebuild the clusters", "admin/config/taxonomy_nco_analysis/rebuild/yes/$nco_local/$power/$remote_power");
+ $output .= l("rebuild the clusters", "admin/config/content/taxonomy_nco_analysis/rebuild/yes/$nco_local/$power/$remote_power");
return $output;
}
@@ -1185,7 +1185,7 @@ function taxonomy_nco_cluster_tree_walk($members, $level = 1) {
if ($data['count']) {
$output .= ' count:' . $data['count'];
}
- $output .= ' (' . l('force root', 'admin/config/taxonomy_nco_analysis/force_root/' . $tid) . ')';
+ $output .= ' (' . l('force root', 'admin/config/content/taxonomy_nco_analysis/force_root/' . $tid) . ')';
$output .= taxonomy_nco_cluster_tree_walk($data['children'], ($level + 1) );
$output .= '';
}