Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/demo/CHANGELOG.txt,v
retrieving revision 1.15
diff -u -p -r1.15 CHANGELOG.txt
--- CHANGELOG.txt 28 Oct 2008 19:06:54 -0000 1.15
+++ CHANGELOG.txt 2 Nov 2008 22:07:33 -0000
@@ -6,6 +6,7 @@ Demo x.x-x.x, xxxx-xx-xx
Demo 6.x-1.x, xxxx-xx-xx
------------------------
+#329182 by sun: Moved menu items below admin/build.
#299841 by sun: Fixed wrong function arguments for watchdog().
#286781 by alex_b: Added function return value for demo_reset().
#272820 by sun: Increased maxlength for snapshot file names.
Index: demo.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/demo/demo.admin.inc,v
retrieving revision 1.2
diff -u -p -r1.2 demo.admin.inc
--- demo.admin.inc 28 Oct 2008 19:06:54 -0000 1.2
+++ demo.admin.inc 2 Nov 2008 22:00:46 -0000
@@ -47,7 +47,7 @@ function demo_admin_settings() {
'#title' => t('Automatically reset site every'),
'#default_value' => variable_get('demo_reset_interval', 0),
'#options' => $period,
- '#description' => t('Select how often this demonstration site is automatically reset. Ensure that you have chosen a snapshot for cron runs in Manage snapshots first. Note: This requires cron to run at least within this interval.', array('!manage' => url('admin/settings/demo/manage'))),
+ '#description' => t('Select how often this demonstration site is automatically reset. Ensure that you have chosen a snapshot for cron runs in Manage snapshots first. Note: This requires cron to run at least within this interval.', array('!manage' => url('admin/build/demo/manage'))),
);
$form['dump']['path'] = array(
@@ -123,7 +123,7 @@ function demo_dump() {
'#rows' => 2,
'#description' => t('Optionally enter a description for this snapshot here. If no description is given and a snapshot with the same filename already exists, the previous description is used.'),
);
- return confirm_form($form, t('Are you sure you want to create a new snapshot?'), 'admin/settings/demo', t('If the above filename already exists, creating a new snapshot will overwrite the existing snapshot. This action cannot be undone.'), t('Create'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to create a new snapshot?'), 'admin/build/demo', t('If the above filename already exists, creating a new snapshot will overwrite the existing snapshot. This action cannot be undone.'), t('Create'), t('Cancel'));
}
function demo_dump_submit($form, &$form_state) {
@@ -154,7 +154,7 @@ function demo_dump_submit($form, &$form_
drupal_set_message(t('@engine support not implemented yet.', array('@engine' => ucfirst($engine))), 'error');
}
- $form_state['redirect'] = 'admin/settings/demo/manage';
+ $form_state['redirect'] = 'admin/build/demo/manage';
}
function demo_reset_confirm() {
@@ -164,7 +164,7 @@ function demo_reset_confirm() {
);
$form = array_merge_recursive($form, demo_get_dumps());
- return confirm_form($form, t('Are you sure you want to reset the site?'), 'admin/settings/demo', t('Resetting the site will overwrite all changes that have been made to this Drupal installation since the chosen snapshot.
THIS ACTION CANNOT BE UNDONE!
'), t('Reset'), t('Cancel'));
+ return confirm_form($form, t('Are you sure you want to reset the site?'), 'admin/build/demo', t('Resetting the site will overwrite all changes that have been made to this Drupal installation since the chosen snapshot.
THIS ACTION CANNOT BE UNDONE!
'), t('Reset'), t('Cancel'));
}
function demo_reset_confirm_submit($form, &$form_state) {
@@ -176,7 +176,7 @@ function demo_reset_confirm_submit($form
// Save time of last reset.
variable_set('demo_reset_last', time());
- $form_state['redirect'] = isset($form_state['values']['redirect']) ? $form_state['values']['redirect'] : 'admin/settings/demo';
+ $form_state['redirect'] = isset($form_state['values']['redirect']) ? $form_state['values']['redirect'] : 'admin/build/demo';
}
function demo_reset($filename = 'demo_site', $verbose = TRUE) {
Index: demo.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/demo/demo.info,v
retrieving revision 1.6
diff -u -p -r1.6 demo.info
--- demo.info 13 Feb 2008 23:38:55 -0000 1.6
+++ demo.info 2 Nov 2008 21:59:55 -0000
@@ -3,4 +3,3 @@ name = Demo Site
description = Create snapshots and reset the site for demonstration or testing purposes.
package = Development
core = 6.x
-
Index: demo.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/demo/demo.module,v
retrieving revision 1.27
diff -u -p -r1.27 demo.module
--- demo.module 28 Oct 2008 19:06:54 -0000 1.27
+++ demo.module 2 Nov 2008 22:00:18 -0000
@@ -20,7 +20,7 @@ function demo_menu() {
$items = array();
$admin_access = array('administer demo settings');
- $items['admin/settings/demo'] = array(
+ $items['admin/build/demo'] = array(
'title' => 'Demonstration site',
'description' => 'Administer reset interval, create new dumps and manually reset this site.',
'page callback' => 'drupal_get_form',
@@ -28,12 +28,12 @@ function demo_menu() {
'access arguments' => $admin_access,
'file' => 'demo.admin.inc',
);
- $items['admin/settings/demo/maintenance'] = array(
+ $items['admin/build/demo/maintenance'] = array(
'title' => 'Status',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => 0,
);
- $items['admin/settings/demo/manage'] = array(
+ $items['admin/build/demo/manage'] = array(
'title' => 'Manage snapshots',
'page callback' => 'drupal_get_form',
'page arguments' => array('demo_manage'),
@@ -42,7 +42,7 @@ function demo_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 1,
);
- $items['admin/settings/demo/dump'] = array(
+ $items['admin/build/demo/dump'] = array(
'title' => 'Create snapshot',
'page callback' => 'drupal_get_form',
'page arguments' => array('demo_dump'),
@@ -51,7 +51,7 @@ function demo_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 2,
);
- $items['admin/settings/demo/reset'] = array(
+ $items['admin/build/demo/reset'] = array(
'title' => 'Reset site',
'page callback' => 'drupal_get_form',
'page arguments' => array('demo_reset_confirm'),