diff --git a/core/includes/theme.inc b/core/includes/theme.inc index bab2af5..08464ab 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1845,6 +1845,24 @@ function theme_dropbutton_wrapper($variables) { } /** + * Returns HTML for wrapping a dropbutton list. + * + * Use this function if the dropbutton contains submit buttons. These elements + * need to have a #prefix and #suffix element that wraps those into an
  • + * element. + * + * @param array $variables + * An associative array containing: + * - element: An associative array containing the properties and children of + * the dropbutton list. Properties used: #children. + */ +function theme_dropbutton_list_wrapper($variables) { + if (!empty($variables['element']['#children'])) { + return ''; + } +} + +/** * Returns HTML for an image. * * @param $variables @@ -3155,6 +3173,9 @@ function drupal_common_theme() { 'dropbutton_wrapper' => array( 'render element' => 'element', ), + 'dropbutton_list_wrapper' => array( + 'render element' => 'element', + ), 'image' => array( // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft // allows the alt attribute to be omitted in some cases. Therefore, diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php index faf5627..b103029 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php @@ -324,7 +324,7 @@ function createSampleNodes($count = 5) { $edit = array(); $edit['title'] = $this->randomName(); $edit["body[$langcode][0][value]"] = $this->randomName(); - $this->drupalPost('node/add/article', $edit, t('Save')); + $this->drupalPost('node/add/article', $edit, t('Publish')); } } } diff --git a/core/modules/book/lib/Drupal/book/Tests/BookTest.php b/core/modules/book/lib/Drupal/book/Tests/BookTest.php index 0a1ffcf..c554c55 100644 --- a/core/modules/book/lib/Drupal/book/Tests/BookTest.php +++ b/core/modules/book/lib/Drupal/book/Tests/BookTest.php @@ -127,7 +127,7 @@ function testBook() { $other_book = $this->createBookNode('new'); $node = $this->createBookNode($book->nid); $edit = array('book[bid]' => $other_book->nid); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->drupalLogout(); $this->drupalLogin($this->web_user); @@ -251,10 +251,10 @@ function createBookNode($book_nid, $parent = NULL) { $this->drupalPost('node/add/book', $edit, t('Change book (update list of parents)')); $edit['book[plid]'] = $parent; - $this->drupalPost(NULL, $edit, t('Save')); + $this->drupalPost(NULL, $edit, t('Publish')); } else { - $this->drupalPost('node/add/book', $edit, t('Save')); + $this->drupalPost('node/add/book', $edit, t('Publish')); } // Check to make sure the book node was created. diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php index e979a5c..87bf71c 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php @@ -103,7 +103,7 @@ function testCommentLanguage() { "body[$langcode_not_specified][0][value]" => $this->randomName(), "langcode" => $node_langcode, ); - $this->drupalPost("node/add/article", $edit, t('Save')); + $this->drupalPost("node/add/article", $edit, t('Publish')); $node = $this->drupalGetNodeByTitle($title); $prefixes = language_negotiation_url_prefixes(); diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php b/core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php index ddfcac4..bacff03 100644 --- a/core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php +++ b/core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php @@ -311,14 +311,14 @@ private function doNode($type) { $edit = $this->getContent($type); $langcode = LANGUAGE_NOT_SPECIFIED; $title = $edit["title"]; - $this->drupalPost('node/add/' . $type, $edit, t('Save')); + $this->drupalPost('node/add/' . $type, $edit, t('Publish')); $this->assertResponse(200); // Retrieve the node object. $node = $this->drupalGetNodeByTitle($title); $this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title))); // Edit the node. $edit = $this->getContentUpdate($type); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertResponse(200); // Delete the node. $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php index 9d7dd30..d9c49fd 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php @@ -64,7 +64,7 @@ function testNodeDisplay() { // Turn the "display" option off and check that the file is no longer displayed. $edit = array($field_name . '[' . LANGUAGE_NOT_SPECIFIED . '][0][display]' => FALSE); - $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $nid . '/edit', $edit, t('Publish')); $this->assertNoRaw($default_output, t('Field is hidden when "display" option is unchecked.')); diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php index 480f411..8f03485 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php @@ -71,7 +71,7 @@ function testRevisions() { // Save a new version of the node without any changes. // Check that the file is still the same as the previous revision. - $this->drupalPost('node/' . $nid . '/edit', array('revision' => '1'), t('Save')); + $this->drupalPost('node/' . $nid . '/edit', array('revision' => '1'), t('Publish')); $node = node_load($nid, TRUE); $node_file_r3 = file_load($node->{$field_name}[LANGUAGE_NOT_SPECIFIED][0]['fid']); $node_vid_r3 = $node->vid; diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php index e291bec..8dd258a 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php @@ -149,7 +149,7 @@ function uploadNodeFile($file, $field_name, $nid_or_type, $new_revision = TRUE, // Attach a file to the node. $edit['files[' . $field_name . '_' . $langcode . '_0]'] = drupal_realpath($file->uri); - $this->drupalPost("node/$nid/edit", $edit, t('Save')); + $this->drupalPost("node/$nid/edit", $edit, t('Publish')); return $nid; } @@ -165,7 +165,7 @@ function removeNodeFile($nid, $new_revision = TRUE) { ); $this->drupalPost('node/' . $nid . '/edit', array(), t('Remove')); - $this->drupalPost(NULL, $edit, t('Save')); + $this->drupalPost(NULL, $edit, t('Publish')); } /** @@ -178,7 +178,7 @@ function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) { ); $this->drupalPost('node/' . $nid . '/edit', array(), t('Remove')); - $this->drupalPost(NULL, $edit, t('Save')); + $this->drupalPost(NULL, $edit, t('Publish')); } /** diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php index 050931b..a3b355e 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php @@ -37,7 +37,7 @@ function testRequired() { // Try to post a new node without uploading a file. $langcode = LANGUAGE_NOT_SPECIFIED; $edit = array("title" => $this->randomName()); - $this->drupalPost('node/add/' . $type_name, $edit, t('Save')); + $this->drupalPost('node/add/' . $type_name, $edit, t('Publish')); $this->assertRaw(t('!title field is required.', array('!title' => $instance['label'])), t('Node save failed when required file field was empty.')); // Create a new node with the uploaded file. @@ -56,7 +56,7 @@ function testRequired() { // Try to post a new node without uploading a file in the multivalue field. $edit = array('title' => $this->randomName()); - $this->drupalPost('node/add/' . $type_name, $edit, t('Save')); + $this->drupalPost('node/add/' . $type_name, $edit, t('Publish')); $this->assertRaw(t('!title field is required.', array('!title' => $instance['label'])), t('Node save failed when required multiple value file field was empty.')); // Create a new node with the uploaded file into the multivalue field. diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php index 7fcf35f..1724798 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php @@ -73,7 +73,7 @@ function testSingleValuedWidget() { $this->assertTrue(isset($label[0]), 'Label for upload found.'); // Save the node and ensure it does not have the file. - $this->drupalPost(NULL, array(), t('Save')); + $this->drupalPost(NULL, array(), t('Publish')); $node = node_load($nid, TRUE); $this->assertTrue(empty($node->{$field_name}[LANGUAGE_NOT_SPECIFIED][0]['fid']), t('File was successfully removed from the node.')); } @@ -191,7 +191,7 @@ function testMultiValuedWidget() { $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), t('After removing all files, there is no "Remove" button displayed (JSMode=%type).', array('%type' => $type))); // Save the node and ensure it does not have any files. - $this->drupalPost(NULL, array('title' => $this->randomName()), t('Save')); + $this->drupalPost(NULL, array('title' => $this->randomName()), t('Publish')); $matches = array(); preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches); $nid = $matches[1]; @@ -268,7 +268,7 @@ function testPrivateFileComment() { $edit = array( 'title' => $this->randomName(), ); - $this->drupalPost('node/add/article', $edit, t('Save')); + $this->drupalPost('node/add/article', $edit, t('Publish')); $node = $this->drupalGetNodeByTitle($edit['title']); // Add a comment with a file. @@ -302,10 +302,7 @@ function testPrivateFileComment() { // Unpublishes node. $this->drupalLogin($this->admin_user); - $edit = array( - 'status' => FALSE, - ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', array(), t('Unpublish')); // Ensures normal user can no longer download the file. $this->drupalLogin($user); diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php index c2b76d2..e5f5ab9 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php @@ -220,7 +220,7 @@ function testFilterAdmin() { $edit["title"] = $this->randomName(); $edit["body[$langcode][0][value]"] = $text; $edit["body[$langcode][0][format]"] = $filtered; - $this->drupalPost('node/add/page', $edit, t('Save')); + $this->drupalPost('node/add/page', $edit, t('Publish')); $this->assertRaw(t('Basic page %title has been created.', array('%title' => $edit["title"])), 'Filtered node created.'); $node = $this->drupalGetNodeByTitle($edit["title"]); @@ -232,7 +232,7 @@ function testFilterAdmin() { // Use plain text and see if it escapes all tags, whether allowed or not. $edit = array(); $edit["body[$langcode][0][format]"] = $plain; - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->drupalGet('node/' . $node->nid); $this->assertText(check_plain($text), 'The "Plain text" text format escapes all HTML tags.'); diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php index a71a9e9..93edb32 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php @@ -207,7 +207,7 @@ function testFormatWidgetPermissions() { $edit['title'] = $this->randomName(8); $edit[$body_value_key] = $this->randomName(16); $edit[$body_format_key] = $this->disallowed_format->format; - $this->drupalPost('node/add/page', $edit, t('Save')); + $this->drupalPost('node/add/page', $edit, t('Publish')); $node = $this->drupalGetNodeByTitle($edit['title']); // Try to edit with a less privileged user. @@ -225,7 +225,7 @@ function testFormatWidgetPermissions() { $this->assertText($edit[$body_value_key], 'Old body found in preview.'); // Save and verify that only the title was changed. - $this->drupalPost(NULL, $new_edit, t('Save')); + $this->drupalPost(NULL, $new_edit, t('Publish')); $this->assertNoText($edit['title'], 'Old title not found.'); $this->assertText($new_edit['title'], 'New title found.'); $this->assertText($edit[$body_value_key], 'Old body found.'); @@ -262,7 +262,7 @@ function testFormatWidgetPermissions() { $old_title = $new_edit['title']; $new_title = $this->randomName(8); $edit = array('title' => $new_title); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.'); $this->drupalGet('node/' . $node->nid); $this->assertText($old_title, 'Old title found.'); @@ -270,7 +270,7 @@ function testFormatWidgetPermissions() { // Now select a new text format and make sure the node can be saved. $edit[$body_format_key] = filter_fallback_format(); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertUrl('node/' . $node->nid); $this->assertText($new_title, 'New title found.'); $this->assertNoText($old_title, 'Old title not found.'); @@ -279,7 +279,7 @@ function testFormatWidgetPermissions() { // other formats on the site (leaving only the fallback format). $this->drupalLogin($this->admin_user); $edit = array($body_format_key => $this->allowed_format->format); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertUrl('node/' . $node->nid); foreach (filter_formats() as $format) { if ($format->format != filter_fallback_format()) { @@ -296,13 +296,13 @@ function testFormatWidgetPermissions() { $old_title = $new_title; $new_title = $this->randomName(8); $edit = array('title' => $new_title); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.'); $this->drupalGet('node/' . $node->nid); $this->assertText($old_title, 'Old title found.'); $this->assertNoText($new_title, 'New title not found.'); $edit[$body_format_key] = filter_fallback_format(); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertUrl('node/' . $node->nid); $this->assertText($new_title, 'New title found.'); $this->assertNoText($old_title, 'Old title not found.'); diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php index 496a5f3..a5e381f 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php @@ -75,7 +75,7 @@ function testFilterHooks() { "body[$language_not_specified][0][value]" => $this->randomName(32), "body[$language_not_specified][0][format]" => $format_id, ); - $this->drupalPost("node/add/{$type->type}", $edit, t('Save')); + $this->drupalPost("node/add/{$type->type}", $edit, t('Publish')); $this->assertText(t('@type @title has been created.', array('@type' => $type_name, '@title' => $title)), 'New node successfully created.'); // Disable the text format. diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php index f36c5a9..0665b57 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php @@ -172,7 +172,7 @@ protected function createForumTopics($count = 5) { ); // Create the forum topic, preselecting the forum ID via a URL parameter. - $this->drupalPost('node/add/forum/1', $edit, t('Save')); + $this->drupalPost('node/add/forum/1', $edit, t('Publish')); $topics[] = $title; } diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php index 7ae7d5f..ee73563 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php @@ -55,7 +55,7 @@ function testForumIndexStatus() { ); // Create the forum topic, preselecting the forum ID via a URL parameter. - $this->drupalPost('node/add/forum/' . $tid, $edit, t('Save')); + $this->drupalPost('node/add/forum/' . $tid, $edit, t('Publish')); // Check that the node exists in the database. $node = $this->drupalGetNodeByTitle($title); @@ -66,10 +66,7 @@ function testForumIndexStatus() { $this->assertText($title, 'Published forum topic appears on index.'); // Unpublish the node. - $edit = array( - 'status' => FALSE, - ); - $this->drupalPost("node/{$node->nid}/edit", $edit, t('Save')); + $this->drupalPost("node/{$node->nid}/edit", array(), t('Unpublish')); $this->drupalGet("node/{$node->nid}"); $this->assertText(t('Access denied'), 'Unpublished node is no longer accessible.'); diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php index e619923..23f654d 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php @@ -61,7 +61,7 @@ function testForumNodeAccess() { "body[$langcode][0][value]" => $this->randomName(200), 'private' => TRUE, ); - $this->drupalPost('node/add/forum/1', $edit, t('Save')); + $this->drupalPost('node/add/forum/1', $edit, t('Publish')); $private_node = $this->drupalGetNodeByTitle($private_node_title); $this->assertTrue(!empty($private_node), 'New private forum node found in database.'); @@ -71,7 +71,7 @@ function testForumNodeAccess() { 'title' => $public_node_title, "body[$langcode][0][value]" => $this->randomName(200), ); - $this->drupalPost('node/add/forum/1', $edit, t('Save')); + $this->drupalPost('node/add/forum/1', $edit, t('Publish')); $public_node = $this->drupalGetNodeByTitle($public_node_title); $this->assertTrue(!empty($public_node), 'New public forum node found in database.'); diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php index 7b0bef7..a86aa8c 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php @@ -210,7 +210,7 @@ function testForum() { // Test editing a forum topic that has a comment. $this->drupalLogin($this->edit_any_topics_user); $this->drupalGet('forum/' . $this->forum['tid']); - $this->drupalPost("node/$node->nid/edit", array(), t('Save')); + $this->drupalPost("node/$node->nid/edit", array(), t('Publish')); $this->assertResponse(200); } @@ -230,7 +230,7 @@ function testAddOrphanTopic() { // Create an orphan forum item. $this->drupalLogin($this->admin_user); - $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NOT_SPECIFIED .'][0][value]' => $this->randomName(120)), t('Save')); + $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NOT_SPECIFIED .'][0][value]' => $this->randomName(120)), t('Publish')); $nid_count = db_query('SELECT COUNT(nid) FROM {node}')->fetchField(); $this->assertEqual(0, $nid_count, 'A forum node was not created when missing a forum vocabulary.'); @@ -465,7 +465,7 @@ function createForumTopic($forum, $container = FALSE) { $tid = $forum['tid']; // Create the forum topic, preselecting the forum ID via a URL parameter. - $this->drupalPost('node/add/forum/' . $tid, $edit, t('Save')); + $this->drupalPost('node/add/forum/' . $tid, $edit, t('Publish')); $type = t('Forum topic'); if ($container) { @@ -549,7 +549,7 @@ private function verifyForums($node_user, Node $node, $admin, $response = 200) { // Assume the topic is initially associated with $forum. $edit["taxonomy_forums[$langcode]"] = $this->root_forum['tid']; $edit['shadow'] = TRUE; - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit["title"])), 'Forum node was edited'); // Verify topic was moved to a different forum. diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php index 1cfda9f..fd12707 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php @@ -187,7 +187,7 @@ function testImageFieldSettings() { $field_name . '[' . LANGUAGE_NOT_SPECIFIED . '][0][alt]' => $image_info['alt'], $field_name . '[' . LANGUAGE_NOT_SPECIFIED . '][0][title]' => $image_info['title'], ); - $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $nid . '/edit', $edit, t('Publish')); $default_output = theme('image', $image_info); $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.'); @@ -197,7 +197,7 @@ function testImageFieldSettings() { $field_name . '[' . LANGUAGE_NOT_SPECIFIED . '][0][alt]' => $this->randomName($test_size), $field_name . '[' . LANGUAGE_NOT_SPECIFIED . '][0][title]' => $this->randomName($test_size), ); - $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $nid . '/edit', $edit, t('Publish')); $this->assertRaw(t('Alternate text cannot be longer than %max characters but is currently %length characters long.', array( '%max' => $schema['fields'][$field_name .'_alt']['length'], '%length' => $test_size, diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php index 760e72d..87af2bd 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php @@ -118,7 +118,7 @@ function uploadNodeImage($image, $field_name, $type) { 'title' => $this->randomName(), ); $edit['files[' . $field_name . '_' . LANGUAGE_NOT_SPECIFIED . '_0]'] = drupal_realpath($image->uri); - $this->drupalPost('node/add/' . $type, $edit, t('Save')); + $this->drupalPost('node/add/' . $type, $edit, t('Publish')); // Retrieve ID of the newly created node from the current URL. $matches = array(); diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php index a424457..59f9b5d 100644 --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php @@ -126,7 +126,7 @@ function testContentTypeLanguageConfiguration() { $edit = array( 'langcode' => 'en', ); - $this->drupalPost($path, $edit, t('Save')); + $this->drupalPost($path, $edit, t('Publish')); $this->assertRaw(t('%title has been updated.', array('%title' => $node_title))); $this->drupalLogout(); diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php index cf01fbe..6e543f9 100644 --- a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php +++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php @@ -66,7 +66,7 @@ function testMenuNodeFormWidget() { "title" => $node_title, "body[$langcode][0][value]" => $this->randomString(), ); - $this->drupalPost('node/add/page', $edit, t('Save')); + $this->drupalPost('node/add/page', $edit, t('Publish')); $node = $this->drupalGetNodeByTitle($node_title); // Assert that there is no link for the node. $this->drupalGet('test-page'); @@ -76,7 +76,7 @@ function testMenuNodeFormWidget() { $edit = array( 'menu[enabled]' => 1, ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); // Assert that there is no link for the node. $this->drupalGet('test-page'); $this->assertNoLink($node_title); @@ -87,7 +87,7 @@ function testMenuNodeFormWidget() { 'menu[link_title]' => $node_title, 'menu[weight]' => 17, ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); // Assert that the link exists. $this->drupalGet('test-page'); $this->assertLink($node_title); @@ -99,7 +99,7 @@ function testMenuNodeFormWidget() { $edit = array( 'menu[enabled]' => FALSE, ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); // Assert that there is no link for the node. $this->drupalGet('test-page'); $this->assertNoLink($node_title); @@ -117,7 +117,7 @@ function testMenuNodeFormWidget() { $this->drupalGet('node/' . $node->nid . '/edit'); $this->assertText('Provide a menu link', 'Link in not allowed menu not shown in node edit form'); // Assert that the link is still in the Administration menu after save. - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); + $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Publish')); $link = menu_link_load($item['mlid']); $this->assertTrue($link, 'Link in not allowed menu still exists after saving node'); diff --git a/core/modules/node/css/node-admin.css b/core/modules/node/css/node-admin.css new file mode 100644 index 0000000..5fb2f67 --- /dev/null +++ b/core/modules/node/css/node-admin.css @@ -0,0 +1,20 @@ +/** + * The .css file is intended to only contain positioning and size declarations + * For example: display, position, float, clear, and overflow. + */ + +/** +* Node form dropbuttons. +*/ +.form-actions .dropbutton-wrapper { + width: 120px; + float: left; + margin-right: 1em; +} + +.form-actions .dropbutton-wrapper li a, +.form-actions .dropbutton-wrapper input { + padding: 4px 17px; + margin-bottom: 0em; +} + diff --git a/core/modules/node/css/node-admin.theme.css b/core/modules/node/css/node-admin.theme.css new file mode 100644 index 0000000..de5c892 --- /dev/null +++ b/core/modules/node/css/node-admin.theme.css @@ -0,0 +1,26 @@ +/** + * The .theme.css file is intended to contain presentation declarations including + * images, borders, colors, and fonts. + */ + +/** + * Node form dropbuttons. + */ +.form-actions .dropbutton-wrapper li a, +.form-actions .dropbutton-wrapper input { + border: medium; + border-radius: 0; + background: none; +} + +.form-actions .dropbutton-wrapper input:hover { + background: none; + border: none; +} + +/** + * Revisions overview screen. + */ +.revision-current { + background: #ffc; +} diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php index 08ecf08..11dcb3e 100644 --- a/core/modules/node/lib/Drupal/node/NodeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeFormController.php @@ -204,7 +204,7 @@ public function form(array $form, array &$form_state, EntityInterface $node) { $form['options'] = array( '#type' => 'details', '#access' => user_access('administer nodes'), - '#title' => t('Publishing options'), + '#title' => t('Promotion options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#group' => 'additional_settings', @@ -217,12 +217,6 @@ public function form(array $form, array &$form_state, EntityInterface $node) { '#weight' => 95, ); - $form['options']['status'] = array( - '#type' => 'checkbox', - '#title' => t('Published'), - '#default_value' => $node->status, - ); - $form['options']['promote'] = array( '#type' => 'checkbox', '#title' => t('Promoted to front page'), @@ -246,6 +240,53 @@ public function form(array $form, array &$form_state, EntityInterface $node) { } /** + * Overrides Drupal\entity\EntityFormController::actionsElement(). + */ + protected function actionsElement(array $form, array &$form_state) { + $element = parent::actionsElement($form, $form_state); + $node = $this->getEntity($form_state); + + // Because some of the 'links' are actually submit buttons, we have to + // manually wrap each item in
  • and the whole list in