';
if ($node->teaser && $node->teaser != $node->body) {
- drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.'));
+ drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication.
You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.'));
$output .= '
'. t('Preview trimmed version') .'
';
$output .= node_view(drupal_clone($node), 1, FALSE, 0);
$output .= '
'. t('Preview full version') .'
';
@@ -2914,6 +2949,42 @@ function node_content_access($op, $node)
}
/**
+ * Return a node body field, with format and teaser.
+ */
+function node_body_field(&$node, $label, $word_count) {
+
+ // Check if we need to restore the teaser at the beginning of the body.
+ $include = !isset($node->teaser) || ($node->teaser == substr($node->body, 0, strlen($node->teaser)));
+
+ $form = array(
+ '#after_build' => array('node_teaser_js'));
+
+ $form['teaser_js'] = array(
+ '#type' => 'textarea',
+ '#rows' => 10,
+ '#teaser' => 'edit-body',
+ '#disabled' => TRUE);
+
+ $form['teaser_include'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include teaser in body'),
+ '#default_value' => $include,
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+
+ $form['body'] = array(
+ '#type' => 'textarea',
+ '#title' => check_plain($label),
+ '#default_value' => $include ? $node->body : ($node->teaser . $node->body),
+ '#rows' => 20,
+ '#required' => ($word_count > 0));
+
+ $form['format'] = filter_form($node->format);
+
+ return $form;
+}
+/**
* Implementation of hook_form().
*/
function node_content_form($node) {
@@ -2931,13 +3002,7 @@ function node_content_form($node) {
}
if ($type->has_body) {
- $form['body_filter']['body'] = array(
- '#type' => 'textarea',
- '#title' => check_plain($type->body_label),
- '#default_value' => $node->body,
- '#rows' => 20,
- '#required' => ($type->min_word_count > 0));
- $form['body_filter']['format'] = filter_form($node->format);
+ $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
}
return $form;
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.21
diff -u -F^f -r1.21 system.css
--- modules/system/system.css 21 Dec 2006 16:13:06 -0000 1.21
+++ modules/system/system.css 8 Jan 2007 04:41:10 -0000
@@ -355,6 +355,31 @@
}
/*
+** Teaser splitter
+*/
+.joined + .grippie {
+ height: 5px;
+ background-position: center 1px;
+ margin-bottom: -2px;
+}
+input.teaser-button {
+ float: right;
+ margin-right: 5%;
+ margin-top: 0;
+}
+.teaser-checkbox div.form-item {
+ float: right;
+ margin: 0 5% 0 0;
+ padding: 0;
+}
+textarea.teaser {
+ display: none;
+}
+html.js .no-js {
+ display: none;
+}
+
+/*
** Progressbar styles
*/
.progress {