Index: node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.499
diff -u -F^function -r1.499 node.module
--- node.module 22 Jun 2005 20:19:58 -0000 1.499
+++ node.module 23 Jun 2005 18:46:17 -0000
@@ -1284,32 +1280,6 @@ function node_form($edit) {
// Add hidden 'op' variable, which specifies the default operation (Preview).
$output .= '\n";
- // Add the admin-specific parts.
- if (user_access('administer nodes')) {
- $output .= '
';
-
- $author = form_autocomplete(t('Authored by'), 'name', $edit->name, 20, 60, 'user/autocomplete');
- $author .= form_textfield(t('Authored on'), 'date', $edit->date, 20, 25, NULL, NULL, TRUE);
-
- $output .= '
';
- $output .= form_group_collapsible(t('Authoring information'), $author, TRUE);
- $output .= "
\n";
-
- $node_options = variable_get('node_options_'. $edit->type, array('status', 'promote'));
- $options .= form_checkbox(t('Published'), 'status', 1, isset($edit->status) ? $edit->status : in_array('status', $node_options));
- $options .= form_checkbox(t('In moderation queue'), 'moderate', 1, isset($edit->moderate) ? $edit->moderate : in_array('moderate', $node_options));
- $options .= form_checkbox(t('Promoted to front page'), 'promote', 1, isset($edit->promote) ? $edit->promote : in_array('promote', $node_options));
- $options .= form_checkbox(t('Sticky at top of lists'), 'sticky', 1, isset($edit->sticky) ? $edit->sticky : in_array('sticky', $node_options));
- $options .= form_checkbox(t('Create new revision'), 'revision', 1, isset($edit->revision) ? $edit->revision : in_array('revision', $node_options));
-
- $output .= '
';
- $output .= form_group_collapsible(t('Publishing options'), $options, TRUE);
- $output .= "
\n";
-
- $extras .= implode('
' : '';
- }
-
// Add the default fields.
$output .= '';
$output .= form_textfield(t('Title'), 'title', $edit->title, 60, 128, NULL, NULL, TRUE);
@@ -1336,9 +1306,36 @@ function node_form($edit) {
$output .= form_hidden('changed', $edit->changed);
}
+ // Add the admin-specific parts.
+ if (user_access('administer nodes')) {
+ $output .= '
';
+
+ $author = form_autocomplete(t('Authored by'), 'name', $edit->name, 20, 60, 'user/autocomplete');
+ $author .= form_textfield(t('Authored on'), 'date', $edit->date, 20, 25, NULL, NULL, TRUE);
+
+ $output .= '
';
+ $output .= form_group_collapsible(t('Authoring information'), $author, TRUE);
+ $output .= "
\n";
+
+ $node_options = variable_get('node_options_'. $edit->type, array('status', 'promote'));
+ $options .= form_checkbox(t('Published'), 'status', 1, isset($edit->status) ? $edit->status : in_array('status', $node_options));
+ $options .= form_checkbox(t('In moderation queue'), 'moderate', 1, isset($edit->moderate) ? $edit->moderate : in_array('moderate', $node_options));
+ $options .= form_checkbox(t('Promoted to front page'), 'promote', 1, isset($edit->promote) ? $edit->promote : in_array('promote', $node_options));
+ $options .= form_checkbox(t('Sticky at top of lists'), 'sticky', 1, isset($edit->sticky) ? $edit->sticky : in_array('sticky', $node_options));
+ $options .= form_checkbox(t('Create new revision'), 'revision', 1, isset($edit->revision) ? $edit->revision : in_array('revision', $node_options));
+
+ $output .= '
';
+ $output .= form_group_collapsible(t('Publishing options'), $options, TRUE);
+ $output .= "
\n";
+
+ $extras .= implode('
' : '
';
+ }
+
$output .= form_hidden('type', $edit->type);
- // Add the buttons.
+ // Add the buttons on a new row.
+ $output .= "