From e98c700483e3f9b82d8403c61ea651776b78cebe Mon Sep 17 00:00:00 2001
From: Bob Vincent <bobvin@pillars.net>
Date: Fri, 29 Jul 2011 16:36:15 -0400
Subject: [PATCH] Issue #763442: Move paths from admin/domain/content to
 admin/structure/domain/content.

---
 domain_content/README.txt                |    2 +-
 domain_content/domain_content.admin.inc  |    6 +++---
 domain_content/domain_content.domain.inc |    2 +-
 domain_content/domain_content.module     |   10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/domain_content/README.txt b/domain_content/README.txt
index f50c5b2..8387c1f 100644
--- a/domain_content/README.txt
+++ b/domain_content/README.txt
@@ -100,7 +100,7 @@ domains' permission is required to access the 'Affiliated content' screen.
 ----
 3.2 Affiliated Content
 
-The Affiliated Content link resides at the path 'admin/domain/content'.  This
+The Affiliated Content link resides at the path 'admin/structure/domain/content'.  This
 page returns a list of all domains for which the user can edit or view content.
 
 By design, the first menu item under Affiliated Content is the 'Content for all
diff --git a/domain_content/domain_content.admin.inc b/domain_content/domain_content.admin.inc
index 25dbb7e..4ffd98e 100644
--- a/domain_content/domain_content.admin.inc
+++ b/domain_content/domain_content.admin.inc
@@ -16,7 +16,7 @@
 function domain_content_page() {
   $build = array();
   $content = array();
-  $content = system_admin_menu_block(menu_get_item('admin/domain/content'));
+  $content = system_admin_menu_block(menu_get_item('admin/structure/domain/content'));
   // Print the list of options.
   if (!empty($content)) {
     $output = theme('admin_block_content', array('content' => $content));
@@ -79,7 +79,7 @@ function domain_content_list() {
     $path = trim(domain_get_path($domain), '/');
     $rows[] = array(
       $domain['domain_id'] . (($domain['is_default']) ? ' * ' : ''),
-      l(t('@sitename content', array('@sitename' => $domain['sitename'])), 'admin/domain/content/' . $domain['domain_id']),
+      l(t('@sitename content', array('@sitename' => $domain['sitename'])), 'admin/structure/domain/content/' . $domain['domain_id']),
       number_format((int) db_query("SELECT COUNT(nid) FROM {domain_access} WHERE gid = :gid AND realm = :realm", array(':gid' => $domain['domain_id'], ':realm' => 'domain_id'))->fetchField()),
       l(t('View @domain', array('@domain' => $domain['subdomain'])), $path),
     );
@@ -87,7 +87,7 @@ function domain_content_list() {
 
   $all = array(
     '-',
-    l(t('Content assigned to all affiliates'), 'admin/domain/content/all'),
+    l(t('Content assigned to all affiliates'), 'admin/structure/domain/content/all'),
     number_format((int) db_query("SELECT COUNT(nid) FROM {domain_access} WHERE gid = :gid AND realm = :realm", array(':gid' => 0, ':realm' => 'domain_site'))->fetchField()),
     '',
   );
diff --git a/domain_content/domain_content.domain.inc b/domain_content/domain_content.domain.inc
index bf39f5a..ea32e0b 100644
--- a/domain_content/domain_content.domain.inc
+++ b/domain_content/domain_content.domain.inc
@@ -13,7 +13,7 @@
 function domain_content_domain_link($domain) {
   $links[] = array(
     'title' => t('content'),
-    'path' => 'admin/domain/content/'. $domain['domain_id']
+    'path' => 'admin/structure/domain/content/'. $domain['domain_id']
   );
   return $links;
 }
diff --git a/domain_content/domain_content.module b/domain_content/domain_content.module
index b85eb28..7dbbfc7 100644
--- a/domain_content/domain_content.module
+++ b/domain_content/domain_content.module
@@ -22,14 +22,14 @@
  */
 function domain_content_menu() {
   $items = array();
-  $items['admin/domain/content'] = array(
+  $items['admin/structure/domain/content'] = array(
     'title' => 'Affiliated content',
     'description' => 'Administer content by domain.',
     'page callback' => 'domain_content_list',
     'access callback' => 'domain_content_menu_check',
     'file' => 'domain_content.admin.inc',
   );
-  $items['admin/domain/content/all'] = array(
+  $items['admin/structure/domain/content/all'] = array(
     'title' => 'Content assigned to all affiliates',
     'page callback' => 'domain_content_view',
     'page arguments' => array(NULL, TRUE),
@@ -45,7 +45,7 @@ function domain_content_menu() {
     $domains = domain_domains();
     if (count($domains) <= variable_get('domain_list_size', DOMAIN_LIST_SIZE)) {
       foreach ($domains as $domain) {
-        $items['admin/domain/content/' . $domain['domain_id']] = array(
+        $items['admin/structure/domain/content/' . $domain['domain_id']] = array(
           'title' => check_plain($domain['sitename']) .' content',
           'page callback' => 'domain_content_view',
           'page arguments' => array($domain['domain_id'], FALSE),
@@ -58,7 +58,7 @@ function domain_content_menu() {
       }
     }
     else {
-      $items['admin/domain/content/list'] = array(
+      $items['admin/structure/domain/content/list'] = array(
         'title' => 'Affiliate site list',
         'page callback' => 'domain_content_list',
         'access callback' => 'domain_content_menu_check',
@@ -66,7 +66,7 @@ function domain_content_menu() {
         'description' => 'View your list of affiliates',
         'weight' => -10
       );
-      $items['admin/domain/content/%'] = array(
+      $items['admin/structure/domain/content/%'] = array(
         'title' => 'Affiliate site list',
         'page callback' => 'domain_content_view',
         'page arguments' => array(3, TRUE),
-- 
1.7.6.238.g11ac1.dirty